summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/noticesearchrss.php7
-rw-r--r--actions/passwordsettings.php2
-rw-r--r--actions/siteadminpanel.php10
-rw-r--r--classes/statusnet.ini3
-rw-r--r--js/geometa.js31
-rw-r--r--lib/columndef.php169
-rw-r--r--lib/htmloutputter.php5
-rw-r--r--lib/noticelist.php42
-rw-r--r--lib/schema.php168
-rw-r--r--lib/searchaction.php4
-rw-r--r--lib/searchgroupnav.php4
-rw-r--r--lib/tabledef.php63
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.mobin36593 -> 48583 bytes
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po961
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.mobin88688 -> 66029 bytes
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po819
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.mobin75686 -> 58477 bytes
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po830
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.mobin37974 -> 17684 bytes
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po685
-rw-r--r--locale/de/LC_MESSAGES/statusnet.mobin75715 -> 56078 bytes
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po698
-rw-r--r--locale/el/LC_MESSAGES/statusnet.mobin32801 -> 15005 bytes
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po676
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.mobin70745 -> 61282 bytes
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po990
-rw-r--r--locale/es/LC_MESSAGES/statusnet.mobin74756 -> 51119 bytes
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po701
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.mobin80746 -> 67531 bytes
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po698
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.mobin98865 -> 114660 bytes
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po1084
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.mobin78412 -> 48102 bytes
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po705
-rw-r--r--locale/he/LC_MESSAGES/statusnet.mobin41479 -> 19693 bytes
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po683
-rw-r--r--locale/is/LC_MESSAGES/statusnet.mobin66563 -> 55910 bytes
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po698
-rw-r--r--locale/it/LC_MESSAGES/statusnet.mobin74607 -> 54293 bytes
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po698
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.mobin51365 -> 31052 bytes
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po686
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.mobin79573 -> 57596 bytes
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po697
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.mobin48861 -> 23107 bytes
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po682
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.mobin25159 -> 13985 bytes
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po680
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.mobin104559 -> 113010 bytes
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po1037
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.mobin71756 -> 52282 bytes
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po697
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.mobin100184 -> 84319 bytes
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po709
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.mobin27718 -> 17764 bytes
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po719
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.mobin74412 -> 54022 bytes
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po778
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.mobin100725 -> 136649 bytes
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po1742
-rw-r--r--locale/statusnet.po645
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.mobin62253 -> 36689 bytes
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po698
-rw-r--r--locale/te/LC_MESSAGES/statusnet.mobin59709 -> 41877 bytes
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po702
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.mobin37480 -> 17491 bytes
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po685
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.mobin97470 -> 71199 bytes
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po702
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.mobin71795 -> 36601 bytes
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po701
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.mobin68386 -> 42849 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po697
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.mobin20853 -> 8296 bytes
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po682
-rw-r--r--plugins/GeonamesPlugin.php87
-rw-r--r--plugins/Mapstraction/MapstractionPlugin.php4
-rw-r--r--plugins/Mapstraction/usermap.js21
-rw-r--r--plugins/Realtime/RealtimePlugin.php9
-rw-r--r--plugins/Realtime/realtimeupdate.css29
-rw-r--r--plugins/Realtime/realtimeupdate.js20
-rwxr-xr-xscripts/pluginqueuehandler.php6
-rwxr-xr-xscripts/update_translations.php2
-rw-r--r--theme/base/css/display.css1
-rw-r--r--theme/default/css/display.css4
-rw-r--r--theme/identica/css/display.css4
86 files changed, 14970 insertions, 10590 deletions
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/actions/passwordsettings.php b/actions/passwordsettings.php
index 11d7bf785..4395f772b 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -110,7 +110,7 @@ class PasswordsettingsAction extends AccountSettingsAction
$this->elementEnd('li');
$this->elementStart('li');
$this->password('confirm', _('Confirm'),
- _('same as password above'));
+ _('Same as password above'));
$this->elementEnd('li');
$this->elementEnd('ul');
diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
index 40197d6e2..b963336e6 100644
--- a/actions/siteadminpanel.php
+++ b/actions/siteadminpanel.php
@@ -196,18 +196,18 @@ class SiteadminpanelAction extends AdminPanelAction
if (in_array($values['site']['ssl'], array('sometimes', 'always'))) {
if (empty($values['site']['sslserver'])) {
- $this->clientError(_("You must set an SSL sever when enabling SSL."));
+ $this->clientError(_("You must set an SSL server when enabling SSL."));
}
}
if (mb_strlen($values['site']['sslserver']) > 255) {
- $this->clientError(_("Invalid SSL server. Max length is 255 characters."));
+ $this->clientError(_("Invalid SSL server. The maximum length is 255 characters."));
}
// Validate text limit
if (!Validate::number($values['site']['textlimit'], array('min' => 140))) {
- $this->clientError(_("Minimum text limit is 140c."));
+ $this->clientError(_("Minimum text limit is 140 characters."));
}
// Validate dupe limit
@@ -281,7 +281,7 @@ class SiteAdminPanelForm extends AdminForm
$this->unli();
$this->li();
$this->input('email', _('Email'),
- _('contact email address for your site'));
+ _('Contact email address for your site'));
$this->unli();
$this->out->elementEnd('ul');
$this->out->elementEnd('fieldset');
@@ -364,7 +364,7 @@ class SiteAdminPanelForm extends AdminForm
$this->li();
$this->input('frequency', _('Frequency'),
- _('Snapshots will be sent once every N Web hits'),
+ _('Snapshots will be sent once every N web hits'),
'snapshot');
$this->unli();
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index b2509dac5..69b355870 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -261,6 +261,7 @@ modified = 384
[login_token__keys]
user_id = K
+token = K
[message]
id = 129
@@ -542,4 +543,4 @@ created = 142
modified = 384
[user_group__keys]
-id = N \ No newline at end of file
+id = N
diff --git a/js/geometa.js b/js/geometa.js
index ced5be060..21deb1885 100644
--- a/js/geometa.js
+++ b/js/geometa.js
@@ -1,5 +1,5 @@
// A shim to implement the W3C Geolocation API Specification using Gears or the Ajax API
-if ( typeof navigator.geolocation == "undefined" || navigator.geolocation.shim ) (function(){
+if (typeof navigator.geolocation == "undefined" || navigator.geolocation.shim ) (function(){
// -- BEGIN GEARS_INIT
(function() {
@@ -94,7 +94,7 @@ var GearsGeoLocation = (function() {
}
};
-})();
+});
var AjaxGeoLocation = (function() {
// -- PRIVATE
@@ -103,7 +103,7 @@ var AjaxGeoLocation = (function() {
if (!hasGoogleLoader() && !loading) {
loading = true;
var s = document.createElement('script');
- s.src = 'http://www.google.com/jsapi?callback=_google_loader_apiLoaded';
+ s.src = (document.location.protocol == "https:"?"https://":"http://") + 'www.google.com/jsapi?callback=_google_loader_apiLoaded';
s.type = "text/javascript";
document.getElementsByTagName('body')[0].appendChild(s);
}
@@ -161,22 +161,23 @@ var AjaxGeoLocation = (function() {
var cl = google.loader.ClientLocation;
var position = {
- latitude: cl.latitude,
- longitude: cl.longitude,
- altitude: null,
- accuracy: 43000, // same as Gears accuracy over wifi?
- altitudeAccuracy: null,
- heading: null,
- velocity: null,
- timestamp: new Date(),
-
+ coords: {
+ latitude: cl.latitude,
+ longitude: cl.longitude,
+ altitude: null,
+ accuracy: 43000, // same as Gears accuracy over wifi?
+ altitudeAccuracy: null,
+ heading: null,
+ speed: null,
+ },
// extra info that is outside of the bounds of the core API
address: {
city: cl.address.city,
country: cl.address.country,
country_code: cl.address.country_code,
region: cl.address.region
- }
+ },
+ timestamp: new Date()
};
successCallback(position);
@@ -208,9 +209,9 @@ var AjaxGeoLocation = (function() {
}
};
-})();
+});
// If you have Gears installed use that, else use Ajax ClientLocation
-navigator.geolocation = (window.google && google.gears) ? GearsGeoLocation : AjaxGeoLocation;
+navigator.geolocation = (window.google && google.gears) ? GearsGeoLocation() : AjaxGeoLocation();
})();
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/noticelist.php b/lib/noticelist.php
index dd97b85bd..21cec528f 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -396,22 +396,44 @@ class NoticeListItem extends Widget
$lon = $this->notice->lon;
$latlon = (!empty($lat) && !empty($lon)) ? $lat.';'.$lon : '';
+ if (empty($name)) {
+ $latdms = $this->decimalDegreesToDMS(abs($lat));
+ $londms = $this->decimalDegreesToDMS(abs($lon));
+ $name = sprintf(
+ _('%1$u°%2$u\'%3$u"%4$s %5$u°%6$u\'%7$u"%8$s'),
+ $latdms['deg'],$latdms['min'], $latdms['sec'],($lat>0?_('N'):_('S')),
+ $londms['deg'],$londms['min'], $londms['sec'],($lon>0?_('E'):_('W')));
+ }
+
$url = $location->getUrl();
$this->out->elementStart('span', array('class' => 'location'));
$this->out->text(_('at'));
+ if (empty($url)) {
+ $this->out->element('span', array('class' => 'geo',
+ 'title' => $latlon),
+ $name);
+ } else {
+ $this->out->element('a', array('class' => 'geo',
+ 'title' => $latlon,
+ 'href' => $url),
+ $name);
+ }
+ $this->out->elementEnd('span');
+ }
- $this->out->elementStart('a', array('class' => 'geo', 'href' => $url));
- $this->out->elementStart('abbr', array('class' => 'latitude', 'title' => $lat, 'style' => empty($name)?null:'display: none'));
- $this->out->text($lat); //TODO translate to a prettier format, like "S 37.2 deg" instead of "-37.2"
- $this->out->elementEnd('abbr');
- $this->out->elementStart('abbr', array('class' => 'longitude', 'title' => $lon, 'style' => empty($name)?null:'display: none'));
- $this->out->text($lon);
- $this->out->elementEnd('abbr');
- $this->out->text($name);
- $this->out->elementEnd('a');
+ function decimalDegreesToDMS($dec)
+ {
- $this->out->elementEnd('span');
+ $vars = explode(".",$dec);
+ $deg = $vars[0];
+ $tempma = "0.".$vars[1];
+
+ $tempma = $tempma * 3600;
+ $min = floor($tempma / 60);
+ $sec = $tempma - ($min*60);
+
+ return array("deg"=>$deg,"min"=>$min,"sec"=>$sec);
}
/**
diff --git a/lib/schema.php b/lib/schema.php
index 560884d9f..11e2b6f60 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -547,171 +547,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/searchaction.php b/lib/searchaction.php
index 130b28ff5..bb71a2ba1 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -123,8 +123,8 @@ class SearchAction extends Action
if (!common_config('site', 'fancy')) {
$this->hidden('action', $this->trimmed('action'));
}
- $this->input('q', 'Keyword(s)', $q);
- $this->submit('search', 'Search');
+ $this->input('q', _('Keyword(s)'), $q);
+ $this->submit('search', _('Search'));
$this->elementEnd('li');
$this->elementEnd('ul');
$this->elementEnd('fieldset');
diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php
index 677365ea9..e843dc096 100644
--- a/lib/searchgroupnav.php
+++ b/lib/searchgroupnav.php
@@ -79,9 +79,9 @@ class SearchGroupNav extends Widget
}
$this->out->menuItem(common_local_url('peoplesearch', $args), _('People'),
_('Find people on this site'), $action_name == 'peoplesearch', 'nav_search_people');
- $this->out->menuItem(common_local_url('noticesearch', $args), _('Notice'),
+ $this->out->menuItem(common_local_url('noticesearch', $args), _('Notices'),
_('Find content of notices'), $action_name == 'noticesearch', 'nav_search_notice');
- $this->out->menuItem(common_local_url('groupsearch', $args), _('Group'),
+ $this->out->menuItem(common_local_url('groupsearch', $args), _('Groups'),
_('Find groups on this site'), $action_name == 'groupsearch', 'nav_search_group');
$this->action->elementEnd('ul');
}
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/locale/ar/LC_MESSAGES/statusnet.mo b/locale/ar/LC_MESSAGES/statusnet.mo
index 45861299a..54a7df9a8 100644
--- a/locale/ar/LC_MESSAGES/statusnet.mo
+++ b/locale/ar/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 5b4aa5770..3de9756b8 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:46:52+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(r59365); 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 "حجم غير صالح."
+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
+#: 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
+#: 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 "رُفع الأفتار."
+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,79 +1056,79 @@ 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 ""
@@ -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"
@@ -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"
@@ -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 ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
+msgid "URLs"
+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:180
-msgid "Is registration on this site only open to invited users?"
+#: 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 ""
@@ -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 ""
@@ -3716,7 +3795,7 @@ 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 ""
@@ -4270,7 +4358,7 @@ msgstr "فضّل"
#: lib/feedlist.php:64
msgid "Export data"
-msgstr "صدّر البيانات"
+msgstr "تصدير البيانات"
#: lib/feed.php:85
msgid "RSS 1.0"
@@ -4339,7 +4427,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 +4472,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."
@@ -4448,7 +4536,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 +4740,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 +4776,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 +4852,7 @@ msgstr "خطأ أثناء إدراج الملف الشخصي الجديد"
#: lib/oauthstore.php:291
msgid "Error inserting avatar"
-msgstr ""
+msgstr "خطأ في إدراج الأفتار"
#: lib/oauthstore.php:311
msgid "Error inserting remote profile"
@@ -4848,9 +4961,8 @@ msgid "Popular"
msgstr ""
#: lib/sandboxform.php:67
-#, fuzzy
msgid "Sandbox"
-msgstr "صندوق الوارد"
+msgstr ""
#: lib/sandboxform.php:78
#, fuzzy
@@ -4861,6 +4973,10 @@ msgstr "ألغِ منع هذا المستخدم"
msgid "Search site"
msgstr "ابحث في الموقع"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr "الكلمات المفتاحية"
+
#: lib/searchaction.php:162
msgid "Search help"
msgstr "ابحث في المساعدة"
@@ -4873,17 +4989,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 +5006,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 +5086,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"
@@ -5075,7 +5184,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."
@@ -5085,9 +5194,5 @@ msgstr ""
msgid "Sorry, no incoming email allowed."
msgstr ""
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "ألغِ منع هذا المستخدم"
-
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "هؤلاء الأشخاص مشتركون بك: "
+#~ msgid "Notice"
+#~ msgstr "إشعارات"
diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo
index b86a8042e..7450f5466 100644
--- a/locale/bg/LC_MESSAGES/statusnet.mo
+++ b/locale/bg/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 70937c64a..b4d48b9c9 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:46:55+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(r59365); 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
@@ -197,9 +196,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 +211,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
@@ -354,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 "Неправилен етикет: \"%s\""
+msgstr "Неправилен псевдоним: \"%s\""
#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
@@ -372,12 +371,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 +388,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 +407,7 @@ msgid "groups on %s"
msgstr "Търсене на групи в сайта"
#: actions/apigrouplist.php:95
-#, fuzzy, php-format
+#, php-format
msgid "%s's groups"
msgstr "Групи на %s"
@@ -447,7 +443,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 ""
@@ -562,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 "Изтриване"
@@ -575,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 +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."
@@ -613,9 +609,8 @@ msgid "Failed updating avatar."
msgstr "Неуспешно обновяване на аватара."
#: actions/avatarsettings.php:387
-#, fuzzy
msgid "Avatar deleted."
-msgstr "Аватарът е обновен."
+msgstr "Аватарът е изтрит."
#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
@@ -724,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 "Грешка при изтриване потвърждението по е-поща."
@@ -747,12 +742,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 "Бележки"
@@ -793,7 +787,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 "Изтриване на бележката"
@@ -813,9 +807,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 ""
@@ -824,9 +817,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 +829,117 @@ 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 ""
-#: 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 ""
+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
+#: 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 ""
@@ -1165,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."
@@ -1204,43 +1130,43 @@ 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 "Добавен е нов входящ адрес на е-поща."
@@ -1371,9 +1297,8 @@ msgid "No such group."
msgstr "Няма такава група"
#: actions/getfile.php:75
-#, fuzzy
msgid "No such file."
-msgstr "Няма такава бележка."
+msgstr "Няма такъв файл."
#: actions/getfile.php:79
#, fuzzy
@@ -1394,9 +1319,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 +1368,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,7 +1437,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 ""
@@ -1555,9 +1478,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 +1496,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 "Групи"
@@ -1789,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 "Прати"
@@ -1914,7 +1836,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 +1950,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 +1958,7 @@ msgstr "Грешка в Ajax"
msgid "New notice"
msgstr "Нова бележка"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
#, fuzzy
msgid "Notice posted"
msgstr "Бележки"
@@ -2073,12 +1995,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 +2126,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 +2158,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 ""
@@ -2336,7 +2365,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 "Език"
@@ -2534,7 +2563,7 @@ msgstr ""
#: actions/recoverpassword.php:191
msgid "Nickname or email address"
-msgstr ""
+msgstr "Псевдоним или е-поща"
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
@@ -2564,10 +2593,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 +2654,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 +2700,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 "Е-поща"
@@ -2936,9 +2961,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"
@@ -3117,11 +3141,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 ""
@@ -3153,157 +3172,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"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
+msgid "URLs"
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 +3327,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 ""
-#: 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 ""
-#: 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 +3501,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 +3689,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 +3698,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 "Профил"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:178
+#: 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 +3796,8 @@ msgstr ""
"на този потребител. Ако не искате абонамента, натиснете \"Cancel\" (Отказ)."
#: actions/userauthorization.php:188
-#, fuzzy
msgid "License"
-msgstr "лиценз."
+msgstr "Лиценз"
#: actions/userauthorization.php:209
msgid "Accept"
@@ -3920,10 +4010,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 +4040,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 +4184,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 +4200,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 +4259,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 +4440,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 +4451,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] "Не членувате в тази група."
@@ -4451,7 +4537,7 @@ msgstr "Бележки през SMS"
#: lib/dberroraction.php:60
msgid "Database error"
-msgstr ""
+msgstr "Грешка в базата от данни"
#: lib/designsettings.php:105
#, fuzzy
@@ -4558,7 +4644,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 +4690,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 "Страницата не е достъпна във вида медия, който приемате"
@@ -4669,10 +4755,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 +4898,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 +5003,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 "Отговор"
@@ -5096,6 +5206,10 @@ msgstr "Разблокиране на този потребител"
msgid "Search site"
msgstr "Търсене"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5109,10 +5223,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 "Търсене в съдържанието на бележките"
@@ -5323,10 +5433,5 @@ msgstr "Това не е вашият входящ адрес."
msgid "Sorry, no incoming email allowed."
msgstr "Входящата поща не е разрешена."
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Разблокиране на този потребител"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Абонирани за %s"
+#~ msgid "Notice"
+#~ msgstr "Бележки"
diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo
index b1682d409..18771ecb2 100644
--- a/locale/ca/LC_MESSAGES/statusnet.mo
+++ b/locale/ca/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index b62c35c19..543975146 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:46:59+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(r59365); 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
@@ -408,9 +408,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 +426,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 +443,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 +558,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 +571,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 +588,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."
@@ -725,15 +724,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 +751,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 +794,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 +806,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 +815,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 ""
@@ -841,183 +838,113 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: 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
+#: actions/designadminpanel.php:400
#, fuzzy
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."
-
-#: 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 "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 ""
@@ -1173,37 +1100,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,43 +1139,43 @@ 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."
@@ -1329,7 +1256,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 +1280,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 +1309,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 +1326,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 +1446,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 +1484,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 +1506,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 +1729,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 +1853,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 +1907,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 +1967,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 +1975,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 +2011,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 +2046,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 +2060,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 +2145,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 +2177,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 ""
+
+#: 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 ""
+
+#: 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 +2389,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 +2620,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 +2681,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 +2726,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"
@@ -3013,9 +3039,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 +3064,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 +3172,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 ""
@@ -3184,107 +3203,102 @@ 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 "Avís 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 +3313,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 +3322,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 +3363,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 +3727,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 +3736,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:178
+#: actions/useradminpanel.php:241
#, fuzzy
-msgid "Invite-only"
-msgstr "Invitar"
+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:251
+#, fuzzy
+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: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
@@ -3743,7 +3842,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 +3851,7 @@ msgstr "Subscriure's a aquest usuari"
#: actions/userauthorization.php:211
msgid "Reject"
-msgstr "Rebutjar"
+msgstr "Rebutja"
#: actions/userauthorization.php:212
#, fuzzy
@@ -3951,25 +4050,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 +4088,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 +4220,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 +4236,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 +4295,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 +4319,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 +4474,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 +4485,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 +4496,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 ""
@@ -4551,7 +4647,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 +4678,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 +4724,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."
@@ -4692,7 +4788,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 +5045,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"
@@ -5123,9 +5245,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 ""
#: lib/searchaction.php:162
#, fuzzy
@@ -5140,10 +5265,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 +5279,7 @@ msgstr "Secció sense títol"
#: lib/section.php:106
msgid "More..."
-msgstr ""
+msgstr "Més…"
#: lib/silenceform.php:67
#, fuzzy
@@ -5259,22 +5380,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"
@@ -5329,9 +5448,9 @@ 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
@@ -5354,10 +5473,5 @@ msgstr "Perdó, aquest no és el teu correu electrònic entrant permès."
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"
+#~ msgid "Notice"
+#~ msgstr "Avisos"
diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo
index e901c2e64..bd42c1563 100644
--- a/locale/cs/LC_MESSAGES/statusnet.mo
+++ b/locale/cs/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index a16f2aa14..b3b547cce 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:02+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(r59365); 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,79 +1095,79 @@ 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 ""
@@ -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"
@@ -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: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 "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: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
@@ -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 ""
@@ -4491,7 +4606,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 +4653,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."
@@ -4607,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 " od "
@@ -4855,39 +4970,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ěď"
@@ -5035,6 +5175,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 +5192,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 ""
@@ -5265,9 +5404,5 @@ 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"
+#~ msgid "Notice"
+#~ msgstr "Sdělení"
diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo
index c8d4cc24c..17472c1b4 100644
--- a/locale/de/LC_MESSAGES/statusnet.mo
+++ b/locale/de/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index e6c0a751f..866cf3559 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/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:34+0000\n"
+"POT-Creation-Date: 2009-11-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:05+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(r59365); 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
@@ -436,7 +436,7 @@ 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 ""
@@ -550,7 +550,7 @@ msgid "Preview"
msgstr "Vorschau"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
#, fuzzy
msgid "Delete"
msgstr "Löschen"
@@ -564,7 +564,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 +579,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."
@@ -716,15 +716,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."
@@ -744,7 +744,7 @@ msgid "Conversation"
msgstr "Bestätigungscode"
#: 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"
@@ -787,7 +787,7 @@ msgstr "Sind sie sicher, dass sie diese Nachricht löschen wollen?"
msgid "Do not delete this notice"
msgstr "Die Nachricht konnte nicht gelöscht werden."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
#, fuzzy
msgid "Delete this notice"
msgstr "Notiz löschen"
@@ -832,183 +832,120 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Ungültige Größe."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, 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
-#, 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 "Ändere dein Passwort"
-#: 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 ""
-#: 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 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 ""
-#: 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 "Ändere dein Passwort"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Verbinden"
-#: 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
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Liste"
-#: 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 "Speichern"
-#: 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 "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,43 +1140,43 @@ 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."
@@ -1513,7 +1450,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
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
#, fuzzy
msgid "Admin"
msgstr "Admin"
@@ -1576,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 "Gruppen"
@@ -1801,7 +1738,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 +1861,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"
@@ -2038,7 +1975,7 @@ msgstr "Nachricht"
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 +1983,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 +2020,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"
@@ -2216,9 +2153,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 +2185,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 ""
@@ -2354,7 +2399,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"
@@ -2583,10 +2628,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 +2689,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 +2736,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"
@@ -3147,11 +3188,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 ""
@@ -3183,103 +3219,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 +3331,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 +3340,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 +3381,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"
@@ -3697,7 +3743,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 +3752,89 @@ 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:178
+#: actions/useradminpanel.php:231
#, fuzzy
-msgid "Invite-only"
-msgstr "Einladen"
+msgid "New users"
+msgstr "Lade neue Leute ein"
+
+#: 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 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: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: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
@@ -3952,10 +4071,6 @@ msgstr "Konnte Gruppenmitgliedschaft nicht setzen."
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"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Ändern der Profileinstellungen"
@@ -3994,131 +4109,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
+#: lib/action.php:445 lib/subgroupnav.php:106
#, fuzzy, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Lade Freunde und Kollegen ein dir auf %s beizutreten"
-#: 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 +4242,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 +4258,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."
@@ -4203,6 +4318,11 @@ 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 ""
@@ -4377,11 +4497,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 +4508,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 +4519,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."
@@ -4590,7 +4707,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 +4754,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."
@@ -4705,7 +4822,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,40 +5080,66 @@ 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
#, fuzzy
msgid "in context"
msgstr "Kein Inhalt!"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
#, fuzzy
msgid "Reply to this notice"
msgstr "Auf diese Nachricht antworten"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
#, fuzzy
msgid "Reply"
msgstr "Antworten"
@@ -5148,6 +5291,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 +5308,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"
@@ -5379,9 +5521,5 @@ 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"
+#~ msgid "Notice"
+#~ msgstr "Nachricht"
diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo
index 714f1f7c4..23652a257 100644
--- a/locale/el/LC_MESSAGES/statusnet.mo
+++ b/locale/el/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index d684dd7b4..cc70f3edc 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:08+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(r59365); 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,43 +1126,43 @@ 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 ""
@@ -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"
@@ -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"
+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
-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: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:178
-msgid "Invite-only"
+#: 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
@@ -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] "Ομάδες με τα περισσότερα μέλη"
@@ -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 ""
@@ -4533,7 +4647,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 +4891,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 ""
@@ -4950,6 +5089,10 @@ msgstr "Αδυναμία διαγραφής αυτού του μηνύματος
msgid "Search site"
msgstr ""
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
msgid "Search help"
msgstr ""
@@ -4962,10 +5105,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 ""
@@ -5175,6 +5314,5 @@ msgstr ""
msgid "Sorry, no incoming email allowed."
msgstr ""
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
+#~ msgid "Notice"
+#~ msgstr "Μήνυμα"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo
index 694b1eb90..3a5c7d845 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.mo
+++ b/locale/en_GB/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 628da61d8..456f739e9 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:12+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(r59365); 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,43 +1115,43 @@ 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."
@@ -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"
@@ -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: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:178
+#: 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!"
@@ -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"
@@ -4530,19 +4604,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 +4632,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 +4649,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"
@@ -4640,7 +4713,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 +4745,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 +4760,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 +4869,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 +4974,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,14 +5058,12 @@ 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
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
msgid "Couldn't insert new subscription."
@@ -5018,9 +5119,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 +5160,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 +5188,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 +5205,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 +5279,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"
@@ -5281,7 +5374,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."
@@ -5299,10 +5392,5 @@ msgstr "Sorry, that is not your incoming e-mail address."
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"
+#~ msgid "Notice"
+#~ msgstr "Notice"
diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo
index 4c0463da5..f562bcaa3 100644
--- a/locale/es/LC_MESSAGES/statusnet.mo
+++ b/locale/es/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index b3f2469ad..835a89d52 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:16+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(r59365); 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,43 +1144,43 @@ 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."
@@ -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"
@@ -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: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 "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
@@ -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."
@@ -4608,7 +4726,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 +4771,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."
@@ -4721,7 +4839,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 +5095,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"
@@ -5155,6 +5299,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 +5315,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"
@@ -5384,9 +5527,5 @@ 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"
+#~ msgid "Notice"
+#~ msgstr "Aviso"
diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo
index 8c3399f71..d0370b6d9 100644
--- a/locale/fi/LC_MESSAGES/statusnet.mo
+++ b/locale/fi/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 6563dbc5a..416e4eb7d 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:19+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(r59365); 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
@@ -444,7 +444,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 +558,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 +571,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 +588,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 +718,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 +745,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 +786,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"
@@ -831,183 +831,120 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: 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 ""
-#: 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 "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 ""
-#: 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 "Vaihda salasanasi"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Yhdistä"
-#: 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
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Kirjaudu sisään"
-#: 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 "Tallenna"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1160,37 +1097,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,43 +1136,43 @@ 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."
@@ -1493,7 +1430,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 +1489,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 +1709,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 +1832,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 +1946,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 +1954,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 +1992,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 +2124,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 +2156,114 @@ msgstr "Uutta salasanaa ei voida tallentaa."
msgid "Password saved."
msgstr "Salasana tallennettu."
+#: 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 "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 ""
+
+#: 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 "Palvelun ilmoitus"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2325,7 +2370,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 +2599,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 +2660,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 +2706,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"
@@ -3116,11 +3157,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 +3188,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 +3300,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 +3309,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 +3350,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 +3711,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 +3720,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: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 "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: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: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 "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: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
@@ -3914,10 +4033,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 +4071,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 +4204,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 +4220,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 +4279,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 +4458,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 +4469,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 +4480,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."
@@ -4546,7 +4663,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 +4709,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ä."
@@ -4656,7 +4773,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 +5034,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"
@@ -5095,6 +5238,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 +5255,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ä"
@@ -5322,10 +5465,5 @@ msgstr "Valitettavasti tuo ei ole oikea osoite sähköpostipäivityksille."
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"
+#~ msgid "Notice"
+#~ msgstr "Päivitys"
diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo
index eb8da8f56..5351cd427 100644
--- a/locale/fr/LC_MESSAGES/statusnet.mo
+++ b/locale/fr/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 8c2afd401..b8f449dd1 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -12,16 +12,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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:22+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(r59365); 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 +102,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 +112,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 +150,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 +167,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 +378,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 +419,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 %s sont membre de %s."
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
@@ -441,7 +449,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 +566,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 +579,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 +596,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 +663,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 +727,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 +754,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 +795,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 +806,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 +836,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 ""
+msgstr "Thème pour le site."
-#: 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."
-
-#: 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 +1095,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,43 +1133,43 @@ 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."
@@ -1284,9 +1217,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 +1380,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 +1391,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 +1436,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 +1457,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 +1486,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 +1495,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 +1517,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 +1727,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 +1848,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 +1894,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 +1917,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 +1969,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 +1977,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 +2005,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 +2014,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 +2094,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 +2149,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 +2181,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 +2315,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 +2388,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 +2448,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 +2481,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 +2493,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 +2511,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 +2532,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 +2544,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 +2585,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 +2630,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 +2691,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 +2721,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 +2738,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"
@@ -2842,6 +2901,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 +2910,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 +2923,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 +3076,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 +3189,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 ""
+msgstr "Nom d'hôte du serveur du site."
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Notice 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:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr "Limites"
+
+#: 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 +3733,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 +3763,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:235
+msgid "New user welcome"
+msgstr "Accueil des nouveaux utilisateurs"
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: 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:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr "Invitations activées"
+
+#: 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 +4015,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 +4047,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."
@@ -3952,10 +4080,6 @@ msgstr "Impossible d'établir l’inscription au groupe."
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"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Modifier vos paramètres de profil"
@@ -3993,130 +4117,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 +4247,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 +4263,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 +4365,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 +4499,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 ""
@@ -4620,7 +4737,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 +4782,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."
@@ -4733,7 +4850,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 +5180,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"
@@ -5125,9 +5267,8 @@ msgid "Duplicate notice"
msgstr "Dupliquer l’avis"
#: lib/oauthstore.php:466 lib/subs.php:48
-#, fuzzy
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
msgid "Couldn't insert new subscription."
@@ -5195,13 +5336,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 +5364,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 +5391,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 +5408,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 +5433,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 +5478,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"
@@ -5461,9 +5595,5 @@ msgstr "Désolé, ceci n’est pas votre adresse de courriel entrant."
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 : "
+#~ msgid "Notice"
+#~ msgstr "Statut"
diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo
index c9641c01e..58295cef7 100644
--- a/locale/ga/LC_MESSAGES/statusnet.mo
+++ b/locale/ga/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 8f4de8169..4b8d4f103 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:26+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(r59365); 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,43 +1156,43 @@ 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."
@@ -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"
@@ -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: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:178
+#: 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: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 "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: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
@@ -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
@@ -4662,7 +4788,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 +4835,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"
@@ -4779,7 +4905,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 +5209,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"
@@ -5271,6 +5423,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 +5440,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"
@@ -5506,9 +5657,5 @@ 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"
+#~ msgid "Notice"
+#~ msgstr "Chíos"
diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo
index 792701599..8c7db4527 100644
--- a/locale/he/LC_MESSAGES/statusnet.mo
+++ b/locale/he/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 25efb2853..02e557cd7 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:29+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(r59365); 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,79 +1098,79 @@ 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 ""
@@ -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 ""
@@ -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"
-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"
@@ -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:178
-msgid "Invite-only"
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: 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: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
@@ -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] "לא שלחנו אלינו את הפרופיל הזה"
@@ -4483,7 +4597,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 +4644,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 "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
@@ -4599,7 +4713,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 +4959,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 "הגב"
@@ -5026,6 +5166,10 @@ msgstr "אין משתמש כזה."
msgid "Search site"
msgstr "חיפוש"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5039,11 +5183,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 ""
@@ -5258,9 +5397,5 @@ msgid "Sorry, no incoming email allowed."
msgstr ""
#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "אין משתמש כזה."
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "הרשמה מרוחקת"
+#~ msgid "Notice"
+#~ msgstr "הודעות"
diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo
index 9a9203ec0..eb8debe0e 100644
--- a/locale/is/LC_MESSAGES/statusnet.mo
+++ b/locale/is/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index c5a0216ef..249c21aee 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:32+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(r59365); 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,43 +1121,43 @@ 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ð."
@@ -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"
@@ -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: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:178
+#: 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: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: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
@@ -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."
@@ -4496,7 +4615,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 +4660,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"
@@ -4606,7 +4725,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 +4977,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"
@@ -5033,6 +5178,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 +5194,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"
@@ -5257,10 +5402,5 @@ msgstr "Afsakið en þetta er ekki móttökutölvupóstfangið þitt."
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"
+#~ msgid "Notice"
+#~ msgstr "Babl"
diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo
index 2dec03ba7..dce2fa137 100644
--- a/locale/it/LC_MESSAGES/statusnet.mo
+++ b/locale/it/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 874698170..f46f46331 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:35+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(r59365); 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,43 +1145,43 @@ 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."
@@ -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"
@@ -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: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:178
+#: 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: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: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
@@ -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."
@@ -4569,7 +4686,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 +4732,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"
@@ -4679,7 +4796,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 +5053,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"
@@ -5114,6 +5257,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 +5274,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"
@@ -5341,10 +5484,5 @@ msgstr "Quella non è la tua email di ricezione."
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"
+#~ msgid "Notice"
+#~ msgstr "Messaggio"
diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo
index eeceb93e6..5b4f3cf1e 100644
--- a/locale/ja/LC_MESSAGES/statusnet.mo
+++ b/locale/ja/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 54362b777..35918a4af 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/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:07+0000\n"
+"POT-Creation-Date: 2009-11-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:38+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(r59365); 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
@@ -444,7 +444,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."
@@ -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
#, 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 +1099,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,43 +1138,43 @@ 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 ""
@@ -1509,7 +1446,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 +1506,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 +1717,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 +1843,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 +1952,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 +1960,7 @@ msgstr ""
msgid "New notice"
msgstr "新しい通知"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
#, fuzzy
msgid "Notice posted"
msgstr "通知"
@@ -2058,12 +1995,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 +2128,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 +2160,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 +2369,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 +2596,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 +2655,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 +2700,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 "メール"
@@ -3104,10 +3144,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 +3175,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"
-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"
@@ -3252,7 +3284,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 +3293,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 +3334,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 +3691,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 +3700,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: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
@@ -3888,10 +4003,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 +4041,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 +4177,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 +4193,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 +4250,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 +4429,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 +4439,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 +4449,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 ""
@@ -4519,7 +4629,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 +4675,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 "このページはあなたが承認したメディアタイプでは利用できません。"
@@ -4630,7 +4740,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 +4987,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 "返信"
@@ -5053,6 +5188,10 @@ msgstr "このユーザをアンブロックする"
msgid "Search site"
msgstr "検索"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5066,10 +5205,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 ""
@@ -5281,10 +5416,5 @@ msgstr ""
msgid "Sorry, no incoming email allowed."
msgstr ""
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "このユーザをアンブロックする"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "リモートサブスクライブ"
+#~ msgid "Notice"
+#~ msgstr "通知"
diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo
index 19e0ecb93..3d3438d36 100644
--- a/locale/ko/LC_MESSAGES/statusnet.mo
+++ b/locale/ko/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 767c4e75f..63800df5d 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:41+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(r59365); 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,43 +1139,43 @@ 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 "새로운 이메일 주소가 추가 되었습니다."
@@ -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 "이메일"
@@ -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: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
+#: 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
@@ -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 ""
@@ -4533,7 +4645,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 +4691,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 "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
@@ -4643,7 +4755,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 +5004,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 "답장하기"
@@ -5070,6 +5208,10 @@ msgstr "이 사용자를 차단해제합니다."
msgid "Search site"
msgstr "검색"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5083,10 +5225,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 "통지들의 내용 찾기"
@@ -5297,10 +5435,5 @@ msgstr "죄송합니다. 귀하의 이메일이 아닙니다."
msgid "Sorry, no incoming email allowed."
msgstr "죄송합니다. 이메일이 허용되지 않습니다."
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "이 사용자를 차단해제합니다."
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "%s에 의해 구독되는 사람들"
+#~ msgid "Notice"
+#~ msgstr "게시글"
diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo
index a3e2cb11a..e6258bf4b 100644
--- a/locale/mk/LC_MESSAGES/statusnet.mo
+++ b/locale/mk/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 6e20b573e..0bf913950 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:44+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(r59365); 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,79 +1095,79 @@ 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 ""
@@ -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 "Е-пошта"
@@ -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"
-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"
@@ -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:178
-msgid "Invite-only"
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: 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 "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
@@ -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] "Не ни го испративте тој профил."
@@ -4496,7 +4608,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 +4655,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 "Оваа страница не е достапна во форматот кој Вие го прифаќате."
@@ -4612,7 +4724,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 +4971,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 "одговор"
@@ -5038,6 +5175,10 @@ msgstr "Нема таков корисник."
msgid "Search site"
msgstr "Барај"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5051,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 ""
@@ -5268,9 +5404,5 @@ msgid "Sorry, no incoming email allowed."
msgstr ""
#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Нема таков корисник."
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Оддалечена претплата"
+#~ msgid "Notice"
+#~ msgstr "Известувања"
diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo
index 00a1f197f..28fe57a4f 100644
--- a/locale/nb/LC_MESSAGES/statusnet.mo
+++ b/locale/nb/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 1439bee64..453664335 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:46+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(r59365); 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,43 +1129,43 @@ 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 ""
@@ -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"
@@ -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: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
#, 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:178
-msgid "Invite-only"
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: 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:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -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!"
@@ -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 ""
@@ -4556,7 +4667,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 +4914,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"
@@ -4980,6 +5116,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 +5133,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 ""
@@ -5205,11 +5341,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
index 5384ea6b4..af1150fb0 100644
--- a/locale/nl/LC_MESSAGES/statusnet.mo
+++ b/locale/nl/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 022b02b5f..2dd1a24e0 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:52+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(r59365); 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
@@ -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
@@ -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."
@@ -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."
+msgstr "De logo-URL is ongeldig."
-#: 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
+#: 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 "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 ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
+msgstr "Mogelijke vormgevingen voor deze website."
-#: 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,43 +1135,43 @@ 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."
@@ -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"
@@ -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 ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
+msgid "URLs"
+msgstr "URL's"
-#: 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:400
+msgid "Limits"
+msgstr "Limieten"
-#: actions/siteadminpanel.php:396
+#: 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
@@ -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 ""
@@ -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"
@@ -4791,7 +4858,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 +5191,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,13 +5276,11 @@ msgstr ""
#: lib/oauthstore.php:345
msgid "Duplicate notice"
-msgstr "Kennisgeving van duplicaat"
+msgstr "Duplicaatmelding"
#: lib/oauthstore.php:466 lib/subs.php:48
-#, fuzzy
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
msgid "Couldn't insert new subscription."
@@ -5258,13 +5348,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 +5376,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 +5403,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 +5420,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 +5445,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 +5490,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"
@@ -5523,9 +5606,5 @@ msgstr "Dit is niet uw inkomende e-mailadres."
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: "
+#~ msgid "Notice"
+#~ msgstr "Mededeling"
diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo
index 306a5b624..90632f0ac 100644
--- a/locale/nn/LC_MESSAGES/statusnet.mo
+++ b/locale/nn/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 7e57fe4b3..2a186afcb 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:49+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(r59365); 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,43 +1139,43 @@ 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."
@@ -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"
@@ -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:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:178
+#: 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: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 "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
@@ -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."
@@ -4549,7 +4665,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 +4711,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."
@@ -4659,7 +4775,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 +5031,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"
@@ -5093,6 +5235,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 +5252,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"
@@ -5320,10 +5462,5 @@ msgstr "Beklager, det er ikkje di inngåande epost addresse."
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"
+#~ msgid "Notice"
+#~ msgstr "Notis"
diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo
index b9d95d0d3..4ca003cf6 100644
--- a/locale/pl/LC_MESSAGES/statusnet.mo
+++ b/locale/pl/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index c7b3d860f..446ebddfb 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/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:32:25+0000\n"
+"POT-Creation-Date: 2009-11-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:47:55+0000\n"
"Language-Team: Polish\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"
+"X-Generator: MediaWiki 1.16alpha(r59365); 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"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 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
@@ -451,7 +452,7 @@ msgstr "Wpis jest za długi. Maksymalna długość to 140 znaków."
msgid "Not found"
msgstr "Nie znaleziono"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, fuzzy, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maksymalny rozmiar wpisu to 140 znaków, w tym adres URL załącznika."
@@ -565,7 +566,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 +579,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 +594,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."
@@ -727,15 +728,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."
@@ -754,7 +755,7 @@ 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"
@@ -795,7 +796,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"
@@ -838,182 +839,116 @@ msgstr "Wygląd"
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Nieprawidłowy rozmiar."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, 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 ""
-
-#: 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 "Zmień kolory"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "Zaproś"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Zmień"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Wpis strony"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
#, fuzzy
msgid "Theme for the site."
msgstr "Wyloguj się ze 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"
-#: 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
+#: 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 "Można wysłać obraz logo grupy. Maksymalny rozmiar pliku to %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"
-#: 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"
@@ -1164,37 +1099,37 @@ msgstr "Chcę wysyłać wpisy przez e-mail."
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."
-#: 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."
@@ -1203,43 +1138,43 @@ msgstr ""
"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."
-#: 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."
@@ -1507,7 +1442,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"
@@ -1569,7 +1504,7 @@ msgstr ""
"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"
@@ -1794,7 +1729,7 @@ 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"
@@ -1918,7 +1853,7 @@ msgstr "Niepoprawna nazwa użytkownika lub hasło."
msgid "Error setting user. You are probably not authorized."
msgstr "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ę"
@@ -2031,7 +1966,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 +1974,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"
@@ -2080,12 +2015,12 @@ msgstr ""
"pierwszym, który [wyśle coś na ten temat](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "Aktualizacje ze znacznikiem %1$s na %2$s!"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Wszystkie aktualizacje pasujące do wyszukiwanego terminu \"%s\""
@@ -2211,9 +2146,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"
@@ -2243,6 +2178,118 @@ 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 ""
+
+#: 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 "Ta strona nie jest dostępna w "
+
+#: 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 "Zaproś"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "Wpis strony"
+
+#: 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 "Awatar"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Ustawienia awatara"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Zaktualizowano awatar."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Usunięto awatar."
+
+#: actions/pathsadminpanel.php:269
+#, fuzzy
+msgid "Backgrounds"
+msgstr "Tło"
+
+#: actions/pathsadminpanel.php:273
+#, fuzzy
+msgid "Background server"
+msgstr "Tło"
+
+#: actions/pathsadminpanel.php:277
+#, fuzzy
+msgid "Background path"
+msgstr "Tło"
+
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Background directory"
+msgstr "Tło"
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "Wpis strony"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2348,7 +2395,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"
@@ -2585,10 +2632,6 @@ msgstr "Nieznane działanie"
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"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Przywróć"
@@ -2649,7 +2692,7 @@ msgstr "Przepraszamy, nieprawidłowy kod zaproszenia."
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ę"
@@ -2700,7 +2743,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"
@@ -3178,11 +3221,6 @@ msgstr "Nie można wysłać wiadomości do tego użytkownika."
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ś"
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3214,103 +3252,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 "Wpis strony"
-#: 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 "Nowy adres e-mail do wysyłania do %s"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Lokalne widoki"
+
+#: 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 "Preferowany język"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
+#, fuzzy
+msgid "URLs"
+msgstr "Adres URL"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "Przywróć"
-#: 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"
-
-#: 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 "Zaakceptuj"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3329,7 +3364,7 @@ msgstr "Zaproś"
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "Zablokowano"
@@ -3338,33 +3373,37 @@ msgstr "Zablokowano"
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 "Przywróć"
-#: 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
@@ -3375,49 +3414,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 "Wpisy"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
#, fuzzy
msgid "Always"
msgstr "Aliasy"
-#: 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 "Ustawienia awatara"
@@ -3736,7 +3784,8 @@ msgstr "Zrezygnowano z subskrypcji"
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 "Użytkownik"
@@ -3744,17 +3793,89 @@ msgstr "Użytkownik"
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
+#: actions/useradminpanel.php:231
#, fuzzy
-msgid "Invite-only"
-msgstr "Zaproś"
+msgid "New users"
+msgstr "Zaproś nowych użytkowników"
+
+#: 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 "Wszystkie subskrypcje"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+"Automatycznie zasubskrybuj każdego, kto mnie zasubskrybuje (najlepsze dla "
+"botów)"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Wysłano zaproszenia"
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Wysłano zaproszenia"
+
+#: 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
@@ -3987,10 +4108,6 @@ msgstr "Nie można ustawić członkostwa w grupie."
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"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Zmień ustawienia profilu"
@@ -4028,130 +4145,130 @@ 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"
-#: 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
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "Nie można przekierować do serwera: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "Główna nawigacja 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"
-#: 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!"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Znajdź"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr "Znajdź 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 +4277,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,32 +4293,32 @@ 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
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "Licencja oprogramowania StatusNet"
-#: 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"
-#: 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."
@@ -4235,6 +4352,11 @@ msgstr "Potwierdzenie adresu e-mail"
msgid "Design configuration"
msgstr "Potwierdzenie SMS"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "Potwierdzenie SMS"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "Załączniki"
@@ -4411,11 +4533,11 @@ msgid "You are not subscribed to anyone."
msgstr "Nie jesteś zasubskrybowany do tego profilu."
#: 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] "Jesteś już zasubskrybowany do tych użytkowników:"
+msgstr[1] "Jesteś już zasubskrybowany do tych użytkowników:"
+msgstr[2] ""
#: lib/command.php:640
#, fuzzy
@@ -4423,11 +4545,11 @@ msgid "No one is subscribed to you."
msgstr "Nie można zasubskrybować innych do Ciebie."
#: 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[2] ""
#: lib/command.php:662
#, fuzzy
@@ -4435,11 +4557,11 @@ msgid "You are not a member of any groups."
msgstr "Nie jesteś członkiem tej 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[2] ""
#: lib/command.php:678
#, fuzzy
@@ -4647,7 +4769,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"
@@ -4692,7 +4814,7 @@ 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"
@@ -4759,7 +4881,7 @@ msgstr ""
"rozmowę z innymi użytkownikami. Inni mogą wysyłać Ci wiadomości tylko dla "
"Twoich oczu."
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
#, fuzzy
msgid "from"
msgstr " z "
@@ -5076,36 +5198,62 @@ 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 ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Nie"
+
+#: 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 "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"
@@ -5251,6 +5399,10 @@ msgstr "Odblokuj tego użytkownika"
msgid "Search site"
msgstr "Znajdź stronę"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
msgid "Search help"
msgstr "Znajdź w pomocy"
@@ -5263,10 +5415,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"
@@ -5477,10 +5625,5 @@ msgstr "Przepraszamy, to nie jest twój przychodzący adres e-mail."
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"
+#~ msgid "Notice"
+#~ msgstr "Wpis"
diff --git a/locale/pt/LC_MESSAGES/statusnet.mo b/locale/pt/LC_MESSAGES/statusnet.mo
index b969c15b7..516eec1d0 100644
--- a/locale/pt/LC_MESSAGES/statusnet.mo
+++ b/locale/pt/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index f2ef56285..5c18e0d09 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,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:28+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:41:01+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(r59338); 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
@@ -275,27 +276,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,7 +306,7 @@ 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 diferente."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
#: actions/newgroup.php:133 actions/profilesettings.php:211
@@ -319,7 +318,7 @@ msgstr ""
#: 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 "A página de início não é uma URL válida."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
#: actions/newgroup.php:142 actions/profilesettings.php:218
@@ -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 ""
@@ -550,7 +549,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr ""
@@ -563,7 +562,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
@@ -578,7 +577,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."
@@ -710,15 +709,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 "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."
@@ -779,7 +778,7 @@ msgstr "Tem a certeza que permite remover esta mensagem?"
msgid "Do not delete this notice"
msgstr "Não é possível remover a mensagem."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
#, fuzzy
msgid "Delete this notice"
msgstr "Não é possível remover a mensagem."
@@ -822,181 +821,118 @@ 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
#, 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 "Modificar a sua palavra-passe"
-#: 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 "Modificar"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Modificar"
-#: 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 "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 ""
-#: 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 "Modificar a sua palavra-passe"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Ligar"
-#: 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 "Entrar"
-#: 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 ""
@@ -1147,37 +1083,37 @@ msgstr "Quero postar mensagens por 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 "Não é possível normalizar esse endereço de 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 "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."
@@ -1186,43 +1122,43 @@ msgstr ""
"Procure na sua 'Caixa de Entrada' (e caixa de spam) pelo email com o código "
"e instrucçõ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 ""
-#: 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 ""
-#: 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 "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."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
msgid "New incoming email address added."
msgstr ""
@@ -1483,7 +1419,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 ""
@@ -1745,7 +1681,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 ""
@@ -1867,7 +1803,7 @@ msgstr "Nome de utilizador ou palavra-passe incorrecta"
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"
@@ -1980,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 ""
@@ -1988,7 +1924,7 @@ msgstr ""
msgid "New notice"
msgstr ""
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr ""
@@ -2022,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 "Todas as actualizações com o termo \"%s\""
@@ -2152,8 +2088,8 @@ msgstr "6 ou mais caracteres"
msgid "Confirm"
msgstr "Confirmar"
-#: 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
@@ -2184,6 +2120,114 @@ msgstr "Não é possível guardar a nova password."
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
+#, fuzzy
+msgid "Site"
+msgstr "Convidar"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "Convidar"
+
+#: 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 actualizado."
+
+#: 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 "Convidar"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2282,21 +2326,21 @@ 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 "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 ""
@@ -2306,17 +2350,17 @@ msgstr ""
"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 demasiada 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
@@ -2329,7 +2373,7 @@ msgstr "Não foi possível actualizar o utilizador para auto-subscrição."
#: 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."
@@ -2337,7 +2381,7 @@ msgstr ""
#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
-msgstr ""
+msgstr "Configurações gravadas."
#: actions/public.php:83
#, php-format
@@ -2406,7 +2450,7 @@ msgstr ""
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
-msgstr ""
+msgstr "Nuvem de etiquetas ''(tag cloud)'' pública"
#: actions/publictagcloud.php:63
#, php-format
@@ -2431,7 +2475,7 @@ msgstr ""
#: actions/publictagcloud.php:135
msgid "Tag cloud"
-msgstr ""
+msgstr "Nuvem de etiquetas ''(tag cloud)''"
#: actions/recoverpassword.php:36
msgid "You are already logged in!"
@@ -2508,10 +2552,6 @@ msgstr ""
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 ""
@@ -2573,7 +2613,7 @@ msgstr "Erro no código de confirmação."
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 +2657,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"
@@ -3051,11 +3091,6 @@ msgstr ""
msgid "User is already silenced."
msgstr "O utilizador bloqueou-o."
-#: 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 ""
@@ -3087,100 +3122,96 @@ 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"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-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
+#, fuzzy
+msgid "Access"
+msgstr "Aceitar"
+
#: actions/siteadminpanel.php:334
msgid "Private"
msgstr ""
@@ -3198,7 +3229,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"
@@ -3207,32 +3238,36 @@ 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
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
@@ -3243,47 +3278,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"
@@ -3583,7 +3626,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 ""
@@ -3591,17 +3635,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: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
+#: actions/useradminpanel.php:231
#, fuzzy
-msgid "Invite-only"
-msgstr "Convidar"
+msgid "New users"
+msgstr "Convidar novos utilizadores"
+
+#: 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 subscrições"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+"Subscrever automaticamente a quem se subscrever a mim (recomendado para não-"
+"humanos)"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Contive(s) enviado(s)"
+
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Contive(s) enviado(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: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
@@ -3814,10 +3930,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 "Modificar as suas definições de perfil"
@@ -3855,132 +3967,132 @@ 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 "Início"
-#: 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 "Modificar a sua palavra-passe"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Ligar"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "Não foi possível redireccionar para o servidor: %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 "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 ""
-#: 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 "Ligar conta existente"
-#: 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 "Ajuda"
-#: 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 "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 ""
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr ""
-#: 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."
@@ -3989,12 +4101,12 @@ msgstr ""
"**%%site.name%%*** é um serviço de microblogging trazido até sí 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. "
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4002,33 +4114,33 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "Encontrar conteúdo dos mensagens"
-#: 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 "Antes »"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr ""
@@ -4058,6 +4170,11 @@ msgstr "Confirmação do Endereço de Email"
msgid "Design configuration"
msgstr "Confirmação do Endereço de Email"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "Confirmação do Endereço de Email"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4235,8 +4352,8 @@ msgstr "Não foi possível subscrever outros a si."
#, 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] "Não foi possível subscrever outros a si."
+msgstr[1] "Não foi possível subscrever outros a si."
#: lib/command.php:640
#, fuzzy
@@ -4480,7 +4597,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 ""
@@ -4544,7 +4661,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"
@@ -4792,38 +4909,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 ou mais caracteres"
-#: 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 "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
msgid "in context"
msgstr ""
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
#, fuzzy
msgid "Reply to this notice"
msgstr "Não é possível remover a mensagem."
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr ""
@@ -4967,6 +5110,10 @@ msgstr "Desbloquear este utilizador"
msgid "Search site"
msgstr ""
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
msgid "Search help"
msgstr ""
@@ -5191,11 +5338,3 @@ msgstr ""
#: 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!."
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo
index fcec3270e..d0ad4ab4b 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.mo
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 074cde443..5b1d62251 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:48:02+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(r59365); 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
@@ -199,9 +198,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 +213,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 +300,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 +336,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 +354,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 +372,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 +389,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 +435,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 +443,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 +532,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 +558,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 +571,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 +587,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 +656,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 +686,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 +718,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 +746,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 +768,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 +788,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 +809,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 +834,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 +983,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 +1102,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,43 +1141,43 @@ 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."
@@ -1352,7 +1283,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 +1338,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 +1382,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 +1430,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 +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 "Admin"
@@ -1587,7 +1514,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 +1735,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 +1866,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 +1984,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 +1992,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 +2028,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 +2163,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 +2195,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 +2409,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 +2638,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 +2702,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 +2747,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"
@@ -3170,11 +3201,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 +3232,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 +3343,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 +3352,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 +3393,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 +3756,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 +3765,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: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:178
+#: 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: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
@@ -3961,9 +4067,8 @@ 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 +4080,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 +4118,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 +4254,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 +4270,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 +4331,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 +4513,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 +4524,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 +4535,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 ""
@@ -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"
@@ -4723,7 +4826,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 +5084,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"
@@ -5160,6 +5289,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 +5306,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"
@@ -5390,10 +5519,5 @@ msgstr "Desculpe-me, mas este não é seu endereço de e-mail para recebimento."
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"
+#~ msgid "Notice"
+#~ msgstr "Mensagem"
diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo
index 978cb29f4..04c4ac010 100644
--- a/locale/ru/LC_MESSAGES/statusnet.mo
+++ b/locale/ru/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index ce0aae056..89c6d3784 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:48:05+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(r59365); 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,7 +490,7 @@ 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
@@ -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 "Неверный размер."
+msgstr "Неверный URL логотипа."
-#: 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 ""
-
-#: 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 ""
+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
-#, 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,43 +1130,43 @@ 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 "Новый входящий электронный адрес добавлен."
@@ -1263,12 +1187,16 @@ msgstr "Самые популярные записи на %%site.name%% на т
#: 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 "Нет результатов."
@@ -1572,7 +1490,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 "Группы"
@@ -1597,12 +1515,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 +1539,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 +1637,7 @@ msgstr ""
#: actions/invite.php:39
msgid "Invites have been disabled."
-msgstr ""
+msgstr "Приглашения отключены."
#: actions/invite.php:41
#, php-format
@@ -1750,7 +1666,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 +1708,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 +1785,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 +1816,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 +1871,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 +1942,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 +1950,7 @@ msgstr "Ошибка AJAX"
msgid "New notice"
msgstr "Новая запись"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr "Запись опубликована"
@@ -2056,7 +1970,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
@@ -2072,12 +1986,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 +2005,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 +2018,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 +2051,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 +2067,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 +2095,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 +2118,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 +2150,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 +2281,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 +2354,7 @@ msgstr ""
"Теги для самого себя (буквы, цифры, -, ., и _), разделенные запятой или "
"пробелом"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Язык"
@@ -2398,7 +2412,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 +2444,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
@@ -2479,11 +2495,11 @@ 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 +2507,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 +2547,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 +2590,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 +2643,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 +2698,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 +2719,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 +2786,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"
@@ -2802,20 +2815,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 +2860,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 +2868,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 +2877,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 +2924,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 +2933,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 +2946,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 +2974,7 @@ msgstr "Запись"
#: actions/showgroup.php:284 lib/groupeditform.php:184
msgid "Aliases"
-msgstr ""
+msgstr "Алиасы"
#: actions/showgroup.php:293
msgid "Group actions"
@@ -2976,9 +2996,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 +3019,8 @@ msgid "Statistics"
msgstr "Статистика"
#: actions/showgroup.php:432
-#, fuzzy
msgid "Created"
-msgstr "Создать"
+msgstr "Создано"
#: actions/showgroup.php:448
#, php-format
@@ -3012,12 +3031,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 +3046,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 +3074,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 +3108,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 +3131,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,37 +3163,29 @@ 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."
@@ -3185,212 +3200,210 @@ msgid "Snapshot frequency must be a number."
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 ""
-#: 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 "Предпочитаемый язык"
-
-#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
+msgstr "Язык сайта по умолчанию"
#: 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 "Восстановление"
+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:354
+msgid "Snapshots"
+msgstr "Снимки"
-#: actions/siteadminpanel.php:353
+#: 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 ""
-#: 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"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
msgid "Report URL"
-msgstr ""
+msgstr "URL отчёта"
#: 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
+#: 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"
@@ -3526,18 +3539,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 +3560,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 +3593,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 +3660,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 +3683,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."
@@ -3697,46 +3711,111 @@ 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 "Пользователь"
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Пользовательские настройки для этого сайта StatusNet."
+
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr "Неверное ограничение биографии. Должно быть числом."
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: 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 +3831,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,14 +3843,13 @@ 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"
@@ -3806,12 +3883,12 @@ msgstr ""
#: 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 +3896,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 +3918,7 @@ msgstr ""
#: actions/userdesignsettings.php:282
msgid "Enjoy your hotdog!"
-msgstr ""
+msgstr "Приятного аппетита!"
#: actions/usergroups.php:64
#, php-format
@@ -3853,14 +3930,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 +3946,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 +3977,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 +3992,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."
@@ -3944,13 +4021,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 +4031,7 @@ msgstr "Изменить ваши настройки профиля"
#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
-msgstr "Загрузить аватар"
+msgstr "Загрузить аватару"
#: lib/accountsettingsaction.php:116
msgid "Change your password"
@@ -3969,9 +4042,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 +4062,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 +4192,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 +4209,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 +4302,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 +4322,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 +4364,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 +4425,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 +4505,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,9 +4574,8 @@ msgid "Database error"
msgstr "Ошибка базы данных"
#: lib/designsettings.php:105
-#, fuzzy
msgid "Upload file"
-msgstr "Загрузить"
+msgstr "Загрузить файл"
#: lib/designsettings.php:109
msgid ""
@@ -4489,19 +4586,19 @@ msgstr ""
#: 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 +4610,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 +4633,8 @@ msgid "All"
msgstr "Все"
#: lib/galleryaction.php:139
-#, fuzzy
msgid "Select tag to filter"
-msgstr "Выбор провайдера"
+msgstr "Выберите тег для фильтрации"
#: lib/galleryaction.php:140
msgid "Tag"
@@ -4546,7 +4642,7 @@ msgstr "Теги"
#: lib/galleryaction.php:141
msgid "Choose a tag to narrow list"
-msgstr "Выберите тэг из выпадающего списка"
+msgstr "Выберите тег из выпадающего списка"
#: lib/galleryaction.php:143
msgid "Go"
@@ -4557,14 +4653,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 +4674,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 +4705,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 +4722,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 +4741,7 @@ msgstr "Системная ошибка при загрузке файла."
#: lib/imagefile.php:96
msgid "Not an image or corrupt file."
-msgstr "Не является изображением или разрушенный файл."
+msgstr "Не является изображением или повреждённый файл."
#: lib/imagefile.php:105
msgid "Unsupported image file format."
@@ -4662,7 +4758,7 @@ msgstr "Неподдерживаемый тип файла"
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
#: lib/joinform.php:114
msgid "Join"
@@ -4670,7 +4766,7 @@ msgstr "Присоединиться"
#: lib/leaveform.php:114
msgid "Leave"
-msgstr "Выйти"
+msgstr "Покинуть"
#: lib/logingroupnav.php:80
msgid "Login with a username and password"
@@ -4689,8 +4785,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 +4813,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 +4846,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 +4873,7 @@ msgid ""
"Bio: %s\n"
"\n"
msgstr ""
-"Био: %s\n"
+"Биография: %s\n"
"\n"
#: lib/mail.php:286
@@ -4792,7 +4914,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 +4931,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 +4966,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 +5006,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 +5042,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 +5117,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,21 +5193,19 @@ 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
msgid "You have been banned from subscribing."
-msgstr "Этот пользователь заблокировал вас на его подписку."
+msgstr "Вы заблокированы от подписки."
#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
@@ -5035,7 +5233,7 @@ msgstr "Ваши входящие сообщения"
#: lib/personalgroupnav.php:129
msgid "Outbox"
-msgstr "Исходящее"
+msgstr "Исходящие"
#: lib/personalgroupnav.php:130
msgid "Your sent messages"
@@ -5075,13 +5273,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 +5290,7 @@ msgstr "Группы"
#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
msgid "Recent tags"
-msgstr "Облаго тэгов"
+msgstr "Облако тегов"
#: lib/publicgroupnav.php:88
msgid "Featured"
@@ -5104,24 +5301,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 +5328,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 +5342,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 +5370,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 +5383,7 @@ msgstr "(пока ничего нет)"
#: lib/subs.php:52
msgid "Already subscribed!"
-msgstr ""
+msgstr "Уже подписаны!"
#: lib/subs.php:56
msgid "User has blocked you."
@@ -5207,9 +5398,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 +5407,7 @@ msgstr "Не удаётся удалить подписку."
#: lib/tagcloudsection.php:56
msgid "None"
-msgstr "Нет тэгов"
+msgstr "Нет тегов"
#: lib/topposterssection.php:74
msgid "Top posters"
@@ -5225,21 +5415,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 +5438,8 @@ msgid "Unsubscribe"
msgstr "Отписаться"
#: lib/userprofile.php:116
-#, fuzzy
msgid "Edit Avatar"
-msgstr "Аватар"
+msgstr "Изменить аватару"
#: lib/userprofile.php:236
msgid "User actions"
@@ -5264,7 +5451,7 @@ msgstr "Изменение настроек профиля"
#: lib/userprofile.php:249
msgid "Edit"
-msgstr ""
+msgstr "Редактировать"
#: lib/userprofile.php:272
msgid "Send a direct message to this user"
@@ -5319,14 +5506,16 @@ 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."
@@ -5344,10 +5533,5 @@ msgstr "Простите, это не Ваш входящий электронн
msgid "Sorry, no incoming email allowed."
msgstr "Простите, входящих писем нет."
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Разблокировать пользователя."
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Люди подписанные на %s"
+#~ msgid "Notice"
+#~ msgstr "Запись"
diff --git a/locale/statusnet.po b/locale/statusnet.po
index d65222eb1..6f934d48e 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-23 21:46+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,79 +1051,79 @@ 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 ""
@@ -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 ""
@@ -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"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-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:178
-msgid "Invite-only"
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: 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
+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
@@ -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 ""
@@ -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 ""
@@ -4389,7 +4497,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 +4737,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 ""
@@ -4799,6 +4932,10 @@ msgstr ""
msgid "Search site"
msgstr ""
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
msgid "Search help"
msgstr ""
@@ -4811,10 +4948,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 ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.mo b/locale/sv/LC_MESSAGES/statusnet.mo
index 7a03482ed..5a23f84a0 100644
--- a/locale/sv/LC_MESSAGES/statusnet.mo
+++ b/locale/sv/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index ce932a624..03379860a 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:48:09+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(r59365); 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,43 +1153,43 @@ 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."
@@ -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"
@@ -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"
-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 "Å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: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:178
+#: 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
@@ -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"
@@ -4604,7 +4721,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 +4768,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"
@@ -4721,7 +4838,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 +5092,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"
@@ -5158,6 +5301,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 +5318,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"
@@ -5393,9 +5535,5 @@ 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"
+#~ msgid "Notice"
+#~ msgstr "Inlägg"
diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo
index 9a225e09b..438b8885f 100644
--- a/locale/te/LC_MESSAGES/statusnet.mo
+++ b/locale/te/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index cb02d50f6..2449a7967 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:48:12+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(r59365); 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 "ఈ నోటీసుని తొలగించు"
@@ -821,182 +820,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 "హోమ్ పేజీ 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
#, 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 "మీ స్వంత నేపథ్యపు చిత్రాన్ని మీరు ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం 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,79 +1078,79 @@ 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 ""
@@ -1476,7 +1409,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 +1467,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 +1670,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 +1767,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 +1875,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 +1883,7 @@ msgstr ""
msgid "New notice"
msgstr "కొత్త సందేశం"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
#, fuzzy
msgid "Notice posted"
msgstr "సందేశాలు"
@@ -1987,12 +1920,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 +2051,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 +2083,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 +2293,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 +2519,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 +2578,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 +2622,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 "ఈమెయిల్"
@@ -2696,9 +2736,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 +3039,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 +3070,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 +3180,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 +3189,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 +3230,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 +3585,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 +3594,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: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 "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: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: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
@@ -3779,10 +3890,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 +3928,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 +4063,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 +4079,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 +4134,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 +4316,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 +4327,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 +4338,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] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
@@ -4411,7 +4520,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 +4566,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 ""
@@ -4523,7 +4632,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 +4873,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 "స్పందించండి"
@@ -4941,6 +5076,10 @@ msgstr "అటువంటి వాడుకరి లేరు."
msgid "Search site"
msgstr "వెతుకు"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr "కీపదము(లు)"
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -4954,11 +5093,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 ""
@@ -5169,9 +5303,5 @@ msgid "Sorry, no incoming email allowed."
msgstr ""
#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "అటువంటి వాడుకరి లేరు."
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "%sకి స్పందనలు"
+#~ msgid "Notice"
+#~ msgstr "సందేశాలు"
diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo
index c2079ecf0..02303b93d 100644
--- a/locale/tr/LC_MESSAGES/statusnet.mo
+++ b/locale/tr/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 76336f905..f2b8c15bc 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:48:15+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(r59365); 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,79 +1100,79 @@ 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 ""
@@ -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"
@@ -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: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 "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: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
@@ -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 ""
@@ -4493,7 +4602,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 +4649,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"
@@ -4610,7 +4719,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 +4966,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"
@@ -5037,6 +5171,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 +5188,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 ""
@@ -5267,9 +5400,5 @@ 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"
+#~ msgid "Notice"
+#~ msgstr "Durum mesajları"
diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo
index 4cb71655b..5f6d5d78d 100644
--- a/locale/uk/LC_MESSAGES/statusnet.mo
+++ b/locale/uk/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 94db9c503..e2a2aaae6 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/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:32:48+0000\n"
+"POT-Creation-Date: 2009-11-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:48:18+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(r59365); 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
@@ -446,7 +447,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 +562,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 +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
@@ -590,7 +591,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."
@@ -724,15 +725,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 "Не вдалося видалити підтвердження поштової адреси."
@@ -752,7 +753,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 "Повідомлення"
@@ -795,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 "Видалити повідомлення"
@@ -840,183 +841,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 ""
@@ -1169,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."
@@ -1208,43 +1146,43 @@ 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 "Нову адресу для вхідних повідомлень додано."
@@ -1517,7 +1455,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 "Адмін"
@@ -1579,7 +1517,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 "Групи"
@@ -1801,7 +1739,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 "Так!"
@@ -1926,7 +1864,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 "Увійти"
@@ -2043,7 +1981,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"
@@ -2051,7 +1989,7 @@ msgstr "Помилка в Ajax"
msgid "New notice"
msgstr "Нове повідомлення"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr "Повідомлення відправлено"
@@ -2087,12 +2025,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\""
@@ -2221,9 +2159,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"
@@ -2253,6 +2191,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 ""
@@ -2359,7 +2405,7 @@ msgstr ""
"Позначте себе тегами (літери, цифри, -, . та _), відокремлюючи кожен комою "
"або пробілом"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Мова"
@@ -2589,10 +2635,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 "Скинути"
@@ -2655,7 +2697,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 "Реєстрація"
@@ -2701,7 +2743,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 "Пошта"
@@ -3150,11 +3192,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 ""
@@ -3186,103 +3223,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"
@@ -3301,7 +3335,7 @@ msgstr "Запросити"
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "Блок"
@@ -3310,33 +3344,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
@@ -3347,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 "СМС"
+
+#: 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 "Налаштування аватари"
@@ -3697,7 +3744,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 "Користувач"
@@ -3705,17 +3753,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:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:178
+#: 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: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: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
@@ -3950,10 +4070,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 "Змінити налаштування профілю"
@@ -3992,131 +4108,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 "Ліцензія StatusNet software"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4125,12 +4241,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 %"
@@ -4141,32 +4257,32 @@ 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 "Ліцензія StatusNet software"
-#: 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 "Виникли певні проблеми з токеном поточної сесії."
@@ -4200,6 +4316,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 ""
@@ -4374,11 +4495,11 @@ 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] ""
#: lib/command.php:640
#, fuzzy
@@ -4386,11 +4507,11 @@ 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[2] ""
#: lib/command.php:662
#, fuzzy
@@ -4398,11 +4519,11 @@ 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[2] ""
#: lib/command.php:678
msgid ""
@@ -4580,7 +4701,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 "Група"
@@ -4626,7 +4747,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 "Ця сторінка не доступна для того типу медіа, з яким ви погодились"
@@ -4691,7 +4812,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 " від "
@@ -4948,37 +5069,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 "Що нового, %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
msgid "Reply"
msgstr "Відповісти"
@@ -5126,6 +5273,10 @@ msgstr "Розблокувати цього користувача"
msgid "Search site"
msgstr "Пошук"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5139,10 +5290,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 "Знайти за змістом повідомлень"
@@ -5354,10 +5501,5 @@ msgid "Sorry, no incoming email allowed."
msgstr ""
"Вибачте, але не затверджено жодної електронної адреси для вхідної пошти."
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Розблокувати цього користувача"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Люди підписані до %s"
+#~ msgid "Notice"
+#~ msgstr "Повідомлення"
diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo
index 2c799667d..d81241ab3 100644
--- a/locale/vi/LC_MESSAGES/statusnet.mo
+++ b/locale/vi/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 0fe1fed57..bcdd13f2e 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:48:21+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(r59365); 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,47 +1168,47 @@ 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."
@@ -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"
@@ -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: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:178
+#: 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: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: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
@@ -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 ""
@@ -4660,7 +4772,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 +4820,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."
@@ -4780,7 +4892,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 +5190,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"
@@ -5265,6 +5403,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 +5420,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"
@@ -5504,9 +5641,5 @@ 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"
+#~ msgid "Notice"
+#~ msgstr "Tin nhắn"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo
index 6f41c554e..2f06e08bd 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.mo
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index f32b9e629..09f8a30f6 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:48:25+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(r59365); 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,43 +1145,43 @@ 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 "已添加新的发布用的电子邮件地址。"
@@ -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 "电子邮件"
@@ -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: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
#, 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
@@ -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 ""
@@ -4569,7 +4679,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 +4726,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 "这个页面不提供您想要的媒体类型"
@@ -4685,7 +4795,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 +5051,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 "回复"
@@ -5127,6 +5263,10 @@ msgstr "取消阻止次用户"
msgid "Search site"
msgstr "搜索"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5140,11 +5280,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 "搜索通告内容"
@@ -5364,9 +5499,5 @@ msgid "Sorry, no incoming email allowed."
msgstr "对不起,发布用的电子邮件无法使用。"
#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "取消阻止次用户"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "订阅 %s"
+#~ msgid "Notice"
+#~ msgstr "通告"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo
index 89afaf8af..92ef79c48 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.mo
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index ed366612b..84ce25714 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-23 21:46+0000\n"
+"PO-Revision-Date: 2009-11-23 21:48:29+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(r59365); 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,79 +1091,79 @@ 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 ""
@@ -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 "電子信箱"
@@ -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:178
-msgid "Invite-only"
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: 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
+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
@@ -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 ""
@@ -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 ""
@@ -4523,7 +4631,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 +4879,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 ""
@@ -4948,6 +5081,10 @@ msgstr "無此使用者"
msgid "Search site"
msgstr ""
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
msgid "Search help"
msgstr ""
@@ -4960,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 ""
@@ -5176,9 +5308,5 @@ msgid "Sorry, no incoming email allowed."
msgstr ""
#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "無此使用者"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "此帳號已註冊"
+#~ msgid "Notice"
+#~ msgstr "新訊息"
diff --git a/plugins/GeonamesPlugin.php b/plugins/GeonamesPlugin.php
index 59232c1c5..340a6f0bf 100644
--- a/plugins/GeonamesPlugin.php
+++ b/plugins/GeonamesPlugin.php
@@ -63,6 +63,14 @@ class GeonamesPlugin extends Plugin
function onLocationFromName($name, $language, &$location)
{
+ $loc = $this->getCache(array('name' => $name,
+ 'language' => $language));
+
+ if (!empty($loc)) {
+ $location = $loc;
+ return false;
+ }
+
$client = HTTPClient::start();
// XXX: break down a name by commas, narrow by each
@@ -87,6 +95,10 @@ class GeonamesPlugin extends Plugin
$location->location_id = $n->geonameId;
$location->location_ns = self::LOCATION_NS;
+ $this->setCache(array('name' => $name,
+ 'language' => $language),
+ $location);
+
// handled, don't continue processing!
return false;
}
@@ -114,6 +126,13 @@ class GeonamesPlugin extends Plugin
return true;
}
+ $loc = $this->getCache(array('id' => $id));
+
+ if (!empty($loc)) {
+ $location = $loc;
+ return false;
+ }
+
$client = HTTPClient::start();
$str = http_build_query(array('geonameId' => $id,
@@ -148,6 +167,9 @@ class GeonamesPlugin extends Plugin
$location->lat = $last->lat;
$location->lon = $last->lng;
$location->names[$language] = implode(', ', array_reverse($parts));
+
+ $this->setCache(array('id' => $last->geonameId),
+ $location);
}
}
@@ -173,6 +195,14 @@ class GeonamesPlugin extends Plugin
function onLocationFromLatLon($lat, $lon, $language, &$location)
{
+ $loc = $this->getCache(array('lat' => $lat,
+ 'lon' => $lon));
+
+ if (!empty($loc)) {
+ $location = $loc;
+ return false;
+ }
+
$client = HTTPClient::start();
$str = http_build_query(array('lat' => $lat,
@@ -211,6 +241,10 @@ class GeonamesPlugin extends Plugin
$location->names[$language] = implode(', ', $parts);
+ $this->setCache(array('lat' => $lat,
+ 'lon' => $lon),
+ $location);
+
// Success! We handled it, so no further processing
return false;
@@ -242,9 +276,17 @@ class GeonamesPlugin extends Plugin
return true;
}
+ $n = $this->getCache(array('id' => $location->location_id,
+ 'language' => $language));
+
+ if (!empty($n)) {
+ $name = $n;
+ return false;
+ }
+
$client = HTTPClient::start();
- $str = http_build_query(array('geonameId' => $id,
+ $str = http_build_query(array('geonameId' => $location->location_id,
'lang' => $language));
$result = $client->get('http://ws.geonames.org/hierarchyJSON?'.$str);
@@ -271,6 +313,9 @@ class GeonamesPlugin extends Plugin
if (count($parts)) {
$name = implode(', ', array_reverse($parts));
+ $this->setCache(array('id' => $location->location_id,
+ 'language' => $language),
+ $name);
return false;
}
}
@@ -326,4 +371,44 @@ class GeonamesPlugin extends Plugin
// it's been filled, so don't process further.
return false;
}
+
+ function getCache($attrs)
+ {
+ $c = common_memcache();
+
+ if (!$c) {
+ return null;
+ }
+
+ return $c->get($this->cacheKey($attrs));
+ }
+
+ function setCache($attrs, $loc)
+ {
+ $c = common_memcache();
+
+ if (!$c) {
+ return null;
+ }
+
+ $c->set($this->cacheKey($attrs), $loc);
+ }
+
+ function clearCache($attrs)
+ {
+ $c = common_memcache();
+
+ if (!$c) {
+ return null;
+ }
+
+ $c->delete($this->cacheKey($attrs));
+ }
+
+ function cacheKey($attrs)
+ {
+ return common_cache_key('geonames:'.
+ implode(',', array_keys($attrs)) . ':'.
+ common_keyize(implode(',', array_values($attrs))));
+ }
}
diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php
index a0dbf5204..37306a23c 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'),
diff --git a/plugins/Mapstraction/usermap.js b/plugins/Mapstraction/usermap.js
index 7fb73fa88..e667dd579 100644
--- a/plugins/Mapstraction/usermap.js
+++ b/plugins/Mapstraction/usermap.js
@@ -1,17 +1,17 @@
$(document).ready(function() {
- notices = [];
+ var notices = [];
$(".notice").each(function(){
- notice = getNoticeFromElement($(this));
+ var notice = getNoticeFromElement($(this));
if(notice['geo'])
notices.push(notice);
});
- if($("#map_canvas") && notices.length>0)
+ if($("#map_canvas").length && notices.length>0)
{
showMapstraction($("#map_canvas"), notices);
}
- $('a.geo').click(function(){
- noticeElement = $(this).closest(".notice");
+ $('.geo').click(function(){
+ var noticeElement = $(this).closest(".notice");
notice = getNoticeFromElement(noticeElement);
$.fn.jOverlay.options = {
@@ -23,7 +23,7 @@ $(document).ready(function() {
autoHide : true,
css : {'max-width':'542px', 'top':'5%', 'left':'32.5%'}
};
- html="<div id='map_canvas_popup' class='gray smallmap' style='width: 542px; height: 500px' />";
+ var html="<div id='map_canvas_popup' class='gray smallmap' style='width: 542px; height: 500px' />";
html+="<button class='close'>&#215;</button>";
html+=$("<div/>").append($(this).clone()).html();
$().jOverlay({ "html": html });
@@ -47,11 +47,12 @@ function getMicroformatValue(element)
function getNoticeFromElement(noticeElement)
{
- notice = {};
- if(noticeElement.find(".latitude").length){
+ var notice = {};
+ if(noticeElement.find(".geo").length){
+ var latlon = noticeElement.find(".geo").attr('title').split(";");
notice['geo']={'coordinates': [
- parseFloat(getMicroformatValue(noticeElement.find(".latitude"))),
- parseFloat(getMicroformatValue(noticeElement.find(".longitude")))] };
+ parseFloat(latlon[0]),
+ parseFloat(latlon[1])] };
}
notice['user']={
'profile_image_url': noticeElement.find("img.avatar").attr('src'),
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index c5fb6de03..cbfa6bae0 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');
}
@@ -220,8 +220,9 @@ class RealtimePlugin extends Plugin
$action->elementStart('body',
(common_current_user()) ? array('id' => $action->trimmed('action'),
- 'class' => 'user_in')
- : array('id' => $action->trimmed('action')));
+ 'class' => 'user_in realtime-popup')
+ : array('id' => $action->trimmed('action'),
+ 'class'=> 'realtime-popup'));
// XXX hack to deal with JS that tries to get the
// root url from page output
diff --git a/plugins/Realtime/realtimeupdate.css b/plugins/Realtime/realtimeupdate.css
index 0ab5dd32b..a5728b83d 100644
--- a/plugins/Realtime/realtimeupdate.css
+++ b/plugins/Realtime/realtimeupdate.css
@@ -1,3 +1,32 @@
+.realtime-popup address {
+display:none;
+}
+
+.realtime-popup #content {
+width:93.5%;
+}
+
+.realtime-popup #form_notice {
+margin:18px 0 18px 1.795%;
+width:93%;
+max-width:451px;
+}
+
+.realtime-popup #form_notice label[for=notice_data-text],
+.realtime-popup h1 {
+display:none;
+}
+
+.realtime-popup #form_notice label[for=notice_data-attach],
+.realtime-popup #form_notice #notice_data-attach {
+top:0;
+}
+
+.realtime-popup #form_notice #notice_data-attach {
+left:auto;
+right:0;
+}
+
#notices_primary {
position:relative;
}
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index a2c4da113..b3c41456e 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -276,26 +276,6 @@ RealtimeUpdate = {
initPopupWindow: function()
{
- $('address').hide();
- $('#content').css({'width':'93.5%'});
-
- $('#form_notice').css({
- 'margin':'18px 0 18px 1.795%',
- 'width':'93%',
- 'max-width':'451px'
- });
-
- $('#form_notice label[for=notice_data-text], h1').css({'display': 'none'});
-
- $('.notices li:first-child').css({'border-top-color':'transparent'});
-
- $('#form_notice label[for="notice_data-attach"], #form_notice #notice_data-attach').css({'top':'0'});
-
- $('#form_notice #notice_data-attach').css({
- 'left':'auto',
- 'right':'0'
- });
-
$('.notices .entry-title a, .notices .entry-content a').bind('click', function() {
window.open(this.href, '');
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/scripts/update_translations.php b/scripts/update_translations.php
index 580c472ee..73f2a3a7e 100755
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -109,7 +109,7 @@ foreach ($languages as $language) {
file_put_contents($pofile, $new_file);
// --backup=off is workaround for Mac OS X fail
system(sprintf('msgmerge -U --backup=off %s %s', $pofile, $statusnet_pot));
- system(sprintf('msgfmt -f -o %s %s', $mofile, $pofile));
+ system(sprintf('msgfmt -o %s %s', $mofile, $pofile));
} else {
echo "Unchanged - ".$code."\n";
}
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,
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index f4af07081..00cac0ea3 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -97,8 +97,8 @@ color:#002FA7;
.profile {
border-top-color:#C8D1D5;
}
-.section .profile {
-border-top-color:#87B4C8;
+.mark-top {
+border-color:#AAAAAA;
}
#aside_primary {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index ff7311302..12541341d 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -97,8 +97,8 @@ color:#002FA7;
.profile {
border-top-color:#CEE1E9;
}
-.section .profile {
-border-top-color:#87B4C8;
+.mark-top {
+border-color:#AAAAAA;
}
#aside_primary {