summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--EVENTS.txt22
-rw-r--r--actions/apigroupcreate.php62
-rw-r--r--actions/apistatusesupdate.php2
-rw-r--r--actions/designadminpanel.php307
-rw-r--r--actions/emailsettings.php3
-rw-r--r--actions/login.php4
-rw-r--r--actions/newgroup.php46
-rw-r--r--actions/profilesettings.php2
-rw-r--r--actions/siteadminpanel.php173
-rw-r--r--classes/Profile.php11
-rw-r--r--classes/User_group.php62
-rw-r--r--db/notice_source.sql1
-rw-r--r--lib/adminform.php86
-rw-r--r--lib/adminpanelaction.php27
-rw-r--r--lib/apiauth.php6
-rw-r--r--lib/common.php4
-rw-r--r--lib/form.php10
-rw-r--r--lib/language.php57
-rw-r--r--lib/unblockform.php2
-rw-r--r--lib/util.php13
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.mobin33408 -> 36593 bytes
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po808
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.mobin84188 -> 88688 bytes
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po791
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.mobin72040 -> 75686 bytes
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po850
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.mobin35624 -> 37974 bytes
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po779
-rw-r--r--locale/de/LC_MESSAGES/statusnet.mobin72263 -> 75715 bytes
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po874
-rw-r--r--locale/el/LC_MESSAGES/statusnet.mobin30197 -> 32801 bytes
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po763
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.mobin67648 -> 70745 bytes
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po789
-rw-r--r--locale/es/LC_MESSAGES/statusnet.mobin71397 -> 74756 bytes
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po785
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.mobin77266 -> 80746 bytes
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po795
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.mobin95012 -> 98865 bytes
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po823
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.mobin75182 -> 78412 bytes
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po790
-rw-r--r--locale/he/LC_MESSAGES/statusnet.mobin39222 -> 41479 bytes
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po777
-rw-r--r--locale/is/LC_MESSAGES/statusnet.mobin63447 -> 66563 bytes
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po779
-rw-r--r--locale/it/LC_MESSAGES/statusnet.mobin71290 -> 74607 bytes
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po791
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.mobin48534 -> 51365 bytes
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po779
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.mobin75739 -> 79573 bytes
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po791
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.mobin45910 -> 48861 bytes
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po779
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.mobin23808 -> 25159 bytes
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po769
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.mobin100798 -> 104559 bytes
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po798
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.mobin68483 -> 71756 bytes
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po791
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.mobin96716 -> 100184 bytes
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po783
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.mobin25876 -> 27718 bytes
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po771
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.mobin70940 -> 74412 bytes
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po791
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.mobin95158 -> 100725 bytes
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po1023
-rw-r--r--locale/statusnet.po732
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.mobin59360 -> 62253 bytes
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po788
-rw-r--r--locale/te/LC_MESSAGES/statusnet.mobin55687 -> 59709 bytes
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po777
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.mobin35135 -> 37480 bytes
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po780
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.mobin92880 -> 97470 bytes
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po791
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.mobin68580 -> 71795 bytes
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po798
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.mobin65285 -> 68386 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po793
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.mobin19305 -> 20853 bytes
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po769
-rw-r--r--plugins/Authentication/AuthenticationPlugin.php2
-rw-r--r--plugins/Authorization/AuthorizationPlugin.php108
-rw-r--r--plugins/LdapAuthentication/LdapAuthenticationPlugin.php13
-rw-r--r--plugins/LdapAuthorization/LdapAuthorizationPlugin.php211
-rw-r--r--plugins/LdapAuthorization/README91
-rw-r--r--plugins/Realtime/RealtimePlugin.php11
-rw-r--r--plugins/Realtime/icon_pause.gifbin0 -> 75 bytes
-rw-r--r--plugins/Realtime/icon_play.gifbin0 -> 75 bytes
-rw-r--r--plugins/Realtime/realtimeupdate.css49
-rw-r--r--plugins/Realtime/realtimeupdate.js155
-rwxr-xr-xscripts/update_pot.sh12
-rw-r--r--theme/base/css/display.css34
-rw-r--r--theme/default/css/display.css14
-rw-r--r--theme/identica/css/display.css13
97 files changed, 19639 insertions, 7471 deletions
diff --git a/EVENTS.txt b/EVENTS.txt
index c788a9215..34a222e8f 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -535,6 +535,28 @@ StartChangePassword: Before changing a password
EndChangePassword: After changing a password
- $user: user
+StartSetUser: Before setting the currently logged in user
+- $user: user
+
+EndSetUser: After setting the currently logged in user
+- $user: user
+
+StartSetApiUser: Before setting the current API user
+- $user: user
+
+EndSetApiUser: After setting the current API user
+- $user: user
+
+StartHasRole: Before determing if the a profile has a given role
+- $profile: profile in question
+- $name: name of the role in question
+- &$has_role: does this profile have the named role?
+
+EndHasRole: Before determing if the a profile has a given role
+- $profile: profile in question
+- $name: name of the role in question
+- $has_role: does this profile have the named role?
+
UserDeleteRelated: Specify additional tables to delete entries from when deleting users
- $user: User object
- &$related: array of DB_DataObject class names to delete entries on matching user_id.
diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php
index 895dfb7ab..8827d1c5c 100644
--- a/actions/apigroupcreate.php
+++ b/actions/apigroupcreate.php
@@ -117,61 +117,13 @@ class ApiGroupCreateAction extends ApiAuthAction
return;
}
- $group = new User_group();
-
- $group->query('BEGIN');
-
- $group->nickname = $this->nickname;
- $group->fullname = $this->fullname;
- $group->homepage = $this->homepage;
- $group->description = $this->description;
- $group->location = $this->location;
- $group->created = common_sql_now();
-
- $result = $group->insert();
-
- if (!$result) {
- common_log_db_error($group, 'INSERT', __FILE__);
- $this->serverError(
- _('Could not create group.'),
- 500,
- $this->format
- );
- return;
- }
-
- $result = $group->setAliases($this->aliases);
-
- if (!$result) {
- $this->serverError(
- _('Could not create aliases.'),
- 500,
- $this->format
- );
- return;
- }
-
- $member = new Group_member();
-
- $member->group_id = $group->id;
- $member->profile_id = $this->user->id;
- $member->is_admin = 1;
- $member->created = $group->created;
-
- $result = $member->insert();
-
- if (!$result) {
- common_log_db_error($member, 'INSERT', __FILE__);
- $this->serverError(
- _('Could not set group membership.'),
- 500,
- $this->format
- );
- return;
- }
-
- $group->query('COMMIT');
-
+ $group = User_group::register(array('nickname' => $this->nickname,
+ 'fullname' => $this->fullname,
+ 'homepage' => $this->homepage,
+ 'description' => $this->description,
+ 'location' => $this->location,
+ 'aliases' => $this->aliases,
+ 'userid' => $this->user->id));
switch($this->format) {
case 'xml':
$this->showSingleXmlGroup($group);
diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index 7ddf7703b..85a7c8c08 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -85,7 +85,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction
$this->lat = $this->trimmed('lat');
$this->lon = $this->trimmed('long');
- if (empty($this->source) || in_array($source, self::$reserved_sources)) {
+ if (empty($this->source) || in_array($this->source, self::$reserved_sources)) {
$this->source = 'api';
}
diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
index d1aadc8c2..7c71c032a 100644
--- a/actions/designadminpanel.php
+++ b/actions/designadminpanel.php
@@ -74,7 +74,7 @@ class DesignadminpanelAction extends AdminPanelAction
}
/**
- * Show the site admin panel form
+ * Get the default design and show the design admin panel form
*
* @return void
*/
@@ -82,7 +82,6 @@ class DesignadminpanelAction extends AdminPanelAction
function showForm()
{
$this->design = Design::siteDesign();
-
$form = new DesignAdminPanelForm($this);
$form->show();
return;
@@ -101,8 +100,7 @@ class DesignadminpanelAction extends AdminPanelAction
} else if ($this->arg('defaults')) {
$this->restoreDefaults();
} else {
- $this->success = false;
- $this->message = 'Unexpected form submission.';
+ $this->clientError(_('Unexpected form submission.'));
}
}
@@ -114,7 +112,6 @@ class DesignadminpanelAction extends AdminPanelAction
function saveDesignSettings()
{
-
// Workaround for PHP returning empty $_POST and $_FILES when POST
// length > post_max_size in php.ini
@@ -124,8 +121,7 @@ class DesignadminpanelAction extends AdminPanelAction
) {
$msg = _('The server was unable to handle that much POST ' .
'data (%s bytes) due to its current configuration.');
- $this->success = false;
- $this->msg = $e->getMessage(sprintf($msg, $_SERVER['CONTENT_LENGTH']));
+ $this->clientException(sprintf($msg, $_SERVER['CONTENT_LENGTH']));
return;
}
@@ -133,25 +129,30 @@ class DesignadminpanelAction extends AdminPanelAction
$bgimage = $this->saveBackgroundImage();
- static $settings = array('theme');
+ static $settings = array(
+ 'site' => array('theme', 'logo'),
+ 'theme' => array('server', 'dir', 'path'),
+ 'avatar' => array('server', 'dir', 'path'),
+ 'background' => array('server', 'dir', 'path')
+ );
+
$values = array();
- foreach ($settings as $setting) {
- $values[$setting] = $this->trimmed($setting);
+ foreach ($settings as $section => $parts) {
+ foreach ($parts as $setting) {
+ $values[$section][$setting] = $this->trimmed("$section-$setting");
+ }
}
- // This throws an exception on validation errors
- try {
- $bgcolor = new WebColor($this->trimmed('design_background'));
- $ccolor = new WebColor($this->trimmed('design_content'));
- $sbcolor = new WebColor($this->trimmed('design_sidebar'));
- $tcolor = new WebColor($this->trimmed('design_text'));
- $lcolor = new WebColor($this->trimmed('design_links'));
- } catch (WebColorException $e) {
- $this->success = false;
- $this->msg = $e->getMessage();
- return;
- }
+ $this->validate($values);
+
+ // assert(all values are valid);
+
+ $bgcolor = new WebColor($this->trimmed('design_background'));
+ $ccolor = new WebColor($this->trimmed('design_content'));
+ $sbcolor = new WebColor($this->trimmed('design_sidebar'));
+ $tcolor = new WebColor($this->trimmed('design_text'));
+ $lcolor = new WebColor($this->trimmed('design_links'));
$onoff = $this->arg('design_background-image_onoff');
@@ -166,16 +167,14 @@ class DesignadminpanelAction extends AdminPanelAction
$tile = $this->boolean('design_background-image_repeat');
- $this->validate($values);
-
- // assert(all values are valid);
-
$config = new Config();
$config->query('BEGIN');
- foreach ($settings as $setting) {
- Config::save('site', $setting, $values[$setting]);
+ foreach ($settings as $section => $parts) {
+ foreach ($parts as $setting) {
+ Config::save($section, $setting, $values[$section][$setting]);
+ }
}
if (isset($bgimage)) {
@@ -197,32 +196,6 @@ class DesignadminpanelAction extends AdminPanelAction
$config->query('COMMIT');
return;
-
- }
-
- /**
- * Delete a design setting
- *
- * @return mixed $result false if something didn't work
- */
-
- function deleteSetting($section, $setting)
- {
- $config = new Config();
-
- $config->section = $section;
- $config->setting = $setting;
-
- if ($config->find(true)) {
- $result = $config->delete();
- if (!$result) {
- common_log_db_error($config, 'DELETE', __FILE__);
- $this->clientError(_("Unable to delete design setting."));
- return null;
- }
- }
-
- return $result;
}
/**
@@ -233,6 +206,7 @@ class DesignadminpanelAction extends AdminPanelAction
function restoreDefaults()
{
+ $this->deleteSetting('site', 'logo');
$this->deleteSetting('site', 'theme');
$settings = array(
@@ -243,6 +217,8 @@ class DesignadminpanelAction extends AdminPanelAction
foreach ($settings as $setting) {
$this->deleteSetting('design', $setting);
}
+
+ // XXX: Should we restore the default dir settings, etc.? --Z
}
/**
@@ -264,8 +240,7 @@ class DesignadminpanelAction extends AdminPanelAction
$imagefile =
ImageFile::fromUpload('design_background-image_file');
} catch (Exception $e) {
- $this->success = false;
- $this->msg = $e->getMessage();
+ $this->clientError('Unable to save background image.');
return;
}
@@ -297,8 +272,48 @@ class DesignadminpanelAction extends AdminPanelAction
function validate(&$values)
{
- if (!in_array($values['theme'], Theme::listAvailable())) {
- $this->clientError(sprintf(_("Theme not available: %s"), $values['theme']));
+
+ if (!empty($values['site']['logo']) &&
+ !Validate::uri($values['site']['logo'], array('allowed_schemes' => array('http', 'https')))) {
+ $this->clientError(_("Invalid logo URL."));
+ }
+
+ if (!in_array($values['site']['theme'], Theme::listAvailable())) {
+ $this->clientError(sprintf(_("Theme not available: %s"), $values['site']['theme']));
+ }
+
+ // Make sure the directories are there
+
+ if (!empty($values['theme']['dir']) && !is_readable($values['theme']['dir'])) {
+ $this->clientError(sprintf(_("Theme directory not readable: %s"), $values['theme']['dir']));
+ }
+
+ if (empty($values['avatar']['dir']) || !is_writable($values['avatar']['dir'])) {
+ $this->clientError(sprintf(_("Avatar directory not writable: %s"), $values['avatar']['dir']));
+ }
+
+ if (empty($values['background']['dir']) || !is_writable($values['background']['dir'])) {
+ $this->clientError(sprintf(_("Background directory not writable: %s"), $values['background']['dir']));
+ }
+
+ // Do we need to do anything else but validate the
+ // other fields for length? Design settings are
+ // validated elsewhere --Z
+
+ static $settings = array(
+ 'theme' => array('server', 'path'),
+ 'avatar' => array('server', 'path'),
+ 'background' => array('server', 'path')
+ );
+
+ foreach ($settings as $section => $parts) {
+ foreach ($parts as $setting) {
+ if (mb_strlen($values[$section][$setting]) > 255) {
+ $this->clientError(sprintf(_("Max length for %s %s is 255 characters."),
+ $section, $setting));
+ return;
+ }
+ }
}
}
@@ -332,7 +347,7 @@ class DesignadminpanelAction extends AdminPanelAction
}
-class DesignAdminPanelForm extends Form
+class DesignAdminPanelForm extends AdminForm
{
/**
@@ -393,33 +408,85 @@ class DesignAdminPanelForm extends Form
function formData()
{
- $design = $this->out->design;
+ $this->out->elementStart('fieldset', array('id' => 'settings_design_logo'));
+ $this->out->element('legend', null, _('Change logo'));
- $themes = Theme::listAvailable();
+ $this->out->elementStart('ul', 'form_data');
- asort($themes);
+ $this->li();
+ $this->input('logo', _('Site logo'), 'Logo for the site (full URL)', 'site');
+ $this->unli();
- $themes = array_combine($themes, $themes);
+ $this->out->elementEnd('ul');
- $this->out->elementStart('fieldset', array('id' =>
- 'settings_design_theme'));
+ $this->out->elementEnd('fieldset');
+ $this->out->elementStart('fieldset', array('id' => 'settings_design_theme'));
$this->out->element('legend', null, _('Change theme'));
+
$this->out->elementStart('ul', 'form_data');
- $this->out->elementStart('li');
- $this->out->dropdown('theme', _('Theme'),
+ $themes = Theme::listAvailable();
+
+ // XXX: listAvailable() can return an empty list if you
+ // screw up your settings, so just in case:
+
+ if (empty($themes)) {
+ $themes = array('default', 'default');
+ }
+
+ asort($themes);
+ $themes = array_combine($themes, $themes);
+
+ $this->li();
+ $this->out->dropdown('site-theme', _('Site theme'),
$themes, _('Theme for the site.'),
- false, $this->value('theme'));
- $this->out->elementEnd('li');
+ false, $this->value('theme', 'site'));
+ $this->unli();
+
+ $this->li();
+ $this->input('server', _('Theme server'), 'Server for themes', 'theme');
+ $this->unli();
+
+ $this->li();
+ $this->input('path', _('Theme path'), 'Web path to themes', 'theme');
+ $this->unli();
+
+ $this->li();
+ $this->input('dir', _('Theme directory'), 'Directory where themes are located', 'theme');
+ $this->unli();
+
+ $this->out->elementEnd('ul');
+
+ $this->out->elementEnd('fieldset');
+ $this->out->elementStart('fieldset', array('id' => 'settings_design_avatar'));
+ $this->out->element('legend', null, _('Avatar Settings'));
+
+ $this->out->elementStart('ul', 'form_data');
+
+ $this->li();
+ $this->input('server', _('Avatar server'), 'Server for avatars', 'avatar');
+ $this->unli();
+
+ $this->li();
+ $this->input('path', _('Avatar path'), 'Web path to avatars', 'avatar');
+ $this->unli();
+
+ $this->li();
+ $this->input('dir', _('Avatar directory'), 'Directory where avatars are located', 'avatar');
+ $this->unli();
+
$this->out->elementEnd('ul');
+
$this->out->elementEnd('fieldset');
+ $design = $this->out->design;
$this->out->elementStart('fieldset', array('id' =>
'settings_design_background-image'));
$this->out->element('legend', null, _('Change background image'));
$this->out->elementStart('ul', 'form_data');
- $this->out->elementStart('li');
+
+ $this->li();
$this->out->element('label', array('for' => 'design_background-image_file'),
_('Background'));
$this->out->element('input', array('name' => 'design_background-image_file',
@@ -432,7 +499,7 @@ class DesignAdminPanelForm extends Form
'type' => 'hidden',
'id' => 'MAX_FILE_SIZE',
'value' => ImageFile::maxFileSizeInt()));
- $this->out->elementEnd('li');
+ $this->unli();
if (!empty($design->backgroundimage)) {
@@ -474,27 +541,40 @@ class DesignAdminPanelForm extends Form
'class' => 'radio'),
_('Off'));
$this->out->element('p', 'form_guide', _('Turn background image on or off.'));
- $this->out->elementEnd('li');
+ $this->unli();
- $this->out->elementStart('li');
+ $this->li();
$this->out->checkbox('design_background-image_repeat',
_('Tile background image'),
($design->disposition & BACKGROUND_TILE) ? true : false);
- $this->out->elementEnd('li');
+ $this->unli();
}
+ $this->li();
+ $this->input('server', _('Background server'), 'Server for backgrounds', 'background');
+ $this->unli();
+
+ $this->li();
+ $this->input('path', _('Background path'), 'Web path to backgrounds', 'background');
+ $this->unli();
+
+ $this->li();
+ $this->input('dir', _('Background directory'), 'Directory where backgrounds are located', 'background');
+ $this->unli();
+
$this->out->elementEnd('ul');
$this->out->elementEnd('fieldset');
$this->out->elementStart('fieldset', array('id' => 'settings_design_color'));
$this->out->element('legend', null, _('Change colours'));
+
$this->out->elementStart('ul', 'form_data');
try {
$bgcolor = new WebColor($design->backgroundcolor);
- $this->out->elementStart('li');
+ $this->li();
$this->out->element('label', array('for' => 'swatch-1'), _('Background'));
$this->out->element('input', array('name' => 'design_background',
'type' => 'text',
@@ -503,11 +583,11 @@ class DesignAdminPanelForm extends Form
'maxlength' => '7',
'size' => '7',
'value' => ''));
- $this->out->elementEnd('li');
+ $this->unli();
$ccolor = new WebColor($design->contentcolor);
- $this->out->elementStart('li');
+ $this->li();
$this->out->element('label', array('for' => 'swatch-2'), _('Content'));
$this->out->element('input', array('name' => 'design_content',
'type' => 'text',
@@ -516,11 +596,11 @@ class DesignAdminPanelForm extends Form
'maxlength' => '7',
'size' => '7',
'value' => ''));
- $this->out->elementEnd('li');
+ $this->unli();
$sbcolor = new WebColor($design->sidebarcolor);
- $this->out->elementStart('li');
+ $this->li();
$this->out->element('label', array('for' => 'swatch-3'), _('Sidebar'));
$this->out->element('input', array('name' => 'design_sidebar',
'type' => 'text',
@@ -529,11 +609,11 @@ class DesignAdminPanelForm extends Form
'maxlength' => '7',
'size' => '7',
'value' => ''));
- $this->out->elementEnd('li');
+ $this->unli();
$tcolor = new WebColor($design->textcolor);
- $this->out->elementStart('li');
+ $this->li();
$this->out->element('label', array('for' => 'swatch-4'), _('Text'));
$this->out->element('input', array('name' => 'design_text',
'type' => 'text',
@@ -542,11 +622,11 @@ class DesignAdminPanelForm extends Form
'maxlength' => '7',
'size' => '7',
'value' => ''));
- $this->out->elementEnd('li');
+ $this->unli();
$lcolor = new WebColor($design->linkcolor);
- $this->out->elementStart('li');
+ $this->li();
$this->out->element('label', array('for' => 'swatch-5'), _('Links'));
$this->out->element('input', array('name' => 'design_links',
'type' => 'text',
@@ -555,49 +635,16 @@ class DesignAdminPanelForm extends Form
'maxlength' => '7',
'size' => '7',
'value' => ''));
- $this->out->elementEnd('li');
+ $this->unli();
} catch (WebColorException $e) {
common_log(LOG_ERR, 'Bad color values in site design: ' .
$e->getMessage());
}
- $this->out->elementEnd('ul');
$this->out->elementEnd('fieldset');
- }
-
- /**
- * Utility to simplify some of the duplicated code around
- * params and settings.
- *
- * @param string $setting Name of the setting
- * @param string $title Title to use for the input
- * @param string $instructions Instructions for this field
- *
- * @return void
- */
-
- function input($setting, $title, $instructions)
- {
- $this->out->input($setting, $title, $this->value($setting), $instructions);
- }
-
- /**
- * Utility to simplify getting the posted-or-stored setting value
- *
- * @param string $setting Name of the setting
- *
- * @return string param value if posted, or current config value
- */
-
- function value($setting)
- {
- $value = $this->out->trimmed($setting);
- if (empty($value)) {
- $value = common_config('site', $setting);
- }
- return $value;
+ $this->out->elementEnd('ul');
}
/**
@@ -618,5 +665,27 @@ class DesignAdminPanelForm extends Form
'title' => _('Reset back to default')));
$this->out->submit('save', _('Save'), 'submit form_action-secondary',
- 'save', _('Save design')); }
+ 'save', _('Save design'));
+ }
+
+
+ /**
+ * Utility to simplify some of the duplicated code around
+ * params and settings. Overriding the input() in the base class
+ * to handle a whole bunch of cases of settings with the same
+ * name under different sections.
+ *
+ * @param string $setting Name of the setting
+ * @param string $title Title to use for the input
+ * @param string $instructions Instructions for this field
+ * @param string $section config section, default = 'site'
+ *
+ * @return void
+ */
+
+ function input($setting, $title, $instructions, $section='site')
+ {
+ $this->out->input("$section-$setting", $title, $this->value($setting, $section), $instructions);
+ }
+
}
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 67b991cdc..761aaa8f3 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -95,7 +95,7 @@ class EmailsettingsAction extends AccountSettingsAction
'class' => 'form_settings',
'action' =>
common_local_url('emailsettings')));
-
+ $this->elementStart('fieldset');
$this->elementStart('fieldset', array('id' => 'settings_email_address'));
$this->element('legend', null, _('Address'));
$this->hidden('token', common_session_token());
@@ -194,6 +194,7 @@ class EmailsettingsAction extends AccountSettingsAction
$this->elementEnd('ul');
$this->submit('save', _('Save'));
$this->elementEnd('fieldset');
+ $this->elementEnd('fieldset');
$this->elementEnd('form');
}
diff --git a/actions/login.php b/actions/login.php
index ad57dd667..63955e3f5 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -133,7 +133,7 @@ class LoginAction extends Action
return;
}
- $nickname = common_canonical_nickname($this->trimmed('nickname'));
+ $nickname = $this->trimmed('nickname');
$password = $this->arg('password');
$user = common_check_user($nickname, $password);
@@ -146,7 +146,7 @@ class LoginAction extends Action
// success!
if (!common_set_user($user)) {
- $this->serverError(_('Error setting user.'));
+ $this->serverError(_('Error setting user. You are probably not authorized.'));
return;
}
diff --git a/actions/newgroup.php b/actions/newgroup.php
index 80da9861a..25da7f8fc 100644
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -186,45 +186,13 @@ class NewgroupAction extends Action
assert(!is_null($cur));
- $group = new User_group();
-
- $group->query('BEGIN');
-
- $group->nickname = $nickname;
- $group->fullname = $fullname;
- $group->homepage = $homepage;
- $group->description = $description;
- $group->location = $location;
- $group->created = common_sql_now();
-
- $result = $group->insert();
-
- if (!$result) {
- common_log_db_error($group, 'INSERT', __FILE__);
- $this->serverError(_('Could not create group.'));
- }
-
- $result = $group->setAliases($aliases);
-
- if (!$result) {
- $this->serverError(_('Could not create aliases.'));
- }
-
- $member = new Group_member();
-
- $member->group_id = $group->id;
- $member->profile_id = $cur->id;
- $member->is_admin = 1;
- $member->created = $group->created;
-
- $result = $member->insert();
-
- if (!$result) {
- common_log_db_error($member, 'INSERT', __FILE__);
- $this->serverError(_('Could not set group membership.'));
- }
-
- $group->query('COMMIT');
+ $group = User_group::register(array('nickname' => $nickname,
+ 'fullname' => $fullname,
+ 'homepage' => $homepage,
+ 'description' => $description,
+ 'location' => $location,
+ 'aliases' => $aliases,
+ 'userid' => $cur->id));
common_redirect($group->homeUrl(), 303);
}
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 0a0cc5997..359664096 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -323,7 +323,7 @@ class ProfilesettingsAction extends AccountSettingsAction
$result = $profile->update($orig_profile);
- if (!$result) {
+ if ($result === false) {
common_log_db_error($profile, 'UPDATE', __FILE__);
$this->serverError(_('Couldn\'t save profile.'));
return;
diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
index c316f8e17..916b9ebfb 100644
--- a/actions/siteadminpanel.php
+++ b/actions/siteadminpanel.php
@@ -91,10 +91,12 @@ class SiteadminpanelAction extends AdminPanelAction
function saveSettings()
{
static $settings = array('site' => array('name', 'broughtby', 'broughtbyurl',
- 'email', 'timezone', 'language'),
+ 'email', 'timezone', 'language',
+ 'ssl', 'sslserver', 'site', 'path',
+ 'textlimit', 'dupelimit', 'locale_path'),
'snapshot' => array('run', 'reporturl', 'frequency'));
- static $booleans = array('site' => array('private'));
+ static $booleans = array('site' => array('private', 'inviteonly', 'closed', 'fancy'));
$values = array();
@@ -190,10 +192,42 @@ class SiteadminpanelAction extends AdminPanelAction
$this->clientError(_("Snapshot frequency must be a number."));
}
+ // Validate SSL setup
+
+ 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."));
+ }
+ }
+
+ if (mb_strlen($values['site']['sslserver']) > 255) {
+ $this->clientError(_("Invalid SSL server. Max length is 255 characters."));
+ }
+
+ // Validate text limit
+
+ if (!Validate::number($values['site']['textlimit'], array('min' => 140))) {
+ $this->clientError(_("Minimum text limit is 140c."));
+ }
+
+ // Validate dupe limit
+
+ if (!Validate::number($values['site']['dupelimit'], array('min' => 1))) {
+ $this->clientError(_("Dupe limit must 1 or more seconds."));
+ }
+
+ // Validate locales path
+
+ // XXX: What else do we need to validate for lacales path here? --Z
+
+ if (!empty($values['site']['locale_path']) && !is_readable($values['site']['locale_path'])) {
+ $this->clientError(sprintf(_("Locales directory not readable: %s"), $values['site']['locale_path']));
+ }
+
}
}
-class SiteAdminPanelForm extends Form
+class SiteAdminPanelForm extends AdminForm
{
/**
* ID of the form
@@ -236,15 +270,19 @@ class SiteAdminPanelForm extends Form
function formData()
{
+ $this->out->elementStart('fieldset', array('id' => 'settings_admin_general'));
+ $this->out->element('legend', null, _('General'));
$this->out->elementStart('ul', 'form_data');
$this->li();
$this->input('name', _('Site name'),
_('The name of your site, like "Yourcompany Microblog"'));
$this->unli();
+
$this->li();
$this->input('broughtby', _('Brought by'),
_('Text used for credits link in footer of each page'));
$this->unli();
+
$this->li();
$this->input('broughtbyurl', _('Brought by URL'),
_('URL used for credits link in footer of each page'));
@@ -252,9 +290,13 @@ class SiteAdminPanelForm extends Form
$this->li();
$this->input('email', _('Email'),
_('contact email address for your site'));
-
$this->unli();
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
+ $this->out->elementStart('fieldset', array('id' => 'settings_admin_local'));
+ $this->out->element('legend', null, _('Local'));
+ $this->out->elementStart('ul', 'form_data');
$timezones = array();
foreach (DateTimeZone::listIdentifiers() as $k => $v) {
@@ -264,100 +306,123 @@ class SiteAdminPanelForm extends Form
asort($timezones);
$this->li();
-
$this->out->dropdown('timezone', _('Default timezone'),
$timezones, _('Default timezone for the site; usually UTC.'),
true, $this->value('timezone'));
-
$this->unli();
- $this->li();
+ $this->li();
$this->out->dropdown('language', _('Language'),
get_nice_language_list(), _('Default site language'),
false, $this->value('language'));
+ $this->unli();
+ $this->li();
+ $this->input('locale_path', _('Path to locales'), _('Directory path to locales'));
$this->unli();
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
+
+ $this->out->elementStart('fieldset', array('id' => 'settings_admin_urls'));
+ $this->out->element('legend', null, _('URLs'));
+ $this->out->elementStart('ul', 'form_data');
$this->li();
+ $this->input('server', _('Server'), _('Site\'s server hostname.'));
+ $this->unli();
+ $this->li();
+ $this->input('path', _('Path'), _('Site path'));
+ $this->unli();
+
+ $this->li();
+ $this->out->checkbox('fancy', _('Fancy URLs'),
+ (bool) $this->value('fancy'),
+ _('Use fancy (more readable and memorable) URLs?'));
+ $this->unli();
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
+
+ $this->out->elementStart('fieldset', array('id' => 'settings_admin_access'));
+ $this->out->element('legend', null, _('Access'));
+ $this->out->elementStart('ul', 'form_data');
+ $this->li();
$this->out->checkbox('private', _('Private'),
(bool) $this->value('private'),
_('Prohibit anonymous users (not logged in) from viewing site?'));
+ $this->unli();
+ $this->li();
+ $this->out->checkbox('inviteonly', _('Invite only'),
+ (bool) $this->value('inviteonly'),
+ _('Make registration invitation only.'));
$this->unli();
$this->li();
+ $this->out->checkbox('closed', _('Closed'),
+ (bool) $this->value('closed'),
+ _('Disable new registrations.'));
+ $this->unli();
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
+ $this->out->elementStart('fieldset', array('id' => 'settings_admin_snapshots'));
+ $this->out->element('legend', null, _('Snapshots'));
+ $this->out->elementStart('ul', 'form_data');
+ $this->li();
$snapshot = array('web' => _('Randomly during Web hit'),
'cron' => _('In a scheduled job'),
'never' => _('Never'));
-
$this->out->dropdown('run', _('Data snapshots'),
$snapshot, _('When to send statistical data to status.net servers'),
false, $this->value('run', 'snapshot'));
-
$this->unli();
- $this->li();
+ $this->li();
$this->input('frequency', _('Frequency'),
_('Snapshots will be sent once every N Web hits'),
'snapshot');
-
$this->unli();
$this->li();
-
$this->input('reporturl', _('Report URL'),
_('Snapshots will be sent to this URL'),
'snapshot');
-
$this->unli();
-
$this->out->elementEnd('ul');
- }
-
- /**
- * Utility to simplify some of the duplicated code around
- * params and settings.
- *
- * @param string $setting Name of the setting
- * @param string $title Title to use for the input
- * @param string $instructions Instructions for this field
- * @param string $section config section, default = 'site'
- *
- * @return void
- */
+ $this->out->elementEnd('fieldset');
- function input($setting, $title, $instructions, $section='site')
- {
- $this->out->input($setting, $title, $this->value($setting, $section), $instructions);
- }
+ $this->out->elementStart('fieldset', array('id' => 'settings_admin_ssl'));
+ $this->out->element('legend', null, _('SSL'));
+ $this->out->elementStart('ul', 'form_data');
+ $this->li();
+ $ssl = array('never' => _('Never'),
+ 'sometimes' => _('Sometimes'),
+ 'always' => _('Always'));
- /**
- * Utility to simplify getting the posted-or-stored setting value
- *
- * @param string $setting Name of the setting
- * @param string $main configuration section, default = 'site'
- *
- * @return string param value if posted, or current config value
- */
+ $this->out->dropdown('ssl', _('Use SSL'),
+ $ssl, _('When to use SSL'),
+ false, $this->value('ssl', 'site'));
+ $this->unli();
- function value($setting, $main='site')
- {
- $value = $this->out->trimmed($setting);
- if (empty($value)) {
- $value = common_config($main, $setting);
- }
- return $value;
- }
+ $this->li();
+ $this->input('sslserver', _('SSL Server'),
+ _('Server to direct SSL requests to'));
+ $this->unli();
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
- function li()
- {
- $this->out->elementStart('li');
- }
+ $this->out->elementStart('fieldset', array('id' => 'settings_admin_limits'));
+ $this->out->element('legend', null, _('Limits'));
+ $this->out->elementStart('ul', 'form_data');
+ $this->li();
+ $this->input('textlimit', _('Text limit'), _('Maximum number of characters for notices.'));
+ $this->unli();
- function unli()
- {
- $this->out->elementEnd('li');
+ $this->li();
+ $this->input('dupelimit', _('Dupe limit'), _('How long users must wait (in seconds) to post the same thing again.'));
+ $this->unli();
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
}
/**
diff --git a/classes/Profile.php b/classes/Profile.php
index 1b9cdb52f..4b2e09006 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -594,9 +594,14 @@ class Profile extends Memcached_DataObject
function hasRole($name)
{
- $role = Profile_role::pkeyGet(array('profile_id' => $this->id,
- 'role' => $name));
- return (!empty($role));
+ $has_role = false;
+ if (Event::handle('StartHasRole', array($this, $name, &$has_role))) {
+ $role = Profile_role::pkeyGet(array('profile_id' => $this->id,
+ 'role' => $name));
+ $has_role = !empty($role);
+ Event::handle('EndHasRole', array($this, $name, $has_role));
+ }
+ return $has_role;
}
function grantRole($name)
diff --git a/classes/User_group.php b/classes/User_group.php
index b92638f7a..c86eadf8f 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -354,4 +354,66 @@ class User_group extends Memcached_DataObject
return $xs->getString();
}
+
+ static function register($fields) {
+
+ // MAGICALLY put fields into current scope
+
+ extract($fields);
+
+ $group = new User_group();
+
+ $group->query('BEGIN');
+
+ $group->nickname = $nickname;
+ $group->fullname = $fullname;
+ $group->homepage = $homepage;
+ $group->description = $description;
+ $group->location = $location;
+ $group->created = common_sql_now();
+
+ $result = $group->insert();
+
+ if (!$result) {
+ common_log_db_error($group, 'INSERT', __FILE__);
+ $this->serverError(
+ _('Could not create group.'),
+ 500,
+ $this->format
+ );
+ return;
+ }
+ $result = $group->setAliases($aliases);
+
+ if (!$result) {
+ $this->serverError(
+ _('Could not create aliases.'),
+ 500,
+ $this->format
+ );
+ return;
+ }
+
+ $member = new Group_member();
+
+ $member->group_id = $group->id;
+ $member->profile_id = $userid;
+ $member->is_admin = 1;
+ $member->created = $group->created;
+
+ $result = $member->insert();
+
+ if (!$result) {
+ common_log_db_error($member, 'INSERT', __FILE__);
+ $this->serverError(
+ _('Could not set group membership.'),
+ 500,
+ $this->format
+ );
+ return;
+ }
+
+ $group->query('COMMIT');
+ return $group;
+ }
}
diff --git a/db/notice_source.sql b/db/notice_source.sql
index 5c5c939dd..10ff0d55a 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -30,6 +30,7 @@ VALUES
('mbpidgin','mbpidgin','http://code.google.com/p/microblog-purple/', now()),
('Mobidentica', 'Mobidentica', 'http://www.substanceofcode.com/software/mobidentica/', now()),
('moconica','Moconica','http://moconica.com/', now()),
+ ('mustard', 'MuSTArDroid', 'https://launchpad.net/mustardroid', now()),
('nambu','Nambu','http://www.nambu.com/', now()),
('peoplebrowsr', 'PeopleBrowsr', 'http://www.peoplebrowsr.com/', now()),
('Pikchur','Pikchur','http://www.pikchur.com/', now()),
diff --git a/lib/adminform.php b/lib/adminform.php
new file mode 100644
index 000000000..3934f6351
--- /dev/null
+++ b/lib/adminform.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Base class for administrative forms
+ *
+ * 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 Widget
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+ exit(1);
+}
+
+/**
+ * Base class for Administrative forms
+ *
+ * Just a place holder for some utility methods to simply some
+ * repetitive form building code
+ *
+ * @category Widget
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ *
+ * @see Form
+ */
+
+class AdminForm extends Form
+{
+ /**
+ * Utility to simplify some of the duplicated code around
+ * params and settings.
+ *
+ * @param string $setting Name of the setting
+ * @param string $title Title to use for the input
+ * @param string $instructions Instructions for this field
+ * @param string $section config section, default = 'site'
+ *
+ * @return void
+ */
+
+ function input($setting, $title, $instructions, $section='site')
+ {
+ $this->out->input($setting, $title, $this->value($setting, $section), $instructions);
+ }
+
+ /**
+ * Utility to simplify getting the posted-or-stored setting value
+ *
+ * @param string $setting Name of the setting
+ * @param string $main configuration section, default = 'site'
+ *
+ * @return string param value if posted, or current config value
+ */
+
+ function value($setting, $main='site')
+ {
+ $value = $this->out->trimmed($setting);
+ if (empty($value)) {
+ $value = common_config($main, $setting);
+ }
+ return $value;
+ }
+
+}
diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index 33b210da3..e0c253ccf 100644
--- a/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@ -224,6 +224,33 @@ class AdminPanelAction extends Action
$this->clientError(_('saveSettings() not implemented.'));
return;
}
+
+ /**
+ * Delete a design setting
+ *
+ * // XXX: Maybe this should go in Design? --Z
+ *
+ * @return mixed $result false if something didn't work
+ */
+
+ function deleteSetting($section, $setting)
+ {
+ $config = new Config();
+
+ $config->section = $section;
+ $config->setting = $setting;
+
+ if ($config->find(true)) {
+ $result = $config->delete();
+ if (!$result) {
+ common_log_db_error($config, 'DELETE', __FILE__);
+ $this->clientError(_("Unable to delete design setting."));
+ return null;
+ }
+ }
+
+ return $result;
+ }
}
/**
diff --git a/lib/apiauth.php b/lib/apiauth.php
index 2f2e44a26..0d1613d38 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -110,7 +110,11 @@ class ApiAuthAction extends ApiAction
} else {
$nickname = $this->auth_user;
$password = $this->auth_pw;
- $this->auth_user = common_check_user($nickname, $password);
+ $user = common_check_user($nickname, $password);
+ if (Event::handle('StartSetApiUser', array(&$user))) {
+ $this->auth_user = $user;
+ Event::handle('EndSetApiUser', array($user));
+ }
if (empty($this->auth_user)) {
diff --git a/lib/common.php b/lib/common.php
index 203b37c87..732c22bfd 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -59,10 +59,6 @@ require_once('PEAR.php');
require_once('DB/DataObject.php');
require_once('DB/DataObject/Cast.php'); # for dates
-if (!function_exists('gettext')) {
- require_once("php-gettext/gettext.inc");
-}
-
require_once(INSTALLDIR.'/lib/language.php');
// This gets included before the config file, so that admin code and plugins
diff --git a/lib/form.php b/lib/form.php
index 868c986b9..f6501dc6d 100644
--- a/lib/form.php
+++ b/lib/form.php
@@ -181,4 +181,14 @@ class Form extends Widget
{
return 'form';
}
+
+ function li()
+ {
+ $this->out->elementStart('li');
+ }
+
+ function unli()
+ {
+ $this->out->elementEnd('li');
+ }
}
diff --git a/lib/language.php b/lib/language.php
index 2570907b7..a99bf89e3 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -32,6 +32,63 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
+if (!function_exists('gettext')) {
+ require_once("php-gettext/gettext.inc");
+}
+
+if (!function_exists('pgettext')) {
+ /**
+ * Context-aware gettext wrapper; use when messages in different contexts
+ * won't be distinguished from the English source but need different translations.
+ * The context string will appear as msgctxt in the .po files.
+ *
+ * Not currently exposed in PHP's gettext module; implemented to be compat
+ * with gettext.h's macros.
+ *
+ * @param string $context context identifier, should be some key like "menu|file"
+ * @param string $msgid English source text
+ * @return string original or translated message
+ */
+ function pgettext($context, $msg)
+ {
+ $msgid = $context . "\004" . $msg;
+ $out = dcgettext(textdomain(NULL), $msgid, LC_MESSAGES);
+ if ($out == $msgid) {
+ return $msg;
+ } else {
+ return $out;
+ }
+ }
+}
+
+if (!function_exists('npgettext')) {
+ /**
+ * Context-aware ngettext wrapper; use when messages in different contexts
+ * won't be distinguished from the English source but need different translations.
+ * The context string will appear as msgctxt in the .po files.
+ *
+ * Not currently exposed in PHP's gettext module; implemented to be compat
+ * with gettext.h's macros.
+ *
+ * @param string $context context identifier, should be some key like "menu|file"
+ * @param string $msg singular English source text
+ * @param string $plural plural English source text
+ * @param int $n number of items to control plural selection
+ * @return string original or translated message
+ */
+ function npgettext($context, $msg, $plural, $n)
+ {
+ $msgid = $context . "\004" . $msg;
+ $out = dcngettext(textdomain(NULL), $msgid, $plural, $n, LC_MESSAGES);
+ if ($out == $msgid) {
+ return $msg;
+ } else {
+ return $out;
+ }
+ }
+}
+
+
/**
* Content negotiation for language codes
*
diff --git a/lib/unblockform.php b/lib/unblockform.php
index 4fe28b21a..2a444f7cd 100644
--- a/lib/unblockform.php
+++ b/lib/unblockform.php
@@ -77,6 +77,6 @@ class UnblockForm extends ProfileActionForm
function description()
{
- return _('Unlock this user');
+ return _('Unblock this user');
}
}
diff --git a/lib/util.php b/lib/util.php
index 68f3520db..5bf4f6091 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -196,10 +196,15 @@ function common_set_user($user)
}
if ($user) {
- common_ensure_session();
- $_SESSION['userid'] = $user->id;
- $_cur = $user;
- return $_cur;
+ if (Event::handle('StartSetUser', array(&$user))) {
+ if($user){
+ common_ensure_session();
+ $_SESSION['userid'] = $user->id;
+ $_cur = $user;
+ Event::handle('EndSetUser', array($user));
+ return $_cur;
+ }
+ }
}
return false;
}
diff --git a/locale/ar/LC_MESSAGES/statusnet.mo b/locale/ar/LC_MESSAGES/statusnet.mo
index 9d156ce91..45861299a 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 8cbdb40b1..f4a523b6b 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:42:46+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:31:23+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -42,7 +42,7 @@ msgstr "لا صفحة كهذه"
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "لا مستخدم كهذا."
@@ -55,7 +55,7 @@ msgstr ""
#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
-msgstr ""
+msgstr "%s والأصدقاء"
#: actions/all.php:99
#, php-format
@@ -143,7 +143,8 @@ msgstr "تعذّر تحديث المستخدم."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -227,12 +228,12 @@ msgstr ""
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -365,6 +366,13 @@ msgstr ""
msgid "Alias can't be the same as nickname."
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 "لم يوجد"
+
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
msgstr ""
@@ -452,13 +460,13 @@ msgstr ""
msgid "%s updates favorited by %s / %s."
msgstr ""
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "مسار %s الزمني"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -477,7 +485,7 @@ msgstr ""
#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
-msgstr ""
+msgstr "مسار %s الزمني العام"
#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
#, php-format
@@ -545,7 +553,8 @@ msgstr "الأصلي"
msgid "Preview"
msgstr "عاين"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "احذف"
@@ -557,7 +566,7 @@ msgstr "ارفع"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -567,7 +576,7 @@ msgstr ""
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -631,70 +640,49 @@ msgstr ""
msgid "Unblock user from group"
msgstr ""
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "ألغِ المنع"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "ألغِ منع هذا المستخدم"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "لست والجًا."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "لا ملف شخصي مُحدّد."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "لا ملف شخصي بهذه الهوية."
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "لا تمنع هذا المستخدم"
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "امنع المستخدم"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "لا"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
msgid "Do not block this user"
msgstr "لا تمنع هذا المستخدم"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "نعم"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr "امنع هذا المستخدم"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr ""
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr ""
@@ -758,6 +746,15 @@ msgstr "الإشعارات"
msgid "No such notice."
msgstr "لا إشعار كهذا."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "لست والجًا."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "تعذّر حذف هذا الإشعار."
@@ -788,6 +785,140 @@ msgstr "احذف هذا الإشعار"
msgid "There was a problem with your session token. Try again, please."
msgstr ""
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "تعذّر تحديث المستخدم."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "ليس مُستخدمًا محليًا."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+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 "احذف هذا الإشعار"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr "التصميم"
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "المراسلة الفورية غير متوفرة."
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "غيّر"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+msgid "Theme for the site."
+msgstr ""
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr "غيّر صورة الخلفية"
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "الخلفية"
+
+#: actions/designadminpanel.php:429
+#, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr ""
+
+#: actions/designadminpanel.php:459 lib/designsettings.php:139
+msgid "On"
+msgstr "مكّن"
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr "عطّل"
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr "مكّن صورة الخلفية أو عطّلها."
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+msgid "Change colours"
+msgstr "غيّر الألوان"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+msgid "Content"
+msgstr "المحتوى"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "الشريط الجانبي"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "النص"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+msgid "Links"
+msgstr "وصلات"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "استخدم المبدئيات"
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr "استعد التصميمات المبدئية"
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr "ارجع إلى المبدئي"
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "أرسل"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr "احفظ التصميم"
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "هذا الشعار ليس مفضلًا!"
@@ -928,14 +1059,6 @@ msgstr "أريد أن أرسل الملاحظات عبر البريد الإلك
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "أرسل"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -949,7 +1072,7 @@ msgstr "لا عنوان بريد إلكتروني."
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "ليس عنوان بريد صالح"
@@ -1139,6 +1262,18 @@ msgstr "لا ملف كهذا."
msgid "Cannot read file."
msgstr "تعذّرت قراءة الملف."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "لا ملف شخصي مُحدّد."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "لا ملف شخصي بهذه الهوية."
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1249,11 +1384,11 @@ msgstr ""
msgid "A list of the users in this group."
msgstr "قائمة بمستخدمي هذه المجموعة."
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "إداري"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "امنع"
@@ -1312,7 +1447,7 @@ msgstr "مجموعات"
#: actions/groups.php:64
#, php-format
msgid "Groups, page %d"
-msgstr ""
+msgstr "المجموعات، صفحة %d"
#: actions/groups.php:90
#, php-format
@@ -1336,7 +1471,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr ""
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr "خطأ أثناء منع الحجب."
@@ -1458,7 +1593,7 @@ msgstr "أُرسلت الدعوة"
#: actions/invite.php:112
msgid "Invite new users"
-msgstr "ادعُ مستخدمين جددًا"
+msgstr "دعوة مستخدمين جدد"
#: actions/invite.php:128
msgid "You are already subscribed to these users:"
@@ -1602,7 +1737,7 @@ msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
msgid "Error setting user."
msgstr "خطأ أثناء ضبط المستخدم."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "لُج"
@@ -1730,7 +1865,7 @@ msgstr ""
#: actions/noticesearch.php:78
msgid "Text search"
-msgstr "بحث النص"
+msgstr "بحث في النصوص"
#: actions/noticesearch.php:91
#, php-format
@@ -1798,7 +1933,7 @@ msgstr ""
#: actions/opensearch.php:64
msgid "People Search"
-msgstr "بحث الأشخاص"
+msgstr "بحث في الأشخاص"
#: actions/opensearch.php:67
msgid "Notice Search"
@@ -1920,7 +2055,7 @@ msgstr ""
#: actions/peoplesearch.php:58
msgid "People search"
-msgstr "بحث الأشخاص"
+msgstr "بحث في الأشخاص"
#: actions/peopletag.php:70
#, php-format
@@ -2008,7 +2143,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "اللغة"
@@ -2034,7 +2169,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr ""
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "لم تُختر المنطقة الزمنية."
@@ -2059,7 +2194,7 @@ msgstr "تعذّر حفظ الملف الشخصي."
msgid "Couldn't save tags."
msgstr "تعذّر حفظ الوسوم."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "حُفظت الإعدادات."
@@ -2294,7 +2429,7 @@ msgstr "عذرا، رمز دعوة غير صالح."
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "سجّل"
@@ -2338,7 +2473,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "البريد الإلكتروني"
@@ -2422,7 +2557,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "اشترك"
@@ -2495,6 +2630,14 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr ""
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+msgid "You cannot sandbox users on this site."
+msgstr ""
+
+#: actions/sandbox.php:72
+msgid "User is already sandboxed."
+msgstr ""
+
#: actions/showfavorites.php:79
#, php-format
msgid "%s's favorite notices, page %d"
@@ -2733,6 +2876,143 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#: actions/silence.php:65 actions/unsilence.php:65
+msgid "You cannot silence users on this site."
+msgstr ""
+
+#: actions/silence.php:72
+msgid "User is already silenced."
+msgstr ""
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "ادعُ"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "ليس عنوان بريد صالح"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "إشعار الموقع"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "عنوان بريد إلكتروني غير صالح: %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "اللغة المفضلة"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "خصوصية"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "استرجع"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "إعدادات الأفتار"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr ""
@@ -2992,6 +3272,21 @@ msgstr "لا وسم كهذا."
msgid "API method under construction."
msgstr ""
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "لا تمنع هذا المستخدم"
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "ليس للمستخدم إشعار أخير"
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "ليس للمستخدم ملف شخصي."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr ""
@@ -3009,6 +3304,32 @@ msgstr ""
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "المستخدم"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "ممنوع"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "ادعُ"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr ""
@@ -3156,11 +3477,16 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "رسائلك الواردة"
+
+#: classes/Message.php:61
msgid "Could not insert message."
-msgstr ""
+msgstr "تعذّر إدراج الرسالة."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr ""
@@ -3188,15 +3514,15 @@ msgid ""
"few minutes."
msgstr ""
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "مشكلة أثناء حفظ الإشعار."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
@@ -3204,7 +3530,7 @@ msgstr ""
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
+msgstr "أهلا بكم في %1$s يا @%2$s!"
#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
@@ -3226,10 +3552,6 @@ msgstr "غير كلمة سرّك"
msgid "Change email handling"
msgstr "غير أسلوب التعامل مع البريد الإلكتروني"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr "التصميم"
-
#: lib/accountsettingsaction.php:124
msgid "Design your profile"
msgstr "صمّم ملفك الشخصي"
@@ -3279,146 +3601,172 @@ msgstr "اتصل"
msgid "Connect to services"
msgstr ""
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+msgid "Change site configuration"
+msgstr ""
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "ادعُ"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout"
msgstr "اخرج"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
-msgstr ""
+msgstr "أنشئ حسابًا"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr ""
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "مساعدة"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr "ساعدني!"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "ابحث"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr "إشعار الموقع"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr ""
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr "إشعار الصفحة"
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "عن"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "الأسئلة المكررة"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr "الشروط"
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "خصوصية"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "المصدر"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "اتصل"
-#: lib/action.php:736
+#: lib/action.php:740
msgid "Badge"
msgstr ""
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
"s, available under the [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-"تعمل على برنامج التدوين المُصغّر [StatusNet](http://status.net/) -النسخة %s- "
+"يعمل على برنامج التدوين المُصغّر [StatusNet](http://status.net/) -النسخة %s- "
"المتوفر تحت [رخصة غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/"
"agpl-3.0.html)."
-#: lib/action.php:785
+#: lib/action.php:789
msgid "Site content license"
msgstr "رخصة محتوى الموقع"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "الرخصة."
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr ""
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "بعد"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "قبل"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr ""
+#: lib/adminpanelaction.php:96
+msgid "You cannot make changes to this site."
+msgstr ""
+
+#: lib/adminpanelaction.php:195
+msgid "showForm() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:224
+msgid "saveSettings() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "تأكيد عنوان البريد الإلكتروني"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "تأكيد عنوان البريد الإلكتروني"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "مرفقات"
@@ -3589,36 +3937,39 @@ msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
#: lib/command.php:618
-#, fuzzy
msgid "You are not subscribed to anyone."
-msgstr "لا تملك تصريحًا."
+msgstr "لست مُشتركًا بأي أحد."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "الأشخاص المشتركون ب%s"
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "أنت مشترك بهؤلاء الأِشخاص: "
+msgstr[1] "أنت مشترك بهؤلاء الأِشخاص: "
-#: lib/command.php:637
-#, fuzzy
+#: lib/command.php:640
msgid "No one is subscribed to you."
-msgstr "الأشخاص الذين اشترك بهم %s"
+msgstr "لا أحد مشترك بك."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "الأشخاص المشتركون ب%s"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "لا أحد مشترك بك."
+msgstr[1] "لا أحد مشترك بك."
-#: lib/command.php:656
-#, fuzzy
+#: lib/command.php:662
msgid "You are not a member of any groups."
-msgstr "لست عضوا في تلك المجموعة."
+msgstr "لست عضوًا في أي مجموعة."
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "لست عضوا في تلك المجموعة."
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "أنت عضو في هذه المجموعات: "
+msgstr[1] "أنت عضو في هذه المجموعات: "
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3657,19 +4008,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
msgid "Go to the installer."
msgstr "اذهب إلى المُثبّت."
@@ -3689,10 +4040,6 @@ msgstr ""
msgid "Database error"
msgstr "خطأ قاعدة بيانات"
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr "غيّر صورة الخلفية"
-
#: lib/designsettings.php:105
msgid "Upload file"
msgstr "ارفع ملفًا"
@@ -3702,62 +4049,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-msgid "Change colours"
-msgstr "غيّر الألوان"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr "الخلفية"
-
-#: lib/designsettings.php:191
-msgid "Content"
-msgstr "المحتوى"
-
-#: lib/designsettings.php:204
-msgid "Sidebar"
-msgstr "الشريط الجانبي"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "النص"
-
-#: lib/designsettings.php:230
-msgid "Links"
-msgstr "وصلات"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr "استخدم المبدئيات"
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr "استعد التصميمات المبدئية"
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr "ارجع إلى المبدئي"
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr "احفظ التصميم"
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -3851,7 +4142,7 @@ msgstr ""
#: lib/groupnav.php:85 lib/searchgroupnav.php:84
msgid "Group"
-msgstr "المجموعة"
+msgstr "مجموعات"
#: lib/groupnav.php:101
msgid "Blocked"
@@ -3930,7 +4221,7 @@ msgstr "نوع ملف غير معروف"
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
#: lib/joinform.php:114
msgid "Join"
@@ -3983,12 +4274,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
-#: lib/mail.php:240
+#: lib/mail.php:241
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4003,29 +4294,29 @@ msgid ""
"Change your email address or notification options at %8$s\n"
msgstr ""
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "الموقع: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "الصفحة الرئيسية: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
"\n"
msgstr "السيرة: %s\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4038,21 +4329,21 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "حالة %s"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4068,12 +4359,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "رسالة خاصة جديدة من %s"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4092,12 +4383,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4118,12 +4409,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4259,7 +4550,11 @@ msgstr "خطأ أثناء إدراج الملف الشخصي البعيد"
msgid "Duplicate notice"
msgstr "ضاعف الإشعار"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "تعذّر إدراج اشتراك جديد."
@@ -4275,10 +4570,6 @@ msgstr "الردود"
msgid "Favorites"
msgstr "المفضلات"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "المستخدم"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "صندوق الوارد"
@@ -4328,6 +4619,15 @@ msgstr "عضو منذ"
msgid "All groups"
msgstr "كل المجموعات"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "لا مُدخل هوية."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "عام"
@@ -4348,6 +4648,16 @@ msgstr "مُختارون"
msgid "Popular"
msgstr ""
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "صندوق الوارد"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "ألغِ منع هذا المستخدم"
+
#: lib/searchaction.php:120
msgid "Search site"
msgstr "ابحث في الموقع"
@@ -4366,7 +4676,7 @@ msgstr "ابحث عن أشخاص على هذا الموقع"
#: lib/searchgroupnav.php:82
msgid "Notice"
-msgstr "إشعار"
+msgstr "إشعارات"
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
@@ -4384,6 +4694,16 @@ msgstr "قسم غير مُعنون"
msgid "More..."
msgstr "المزيد..."
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "إشعار الموقع"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "امنع هذا المستخدم"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4413,28 +4733,28 @@ msgstr ""
msgid "(none)"
msgstr "(لا شيء)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr "مُشترك أصلا!"
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "لقد منعك المستخدم."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "تعذّر الاشتراك."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr ""
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "لست مُشتركًا!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "تعذّر حذف الاشتراك."
@@ -4446,6 +4766,29 @@ msgstr "لا شيء"
msgid "Top posters"
msgstr "أعلى المرسلين"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "ألغِ منع هذا المستخدم"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "ألغِ منع هذا المستخدم"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "ألغِ منع هذا المستخدم"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "ألغِ الاشتراك مع هذا المستخدم"
@@ -4547,3 +4890,6 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "هؤلاء الأشخاص مشتركون بك: "
diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo
index 48af8295b..b86a8042e 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 c4930c6ff..abda8bab2 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:42:49+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:31:26+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -42,7 +42,7 @@ msgstr "Няма такъв етикет."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Няма такъв потребител"
@@ -145,7 +145,8 @@ msgstr "Грешка при обновяване на потребителя."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -233,12 +234,12 @@ msgstr "Всички преки съобщения, изпратени до %s"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -380,6 +381,13 @@ msgstr "Опитайте друг псевдоним, този вече е за
msgid "Alias can't be the same as nickname."
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."
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -471,13 +479,13 @@ msgstr "%s / Отбелязани като любими от %s"
msgid "%s updates favorited by %s / %s."
msgstr "%s бележки отбелязани като любими от %s / %s."
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "Поток на %s"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -565,7 +573,8 @@ msgstr "Оригинал"
msgid "Preview"
msgstr "Преглед"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "Изтриване"
@@ -577,7 +586,7 @@ msgstr "Качване"
msgid "Crop"
msgstr "Изрязване"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -587,7 +596,7 @@ msgstr "Изрязване"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
@@ -654,71 +663,50 @@ msgstr "Списък с потребителите в тази група."
msgid "Unblock user from group"
msgstr "Разблокиране на този потребител"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Разблокиране"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "Разблокиране на този потребител"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Не сте влезли в системата."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Не е указан профил."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Не е открит профил с такъв идентификатор."
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Вече сте блокирали този потребител."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "Блокиране на потребителя"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "Не"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Разблокиране на този потребител"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Да"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокиране на потребителя"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "Вече сте блокирали този потребител."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "Грешка при записване данните за блокирането."
@@ -784,6 +772,15 @@ msgstr "Бележки"
msgid "No such notice."
msgstr "Няма такава бележка."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Не сте влезли в системата."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Грешка при изтриване на бележката."
@@ -817,6 +814,146 @@ msgstr "Изтриване на бележката"
msgid "There was a problem with your session token. Try again, please."
msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Грешка при обновяване на потребителя."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Не може да изтривате бележки на друг потребител."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+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 "Изтриване на бележката"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Грешка при записване настройките за Twitter"
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "Страницата не е достъпна във вида медия, който приемате"
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Промяна"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "Излизане от сайта"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, fuzzy, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr "Може да качите лого за групата ви."
+
+#: actions/designadminpanel.php:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Смяна на паролата"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Свързване"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Търсене"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Текст"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Списък"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Запазване"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "Тази бележка не е отбелязана като любима!"
@@ -960,14 +1097,6 @@ msgstr "Искам да изпращам бележки по пощата."
msgid "Publish a MicroID for my email address."
msgstr "Публикуване на MicroID за адреса на е-пощата."
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Запазване"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -981,7 +1110,7 @@ msgstr "Не е въведена е-поща."
msgid "Cannot normalize that email address"
msgstr "Грешка при нормализиране адреса на е-пощата"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "Това не е правилен адрес на е-поща."
@@ -1183,6 +1312,18 @@ msgstr "Няма такава бележка."
msgid "Cannot read file."
msgstr "Няма такава бележка."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "Не е указан профил."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "Не е открит профил с такъв идентификатор."
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
#, fuzzy
@@ -1305,11 +1446,11 @@ msgstr ""
msgid "A list of the users in this group."
msgstr "Списък с потребителите в тази група."
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "Блокиране"
@@ -1397,7 +1538,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "Потребителят ви е блокирал."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
#, fuzzy
msgid "Error removing the block."
msgstr "Грешка при запазване на потребител."
@@ -1705,7 +1846,7 @@ msgstr "Грешно име или парола."
msgid "Error setting user."
msgstr "Грешка в настройките на потребителя."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
@@ -2127,7 +2268,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Език"
@@ -2155,7 +2296,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Автобиографията е твърде дълга (до 140 символа)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "Не е избран часови пояс"
@@ -2180,7 +2321,7 @@ msgstr "Грешка при запазване на профила."
msgid "Couldn't save tags."
msgstr "Грешка при запазване етикетите."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Настройките са запазени."
@@ -2416,7 +2557,7 @@ msgstr "Грешка в кода за потвърждение."
msgid "Registration successful"
msgstr "Записването е успешно."
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистриране"
@@ -2462,7 +2603,7 @@ msgid "Same as password above. Required."
msgstr "Същото като паролата по-горе. Задължително поле."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Е-поща"
@@ -2568,7 +2709,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Адрес на профила ви в друга, съвместима услуга за микроблогване"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Абониране"
@@ -2643,6 +2784,16 @@ msgstr ""
msgid "Replies to %1$s on %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 "Не може да изпращате съобщения до този потребител."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Потребителят ви е блокирал."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2884,6 +3035,145 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "Не може да изпращате съобщения до този потребител."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "Потребителят ви е блокирал."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "Покани"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Това не е правилен адрес на е-поща."
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Нова бележка"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Нов адрес на е-поща за публикщуване в %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Предпочитан език"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Поверителност"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Възстановяване"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Настройки за аватар"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "Настройки за SMS"
@@ -3158,6 +3448,21 @@ msgstr "Няма такъв етикет."
msgid "API method under construction."
msgstr "Методът в API все още се разработва."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Вече сте блокирали този потребител."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Потребителят ви е блокирал."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "Потребителят няма профил."
+
#: actions/unsubscribe.php:77
#, fuzzy
msgid "No profile id in request."
@@ -3178,6 +3483,32 @@ msgstr "Отписване"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Потребител"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Блокиране"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Покани"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Одобряване на абонамента"
@@ -3338,11 +3669,16 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Грешка при изпращане на прякото съобщение"
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "Грешка при вмъкване на съобщението."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "Грешка при обновяване на бележката с нов URL-адрес."
@@ -3376,15 +3712,15 @@ msgstr ""
"Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
"отново след няколко минути."
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr "Забранено ви е да публикувате бележки в този сайт."
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Проблем при записване на бележката."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
@@ -3414,10 +3750,6 @@ msgstr "Смяна на паролата"
msgid "Change email handling"
msgstr "Промяна обработката на писмата"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3469,101 +3801,106 @@ msgstr "Свързване"
msgid "Connect to services"
msgstr "Грешка при пренасочване към сървър: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Абонаменти"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Покани"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Поканете приятели и колеги да се присъединят към вас в %s"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Изход"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "Излизане от сайта"
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr "Създаване на нова сметка"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "Влизане в сайта"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Помощ"
-#: lib/action.php:456
+#: lib/action.php:460
#, fuzzy
msgid "Help me!"
msgstr "Помощ"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Търсене"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "Търсене за хора или бележки"
-#: lib/action.php:480
+#: lib/action.php:484
#, fuzzy
msgid "Site notice"
msgstr "Нова бележка"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr ""
-#: lib/action.php:612
+#: lib/action.php:616
#, fuzzy
msgid "Page notice"
msgstr "Нова бележка"
-#: lib/action.php:714
+#: lib/action.php:718
#, fuzzy
msgid "Secondary site navigation"
msgstr "Абонаменти"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Относно"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "Въпроси"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Поверителност"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Изходен код"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:736
+#: lib/action.php:740
#, fuzzy
msgid "Badge"
msgstr "Побутване"
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr "Лиценз на програмата StatusNet"
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3572,12 +3909,12 @@ msgstr ""
"**%%site.name%%** е услуга за микроблогване, предоставена ви от [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** е услуга за микроблогване. "
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3588,35 +3925,60 @@ msgstr ""
"достъпна под [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "Лиценз на програмата StatusNet"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr "Всички "
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "лиценз."
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "Страниране"
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "След"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "Преди"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr "Имаше проблем със сесията ви в сайта."
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "Не може да изпращате съобщения до този потребител."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "Командата все още не се поддържа."
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "Командата все още не се поддържа."
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Потвърждаване адреса на е-поща"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "Потвърждение за SMS"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3794,30 +4156,36 @@ msgstr "Не сте абонирани за този профил"
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Не сте абонирани за този профил"
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "Не сте абонирани за този профил"
+msgstr[1] "Не сте абонирани за този профил"
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Грешка при абониране на друг потребител за вас."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Абонирани за %s"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "Грешка при абониране на друг потребител за вас."
+msgstr[1] "Грешка при абониране на друг потребител за вас."
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Не членувате в тази група."
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Не членувате в тази група."
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "Не членувате в тази група."
+msgstr[1] "Не членувате в тази група."
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3856,20 +4224,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Няма код за потвърждение."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
#, fuzzy
msgid "Go to the installer."
msgstr "Влизане в сайта"
@@ -3890,10 +4258,6 @@ msgstr "Бележки през SMS"
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3904,66 +4268,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Смяна на паролата"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Свързване"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Търсене"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Текст"
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Списък"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4196,12 +4500,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s вече получава бележките ви в %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4222,17 +4526,17 @@ msgstr ""
"С уважение,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "Местоположение: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "Лична страница: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
@@ -4241,12 +4545,12 @@ msgstr ""
"Биография: %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "Нов адрес на е-поща за публикщуване в %s"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4259,21 +4563,21 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "Състояние на %s"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "Потвърждение за SMS"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "Побутнати сте от %s"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4289,12 +4593,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "Ново лично съобщение от %s"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4313,12 +4617,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s отбеляза бележката ви като любима"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4339,12 +4643,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4482,7 +4786,12 @@ msgstr "Грешка при вмъкване на отдалечен профи
msgid "Duplicate notice"
msgstr "Изтриване на бележката"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Потребителят е забранил да се абонирате за него."
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Грешка при добавяне на нов абонамент."
@@ -4498,10 +4807,6 @@ msgstr "Отговори"
msgid "Favorites"
msgstr "Любими"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "Потребител"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "Входящи"
@@ -4552,6 +4857,15 @@ msgstr "Участник от"
msgid "All groups"
msgstr "Всички групи"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Няма такъв документ."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Общ поток"
@@ -4572,6 +4886,16 @@ msgstr "Избрано"
msgid "Popular"
msgstr "Популярно"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Входящи"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Разблокиране на този потребител"
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4610,6 +4934,16 @@ msgstr "Неозаглавен раздел"
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Нова бележка"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Блокиране на потребителя"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4639,28 +4973,28 @@ msgstr ""
msgid "(none)"
msgstr "(няма)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "Потребителят ви е блокирал."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "Грешка при абониране."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "Грешка при абониране на друг потребител за вас."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Не сте абонирани!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Грешка при изтриване на абонамента."
@@ -4672,6 +5006,29 @@ msgstr "Без"
msgid "Top posters"
msgstr "Най-често пишещи"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Разблокиране на този потребител"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Разблокиране на този потребител"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Разблокиране на този потребител"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Отписване от този потребител"
@@ -4775,3 +5132,7 @@ msgstr "Това не е вашият входящ адрес."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Входящата поща не е разрешена."
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Абонирани за %s"
diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo
index cd6cf878e..b1682d409 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 417607800..585fa3de5 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -1,25 +1,25 @@
# Translation of StatusNet to Catalan
#
+# Author@translatewiki.net: Toniher
# --
msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:42:52+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:31:29+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
-#, fuzzy
msgid "No such page"
-msgstr "No existeix aquesta etiqueta."
+msgstr "No existeix la pàgina."
#: actions/all.php:74 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -42,7 +42,7 @@ msgstr "No existeix aquesta etiqueta."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "No existeix aquest usuari."
@@ -58,19 +58,19 @@ msgid "%s and friends"
msgstr "%s i amics"
#: actions/all.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "Feed per a amics de %s"
+msgstr "Canal dels amics de %s (RSS 1.0)"
#: actions/all.php:107
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "Feed per a amics de %s"
+msgstr "Canal dels amics de %s (RSS 2.0)"
#: actions/all.php:115
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (Atom)"
-msgstr "Feed per a amics de %s"
+msgstr "Canal dels amics de %s (Atom)"
#: actions/all.php:127
#, php-format
@@ -100,9 +100,8 @@ msgid ""
msgstr ""
#: actions/all.php:165
-#, fuzzy
msgid "You and friends"
-msgstr "%s i amics"
+msgstr "Un mateix i amics"
#: actions/allrss.php:119 actions/apitimelinefriends.php:121
#, php-format
@@ -145,7 +144,8 @@ msgstr "No s'ha pogut actualitzar l'usuari."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -231,12 +231,12 @@ msgstr "Tots els missatges directes enviats a %s"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -345,9 +345,9 @@ msgid "Full name is too long (max 255 chars)."
msgstr "El teu nom és massa llarg (màx. 255 caràcters)."
#: actions/apigroupcreate.php:261
-#, fuzzy, php-format
+#, php-format
msgid "Description is too long (max %d chars)."
-msgstr "la descripció és massa llarga (màx. 140 caràcters)."
+msgstr "La descripció és massa llarga (màx. %d caràcters)."
#: actions/apigroupcreate.php:272 actions/editgroup.php:204
#: actions/newgroup.php:148 actions/profilesettings.php:225
@@ -378,6 +378,13 @@ msgstr "Aquest sobrenom ja existeix. Prova un altre. "
msgid "Alias can't be the same as nickname."
msgstr ""
+#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
+#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#, fuzzy
+msgid "Group not found!"
+msgstr "No s'ha trobat el mètode API!"
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -393,14 +400,13 @@ msgid "Could not join user %s to group %s."
msgstr "No s'ha pogut afegir l'usuari %s al grup %s"
#: actions/apigroupleave.php:114
-#, fuzzy
msgid "You are not a member of this group."
-msgstr "No ets membre d'aquest grup."
+msgstr "No sou un membre del grup."
#: actions/apigroupleave.php:124
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %s to group %s."
-msgstr "No s'ha pogut eliminar l'usuari %s del grup %s"
+msgstr "No s'ha pogut suprimir l'usuari %s del grup %s."
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
@@ -469,13 +475,13 @@ msgstr "%s / Favorits de %s"
msgid "%s updates favorited by %s / %s."
msgstr "%s actualitzacions favorites per %s / %s."
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "%s línia temporal"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -563,7 +569,8 @@ msgstr "Original"
msgid "Preview"
msgstr "Previsualitzar"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "Eliminar"
@@ -575,7 +582,7 @@ msgstr "Pujar"
msgid "Crop"
msgstr "Crop"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -585,7 +592,7 @@ msgstr "Crop"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -656,71 +663,50 @@ msgstr "La llista dels usuaris d'aquest grup."
msgid "Unblock user from group"
msgstr "Ha fallat el desbloqueig d'usuari."
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Desbloquejar"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "Desbloquejar aquest usuari"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "No connectat."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "No s'ha especificat perfil."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "No hi ha cap perfil amb aquesta ID."
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Ja havies bloquejat aquest usuari."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "Usuari bloquejat."
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "No"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Desbloquejar aquest usuari"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Sí"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquejar aquest usuari"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "Ja havies bloquejat aquest usuari."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "Error al guardar la informació del block."
@@ -773,9 +759,8 @@ msgid "The address \"%s\" has been confirmed for your account."
msgstr "L'adreça \"%s\" ha estat confirmada per al teu compte."
#: actions/conversation.php:99
-#, fuzzy
msgid "Conversation"
-msgstr "Codi de confirmació"
+msgstr "Conversa"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
#: lib/profileaction.php:206
@@ -786,6 +771,15 @@ msgstr "Avisos"
msgid "No such notice."
msgstr "No existeix aquest avís."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "No connectat."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "No es pot esborrar la notificació."
@@ -823,6 +817,146 @@ msgstr ""
"Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si "
"us plau."
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "No s'ha pogut actualitzar l'usuari."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+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"
+
+#: 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 "Eliminar aquesta nota"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "No s'ha pogut guardar la teva configuració de Twitter!"
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "Aquesta pàgina no està disponible en "
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Canviar"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "Sortir d'aquest lloc"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, 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:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Canviar la teva contrasenya"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Connectar-se"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Cercar"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Text"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Inici de sessió"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Guardar"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "Aquesta notificació no és un favorit!"
@@ -970,14 +1104,6 @@ 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:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Guardar"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -991,7 +1117,7 @@ msgstr "No hi ha cap direcció de correu electrònic."
msgid "Cannot normalize that email address"
msgstr "No es pot normalitzar aquesta direcció de correu electrònic"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "No és una direcció de correu electrònic vàlida."
@@ -1192,6 +1318,18 @@ msgstr "No existeix aquest avís."
msgid "Cannot read file."
msgstr "Hem perdut el nostre arxiu."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "No s'ha especificat perfil."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "No hi ha cap perfil amb aquesta ID."
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
#, fuzzy
@@ -1249,9 +1387,8 @@ msgid "You must be logged in to edit a group."
msgstr "Has d'haver entrat per crear un grup."
#: actions/groupdesignsettings.php:141
-#, fuzzy
msgid "Group design"
-msgstr "Grups"
+msgstr "Disseny de grup"
#: actions/groupdesignsettings.php:152
msgid ""
@@ -1316,11 +1453,11 @@ msgstr "%s membre/s en el grup, pàgina %d"
msgid "A list of the users in this group."
msgstr "La llista dels usuaris d'aquest grup."
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "Bloquejar"
@@ -1358,9 +1495,8 @@ msgstr "Cercar grup"
#: actions/groupsearch.php:79 actions/noticesearch.php:117
#: actions/peoplesearch.php:83
-#, fuzzy
msgid "No results."
-msgstr "Cap resultat"
+msgstr "Cap resultat."
#: actions/groupsearch.php:82
#, php-format
@@ -1409,7 +1545,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "Un usuari t'ha bloquejat."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr "Error al moure el block."
@@ -1528,7 +1664,7 @@ msgstr ""
#: actions/invite.php:39
msgid "Invites have been disabled."
-msgstr ""
+msgstr "S'han inhabilitat les invitacions."
#: actions/invite.php:41
#, php-format
@@ -1724,7 +1860,7 @@ msgstr "Nom d'usuari o contrasenya incorrectes."
msgid "Error setting user."
msgstr "Error en configurar l'usuari."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inici de sessió"
@@ -1830,9 +1966,8 @@ msgid ""
msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això."
#: actions/newmessage.php:181
-#, fuzzy
msgid "Message sent"
-msgstr "Missatge"
+msgstr "S'ha enviat el missatge"
#: actions/newmessage.php:185 lib/command.php:375
#, php-format
@@ -1865,9 +2000,9 @@ msgid "Text search"
msgstr "Cerca de text"
#: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Search results for \"%s\" on %s"
-msgstr "Cerca \"%s\" al flux"
+msgstr "Cerca resultats de «%s» a %s"
#: actions/noticesearch.php:121
#, php-format
@@ -1953,7 +2088,7 @@ msgstr ""
#: actions/othersettings.php:116
msgid "Shorten URLs with"
-msgstr ""
+msgstr "Escurça els URL amb"
#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
@@ -2155,7 +2290,7 @@ msgstr ""
"Etiquetes per a tu mateix (lletres, números, -, ., i _), per comes o separat "
"por espais"
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Idioma"
@@ -2183,7 +2318,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "La biografia és massa llarga (màx. 140 caràcters)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "Franja horària no seleccionada."
@@ -2208,7 +2343,7 @@ msgstr "No s'ha pogut guardar el perfil."
msgid "Couldn't save tags."
msgstr "No s'han pogut guardar les etiquetes."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Configuració guardada."
@@ -2350,7 +2485,7 @@ msgstr ""
#: actions/recoverpassword.php:188
msgid "Password recovery"
-msgstr ""
+msgstr "Recuperació de la contrasenya"
#: actions/recoverpassword.php:191
msgid "Nickname or email address"
@@ -2447,7 +2582,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:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrar-se"
@@ -2492,7 +2627,7 @@ msgid "Same as password above. Required."
msgstr "Igual a la contrasenya de dalt. Requerit."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Correu electrònic"
@@ -2599,7 +2734,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL del teu perfil en un altre servei de microblogging compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Subscriure's"
@@ -2675,6 +2810,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Missatge per a %1$s a %2$s"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "No pots enviar un missatge a aquest usuari."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Un usuari t'ha bloquejat."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2920,6 +3065,145 @@ msgstr ""
"**%s** té un compte a %%%%site.name%%%%, un servei de [microblogging](http://"
"ca.wikipedia.org/wiki/Microblogging) "
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "No pots enviar un missatge a aquest usuari."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "Un usuari t'ha bloquejat."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "Invitar"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "No és una direcció de correu electrònic vàlida."
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Avís del lloc"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Nou correu electrònic per publicar a %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Preferència d'idioma"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Privacitat"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Recuperar"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Configuració de l'avatar"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "Configuració SMS"
@@ -3197,6 +3481,21 @@ msgstr "No existeix aquesta etiqueta."
msgid "API method under construction."
msgstr "Mètode API en construcció."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Ja havies bloquejat aquest usuari."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Un usuari t'ha bloquejat."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "L'usuari no té perfil."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr "No id en el perfil sol·licitat."
@@ -3214,6 +3513,32 @@ msgstr "No subscrit"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Usuari"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Bloquejar"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Invitar"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autoritzar subscripció"
@@ -3345,14 +3670,13 @@ msgid "%s groups, page %d"
msgstr "%s grups, pàgina %d"
#: actions/usergroups.php:130
-#, fuzzy
msgid "Search for more groups"
-msgstr "Cercar gent o text"
+msgstr "Cerca més grups"
#: actions/usergroups.php:153
-#, fuzzy, php-format
+#, php-format
msgid "%s is not a member of any group."
-msgstr "No ets membre d'aquest grup."
+msgstr "%s no és membre de cap grup."
#: actions/usergroups.php:158
#, php-format
@@ -3376,11 +3700,16 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Error al enviar el missatge directe."
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "No s'ha pogut inserir el missatge."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "No s'ha pogut inserir el missatge amb la nova URI."
@@ -3414,15 +3743,15 @@ msgstr ""
"Masses notificacions massa ràpid; pren un respir i publica de nou en uns "
"minuts."
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr "Ha estat bandejat de publicar notificacions en aquest lloc."
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Error de BD en inserir resposta: %s"
@@ -3452,10 +3781,6 @@ msgstr "Canviar la teva contrasenya"
msgid "Change email handling"
msgstr "Canviar correu electrònic"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3507,97 +3832,102 @@ msgstr "Connectar-se"
msgid "Connect to services"
msgstr "No s'ha pogut redirigir al servidor: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Navegació primària del lloc"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invitar"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 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:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Sortir"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "Sortir d'aquest lloc"
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr "Crear nou compte"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "Accedir a aquest lloc"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr "Ajuda'm"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Cercar"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "Cercar gent o text"
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr "Avís del lloc"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr "Vistes locals"
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr "Notificació pàgina"
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr "Navegació del lloc secundària"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Sobre"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "Preguntes freqüents"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Privacitat"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Font"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Posar-se en contacte"
-#: lib/action.php:736
+#: lib/action.php:740
#, fuzzy
msgid "Badge"
msgstr "Reclamar"
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr "Llicència del programari StatusNet"
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3606,12 +3936,12 @@ msgstr ""
"**%%site.name%%** és un servei de microblogging de [%%site.broughtby%%**](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** és un servei de microblogging."
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3622,35 +3952,60 @@ msgstr ""
"%s, disponible sota la [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "Llicència del programari StatusNet"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr "Tot "
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "llicència."
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "Paginació"
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "Posteriors"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "Anteriors"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr "Ha ocorregut algun problema amb la teva sessió."
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "No pots enviar un missatge a aquest usuari."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "Comanda encara no implementada."
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "Comanda encara no implementada."
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Confirmació de l'adreça de correu electrònic"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "Confirmació SMS"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3826,30 +4181,36 @@ msgstr "No estàs subscrit a aquest perfil."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "No estàs subscrit a aquest perfil."
+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."
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "No pots subscriure a un altre a tu mateix."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Persones subscrites a %s"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "No pots subscriure a un altre a tu mateix."
+msgstr[1] "No pots subscriure a un altre a tu mateix."
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "No ets membre d'aquest grup."
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "No ets membre d'aquest grup."
+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."
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3888,20 +4249,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Cap codi de confirmació."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
#, fuzzy
msgid "Go to the installer."
msgstr "Accedir a aquest lloc"
@@ -3922,10 +4283,6 @@ msgstr "Actualitzacions per SMS"
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3936,66 +4293,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Canviar la teva contrasenya"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Connectar-se"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Cercar"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Text"
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Inici de sessió"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4226,12 +4523,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s ara està escoltant els teus avisos a %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4252,17 +4549,17 @@ msgstr ""
"Atentament,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "Ubicació: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "Pàgina personal: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
@@ -4271,12 +4568,12 @@ msgstr ""
"Biografia: %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "Nou correu electrònic per publicar a %s"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4297,21 +4594,21 @@ msgstr ""
"Sincerament teus,\n"
"%4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "%s estat"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "Confirmació SMS"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "Has estat reclamat per %s"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4327,12 +4624,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "Nou missatge privat de %s"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4351,12 +4648,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s ha afegit la teva nota com a favorita"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4377,12 +4674,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4520,7 +4817,12 @@ msgstr "Error en inserir perfil remot"
msgid "Duplicate notice"
msgstr "Eliminar nota."
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Aquest usuari t'ha bloquejat com a subscriptor."
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "No s'ha pogut inserir una nova subscripció."
@@ -4536,10 +4838,6 @@ msgstr "Respostes"
msgid "Favorites"
msgstr "Favorits"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "Usuari"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "Safata d'entrada"
@@ -4590,6 +4888,15 @@ msgstr "Membre des de"
msgid "All groups"
msgstr "Tots els grups"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "No argument de la id."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Públic"
@@ -4610,6 +4917,16 @@ msgstr "Destacat"
msgid "Popular"
msgstr "Popular"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Safata d'entrada"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Desbloquejar aquest usuari"
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4648,6 +4965,16 @@ msgstr "Secció sense títol"
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Avís del lloc"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Bloquejar aquest usuari"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4677,28 +5004,28 @@ msgstr ""
msgid "(none)"
msgstr "(cap)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "Un usuari t'ha bloquejat."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "No pots subscriure."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "No pots subscriure a un altre a tu mateix."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "No estàs subscrit!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "No s'ha pogut eliminar la subscripció."
@@ -4710,6 +5037,29 @@ msgstr "Cap"
msgid "Top posters"
msgstr "Que més publiquen"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Desbloquejar aquest usuari"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Desbloquejar aquest usuari"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Desbloquejar aquest usuari"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Deixar d'estar subscrit des d'aquest usuari"
@@ -4813,3 +5163,7 @@ msgstr "Perdó, aquest no és el teu correu electrònic entrant permès."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Perdó, no hi ha un correu electrònic entrant permès."
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Persones subscrites a %s"
diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo
index 449e93cdc..e901c2e64 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 6bba1da17..78d54d2c4 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:42:56+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:31:32+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -42,7 +42,7 @@ msgstr "Žádné takové oznámení."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Žádný takový uživatel."
@@ -145,7 +145,8 @@ msgstr "Nelze aktualizovat uživatele"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -230,12 +231,12 @@ msgstr ""
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -374,6 +375,13 @@ msgstr "Přezdívku již někdo používá. Zkuste jinou"
msgid "Alias can't be the same as nickname."
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 "Žádný požadavek nebyl nalezen!"
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -465,13 +473,13 @@ msgstr ""
msgid "%s updates favorited by %s / %s."
msgstr ""
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr ""
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -561,7 +569,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr ""
@@ -573,7 +582,7 @@ msgstr "Upload"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -583,7 +592,7 @@ msgstr ""
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -651,75 +660,53 @@ msgstr ""
msgid "Unblock user from group"
msgstr "Žádný takový uživatel."
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
#, fuzzy
msgid "Unblock this user"
msgstr "Žádný takový uživatel."
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Nepřihlášen"
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr ""
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Již jste přihlášen"
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
#, fuzzy
msgid "Block user"
msgstr "Žádný takový uživatel."
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr ""
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Žádný takový uživatel."
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr ""
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Žádný takový uživatel."
-#: actions/block.php:165
-#, fuzzy
-msgid "You have already blocked this user."
-msgstr "Již jste přihlášen"
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr ""
@@ -784,6 +771,15 @@ msgstr "Sdělení"
msgid "No such notice."
msgstr "Žádné takové oznámení."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Nepřihlášen"
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr ""
@@ -815,6 +811,143 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Nelze aktualizovat uživatele"
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Můžete použít místní odebírání."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+msgid "Delete user"
+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 "Žádný takový uživatel."
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: actions/designadminpanel.php:301
+#, 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:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Změnit"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+msgid "Theme for the site."
+msgstr ""
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, 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:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Změnit heslo"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Připojit"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Hledat"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr ""
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Přihlásit"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Uložit"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr ""
@@ -957,14 +1090,6 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Uložit"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -978,7 +1103,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr ""
@@ -1178,6 +1303,18 @@ msgstr "Žádné takové oznámení."
msgid "Cannot read file."
msgstr "Žádné takové oznámení."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr ""
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr ""
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1297,11 +1434,11 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr ""
@@ -1390,7 +1527,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "Uživatel nemá profil."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
#, fuzzy
msgid "Error removing the block."
msgstr "Chyba při ukládaní uživatele"
@@ -1669,7 +1806,7 @@ msgstr "Neplatné jméno nebo heslo"
msgid "Error setting user."
msgstr "Chyba nastavení uživatele"
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Přihlásit"
@@ -2093,7 +2230,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr ""
@@ -2119,7 +2256,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr ""
@@ -2145,7 +2282,7 @@ msgstr "Nelze uložit profil"
msgid "Couldn't save tags."
msgstr "Nelze uložit profil"
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Nastavení uloženo"
@@ -2381,7 +2518,7 @@ msgstr "Chyba v ověřovacím kódu"
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrovat"
@@ -2425,7 +2562,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2516,7 +2653,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Adresa profilu na jiných kompatibilních mikroblozích."
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Odebírat"
@@ -2591,6 +2728,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Odpovědi na %s"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Neodeslal jste nám profil"
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Uživatel nemá profil."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2834,6 +2981,142 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#: actions/silence.php:65 actions/unsilence.php:65
+msgid "You cannot silence users on this site."
+msgstr ""
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "Uživatel nemá profil."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+msgid "Site"
+msgstr ""
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Není platnou mailovou adresou."
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Nové sdělení"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Žádný registrovaný email pro tohoto uživatele."
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+msgid "Default site language"
+msgstr ""
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Soukromí"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Obnovit"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Nastavení"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr ""
@@ -3105,6 +3388,21 @@ msgstr "Žádné takové oznámení."
msgid "API method under construction."
msgstr ""
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Již jste přihlášen"
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Uživatel nemá profil."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "Uživatel nemá profil."
+
#: actions/unsubscribe.php:77
#, fuzzy
msgid "No profile id in request."
@@ -3125,6 +3423,31 @@ msgstr "Odhlásit"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Žádný takový uživatel."
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+msgid "Invite-only"
+msgstr ""
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autorizovaný odběr"
@@ -3286,11 +3609,15 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+msgid "You are banned from sending direct messages."
+msgstr ""
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr ""
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr ""
@@ -3320,15 +3647,15 @@ msgid ""
"few minutes."
msgstr ""
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Chyba v DB při vkládání odpovědi: %s"
@@ -3359,10 +3686,6 @@ msgstr ""
msgid "Change email handling"
msgstr ""
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3415,101 +3738,106 @@ msgstr "Připojit"
msgid "Connect to services"
msgstr "Nelze přesměrovat na server: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Odběry"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Odhlásit"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:454
#, fuzzy
msgid "Create an account"
msgstr "Vytvořit nový účet"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr ""
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Nápověda"
-#: lib/action.php:456
+#: lib/action.php:460
#, fuzzy
msgid "Help me!"
msgstr "Nápověda"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Hledat"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:480
+#: lib/action.php:484
#, fuzzy
msgid "Site notice"
msgstr "Nové sdělení"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr ""
-#: lib/action.php:612
+#: lib/action.php:616
#, fuzzy
msgid "Page notice"
msgstr "Nové sdělení"
-#: lib/action.php:714
+#: lib/action.php:718
#, fuzzy
msgid "Secondary site navigation"
msgstr "Odběry"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "O nás"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Soukromí"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Zdroj"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:736
+#: lib/action.php:740
msgid "Badge"
msgstr ""
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3518,12 +3846,12 @@ msgstr ""
"**%%site.name%%** je služba microblogů, kterou pro vás poskytuje [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** je služba mikroblogů."
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3534,37 +3862,59 @@ msgstr ""
"dostupná pod [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "Nové sdělení"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr ""
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr ""
-#: lib/action.php:1061
+#: lib/action.php:1076
#, fuzzy
msgid "After"
msgstr "« Novější"
-#: lib/action.php:1069
+#: lib/action.php:1084
#, fuzzy
msgid "Before"
msgstr "Starší »"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr ""
+#: lib/adminpanelaction.php:96
+msgid "You cannot make changes to this site."
+msgstr ""
+
+#: lib/adminpanelaction.php:195
+msgid "showForm() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:224
+msgid "saveSettings() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Potvrzení emailové adresy"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "Potvrzení emailové adresy"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3740,30 +4090,36 @@ msgstr "Neodeslal jste nám profil"
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Neodeslal jste nám profil"
+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"
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Vzdálený odběr"
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Vzdálený odběr"
+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"
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Neodeslal jste nám profil"
+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"
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3802,20 +4158,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Žádný potvrzující kód."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
msgid "Go to the installer."
msgstr ""
@@ -3835,10 +4191,6 @@ msgstr ""
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3849,66 +4201,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Změnit heslo"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Připojit"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Hledat"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr ""
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Přihlásit"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4147,12 +4439,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1 od teď naslouchá tvým sdělením v %2"
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4173,29 +4465,29 @@ msgstr ""
"S úctou váš,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, fuzzy, php-format
msgid "Location: %s\n"
msgstr "Umístění %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, fuzzy, php-format
msgid "Homepage: %s\n"
msgstr "Moje stránky: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
"\n"
msgstr ""
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4208,21 +4500,21 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr ""
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4238,12 +4530,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4262,12 +4554,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1 od teď naslouchá tvým sdělením v %2"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4288,12 +4580,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4435,7 +4727,11 @@ msgstr "Chyba při vkládaní vzdáleného profilu"
msgid "Duplicate notice"
msgstr "Nové sdělení"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Nelze vložit odebírání"
@@ -4451,10 +4747,6 @@ msgstr "Odpovědi"
msgid "Favorites"
msgstr ""
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr ""
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr ""
@@ -4505,6 +4797,15 @@ msgstr "Členem od"
msgid "All groups"
msgstr ""
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Žádný takový dokument."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Veřejné"
@@ -4526,6 +4827,15 @@ msgstr ""
msgid "Popular"
msgstr "Hledání lidí"
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr ""
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Žádný takový uživatel."
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4565,6 +4875,16 @@ msgstr ""
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Nové sdělení"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Žádný takový uživatel."
+
#: lib/subgroupnav.php:83
#, fuzzy, php-format
msgid "People %s subscribes to"
@@ -4594,29 +4914,29 @@ msgstr ""
msgid "(none)"
msgstr ""
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
#, fuzzy
msgid "User has blocked you."
msgstr "Uživatel nemá profil."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr ""
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr ""
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Nepřihlášen!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Nelze smazat odebírání"
@@ -4628,6 +4948,29 @@ msgstr ""
msgid "Top posters"
msgstr ""
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Žádný takový uživatel."
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Žádný takový uživatel."
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Žádný takový uživatel."
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr ""
@@ -4731,3 +5074,7 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Vzdálený odběr"
diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo
index 358fc5be4..c8d4cc24c 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 4480f68c1..6de4ddf2e 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -6,21 +6,20 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:43:12+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:31:34+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
#: 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 "Tag nicht vorhanden."
+msgstr "Seite nicht vorhanden"
#: actions/all.php:74 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -43,7 +42,7 @@ msgstr "Tag nicht vorhanden."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Unbekannter Benutzer."
@@ -59,19 +58,19 @@ msgid "%s and friends"
msgstr "%s und Freunde"
#: actions/all.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "Feed der Freunde von %s"
+msgstr "Feed der Freunde von %s (RSS 1.0)"
#: actions/all.php:107
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "Feed der Freunde von %s"
+msgstr "Feed der Freunde von %s (RSS 2.0)"
#: actions/all.php:115
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (Atom)"
-msgstr "Feed der Freunde von %s"
+msgstr "Feed der Freunde von %s (Atom)"
#: actions/all.php:127
#, php-format
@@ -101,9 +100,8 @@ msgid ""
msgstr ""
#: actions/all.php:165
-#, fuzzy
msgid "You and friends"
-msgstr "%s und Freunde"
+msgstr "Du und Freunde"
#: actions/allrss.php:119 actions/apitimelinefriends.php:121
#, php-format
@@ -115,9 +113,8 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountupdateprofile.php:97
-#, fuzzy
msgid "API method not found."
-msgstr "API-Methode nicht gefunden!"
+msgstr "API-Methode nicht gefunden."
#: actions/apiaccountupdatedeliverydevice.php:85
#: actions/apiaccountupdateprofilebackgroundimage.php:86
@@ -139,14 +136,14 @@ msgid ""
msgstr ""
#: actions/apiaccountupdatedeliverydevice.php:132
-#, fuzzy
msgid "Could not update user."
msgstr "Konnte Benutzerdaten nicht aktualisieren."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -157,15 +154,13 @@ msgstr ""
#: actions/apiaccountupdateprofilebackgroundimage.php:146
#: actions/apiaccountupdateprofilecolors.php:164
#: actions/apiaccountupdateprofilecolors.php:174
-#, fuzzy
msgid "Unable to save your design settings."
-msgstr "Konnte Twitter Einstellungen nicht speichern!"
+msgstr "Konnte Twitter-Einstellungen nicht speichern."
#: actions/apiaccountupdateprofilebackgroundimage.php:187
#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
msgid "Could not update your design."
-msgstr "Konnte Benutzerdaten nicht aktualisieren."
+msgstr "Konnte Benutzerdesign nicht aktualisieren."
#: actions/apiaccountupdateprofilebackgroundimage.php:194
#: actions/apiaccountupdateprofilecolors.php:185
@@ -177,7 +172,6 @@ msgid "User has no profile."
msgstr "Benutzer hat kein Profil."
#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
msgid "Could not save profile."
msgstr "Konnte Profil nicht speichern."
@@ -210,7 +204,7 @@ msgstr ""
"du nicht befreundet bist."
#: actions/apidirectmessage.php:89
-#, fuzzy, php-format
+#, php-format
msgid "Direct messages from %s"
msgstr "Direkte Nachricht an %s"
@@ -235,12 +229,12 @@ msgstr "Alle an %s gesendeten direkten Nachrichten"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -252,7 +246,6 @@ msgid "No status found with that ID."
msgstr "Keine Nachricht mit dieser ID gefunden."
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite!"
msgstr "Diese Nachricht ist bereits ein Favorit!"
@@ -261,7 +254,6 @@ msgid "Could not create favorite."
msgstr "Konnte keinen Favoriten erstellen."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite!"
msgstr "Diese Nachricht ist kein Favorit!"
@@ -279,9 +271,8 @@ msgid "Could not follow user: %s is already on your list."
msgstr "Kann Nutzer %s nicht folgen: schon in deiner Kontaktliste eingetragen"
#: actions/apifriendshipsdestroy.php:109
-#, fuzzy
msgid "Could not unfollow user: User not found."
-msgstr "Kann Nutzer %s nicht folgen: Nutzer nicht gefunden"
+msgstr "Kann Benutzer nicht folgen: Benutzer nicht gefunden."
#: actions/apifriendshipsdestroy.php:120
msgid "You cannot unfollow yourself!"
@@ -292,12 +283,10 @@ msgid "Two user ids or screen_names must be supplied."
msgstr "Zwei IDs oder Benutzernamen müssen angegeben werden."
#: actions/apifriendshipsshow.php:135
-#, fuzzy
msgid "Could not determine source user."
msgstr "Konnte öffentlichen Stream nicht abrufen."
#: actions/apifriendshipsshow.php:143
-#, fuzzy
msgid "Could not find target user."
msgstr "Konnte keine Statusmeldungen finden."
@@ -307,7 +296,6 @@ msgstr "Konnte Gruppe nicht erstellen."
#: actions/apigroupcreate.php:147 actions/editgroup.php:259
#: actions/newgroup.php:210
-#, fuzzy
msgid "Could not create aliases."
msgstr "Konnte keinen Favoriten erstellen."
@@ -349,9 +337,9 @@ msgid "Full name is too long (max 255 chars)."
msgstr "Ihr vollständiger Name ist zu lang (maximal 255 Zeichen)."
#: actions/apigroupcreate.php:261
-#, fuzzy, php-format
+#, php-format
msgid "Description is too long (max %d chars)."
-msgstr "Die Beschreibung ist zu lang (max. 140 Zeichen)."
+msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)."
#: actions/apigroupcreate.php:272 actions/editgroup.php:204
#: actions/newgroup.php:148 actions/profilesettings.php:225
@@ -367,23 +355,29 @@ msgstr ""
#: actions/apigroupcreate.php:312 actions/editgroup.php:224
#: actions/newgroup.php:168
-#, fuzzy, php-format
+#, php-format
msgid "Invalid alias: \"%s\""
-msgstr "Ungültiger Tag: \"%s\""
+msgstr "Ungültiger Tag: „%s“"
#: actions/apigroupcreate.php:321 actions/editgroup.php:228
#: actions/newgroup.php:172
-#, fuzzy, php-format
+#, php-format
msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
+msgstr "Nutzername „%s“ wird bereits verwendet. Suche dir einen anderen aus."
#: actions/apigroupcreate.php:334 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupjoin.php:110
+#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
+#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
#, fuzzy
+msgid "Group not found!"
+msgstr "API-Methode nicht gefunden!"
+
+#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
msgstr "Du bist bereits Mitglied dieser Gruppe"
@@ -392,19 +386,18 @@ msgid "You have been blocked from that group by the admin."
msgstr ""
#: actions/apigroupjoin.php:138
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %s to group %s."
-msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen"
+msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen."
#: actions/apigroupleave.php:114
-#, fuzzy
msgid "You are not a member of this group."
msgstr "Du bist kein Mitglied dieser Gruppe."
#: actions/apigroupleave.php:124
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %s to group %s."
-msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen"
+msgstr "Konnte Benutzer %s nicht aus der Gruppe %s entfernen."
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
@@ -412,19 +405,19 @@ msgid "%s groups"
msgstr "%s Gruppen"
#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
+#, php-format
msgid "groups on %s"
-msgstr "Gruppenaktionen"
+msgstr "Gruppen von %s"
#: actions/apigrouplist.php:95
-#, fuzzy, php-format
+#, php-format
msgid "%s's groups"
-msgstr "%s Gruppen"
+msgstr "%s’s Gruppen"
#: actions/apigrouplist.php:103
-#, fuzzy, php-format
+#, php-format
msgid "Groups %s is a member of on %s."
-msgstr "Gruppen zu denen %s gehört"
+msgstr "Gruppen %s sind ein Mitglied von %s."
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
@@ -435,9 +428,8 @@ msgid "You may not delete another user's status."
msgstr "Du kannst den Status eines anderen Benutzers nicht löschen."
#: actions/apistatusesshow.php:138
-#, fuzzy
msgid "Status deleted."
-msgstr "Avatar aktualisiert."
+msgstr "Status gelöscht."
#: actions/apistatusesshow.php:144
msgid "No status with that ID found."
@@ -445,10 +437,10 @@ msgstr "Keine Nachricht mit dieser ID gefunden."
#: 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 ""
-"Das war zu lang. Die Länge einer Nachricht ist auf 140 Zeichen beschränkt."
+"Das war zu lang. Die Länge einer Nachricht ist auf %d Zeichen beschränkt."
#: actions/apistatusesupdate.php:198
msgid "Not found"
@@ -460,7 +452,6 @@ msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
-#, fuzzy
msgid "Unsupported format."
msgstr "Bildformat wird nicht unterstützt."
@@ -472,15 +463,15 @@ msgstr "%s / Favoriten von %s"
#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%s updates favorited by %s / %s."
-msgstr "%s Aktualisieurng in den Favoriten von %s / %s."
+msgstr "%s Aktualisierung in den Favoriten von %s / %s."
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "%s Zeitleiste"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -568,7 +559,8 @@ msgstr "Original"
msgid "Preview"
msgstr "Vorschau"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
#, fuzzy
msgid "Delete"
msgstr "Löschen"
@@ -581,7 +573,7 @@ msgstr "Hochladen"
msgid "Crop"
msgstr "Zuschneiden"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -591,7 +583,7 @@ msgstr "Zuschneiden"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
@@ -659,73 +651,52 @@ msgstr "Liste der Benutzer in dieser Gruppe."
msgid "Unblock user from group"
msgstr "Freigeben des Benutzers fehlgeschlagen."
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Freigeben"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
#, fuzzy
msgid "Unblock this user"
msgstr "Benutzer freigeben"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Nicht angemeldet."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Kein Profil angegeben."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Kein Benutzer-Profil mit dieser ID."
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Du hast diesen Benutzer bereits blockiert."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "Benutzer blockieren"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "Nein"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Benutzer freigeben"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Benutzer blockieren"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "Du hast diesen Benutzer bereits blockiert."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "Konnte Blockierungsdaten nicht speichern."
@@ -791,6 +762,15 @@ msgstr "Nachrichten"
msgid "No such notice."
msgstr "Unbekannte Nachricht."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Nicht angemeldet."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Die Nachricht konnte nicht gelöscht werden."
@@ -827,6 +807,146 @@ msgstr "Notiz löschen"
msgid "There was a problem with your session token. Try again, please."
msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Konnte Benutzerdaten nicht aktualisieren."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Du kannst den Status eines anderen Benutzers nicht löschen."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "Löschen"
+
+#: 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 "Notiz löschen"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Konnte Twitter-Einstellungen nicht speichern."
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "Diese Seite liegt in nicht verfügbar in einem "
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Ändern"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "Von der Seite abmelden"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, 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:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Ändere dein Passwort"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Verbinden"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Suchen"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Text"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Liste"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Speichern"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "Diese Nachricht ist kein Favorit!"
@@ -975,14 +1095,6 @@ 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:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Speichern"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -996,7 +1108,7 @@ msgstr "Keine E-Mail-Adresse."
msgid "Cannot normalize that email address"
msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "Ungültige E-Mail-Adresse"
@@ -1197,6 +1309,18 @@ msgstr "Unbekannte Nachricht."
msgid "Cannot read file."
msgstr "Daten verloren."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "Kein Profil angegeben."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "Kein Benutzer-Profil mit dieser ID."
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
#, fuzzy
@@ -1320,12 +1444,12 @@ msgstr "%s Gruppen-Mitglieder, Seite %d"
msgid "A list of the users in this group."
msgstr "Liste der Benutzer in dieser Gruppe."
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
#, fuzzy
msgid "Admin"
msgstr "Admin"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "Blockieren"
@@ -1415,7 +1539,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "Dieser Benutzer hat dich blockiert."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr "Fehler beim Freigeben des Benutzers."
@@ -1731,7 +1855,7 @@ msgstr "Falscher Benutzername oder Passwort."
msgid "Error setting user."
msgstr "Fehler bei den Nutzereinstellungen."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Einloggen"
@@ -2161,7 +2285,7 @@ msgstr ""
"Tags über dich selbst (Buchstaben, Zahlen, -, ., und _) durch Kommas oder "
"Leerzeichen getrennt"
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Sprache"
@@ -2189,7 +2313,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Die Biografie ist zu lang (max. 140 Zeichen)"
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "Keine Zeitzone ausgewählt."
@@ -2214,7 +2338,7 @@ msgstr "Konnte Profil nicht speichern."
msgid "Couldn't save tags."
msgstr "Konnte Tags nicht speichern."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Einstellungen gespeichert."
@@ -2451,7 +2575,7 @@ msgstr "Fehler beim Bestätigungscode."
msgid "Registration successful"
msgstr "Registrierung erfolgreich"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrieren"
@@ -2498,7 +2622,7 @@ msgid "Same as password above. Required."
msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-Mail"
@@ -2609,7 +2733,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Profil-URL bei einem anderen kompatiblen Microbloggingdienst"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Abonnieren"
@@ -2685,6 +2809,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Nachricht an %1$s auf %2$s"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Dieser Benutzer hat dich blockiert."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2930,6 +3064,145 @@ msgstr ""
"**%s** hat ein Konto auf %%site.name%%, einem [mikro-blogging] (http://de."
"wikipedia.org/wiki/Mikro-blogging) Dienst "
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "Dieser Benutzer hat dich blockiert."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "Einladen"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Ungültige E-Mail-Adresse"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Seitennachricht"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Neue E-Mail-Adresse um auf %s zu schreiben"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Bevorzugte Sprache"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Privatsphäre"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Wiederherstellung"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Avatar-Einstellungen"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "SMS-Einstellungen"
@@ -3205,6 +3478,21 @@ msgstr "Tag nicht vorhanden."
msgid "API method under construction."
msgstr "API-Methode im Aufbau."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Du hast diesen Benutzer bereits blockiert."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Dieser Benutzer hat dich blockiert."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "Benutzer hat kein Profil."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr "Keine Profil-ID in der Anfrage."
@@ -3222,6 +3510,32 @@ msgstr "Abbestellt"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Benutzer"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Blockieren"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Einladen"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Abonnement bestätigen"
@@ -3386,11 +3700,16 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Fehler beim Senden der Nachricht"
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "Konnte Nachricht nicht einfügen."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "Konnte Nachricht nicht mit neuer URI versehen."
@@ -3424,16 +3743,16 @@ msgstr ""
"Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in "
"ein paar Minuten ab."
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr ""
"Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt."
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Problem bei Speichern der Nachricht."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
@@ -3463,10 +3782,6 @@ msgstr "Ändere dein Passwort"
msgid "Change email handling"
msgstr "Ändere die E-Mail Verarbeitung"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3518,97 +3833,102 @@ msgstr "Verbinden"
msgid "Connect to services"
msgstr "Konnte nicht zum Server umleiten: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Hauptnavigation"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Einladen"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 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:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Abmelden"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "Von der Seite abmelden"
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr "Neues Konto erstellen"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "Auf der Seite anmelden"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Hilfe"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr "Hilf mir!"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Suchen"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "Suche nach Leuten oder Text"
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr "Seitennachricht"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr "Lokale Ansichten"
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr "Neue Nachricht"
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr "Unternavigation"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Über"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Privatsphäre"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Quellcode"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:736
+#: lib/action.php:740
#, fuzzy
msgid "Badge"
msgstr "Stups"
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr "StatusNet-Software-Lizenz"
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3617,12 +3937,12 @@ msgstr ""
"**%%site.name%%** ist ein Microbloggingdienst von [%%site.broughtby%%](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** ist ein Microbloggingdienst."
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3633,36 +3953,61 @@ 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:785
+#: lib/action.php:789
msgid "Site content license"
msgstr "StatusNet-Software-Lizenz"
-#: lib/action.php:794
+#: lib/action.php:798
#, fuzzy
msgid "All "
msgstr "Alle "
-#: lib/action.php:799
+#: lib/action.php:803
#, fuzzy
msgid "license."
msgstr "Lizenz."
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "Seitenerstellung"
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "Später"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "Vorher"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr "Es gab ein Problem mit deinem Sessiontoken."
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "Befehl noch nicht implementiert."
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "Befehl noch nicht implementiert."
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Bestätigung der E-Mail-Adresse"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "SMS-Konfiguration"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3838,30 +4183,36 @@ msgstr "Du hast dieses Profil nicht abonniert."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Du hast dieses Profil nicht abonniert."
+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."
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Die Gegenseite konnte Dich nicht abonnieren."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Leute, die %s abonniert haben"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "Die Gegenseite konnte Dich nicht abonnieren."
+msgstr[1] "Die Gegenseite konnte Dich nicht abonnieren."
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du bist kein Mitglied dieser Gruppe."
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Du bist kein Mitglied dieser Gruppe."
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "Du bist kein Mitglied dieser Gruppe."
+msgstr[1] "Du bist kein Mitglied dieser Gruppe."
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3900,20 +4251,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Kein Bestätigungs-Code."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
#, fuzzy
msgid "Go to the installer."
msgstr "Auf der Seite anmelden"
@@ -3934,10 +4285,6 @@ msgstr "Aktualisierungen via SMS"
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3948,66 +4295,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Ändere dein Passwort"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Verbinden"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Suchen"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Text"
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Liste"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4249,12 +4536,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s hat deine Nachrichten auf %2$s abonniert."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4275,17 +4562,17 @@ msgstr ""
"Gruß,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, fuzzy, php-format
msgid "Location: %s\n"
msgstr "Standort: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, fuzzy, php-format
msgid "Homepage: %s\n"
msgstr "Homepage: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, fuzzy, php-format
msgid ""
"Bio: %s\n"
@@ -4294,12 +4581,12 @@ msgstr ""
"Biografie: %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "Neue E-Mail-Adresse um auf %s zu schreiben"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4320,21 +4607,21 @@ msgstr ""
"Viele Grüße,\n"
"%4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "%s Status"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "SMS-Konfiguration"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "Du wurdest von %s angestupst"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4350,12 +4637,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "Neue private Nachricht von %s"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4374,12 +4661,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s hat deine Nachricht als Favorit gespeichert"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4400,12 +4687,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4551,7 +4838,12 @@ msgstr "Fehler beim Einfügen des entfernten Profils"
msgid "Duplicate notice"
msgstr "Notiz löschen"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Konnte neues Abonnement nicht eintragen."
@@ -4567,10 +4859,6 @@ msgstr "Antworten"
msgid "Favorites"
msgstr "Favoriten"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "Benutzer"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "Posteingang"
@@ -4621,6 +4909,15 @@ msgstr "Mitglied seit"
msgid "All groups"
msgstr "Alle Gruppen"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Kein id Argument."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Öffentlich"
@@ -4641,6 +4938,16 @@ msgstr "Featured"
msgid "Popular"
msgstr "Beliebt"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Posteingang"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Benutzer freigeben"
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4680,6 +4987,16 @@ msgstr "Abschnitt ohne Titel"
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Seitennachricht"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Benutzer blockieren"
+
#: lib/subgroupnav.php:83
#, fuzzy, php-format
msgid "People %s subscribes to"
@@ -4710,28 +5027,28 @@ msgstr ""
msgid "(none)"
msgstr "(leer)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "Dieser Benutzer hat dich blockiert."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "Konnte nicht abbonieren."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "Die Gegenseite konnte Dich nicht abonnieren."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Nicht abonniert!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Konnte Abonnement nicht löschen."
@@ -4743,6 +5060,29 @@ msgstr "Nichts"
msgid "Top posters"
msgstr "Top-Schreiber"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Benutzer freigeben"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Benutzer freigeben"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Benutzer freigeben"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Lösche dein Abonnement von diesem Benutzer"
@@ -4847,3 +5187,7 @@ msgstr "Sorry, das ist nicht deine Adresse für eingehende E-Mails."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Sorry, keinen eingehenden E-Mails gestattet."
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Leute, die %s abonniert haben"
diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo
index 464aca5ea..714f1f7c4 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 f8fa1eb63..936f334b8 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:43:15+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:31:37+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -42,7 +42,7 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr ""
@@ -145,7 +145,8 @@ msgstr "Απέτυχε η ενημέρωση του χρήστη."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -230,12 +231,12 @@ msgstr ""
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -375,6 +376,13 @@ msgstr "Το ψευδώνυμο είναι ήδη σε χρήση. Δοκιμά
msgid "Alias can't be the same as nickname."
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 "Η μέθοδος του ΑΡΙ δε βρέθηκε!"
+
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
msgstr ""
@@ -463,13 +471,13 @@ msgstr ""
msgid "%s updates favorited by %s / %s."
msgstr ""
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, fuzzy, php-format
msgid "%s timeline"
msgstr "Χρονοδιάγραμμα του χρήστη %s"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -557,7 +565,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr ""
@@ -569,7 +578,7 @@ msgstr ""
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -579,7 +588,7 @@ msgstr ""
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -646,71 +655,50 @@ msgstr ""
msgid "Unblock user from group"
msgstr ""
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr ""
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr ""
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr ""
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr ""
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr ""
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr ""
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr ""
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr ""
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr ""
@@ -775,6 +763,15 @@ msgstr ""
msgid "No such notice."
msgstr ""
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr ""
+
#: actions/deletenotice.php:71
#, fuzzy
msgid "Can't delete this notice."
@@ -807,6 +804,142 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Απέτυχε η ενημέρωση του χρήστη."
+
+#: actions/deleteuser.php:74
+msgid "You can only delete local users."
+msgstr ""
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+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 "Διαγραφή μηνύματος"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Αλλαγή"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+msgid "Theme for the site."
+msgstr ""
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr ""
+
+#: actions/designadminpanel.php:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Αλλάξτε τον κωδικό σας"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Σύνδεση"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr ""
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr ""
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Σύνδεση"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr ""
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr ""
@@ -951,14 +1084,6 @@ msgstr "Θέλω να δημοσιεύω ενημερώσεις μέσω email"
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr ""
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -972,7 +1097,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr "Αδυναμία κανονικοποίησης αυτής της email διεύθυνσης"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr ""
@@ -1171,6 +1296,18 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ."
msgid "Cannot read file."
msgstr "Αδύνατη η αποθήκευση του προφίλ."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr ""
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr ""
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1284,11 +1421,11 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "Διαχειριστής"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr ""
@@ -1373,7 +1510,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr ""
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr ""
@@ -1645,7 +1782,7 @@ msgstr "Λάθος όνομα χρήστη ή κωδικός"
msgid "Error setting user."
msgstr ""
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Σύνδεση"
@@ -2062,7 +2199,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr ""
@@ -2091,7 +2228,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστο 140 χαρακτ.)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr ""
@@ -2117,7 +2254,7 @@ msgstr "Απέτυχε η αποθήκευση του προφίλ."
msgid "Couldn't save tags."
msgstr "Αδύνατη η αποθήκευση του προφίλ."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr ""
@@ -2349,7 +2486,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -2393,7 +2530,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2498,7 +2635,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr ""
@@ -2572,6 +2709,14 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr ""
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+msgid "You cannot sandbox users on this site."
+msgstr ""
+
+#: actions/sandbox.php:72
+msgid "User is already sandboxed."
+msgstr ""
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2815,6 +2960,139 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#: actions/silence.php:65 actions/unsilence.php:65
+msgid "You cannot silence users on this site."
+msgstr ""
+
+#: actions/silence.php:72
+msgid "User is already silenced."
+msgstr ""
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+msgid "Site"
+msgstr ""
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Αδυναμία κανονικοποίησης αυτής της email διεύθυνσης"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+msgid "Site name"
+msgstr ""
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε."
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+msgid "Default site language"
+msgstr ""
+
+#: actions/siteadminpanel.php:282
+msgid "Private"
+msgstr ""
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Αποχώρηση"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Ρυθμίσεις OpenID"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr ""
@@ -3082,6 +3360,19 @@ msgstr ""
msgid "API method under construction."
msgstr "Η μέθοδος του ΑΡΙ είναι υπό κατασκευή."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
+
+#: actions/unsandbox.php:72
+msgid "User is not sandboxed."
+msgstr ""
+
+#: actions/unsilence.php:72
+msgid "User is not silenced."
+msgstr ""
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr ""
@@ -3099,6 +3390,30 @@ msgstr ""
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+msgid "Closed"
+msgstr ""
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+msgid "Invite-only"
+msgstr ""
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Εξουσιοδοτημένη συνδρομή"
@@ -3247,11 +3562,15 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+msgid "You are banned from sending direct messages."
+msgstr ""
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr ""
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr ""
@@ -3279,15 +3598,15 @@ msgid ""
"few minutes."
msgstr ""
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s"
@@ -3317,10 +3636,6 @@ msgstr "Αλλάξτε τον κωδικό σας"
msgid "Change email handling"
msgstr ""
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3373,98 +3688,102 @@ msgstr "Σύνδεση"
msgid "Connect to services"
msgstr "Αδυναμία ανακατεύθηνσης στο διακομιστή: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+msgid "Change site configuration"
+msgstr ""
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Προσκάλεσε φίλους και συναδέλφους σου να γίνουν μέλη στο %s"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Αποσύνδεση"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:454
#, fuzzy
msgid "Create an account"
msgstr "Δημιουργία νέου λογαριασμού"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr ""
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Βοήθεια"
-#: lib/action.php:456
+#: lib/action.php:460
#, fuzzy
msgid "Help me!"
msgstr "Βοήθεια"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr ""
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr ""
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr ""
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Περί"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "Συχνές ερωτήσεις"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr ""
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Επικοινωνία"
-#: lib/action.php:736
+#: lib/action.php:740
msgid "Badge"
msgstr ""
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:767
+#: lib/action.php:771
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3473,13 +3792,13 @@ msgstr ""
"To **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου) που "
"έφερε κοντά σας το [%%site.broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:769
+#: lib/action.php:773
#, fuzzy, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
"Το **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου). "
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3487,34 +3806,56 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:785
+#: lib/action.php:789
msgid "Site content license"
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr ""
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr ""
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr ""
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr ""
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr ""
+#: lib/adminpanelaction.php:96
+msgid "You cannot make changes to this site."
+msgstr ""
+
+#: lib/adminpanelaction.php:195
+msgid "showForm() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:224
+msgid "saveSettings() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Επιβεβαίωση διεύθυνσης email"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "Επιβεβαίωση διεύθυνσης email"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3688,28 +4029,36 @@ msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
+msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:639
-msgid "These people are 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:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Ομάδες με τα περισσότερα μέλη"
-#: lib/command.php:658
-msgid "You are a member of these groups: "
-msgstr ""
+#: lib/command.php: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:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3748,20 +4097,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
msgid "Go to the installer."
msgstr ""
@@ -3781,10 +4130,6 @@ msgstr ""
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3795,65 +4140,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Αλλάξτε τον κωδικό σας"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Σύνδεση"
-
-#: lib/designsettings.php:204
-msgid "Sidebar"
-msgstr ""
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr ""
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Σύνδεση"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4084,12 +4370,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
-#: lib/mail.php:240
+#: lib/mail.php:241
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4104,17 +4390,17 @@ msgid ""
"Change your email address or notification options at %8$s\n"
msgstr ""
-#: lib/mail.php:253
+#: lib/mail.php:254
#, fuzzy, php-format
msgid "Location: %s\n"
msgstr "Τοποθεσία: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, fuzzy, php-format
msgid "Homepage: %s\n"
msgstr "Αρχική σελίδα: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
@@ -4123,12 +4409,12 @@ msgstr ""
"Βιογραφικό: %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4141,21 +4427,21 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "Κατάσταση του/της %s"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4171,12 +4457,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4195,12 +4481,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4221,12 +4507,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4365,7 +4651,11 @@ msgstr ""
msgid "Duplicate notice"
msgstr "Διαγραφή μηνύματος"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Απέτυχε η εισαγωγή νέας συνδρομής."
@@ -4381,10 +4671,6 @@ msgstr ""
msgid "Favorites"
msgstr ""
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr ""
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr ""
@@ -4434,6 +4720,14 @@ msgstr "Μέλος από"
msgid "All groups"
msgstr ""
+#: lib/profileformaction.php:123
+msgid "No return-to arguments"
+msgstr ""
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Δημόσια"
@@ -4454,6 +4748,15 @@ msgstr "Προτεινόμενα"
msgid "Popular"
msgstr "Δημοφιλή"
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr ""
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
+
#: lib/searchaction.php:120
msgid "Search site"
msgstr ""
@@ -4490,6 +4793,15 @@ msgstr "Ενότητα χωρίς τίτλο"
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+msgid "Silence"
+msgstr ""
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Γίνε συνδρομητής αυτού του χρήστη"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4520,28 +4832,28 @@ msgstr ""
msgid "(none)"
msgstr "(κανένα)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr ""
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "Απέτυχε η συνδρομή."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Απέτυχε η συνδρομή."
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Απέτυχε η διαγραφή συνδρομής."
@@ -4553,6 +4865,29 @@ msgstr "Κανένα"
msgid "Top posters"
msgstr "Κορυφαίοι δημοσιευτές"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo
index 33531f33c..694b1eb90 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 c65fc1c73..fe88e922b 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:43:18+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:31:40+0000\n"
"Language-Team: British English\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -48,7 +48,7 @@ msgstr "No such page"
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "No such user."
@@ -149,7 +149,8 @@ msgstr "Couldn't update user."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -233,12 +234,12 @@ msgstr "All the direct messages sent to %s"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -373,6 +374,13 @@ msgstr "Nickname already in use. Try another one."
msgid "Alias can't be the same as nickname."
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!"
+
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
msgstr "You are already a member of that group."
@@ -463,13 +471,13 @@ msgstr "%s / Favourites from %s"
msgid "%s updates favorited by %s / %s."
msgstr "%s updates favourited by %s / %s."
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "%s timeline"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -557,7 +565,8 @@ msgstr "Original"
msgid "Preview"
msgstr "Preview"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "Delete"
@@ -569,7 +578,7 @@ msgstr "Upload"
msgid "Crop"
msgstr "Crop"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -579,7 +588,7 @@ msgstr "Crop"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr "There was a problem with your session token. Try again, please."
@@ -646,71 +655,50 @@ msgstr "A list of the users in this group."
msgid "Unblock user from group"
msgstr "Unblock user failed."
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Unblock"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "Unblock this user"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Not logged in."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "No profile specified."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "No profile with that ID."
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "You have already blocked this user."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "Block user"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "No"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Unblock this user"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Yes"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr "Block this user"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "You have already blocked this user."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "Failed to save block information."
@@ -774,6 +762,15 @@ msgstr "Notices"
msgid "No such notice."
msgstr "No such notice."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Not logged in."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Can't delete this notice."
@@ -808,6 +805,145 @@ msgstr "Delete this notice"
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/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Couldn't update user."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "You may not delete another user's status."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "Delete"
+
+#: 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 "Delete this notice"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Unable to save your design settings!"
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "This page is not available in a "
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Change"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "Logout from the site"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, 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:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Change colours"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Connect"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Search"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Text"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Login"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Save"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "This notice is not a favourite!"
@@ -950,14 +1086,6 @@ 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:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Save"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -971,7 +1099,7 @@ msgstr "No e-mail address."
msgid "Cannot normalize that email address"
msgstr "Cannot normalise that e-mail address"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "Not a valid e-mail address."
@@ -1173,6 +1301,18 @@ msgstr "No such notice."
msgid "Cannot read file."
msgstr "Lost our file."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "No profile specified."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "No profile with that ID."
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
#, fuzzy
@@ -1292,11 +1432,11 @@ msgstr "%s group members, page %d"
msgid "A list of the users in this group."
msgstr "A list of the users in this group."
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "Block"
@@ -1385,7 +1525,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "User has blocked you."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr "Error removing the block."
@@ -1692,7 +1832,7 @@ msgstr "Incorrect username or password."
msgid "Error setting user."
msgstr "Error setting user."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Login"
@@ -2114,7 +2254,7 @@ msgid ""
msgstr ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Language"
@@ -2141,7 +2281,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Bio is too long (max 140 chars)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "Timezone not selected."
@@ -2166,7 +2306,7 @@ msgstr "Couldn't save profile."
msgid "Couldn't save tags."
msgstr "Couldn't save tags."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Settings saved."
@@ -2403,7 +2543,7 @@ msgstr "Error with confirmation code."
msgid "Registration successful"
msgstr "Registration successful"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Register"
@@ -2447,7 +2587,7 @@ msgid "Same as password above. Required."
msgstr "Same as password above. Required."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -2554,7 +2694,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL of your profile on another compatible microblogging service"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Subscribe"
@@ -2630,6 +2770,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Message 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."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "User is already blocked from group."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2875,6 +3025,145 @@ msgstr ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
"wikipedia.org/wiki/Micro-blogging) service "
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "You can't send a message to this user."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "User is already blocked from group."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "Invite"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Not a valid e-mail address."
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Site notice"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "New e-mail address for posting to %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Preferred language"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Privacy"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Recover"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Avatar settings"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "SMS Settings"
@@ -3149,6 +3438,21 @@ msgstr "No such tag."
msgid "API method under construction."
msgstr "API method under construction."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "You have already blocked this user."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "User has blocked you."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "User has no profile."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr "No profile id in request."
@@ -3166,6 +3470,32 @@ msgstr "Unsubscribed"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "User"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Block"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Invite"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Authorise subscription"
@@ -3329,11 +3659,16 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Error sending direct message."
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "Could not insert message."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "Could not update message with new URI."
@@ -3365,15 +3700,15 @@ msgid ""
msgstr ""
"Too many notices too fast; take a breather and post again in a few minutes."
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr "You are banned from posting notices on this site."
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Problem saving notice."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "DB error inserting reply: %s"
@@ -3403,10 +3738,6 @@ msgstr "Change your password"
msgid "Change email handling"
msgstr "Change e-mail handling"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3458,97 +3789,102 @@ msgstr "Connect"
msgid "Connect to services"
msgstr "Could not redirect to server: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Primary site navigation"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invite"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 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:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Logout"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "Logout from the site"
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr "Create an account"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "Login to the site"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Help"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Search"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "Search for people or text"
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr "Site notice"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr "Local views"
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr "Page notice"
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr "Secondary site navigation"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "About"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "F.A.Q."
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Source"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:736
+#: lib/action.php:740
#, fuzzy
msgid "Badge"
msgstr "Nudge"
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr "StatusNet software licence"
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3557,12 +3893,12 @@ msgstr ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** is a microblogging service."
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3573,35 +3909,60 @@ msgstr ""
"s, available under the [GNU Affero General Public Licence](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "StatusNet software licence"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr "All "
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "licence."
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "After"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "Before"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr "There was a problem with your session token."
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "You can't send a message to this user."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "Command not yet implemented."
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "Command not yet implemented."
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "E-mail address confirmation"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "SMS confirmation"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3777,30 +4138,36 @@ msgstr "You are not subscribed to that profile."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "You are not subscribed to that profile."
+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."
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Could not subscribe other to you."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "People subscribed to %s"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "Could not subscribe other to you."
+msgstr[1] "Could not subscribe other to you."
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "You are not a member of that group."
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "You are not a member of that group."
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "You are not a member of that group."
+msgstr[1] "You are not a member of that group."
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3839,19 +4206,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
msgid "No configuration file found. "
msgstr "No configuration file found"
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
#, fuzzy
msgid "Go to the installer."
msgstr "Login to the site"
@@ -3872,10 +4239,6 @@ msgstr "Updates by SMS"
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3886,65 +4249,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-msgid "Change colours"
-msgstr "Change colours"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Connect"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Search"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Text"
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Login"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr "Bad default colour settings: "
@@ -4173,12 +4477,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
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:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4199,17 +4503,17 @@ msgstr ""
"Faithfully yours,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "Location: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "Homepage: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
@@ -4218,12 +4522,12 @@ msgstr ""
"Bio: %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "New e-mail address for posting to %s"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4244,21 +4548,21 @@ msgstr ""
"Faithfully yours,\n"
"%4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "%s status"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "SMS confirmation"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "You've been nudged by %s"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4274,12 +4578,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "New private message from %s"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4298,12 +4602,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s added your notice as a favourite"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4324,12 +4628,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4466,7 +4770,12 @@ msgstr "Error inserting remote profile."
msgid "Duplicate notice"
msgstr "Delete notice"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "That user has blocked you from subscribing."
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Couldn't insert new subscription."
@@ -4482,10 +4791,6 @@ msgstr "Replies"
msgid "Favorites"
msgstr "Favourites"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "User"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "Inbox"
@@ -4536,6 +4841,15 @@ msgstr "Member since"
msgid "All groups"
msgstr "All groups"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "No id argument."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Public"
@@ -4556,6 +4870,16 @@ msgstr "Featured"
msgid "Popular"
msgstr "Popular"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Inbox"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Unblock this user"
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4594,6 +4918,16 @@ msgstr "Untitled section"
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Site notice"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Block this user"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4623,28 +4957,28 @@ msgstr ""
msgid "(none)"
msgstr "(none)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "User has blocked you."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "Could not subscribe."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "Could not subscribe other to you."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Not subscribed!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Couldn't delete subscription."
@@ -4656,6 +4990,29 @@ msgstr "None"
msgid "Top posters"
msgstr "Top posters"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Unblock this user"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Unblock this user"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Unblock this user"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Unsubscribe from this user"
@@ -4757,3 +5114,7 @@ msgstr "Sorry, that is not your incoming e-mail address."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Sorry, no incoming e-mail allowed."
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "People subscribed to %s"
diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo
index 7bc7cf1b6..4c0463da5 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 aa34e255c..54fb75f3d 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -13,12 +13,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:43:21+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:31:43+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -49,7 +49,7 @@ msgstr "No existe tal página"
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "No existe ese usuario."
@@ -151,7 +151,8 @@ msgstr "No se pudo actualizar el usuario."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -239,12 +240,12 @@ msgstr "Todos los mensajes directos enviados a %s"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -387,6 +388,13 @@ msgstr "El apodo ya existe. Prueba otro."
msgid "Alias can't be the same as nickname."
msgstr ""
+#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
+#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#, fuzzy
+msgid "Group not found!"
+msgstr "¡No se encontró el método de la API!"
+
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
msgstr "Ya eres miembro de ese grupo"
@@ -474,13 +482,13 @@ msgstr "%s / Favoritos desde %s"
msgid "%s updates favorited by %s / %s."
msgstr "%s actualizaciones favoritas por %s / %s."
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "línea temporal de %s"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -569,7 +577,8 @@ msgstr "Original"
msgid "Preview"
msgstr "Vista previa"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "Borrar"
@@ -581,7 +590,7 @@ msgstr "Cargar"
msgid "Crop"
msgstr "Cortar"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -591,7 +600,7 @@ msgstr "Cortar"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -659,72 +668,51 @@ msgstr "Lista de los usuarios en este grupo."
msgid "Unblock user from group"
msgstr "Falló desbloquear usuario."
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Desbloquear"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
#, fuzzy
msgid "Unblock this user"
msgstr "Desbloquear este usuario"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "No conectado."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "No se especificó perfil."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "No existe perfil con ese ID"
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Ya has bloqueado este usuario."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "Bloquear usuario."
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "No"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Desbloquear este usuario"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Sí"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuario."
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "Ya has bloqueado este usuario."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "No se guardó información de bloqueo."
@@ -789,6 +777,15 @@ msgstr "Avisos"
msgid "No such notice."
msgstr "No existe ese aviso."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "No conectado."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "No se puede eliminar este aviso."
@@ -825,6 +822,143 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
"Hubo un problema con tu clave de sesión. Por favor, intenta nuevamente."
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "No se pudo actualizar el usuario."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "No puedes borrar el estado de otro usuario."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "Borrar"
+
+#: 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 "Borrar este aviso"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "¡No se pudo guardar tu configuración de Twitter!"
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "Esta página no está disponible en un "
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Cambiar"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "Salir de sitio"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, 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:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Cambiar colores"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+msgid "Content"
+msgstr "Contenido"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Buscar"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Texto"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+msgid "Links"
+msgstr "Vínculos"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Guardar"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "¡Este aviso no es un favorito!"
@@ -971,14 +1105,6 @@ 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:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Guardar"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -992,7 +1118,7 @@ msgstr "Sin dirección de correo electrónico"
msgid "Cannot normalize that email address"
msgstr "No se puede normalizar esta dirección de correo electrónico."
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "No es una dirección de correo electrónico válida"
@@ -1196,6 +1322,18 @@ msgstr "No existe ese aviso."
msgid "Cannot read file."
msgstr "Se perdió nuestro archivo"
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "No se especificó perfil."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "No existe perfil con ese ID"
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
#, fuzzy
@@ -1320,11 +1458,11 @@ msgstr "Miembros del grupo %s, página %d"
msgid "A list of the users in this group."
msgstr "Lista de los usuarios en este grupo."
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "Bloquear"
@@ -1414,7 +1552,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "El usuario te ha bloqueado."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
#, fuzzy
msgid "Error removing the block."
msgstr "Error al sacar bloqueo."
@@ -1729,7 +1867,7 @@ msgstr "Nombre de usuario o contraseña incorrectos."
msgid "Error setting user."
msgstr "Error al configurar el usuario."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
@@ -2163,7 +2301,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/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Idioma"
@@ -2191,7 +2329,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "La biografía es demasiado larga (máx. 140 caracteres)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "Zona horaria no seleccionada"
@@ -2217,7 +2355,7 @@ msgstr "No se pudo guardar el perfil."
msgid "Couldn't save tags."
msgstr "No se pudo guardar tags."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Se guardó configuración."
@@ -2459,7 +2597,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:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrarse"
@@ -2505,7 +2643,7 @@ msgid "Same as password above. Required."
msgstr "Igual a la contraseña de arriba. Requerida"
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Correo electrónico"
@@ -2614,7 +2752,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "El URL de tu perfil en otro servicio de microblogueo compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Suscribirse"
@@ -2690,6 +2828,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Respuestas a %1$s en %2$s!"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "No puedes enviar mensaje a este usuario."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "El usuario te ha bloqueado."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2937,6 +3085,145 @@ msgstr ""
"**%s** tiene una cuenta en %%%%site.name%%%%, un servicio [micro-blogging]"
"(http://en.wikipedia.org/wiki/Micro-blogging) "
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "No puedes enviar mensaje a este usuario."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "El usuario te ha bloqueado."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "Invitar"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "No es una dirección de correo electrónico válida"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Aviso de sitio"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Nueva dirección de correo para postear a %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Lenguaje de preferencia"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Privacidad"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Recuperar"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Configuración de Avatar"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "Preferencias SMS"
@@ -3219,6 +3506,21 @@ msgstr "No existe ese tag."
msgid "API method under construction."
msgstr "Método API en construcción."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Ya has bloqueado este usuario."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "El usuario te ha bloqueado."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "El usuario no tiene un perfil."
+
#: actions/unsubscribe.php:77
#, fuzzy
msgid "No profile id in request."
@@ -3237,6 +3539,32 @@ msgstr "Desuscrito"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Usuario"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Bloqueado"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Invitar"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autorizar la suscripción"
@@ -3401,11 +3729,16 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Error al enviar mensaje directo."
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "No se pudo insertar mensaje."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "No se pudo actualizar mensaje con nuevo URI."
@@ -3440,15 +3773,15 @@ msgstr ""
"Demasiados avisos demasiado rápido; para y publicar nuevamente en unos "
"minutos."
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr "Tienes prohibido publicar avisos en este sitio."
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Hubo un problema al guardar el aviso."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Error de BD al insertar respuesta: %s"
@@ -3478,10 +3811,6 @@ msgstr "Cambia tu contraseña"
msgid "Change email handling"
msgstr "Cambiar el manejo del correo."
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
msgid "Design your profile"
msgstr "Diseñar tu perfil"
@@ -3534,99 +3863,104 @@ msgstr "Conectarse"
msgid "Connect to services"
msgstr "No se pudo redirigir al servidor: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Navegación de sitio primario"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invitar"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 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:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Salir"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "Salir de sitio"
-#: lib/action.php:450
+#: lib/action.php:454
#, fuzzy
msgid "Create an account"
msgstr "Crear una cuenta"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "Ingresar a sitio"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Ayuda"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr "Ayúdame!"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Buscar"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "Buscar personas o texto"
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr "Aviso de sitio"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr "Vistas locales"
-#: lib/action.php:612
+#: lib/action.php:616
#, fuzzy
msgid "Page notice"
msgstr "Aviso de página"
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr "Navegación de sitio secundario"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Acerca de"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "Preguntas Frecuentes"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Privacidad"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Fuente"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Ponerse en contacto"
-#: lib/action.php:736
+#: lib/action.php:740
#, fuzzy
msgid "Badge"
msgstr "Zumbido "
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr "Licencia de software de StatusNet"
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3635,12 +3969,12 @@ msgstr ""
"**%%site.name%%** es un servicio de microblogueo de [%%site.broughtby%%**](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** es un servicio de microblogueo."
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3651,35 +3985,60 @@ msgstr ""
"disponible bajo la [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "Licencia de software de StatusNet"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr "Todo"
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "Licencia."
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "Paginación"
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "Después"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "Antes"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr "Hubo problemas con tu clave de sesión."
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "No puedes enviar mensaje a este usuario."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "Todavía no se implementa comando."
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "Todavía no se implementa comando."
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Confirmación de correo electrónico"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "SMS confirmación"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3855,30 +4214,36 @@ msgstr "No estás suscrito a ese perfil."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "No estás suscrito a ese perfil."
+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."
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "No se pudo suscribir otro a ti."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Personas suscritas a %s"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "No se pudo suscribir otro a ti."
+msgstr[1] "No se pudo suscribir otro a ti."
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "No eres miembro de ese grupo"
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "No eres miembro de este grupo."
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "No eres miembro de este grupo."
+msgstr[1] "No eres miembro de este grupo."
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3917,19 +4282,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
msgid "No configuration file found. "
msgstr "Ningún archivo de configuración encontrado. "
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
msgid "Go to the installer."
msgstr "Ir al instalador."
@@ -3949,10 +4314,6 @@ msgstr "Actualizaciones por sms"
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
msgid "Upload file"
msgstr "Cargar archivo"
@@ -3962,63 +4323,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-msgid "Change colours"
-msgstr "Cambiar colores"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-msgid "Content"
-msgstr "Contenido"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Buscar"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Texto"
-
-#: lib/designsettings.php:230
-msgid "Links"
-msgstr "Vínculos"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4252,12 +4556,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s ahora está escuchando tus avisos en %2$s"
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4278,17 +4582,17 @@ msgstr ""
"Atentamente,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "Ubicación: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "Página de inicio: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
@@ -4297,12 +4601,12 @@ msgstr ""
"Bio: %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "Nueva dirección de correo para postear a %s"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4323,21 +4627,21 @@ msgstr ""
"Attentamente, \n"
"%4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "estado de %s"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "SMS confirmación"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "%s te mandó un zumbido "
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4353,12 +4657,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "Nuevo mensaje privado de %s"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4377,12 +4681,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) agregó tu aviso como un favorito"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4403,12 +4707,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4546,7 +4850,12 @@ msgstr "Error al insertar perfil remoto"
msgid "Duplicate notice"
msgstr "Duplicar aviso"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Ese usuario te ha bloqueado la suscripción."
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "No se pudo insertar una nueva suscripción."
@@ -4562,10 +4871,6 @@ msgstr "Respuestas"
msgid "Favorites"
msgstr "Favoritos"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "Usuario"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "Bandeja de Entrada"
@@ -4616,6 +4921,15 @@ msgstr "Miembro desde"
msgid "All groups"
msgstr "Todos los grupos"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "No existe argumento de ID."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Público"
@@ -4636,6 +4950,16 @@ msgstr "Destacado"
msgid "Popular"
msgstr "Popular"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Bandeja de Entrada"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Desbloquear este usuario"
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4674,6 +4998,16 @@ msgstr "Sección sin título"
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Aviso de sitio"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Bloquear este usuario."
+
#: lib/subgroupnav.php:83
#, fuzzy, php-format
msgid "People %s subscribes to"
@@ -4703,28 +5037,28 @@ msgstr ""
msgid "(none)"
msgstr "(ninguno)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "El usuario te ha bloqueado."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "No se pudo suscribir."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "No se pudo suscribir otro a ti."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "¡No estás suscrito!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "No se pudo eliminar la suscripción."
@@ -4736,6 +5070,29 @@ msgstr "Ninguno"
msgid "Top posters"
msgstr "Principales posteadores"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Desbloquear este usuario"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Desbloquear este usuario"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Desbloquear este usuario"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Desuscribirse de este usuario"
@@ -4840,3 +5197,7 @@ msgstr "Lo sentimos, pero este no es su dirección de correo entrante."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Lo sentimos, pero no se permite correos entrantes"
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Personas suscritas a %s"
diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo
index 14026dc1e..8c3399f71 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 c75267286..ac84ffd42 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:43:24+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:31:49+0000\n"
"Language-Team: Finnish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -48,7 +48,7 @@ msgstr "Sivua ei ole."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Käyttäjää ei ole."
@@ -154,7 +154,8 @@ msgstr "Ei voitu päivittää käyttäjää."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -241,12 +242,12 @@ msgstr "Kaikki suorat viestit käyttäjälle %s"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -383,6 +384,13 @@ msgstr "Alias \"%s\" on jo käytössä. Yritä toista aliasta."
msgid "Alias can't be the same as nickname."
msgstr "Alias ei voi olla sama kuin ryhmätunnus."
+#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
+#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#, fuzzy
+msgid "Group not found!"
+msgstr "API-metodia ei löytynyt!"
+
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
msgstr "Sinä kuulut jo tähän ryhmään."
@@ -470,13 +478,13 @@ msgstr "%s / Käyttäjän %s suosikit"
msgid "%s updates favorited by %s / %s."
msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen."
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "%s aikajana"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -564,7 +572,8 @@ msgstr "Alkuperäinen"
msgid "Preview"
msgstr "Esikatselu"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "Poista"
@@ -576,7 +585,7 @@ msgstr "Lataa"
msgid "Crop"
msgstr "Rajaa"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -586,7 +595,7 @@ msgstr "Rajaa"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -646,76 +655,55 @@ msgstr "%s ja kaverit, sivu %d"
#: actions/blockedfromgroup.php:108
msgid "A list of the users blocked from joining this group."
-msgstr "Lista käyttäjistä jotka ovat estetty liittymästä tähän ryhmään."
+msgstr "Lista käyttäjistä, jotka ovat estetty liittymästä tähän ryhmään."
#: actions/blockedfromgroup.php:281
msgid "Unblock user from group"
msgstr "Poista käyttäjän esto ryhmästä"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Poista esto"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "Poista esto tältä käyttäjältä"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Et ole kirjautunut sisään."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Profiilia ei ole määritelty."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Ei profiilia tuolle ID:lle."
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Sinä olet jo estänyt tämän käyttäjän."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "Estä käyttäjä"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "Ei"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
msgid "Do not block this user"
msgstr "Älä estä tätä käyttäjää"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Kyllä"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr "Estä tämä käyttäjä"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "Sinä olet jo estänyt tämän käyttäjän."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "Käyttäjän estotiedon tallennus epäonnistui."
@@ -780,6 +768,15 @@ msgstr "Päivitykset"
msgid "No such notice."
msgstr "Päivitystä ei ole."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Et ole kirjautunut sisään."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Tätä päivitystä ei voi poistaa."
@@ -814,6 +811,146 @@ msgstr ""
"Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit "
"uudelleen."
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Ei voitu päivittää käyttäjää."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Et voi poistaa toisen käyttäjän päivitystä."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "Poista"
+
+#: 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 "Poista tämä päivitys"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Twitter-asetuksia ei voitu tallentaa!"
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "Pikaviestin ei ole käytettävissä."
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Vaihda"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "Kirjaudu ulos palvelusta"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, 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:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Vaihda salasanasi"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Yhdistä"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Haku"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Teksti"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Kirjaudu sisään"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Tallenna"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "Tämä päivitys ei ole suosikki!"
@@ -959,14 +1096,6 @@ 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:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Tallenna"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -980,7 +1109,7 @@ msgstr "Sähköpostiosoitetta ei ole."
msgid "Cannot normalize that email address"
msgstr "Ei voida normalisoida sähköpostiosoitetta"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "Tuo ei ole kelvollinen sähköpostiosoite"
@@ -1176,6 +1305,18 @@ msgstr "Tiedostoa ei ole."
msgid "Cannot read file."
msgstr "Tiedostoa ei voi lukea."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "Profiilia ei ole määritelty."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "Ei profiilia tuolle ID:lle."
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1288,11 +1429,11 @@ msgstr "Ryhmän %s jäsenet, sivu %d"
msgid "A list of the users in this group."
msgstr "Lista ryhmän käyttäjistä."
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "Ylläpito"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "Estä"
@@ -1378,7 +1519,7 @@ msgstr "Vain ylläpitäjä voi poistaa eston ryhmän jäseniltä."
msgid "User is not blocked from group."
msgstr "Käyttäjää ei ole estetty ryhmästä."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr "Tapahtui virhe, kun estoa poistettiin."
@@ -1690,7 +1831,7 @@ msgstr "Väärä käyttäjätunnus tai salasana"
msgid "Error setting user."
msgstr "Virhe tapahtui käyttäjän asettamisessa."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Kirjaudu sisään"
@@ -2120,7 +2261,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/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Kieli"
@@ -2148,7 +2289,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "\"Tietoja\" on liian pitkä (max 140 merkkiä)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "Aikavyöhykettä ei ole valittu."
@@ -2173,7 +2314,7 @@ msgstr "Ei voitu tallentaa profiilia."
msgid "Couldn't save tags."
msgstr "Tageja ei voitu tallentaa."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Asetukset tallennettu."
@@ -2410,7 +2551,7 @@ msgstr "Virheellinen kutsukoodin."
msgid "Registration successful"
msgstr "Rekisteröityminen onnistui"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Rekisteröidy"
@@ -2456,7 +2597,7 @@ msgid "Same as password above. Required."
msgstr "Sama kuin ylläoleva salasana. Pakollinen."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Sähköposti"
@@ -2485,7 +2626,7 @@ msgid ""
" except this private data: password, email address, IM address, and phone "
"number."
msgstr ""
-"poislukien yksityinen tieto: salasana, sähköpostiosoite, IM osoite, "
+"poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, "
"puhelinnumero."
#: actions/register.php:537
@@ -2566,7 +2707,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Profiilisi URL-osoite toisessa yhteensopivassa mikroblogauspalvelussa"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Tilaa"
@@ -2643,6 +2784,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Viesti käyttäjälle %1$s, %2$s"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Et voi lähettää viestiä tälle käyttäjälle."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Käyttäjä on asettanut eston sinulle."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2887,6 +3038,145 @@ msgstr ""
"Käyttäjällä **%s** on käyttäjätili palvelussa %%%%site.name%%%%, joka on "
"[mikroblogauspalvelu](http://en.wikipedia.org/wiki/Micro-blogging)"
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "Et voi lähettää viestiä tälle käyttäjälle."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "Käyttäjä on asettanut eston sinulle."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "Kutsu"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Tuo ei ole kelvollinen sähköpostiosoite"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Palvelun ilmoitus"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Ensisijainen kieli"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Yksityisyys"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Palauta"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Profiilikuva-asetukset"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "SMS-asetukset"
@@ -3160,6 +3450,21 @@ msgstr "Tuota tagia ei ole."
msgid "API method under construction."
msgstr "API-metodi on työn alla!"
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Sinä olet jo estänyt tämän käyttäjän."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Käyttäjää ei ole estetty ryhmästä."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "Käyttäjällä ei ole profiilia."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr "Ei profiili id:tä kyselyssä."
@@ -3177,6 +3482,32 @@ msgstr "Tilaus lopetettu"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Käyttäjä"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Estä"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Kutsu"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Valtuuta tilaus"
@@ -3337,11 +3668,16 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Tapahtui virhe suoran viestin lähetyksessä."
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "Viestin tallennus ei onnistunut."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut."
@@ -3374,15 +3710,15 @@ msgstr ""
"Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka "
"päivityksien lähettämista muutaman minuutin päästä."
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr "Päivityksesi tähän palveluun on estetty."
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Tietokantavirhe tallennettaessa vastausta: %s"
@@ -3412,10 +3748,6 @@ msgstr "Vaihda salasanasi"
msgid "Change email handling"
msgstr "Muuta sähköpostin käsittelyasetuksia."
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3467,97 +3799,102 @@ msgstr "Yhdistä"
msgid "Connect to services"
msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Ensisijainen sivunavigointi"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Kutsu"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 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:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Kirjaudu ulos"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "Kirjaudu ulos palvelusta"
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr "Luo uusi käyttäjätili"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "Kirjaudu sisään palveluun"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Ohjeet"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr "Auta minua!"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Haku"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "Hae ihmisiä tai tekstiä"
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr "Palvelun ilmoitus"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr "Paikalliset näkymät"
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr "Sivuilmoitus"
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr "Toissijainen sivunavigointi"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Tietoa"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "UKK"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Yksityisyys"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Lähdekoodi"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Ota yhteyttä"
-#: lib/action.php:736
+#: lib/action.php:740
#, fuzzy
msgid "Badge"
msgstr "Tönäise"
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr "StatusNet-ohjelmiston lisenssi"
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3566,12 +3903,12 @@ msgstr ""
"**%%site.name%%** on mikroblogipalvelu, jonka tarjoaa [%%site.broughtby%%](%%"
"site.broughtbyurl%%). "
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** on mikroblogipalvelu. "
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3582,35 +3919,60 @@ msgstr ""
"versio %s, saatavilla lisenssillä [GNU Affero General Public License](http://"
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "StatusNet-ohjelmiston lisenssi"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr "Kaikki "
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "lisenssi."
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "Sivutus"
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "Myöhemmin"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "Aiemmin"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr "Istuntoavaimesi kanssa oli ongelma."
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "Et voi lähettää viestiä tälle käyttäjälle."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "Komentoa ei ole vielä toteutettu."
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "Komentoa ei ole vielä toteutettu."
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Sähköpostiosoitteen vahvistus"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "SMS vahvistus"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3786,30 +4148,36 @@ msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
+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ä."
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Toista ei voitu asettaa tilaamaan sinua."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "Toista ei voitu asettaa tilaamaan sinua."
+msgstr[1] "Toista ei voitu asettaa tilaamaan sinua."
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Sinä et kuulu tähän ryhmään."
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Sinä et kuulu tähän ryhmään."
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "Sinä et kuulu tähän ryhmään."
+msgstr[1] "Sinä et kuulu tähän ryhmään."
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3848,20 +4216,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Varmistuskoodia ei ole annettu."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
#, fuzzy
msgid "Go to the installer."
msgstr "Kirjaudu sisään palveluun"
@@ -3882,10 +4250,6 @@ msgstr "Päivitykset SMS:llä"
msgid "Database error"
msgstr "Tietokantavirhe"
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3896,66 +4260,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Vaihda salasanasi"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Yhdistä"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Haku"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Teksti"
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Kirjaudu sisään"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4187,12 +4491,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s seuraa nyt päivityksiäsi palvelussa %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4217,17 +4521,17 @@ msgstr ""
"----\n"
"Voit vaihtaa sähköpostiosoitetta tai ilmoitusasetuksiasi %8$s\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "Kotipaikka: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "Kotisivu: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
@@ -4236,12 +4540,12 @@ msgstr ""
"Tietoja: %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4262,21 +4566,21 @@ msgstr ""
"Terveisin,\n"
"%4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "%s päivitys"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "SMS vahvistus"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "%s tönäisi sinua"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4292,12 +4596,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "Uusi yksityisviesti käyttäjältä %s"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4316,12 +4620,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s lisäsi päivityksesi suosikkeihinsa"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4342,12 +4646,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4485,7 +4789,12 @@ msgstr "Virhe tapahtui uuden etäprofiilin lisäämisessä"
msgid "Duplicate notice"
msgstr "Poista päivitys"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Ei voitu lisätä uutta tilausta."
@@ -4501,10 +4810,6 @@ msgstr "Vastaukset"
msgid "Favorites"
msgstr "Suosikit"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "Käyttäjä"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "Saapuneet"
@@ -4555,6 +4860,15 @@ msgstr "Käyttäjänä alkaen"
msgid "All groups"
msgstr "Kaikki ryhmät"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Ei id parametria."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Julkinen"
@@ -4575,6 +4889,16 @@ msgstr "Esittelyssä"
msgid "Popular"
msgstr "Suosituimmat"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Saapuneet"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Poista esto tältä käyttäjältä"
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4613,6 +4937,16 @@ msgstr "Nimetön osa"
msgid "More..."
msgstr "Lisää..."
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Palvelun ilmoitus"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Estä tämä käyttäjä"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4642,28 +4976,28 @@ msgstr ""
msgid "(none)"
msgstr "(tyhjä)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "Käyttäjä on asettanut eston sinulle."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "Ei voitu tilata."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "Toista ei voitu asettaa tilaamaan sinua."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Ei ole tilattu!."
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Ei voitu poistaa tilausta."
@@ -4675,6 +5009,29 @@ msgstr "Ei mitään"
msgid "Top posters"
msgstr "Eniten päivityksiä"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Poista esto tältä käyttäjältä"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Poista esto tältä käyttäjältä"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Poista esto tältä käyttäjältä"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Peruuta tämän käyttäjän tilaus"
@@ -4778,3 +5135,7 @@ msgstr "Valitettavasti tuo ei ole oikea osoite sähköpostipäivityksille."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Valitettavasti päivitysten teko sähköpostilla ei ole sallittua."
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo
index 6328e2ed9..eb8da8f56 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 62ffbe99f..3cf6033a4 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:43:27+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:31:52+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -46,7 +46,7 @@ msgstr "Page non trouvée"
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Utilisateur non trouvé."
@@ -150,7 +150,8 @@ msgstr "Impossible de mettre à jour l’utilisateur."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -235,12 +236,12 @@ msgstr "Tous les messages envoyés à %s"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -375,6 +376,13 @@ msgstr "Alias « %s » déjà utilisé. Essayez-en un autre."
msgid "Alias can't be the same as nickname."
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 !"
+
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
msgstr "Vous êtes déjà membre de ce groupe."
@@ -464,13 +472,13 @@ msgstr "%s / Favoris de %s"
msgid "%s updates favorited by %s / %s."
msgstr "%s statuts ont été ajoutés aux favoris de %s / %s."
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "Activité de %s"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -559,7 +567,8 @@ msgstr "Image originale"
msgid "Preview"
msgstr "Aperçu"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "Supprimer"
@@ -571,7 +580,7 @@ msgstr "Transfert"
msgid "Crop"
msgstr "Recadrer"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -581,7 +590,7 @@ msgstr "Recadrer"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -647,40 +656,24 @@ msgstr "Une liste des utilisateurs dont l’inscription à ce groupe est bloqué
msgid "Unblock user from group"
msgstr "Débloquer l’utilisateur du groupe"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Débloquer"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "Débloquer cet utilisateur"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Non connecté."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Aucun profil n’a été spécifié."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Aucun profil ne correspond à cet identifiant."
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Vous avez déjà bloqué cet utilisateur."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "Bloquer cet utilisateur"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -690,30 +683,25 @@ msgstr ""
"sera plus abonné à votre compte, ne pourra plus s’y abonner de nouveau, et "
"vous ne serez pas informé des @-réponses de sa part."
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "Non"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
msgid "Do not block this user"
msgstr "Ne pas bloquer cet utilisateur"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Oui"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquer cet utilisateur"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "Vous avez déjà bloqué cet utilisateur."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "Impossible d’enregistrer les informations de blocage."
@@ -777,6 +765,15 @@ msgstr "Statuts"
msgid "No such notice."
msgstr "Statut non trouvé."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Non connecté."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Impossible de supprimer ce statut."
@@ -811,6 +808,144 @@ msgstr ""
"Un problème est survenu avec votre jeton de session. Veuillez essayer à "
"nouveau."
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Impossible de mettre à jour l’utilisateur."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "Supprimer"
+
+#: 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 "Supprimer ce statut"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr "Conception"
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Impossible de sauvegarder les parmètres de la conception."
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "La messagerie instantanée n’est pas disponible."
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Modifier"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "Fermer la session"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr "Changer l’image d’arrière plan"
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "Arrière plan"
+
+#: actions/designadminpanel.php:429
+#, fuzzy, 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."
+
+#: actions/designadminpanel.php:459 lib/designsettings.php:139
+msgid "On"
+msgstr "Activé"
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr "Désactivé"
+
+#: actions/designadminpanel.php:476 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:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr "Répéter l’image d’arrière plan"
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Modifier les couleurs"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+msgid "Content"
+msgstr "Contenu"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "Barre latérale"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Texte"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+msgid "Links"
+msgstr "Liens"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "Utiliser les valeurs par défaut"
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr "Restaurer les conceptions par défaut"
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr "Revenir aux valeurs par défaut"
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Enregistrer"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr "Sauvegarder la conception"
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "Ce statut n’est pas un favori !"
@@ -955,14 +1090,6 @@ 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:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Enregistrer"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -976,7 +1103,7 @@ msgstr "Aucune adresse courriel."
msgid "Cannot normalize that email address"
msgstr "Impossible d’utiliser cette adresse courriel"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "Adresse courriel invalide"
@@ -1174,6 +1301,18 @@ msgstr "Fichier non trouvé."
msgid "Cannot read file."
msgstr "Impossible de lire le fichier"
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "Aucun profil n’a été spécifié."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "Aucun profil ne correspond à cet identifiant."
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1292,11 +1431,11 @@ msgstr "Membres du groupe %s - page %d"
msgid "A list of the users in this group."
msgstr "Liste des utilisateurs inscrits à ce groupe."
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrer"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "Bloquer"
@@ -1382,7 +1521,7 @@ msgstr "Seul un administrateur peut débloquer les membres du groupes."
msgid "User is not blocked from group."
msgstr "Cet utilisateur n’est pas bloqué du groupe."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr "Erreur lors de l’annulation du blocage."
@@ -1698,7 +1837,7 @@ msgstr "Identifiant ou mot de passe incorrect."
msgid "Error setting user."
msgstr "Erreur lors de la configuration de l’utilisateur."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Ouvrir une session"
@@ -2125,7 +2264,7 @@ msgid ""
msgstr ""
"Marquages (tags) pour votre profil, séparés par des virgules ou des espaces"
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Langue"
@@ -2153,7 +2292,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "La bio est trop longue (%d caractères maximum)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "Aucun fuseau horaire n’a été choisi."
@@ -2178,7 +2317,7 @@ msgstr "Impossible d’enregistrer le profil."
msgid "Couldn't save tags."
msgstr "Impossible d’enregistrer les marquages."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Préférences enregistrées."
@@ -2419,7 +2558,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:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Créer un compte"
@@ -2464,7 +2603,7 @@ msgid "Same as password above. Required."
msgstr "Identique au mot de passe ci-dessus. Requis."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Courriel"
@@ -2573,7 +2712,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL de votre profil sur un autre service de micro-blogging compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "S’abonner"
@@ -2649,6 +2788,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Message adressé à %1$s le %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."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Cet utilisateur est déjà bloqué pour le groupe."
+
#: actions/showfavorites.php:79
#, php-format
msgid "%s's favorite notices, page %d"
@@ -2905,6 +3054,145 @@ msgstr ""
"**%s** est inscrit au service de [micro-blogging](http://fr.wikipedia.org/"
"wiki/Microblog) %%%%site.name%%%%"
+#: 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."
+
+#: 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:272
+#, fuzzy
+msgid "Site"
+msgstr "Inviter"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Adresse courriel invalide"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Notice du site"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Nouvelle adresse courriel pour poster dans %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Langue préférée"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Confidentialité"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Récupérer"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Paramètres de l’avatar"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "Paramètres SMS"
@@ -3188,6 +3476,21 @@ msgstr "Aucun marquage trouvé."
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."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Cet utilisateur n’est pas bloqué du groupe."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "Aucun profil ne correspond à cet utilisateur."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr "Aucune identité de profil dans la requête."
@@ -3207,6 +3510,32 @@ 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
+msgid "User"
+msgstr "Utilisateur"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Bloqué"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Inviter"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autoriser l’abonnement"
@@ -3251,13 +3580,12 @@ msgid "Subscription authorized"
msgstr "Abonnement autorisé"
#: 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 ""
-"L’abonnement a été autorisé, mais l’URL de rappel n’a pas été validé. "
+"L’abonnement a été autorisé, mais aucune URL de rappel n’a pas été passée. "
"Vérifiez les instructions du site pour savoir comment compléter "
"l’autorisation de l’abonnement. Votre jeton d’abonnement est :"
@@ -3370,11 +3698,16 @@ msgstr "Un fichier aussi gros dépasserai votre quota utilisateur de %d octets."
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:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Une erreur est survenue pendant l’envoi de votre message."
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "Impossible d’insérer le message."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "Impossible de mettre à jour le message avec un nouvel URI."
@@ -3407,15 +3740,15 @@ msgstr ""
"Trop de statuts, trop vite ! Prenez une pause et publiez à nouveau dans "
"quelques minutes."
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr "Il vous est interdit de publier des statuts dans ce site."
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Problème lors de l’enregistrement du statut."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Erreur de base de donnée en insérant la réponse :%s"
@@ -3445,10 +3778,6 @@ msgstr "Modifier votre mot de passe"
msgid "Change email handling"
msgstr "Modifier le traitement des courriels"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr "Conception"
-
#: lib/accountsettingsaction.php:124
msgid "Design your profile"
msgstr "Concevez votre profil"
@@ -3498,97 +3827,102 @@ msgstr "Connecter"
msgid "Connect to services"
msgstr "Se connecter aux services"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Navigation primaire du site"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Inviter"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 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:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Fermeture de session"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "Fermer la session"
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr "Créer un compte"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "Ouvrir une session"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Aide"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr "À l’aide !"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Rechercher"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "Rechercher des personnes ou du texte"
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr "Notice du site"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr "Vues locales"
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr "Avis de la page"
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr "Navigation secondaire du site"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "À propos"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr "CGU"
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Confidentialité"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Source"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:736
+#: lib/action.php:740
#, fuzzy
msgid "Badge"
msgstr "Clin d’œil"
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr "Licence du logiciel StatusNet"
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3597,12 +3931,12 @@ msgstr ""
"**%%site.name%%** est un service de microblogging qui vous est proposé par "
"[%%site.broughtby%%](%%site.broughtbyurl%%)."
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** est un service de micro-blogging."
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3613,34 +3947,59 @@ 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:785
+#: lib/action.php:789
msgid "Site content license"
msgstr "Licence du contenu du site"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr "Tous "
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "licence."
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "Après"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "Avant"
-#: lib/action.php:1117
+#: lib/action.php:1132
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."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "Cette commande n’a pas encore été implémentée."
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "Cette commande n’a pas encore été implémentée."
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Confirmation de l’adresse courriel"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "Confirmation SMS"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "Pièces jointes"
@@ -3678,10 +4037,9 @@ msgid "Sorry, this command is not yet implemented."
msgstr "Désolé, cette commande n’a pas encore été implémentée."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr ""
-"Impossible de mettre l’utilisateur à jour avec l’adresse courriel confirmée."
+msgstr "Impossible de trouver un utilisateur avec le pseudo %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
@@ -3818,37 +4176,39 @@ msgstr ""
"pendant 2 minutes : %s"
#: lib/command.php:618
-#, fuzzy
msgid "You are not subscribed to anyone."
-msgstr "Vous n'êtes pas abonné(e) à ce profil."
+msgstr "Vous n'êtes pas abonné(e) à personne."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Vous n'êtes pas abonné(e) à ce profil."
+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 : "
-#: lib/command.php:637
-#, fuzzy
+#: lib/command.php:640
msgid "No one is subscribed to you."
-msgstr "Impossible d’abonner une autre personne à votre profil."
+msgstr "Personne ne s'est abonné à vous."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Abonnés de %s"
+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."
-#: lib/command.php:656
-#, fuzzy
+#: lib/command.php:662
msgid "You are not a member of any groups."
-msgstr "Vous n'êtes pas membre de ce groupe."
+msgstr "Vous n'êtes pas membre d'aucun groupe."
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Vous n'êtes pas membre de ce groupe."
+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 : "
-#: lib/command.php:670
-#, fuzzy
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3891,6 +4251,9 @@ msgstr ""
"off - désactiver les notifications\n"
"help - montrer l’aide\n"
"follow <nickname> - s’abonner à l’utilisateur\n"
+"groups - lister les groupes de vous avez joint\n"
+"subscriptions - lister les personnes que vous suivez\n"
+"subscribers - lister les personnes qui vous suivent\n"
"leave <nickname> - se désabonner de l’utilisateur\n"
"d <nickname> <text> - message direct à l’utilisateur\n"
"get <nickname> - obtenir le dernier avis de l’utilisateur\n"
@@ -3919,20 +4282,20 @@ msgstr ""
"tracks - pas encore implémenté.\n"
"tracking - pas encore implémenté.\n"
-#: lib/common.php:192
+#: lib/common.php:203
msgid "No configuration file found. "
msgstr "Aucun fichier de configuration n'a été trouvé. "
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
"J’ai cherché des fichiers de configuration dans les emplacements suivants : "
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr "Vous pouvez essayer de lancer l’installeur pour régler ce problème."
-#: lib/common.php:195
+#: lib/common.php:206
msgid "Go to the installer."
msgstr "Aller au programme d’installation"
@@ -3952,10 +4315,6 @@ msgstr "Suivi des statuts par SMS"
msgid "Database error"
msgstr "Erreur de la base de données"
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr "Changer l’image d’arrière plan"
-
#: lib/designsettings.php:105
msgid "Upload file"
msgstr "Importer un fichier"
@@ -3967,65 +4326,9 @@ msgstr ""
"Vous pouvez importer une image d’arrière plan personnelle. La taille "
"maximale du fichier est de 2 Mo."
-#: lib/designsettings.php:139
-msgid "On"
-msgstr "Activé"
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr "Désactivé"
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr "Activer ou désactiver l’image d’arrière plan."
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr "Répéter l’image d’arrière plan"
-
-#: lib/designsettings.php:170
-msgid "Change colours"
-msgstr "Modifier les couleurs"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr "Arrière plan"
-
-#: lib/designsettings.php:191
-msgid "Content"
-msgstr "Contenu"
-
-#: lib/designsettings.php:204
-msgid "Sidebar"
-msgstr "Barre latérale"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Texte"
-
-#: lib/designsettings.php:230
-msgid "Links"
-msgstr "Liens"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr "Utiliser les valeurs par défaut"
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr "Restaurer les conceptions par défaut"
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr "Revenir aux valeurs par défaut"
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr "Sauvegarder la conception"
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
-msgstr ""
+msgstr "Mauvais paramètres de couleur par défaut : "
#: lib/designsettings.php:468
msgid "Design defaults restored."
@@ -4269,12 +4572,12 @@ msgstr ""
"Merci de votre attention,\n"
"%s\n"
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s suit maintenant vos statuts dans %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4299,17 +4602,17 @@ msgstr ""
"----\n"
"Changez votre adresse de courriel ou vos options de notification sur %8$s\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "Emplacement : %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "Site Web : %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
@@ -4318,12 +4621,12 @@ msgstr ""
"Bio : %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "Nouvelle adresse courriel pour poster dans %s"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4345,21 +4648,21 @@ msgstr ""
"Amicalement vôtre,\n"
"%4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "Statut de %s"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "Confirmation SMS"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "Vous avez reçu un clin d’œil de %s"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4386,12 +4689,12 @@ msgstr ""
"Bien à vous,\n"
"%4$s\n"
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "Nouveau message personnel de %s"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4424,13 +4727,13 @@ msgstr ""
"Bien à vous,\n"
"%5$s\n"
-#: lib/mail.php:554
+#: lib/mail.php:559
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) a ajouté un de vos statut à ses favoris"
-#: lib/mail.php:556
-#, fuzzy, php-format
+#: lib/mail.php:561
+#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
"\n"
@@ -4449,26 +4752,30 @@ msgid ""
"Faithfully yours,\n"
"%6$s\n"
msgstr ""
-"%1$s vient de marquer votre message de %2$s comme un de ses favoris.\n"
+"%1$s (@%7$s) vient de marquer votre message de %2$s comme un de ses "
+"favoris.\n"
"\n"
-"Dans le cas où vous l’auriez oublié, vous pouvez lire le texte de votre "
-"message ici :\n"
+"L'URL de votre message est :\n"
"\n"
"%3$s\n"
"\n"
-"Vous pouvez consulter la liste des favoris de %1$s ici :\n"
+"Le texte de votre message est :\n"
"\n"
"%4$s\n"
"\n"
-"Cordialement,\n"
+"Vous pouvez voir la liste des favoris de %1$s ici :\n"
+"\n"
"%5$s\n"
+"\n"
+"Cordialement,\n"
+"%6$s\n"
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) vous a envoyé un avis"
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4618,7 +4925,12 @@ msgstr "Erreur lors de l’insertion du profil distant"
msgid "Duplicate notice"
msgstr "Dupliquer l’avis"
-#: lib/oauthstore.php:487
+#: 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."
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Impossible d’insérer un nouvel abonnement."
@@ -4634,10 +4946,6 @@ msgstr "Réponses"
msgid "Favorites"
msgstr "Favoris"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "Utilisateur"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "Boîte de réception"
@@ -4687,6 +4995,15 @@ msgstr "Membre depuis"
msgid "All groups"
msgstr "Tous les groupes"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Aucun argument d’identification."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Public"
@@ -4707,6 +5024,16 @@ msgstr "En vedette"
msgid "Popular"
msgstr "Populaires"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Boîte de réception"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Débloquer cet utilisateur"
+
#: lib/searchaction.php:120
msgid "Search site"
msgstr "Rechercher sur le site"
@@ -4743,6 +5070,16 @@ msgstr "Section sans titre"
msgid "More..."
msgstr "Plus..."
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Notice du site"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Bloquer cet utilisateur"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4772,27 +5109,27 @@ msgstr ""
msgid "(none)"
msgstr "(aucun)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr "Déjà souscrit !"
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "Cet utilisateur vous a bloqué."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "Impossible de s’abonner."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "Impossible d’abonner une autre personne à votre profil."
-#: lib/subs.php:124
+#: lib/subs.php:128
msgid "Not subscribed!"
msgstr "Pas abonné !"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Impossible de cesser l’abonnement"
@@ -4804,6 +5141,29 @@ msgstr "Aucun"
msgid "Top posters"
msgstr "Utilisateurs les plus actifs"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Débloquer cet utilisateur"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Débloquer cet utilisateur"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Débloquer cet utilisateur"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Ne plus suivre cet utilisateur"
@@ -4906,3 +5266,6 @@ msgstr "Désolé, ceci n’est pas votre adresse de courriel entrant."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Désolé, la réception de courriels n’est pas permise."
+
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Ces personnes sont abonnées à vous : "
diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo
index 78a0e7ba0..c9641c01e 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 bce6ff40a..ff4fd29ef 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:43:30+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:31:55+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -42,7 +42,7 @@ msgstr "Non existe a etiqueta."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Ningún usuario."
@@ -145,7 +145,8 @@ msgstr "Non se puido actualizar o usuario."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -233,12 +234,12 @@ msgstr "Tódalas mensaxes directas enviadas a %s"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -381,6 +382,13 @@ msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
msgid "Alias can't be the same as nickname."
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 "Método da API non atopado"
+
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
msgstr "Xa estas suscrito a estes usuarios:"
@@ -471,13 +479,13 @@ msgstr "%s / Favoritos dende %s"
msgid "%s updates favorited by %s / %s."
msgstr "%s updates favorited by %s / %s."
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "Liña de tempo de %s"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -566,7 +574,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
#, fuzzy
msgid "Delete"
msgstr "eliminar"
@@ -579,7 +588,7 @@ msgstr "Subir"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -589,7 +598,7 @@ msgstr ""
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
@@ -657,41 +666,25 @@ msgstr ""
msgid "Unblock user from group"
msgstr "Desbloqueo de usuario fallido."
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Desbloquear"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
#, fuzzy
msgid "Unblock this user"
msgstr "Bloquear usuario"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Non está logueado."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Non se especificou ningún perfil."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Non se atopou un perfil con ese ID."
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Xa bloqueaches a este usuario."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "Bloquear usuario"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -701,32 +694,27 @@ msgstr ""
"do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a "
"ser notificado de ningunha resposta-@ del."
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "No"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Bloquear usuario"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Si"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Bloquear usuario"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "Xa bloqueaches a este usuario."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "Erro ao gardar información de bloqueo."
@@ -792,6 +780,15 @@ msgstr "Chíos"
msgid "No such notice."
msgstr "Ningún chío."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Non está logueado."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Non se pode eliminar este chíos."
@@ -828,6 +825,145 @@ msgstr "Eliminar chío"
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/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Non se puido actualizar o usuario."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Non deberías eliminar o estado de outro usuario"
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "eliminar"
+
+#: 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 "Eliminar chío"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Non se puideron gardar os teus axustes de Twitter!"
+
+#: actions/designadminpanel.php:301
+#, 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:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Modificado"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+msgid "Theme for the site."
+msgstr ""
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, 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:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Cambiar contrasinal"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Conectar"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Buscar"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Texto"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Lista"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Gardar"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "Este chío non é un favorito!"
@@ -976,14 +1112,6 @@ 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:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Gardar"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -997,7 +1125,7 @@ msgstr "Non se inseriu unha dirección de correo"
msgid "Cannot normalize that email address"
msgstr "Esa dirección de correo non se pode normalizar "
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "Non é unha dirección de correo válida"
@@ -1198,6 +1326,18 @@ msgstr "Ningún chío."
msgid "Cannot read file."
msgstr "Bloqueo de usuario fallido."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "Non se especificou ningún perfil."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "Non se atopou un perfil con ese ID."
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
#, fuzzy
@@ -1321,11 +1461,11 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "Bloquear"
@@ -1414,7 +1554,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "O usuario bloqueoute."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr "Acounteceu un erro borrando o bloqueo."
@@ -1725,7 +1865,7 @@ msgstr "Usuario ou contrasinal incorrectos."
msgid "Error setting user."
msgstr "Acounteceu un erro configurando o usuario."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
@@ -2157,7 +2297,7 @@ msgstr ""
"Etiquetas para o teu usuario (letras, números, -, ., e _), separados por "
"coma ou espazo"
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Linguaxe"
@@ -2185,7 +2325,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "O teu Bio é demasiado longo (max 140 car.)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "Fuso Horario non seleccionado"
@@ -2210,7 +2350,7 @@ msgstr "Non se puido gardar o perfil."
msgid "Couldn't save tags."
msgstr "Non se puideron gardar as etiquetas."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Configuracións gardadas."
@@ -2454,7 +2594,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:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Rexistrar"
@@ -2504,7 +2644,7 @@ msgid "Same as password above. Required."
msgstr "A mesma contrasinal que arriba. Requerido."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Correo Electrónico"
@@ -2612,7 +2752,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Enderezo do teu perfil en outro servizo de microblogaxe compatíbel"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Subscribir"
@@ -2688,6 +2828,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Mensaxe de %1$s en %2$s"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Non podes enviar mensaxes a este usurio."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "O usuario bloqueoute."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2949,6 +3099,145 @@ msgstr ""
"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "Non podes enviar mensaxes a este usurio."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "O usuario bloqueoute."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "Invitar"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Non é unha dirección de correo válida"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Novo chío"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Nova dirección de email para posterar en %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Linguaxe preferida"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Privacidade"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Recuperar"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Configuracións de Twitter"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "Configuracións de SMS"
@@ -3225,6 +3514,21 @@ msgstr "Non existe a etiqueta."
msgid "API method under construction."
msgstr "Método da API en contrución."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Xa bloqueaches a este usuario."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "O usuario bloqueoute."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "O usuario non ten perfil."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr "Non hai identificador de perfil na peticion."
@@ -3242,6 +3546,32 @@ msgstr "De-suscribido"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Usuario"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Bloquear"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Invitar"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Subscrición de autorización."
@@ -3404,11 +3734,16 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Erro ó enviar a mensaxe directa."
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "Non se pode inserir unha mensaxe."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "Non se puido actualizar a mensaxe coa nova URI."
@@ -3442,15 +3777,15 @@ msgstr ""
"Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro "
"duns minutos."
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr "Tes restrinxido o envio de chíos neste sitio."
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Erro ó inserir a contestación na BD: %s"
@@ -3481,10 +3816,6 @@ msgstr "Cambiar contrasinal"
msgid "Change email handling"
msgstr "Cambiar a xestión de email"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3538,103 +3869,108 @@ msgstr "Conectar"
msgid "Connect to services"
msgstr "Non se pode redireccionar ao servidor: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Navegación de subscricións"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invitar"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 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:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Sair"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:454
#, fuzzy
msgid "Create an account"
msgstr "Crear nova conta"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr ""
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Axuda"
-#: lib/action.php:456
+#: lib/action.php:460
#, fuzzy
msgid "Help me!"
msgstr "Axuda"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Buscar"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:480
+#: lib/action.php:484
#, fuzzy
msgid "Site notice"
msgstr "Novo chío"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr ""
-#: lib/action.php:612
+#: lib/action.php:616
#, fuzzy
msgid "Page notice"
msgstr "Novo chío"
-#: lib/action.php:714
+#: lib/action.php:718
#, fuzzy
msgid "Secondary site navigation"
msgstr "Navegación de subscricións"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Sobre"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "Preguntas frecuentes"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Privacidade"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Fonte"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:736
+#: lib/action.php:740
msgid "Badge"
msgstr ""
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3643,12 +3979,12 @@ msgstr ""
"**%%site.name%%** é un servizo de microbloguexo que che proporciona [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** é un servizo de microbloguexo."
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3659,39 +3995,64 @@ msgstr ""
"%s, dispoñible baixo licenza [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "Atopar no contido dos chíos"
-#: lib/action.php:794
+#: lib/action.php:798
#, fuzzy
msgid "All "
msgstr "Todos"
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr ""
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr ""
-#: lib/action.php:1061
+#: lib/action.php:1076
#, fuzzy
msgid "After"
msgstr "« Despois"
-#: lib/action.php:1069
+#: lib/action.php:1084
#, fuzzy
msgid "Before"
msgstr "Antes »"
-#: lib/action.php:1117
+#: lib/action.php:1132
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "Non podes enviar mensaxes a este usurio."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "Comando non implementado."
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "Comando non implementado."
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Confirmar correo electrónico"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "Confirmación de SMS"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3870,30 +4231,36 @@ msgstr "Non estás suscrito a ese perfil"
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Non estás suscrito a ese perfil"
+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"
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Outro usuario non se puido suscribir a ti."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Suscrito a %s"
+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."
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Non estás suscrito a ese perfil"
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Non estás suscrito a ese perfil"
+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"
-#: lib/command.php:670
+#: lib/command.php:678
#, fuzzy
msgid ""
"Commands:\n"
@@ -3959,20 +4326,20 @@ msgstr ""
"tracks - non implementado por agora.\n"
"tracking - non implementado por agora.\n"
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Sen código de confirmación."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
msgid "Go to the installer."
msgstr ""
@@ -3992,10 +4359,6 @@ msgstr "Chíos dende SMS"
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -4006,66 +4369,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Cambiar contrasinal"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Conectar"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Buscar"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Texto"
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Lista"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4319,12 +4622,12 @@ msgstr ""
"Grazas polo teu tempo, \n"
"%s\n"
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s está a escoitar os teus chíos %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4345,29 +4648,29 @@ msgstr ""
"Atentamente todo seu,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, fuzzy, php-format
msgid "Location: %s\n"
msgstr "Ubicación: %s"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, fuzzy, php-format
msgid "Homepage: %s\n"
msgstr "Páxina persoal: %s"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
"\n"
msgstr ""
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "Nova dirección de email para posterar en %s"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4388,21 +4691,21 @@ msgstr ""
"Sempre teu...,\n"
"%4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "Estado de %s"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "Confirmación de SMS"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "%s douche un toque"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4428,12 +4731,12 @@ msgstr ""
"With kind regards,\n"
"%4$s\n"
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "%s enviouche unha nova mensaxe privada"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4466,12 +4769,12 @@ msgstr ""
"With kind regards,\n"
"%5$s\n"
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s gustoulle o teu chío"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, fuzzy, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4504,12 +4807,12 @@ msgstr ""
"Fielmente teu,\n"
"%5$s\n"
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4655,7 +4958,12 @@ msgstr "Aconteceu un erro ó inserir o perfil remoto"
msgid "Duplicate notice"
msgstr "Eliminar chío"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Este usuario non che permite suscribirte a el."
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Non se puido inserir a nova subscrición."
@@ -4671,10 +4979,6 @@ msgstr "Respostas"
msgid "Favorites"
msgstr "Favoritos"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "Usuario"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "Band. Entrada"
@@ -4727,6 +5031,15 @@ msgstr "Membro dende"
msgid "All groups"
msgstr "Tódalas etiquetas"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Non hai argumento id."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Público"
@@ -4748,6 +5061,16 @@ msgstr "Destacado"
msgid "Popular"
msgstr "Popular"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Band. Entrada"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Bloquear usuario"
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4788,6 +5111,16 @@ msgstr ""
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Novo chío"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Bloquear usuario"
+
#: lib/subgroupnav.php:83
#, fuzzy, php-format
msgid "People %s subscribes to"
@@ -4817,28 +5150,28 @@ msgstr ""
msgid "(none)"
msgstr "(nada)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "O usuario bloqueoute."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "No se pode suscribir."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "Outro usuario non se puido suscribir a ti."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Non está suscrito!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Non se pode eliminar a subscrición."
@@ -4851,6 +5184,29 @@ msgstr "No"
msgid "Top posters"
msgstr ""
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Bloquear usuario"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Bloquear usuario"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Bloquear usuario"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
#, fuzzy
msgid "Unsubscribe from this user"
@@ -4958,3 +5314,7 @@ msgstr "Ise é un enderezo IM incorrecto."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Aivá, non se permiten correos entrantes."
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Suscrito a %s"
diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo
index 57b3fb49f..792701599 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 3de5c0072..e6adf336f 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:43:33+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:31:58+0000\n"
"Language-Team: Hebrew\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -42,7 +42,7 @@ msgstr "אין הודעה כזו."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "אין משתמש כזה."
@@ -145,7 +145,8 @@ msgstr "עידכון המשתמש נכשל."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -230,12 +231,12 @@ msgstr ""
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -374,6 +375,13 @@ msgstr "כינוי זה כבר תפוס. נסה כינוי אחר."
msgid "Alias can't be the same as nickname."
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 "לא נמצא"
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -465,13 +473,13 @@ msgstr ""
msgid "%s updates favorited by %s / %s."
msgstr ""
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr ""
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -561,7 +569,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
#, fuzzy
msgid "Delete"
msgstr "מחק"
@@ -574,7 +583,7 @@ msgstr "ההעלה"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -584,7 +593,7 @@ msgstr ""
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -652,75 +661,53 @@ msgstr ""
msgid "Unblock user from group"
msgstr "אין משתמש כזה."
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
#, fuzzy
msgid "Unblock this user"
msgstr "אין משתמש כזה."
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "לא מחובר."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr ""
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "כבר נכנסת למערכת!"
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
#, fuzzy
msgid "Block user"
msgstr "אין משתמש כזה."
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "לא"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "אין משתמש כזה."
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "כן"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "אין משתמש כזה."
-#: actions/block.php:165
-#, fuzzy
-msgid "You have already blocked this user."
-msgstr "כבר נכנסת למערכת!"
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr ""
@@ -785,6 +772,15 @@ msgstr "הודעות"
msgid "No such notice."
msgstr "אין הודעה כזו."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "לא מחובר."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr ""
@@ -816,6 +812,144 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "עידכון המשתמש נכשל."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "ניתן להשתמש במנוי המקומי!"
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+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 "אין משתמש כזה."
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "שנה"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+msgid "Theme for the site."
+msgstr ""
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, 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:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "שנה סיסמה"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "התחבר"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "חיפוש"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "טקסט"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "היכנס"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "שמור"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr ""
@@ -959,14 +1093,6 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "שמור"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -980,7 +1106,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr ""
@@ -1180,6 +1306,18 @@ msgstr "אין הודעה כזו."
msgid "Cannot read file."
msgstr "אין הודעה כזו."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr ""
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr ""
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1300,11 +1438,11 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr ""
@@ -1393,7 +1531,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "למשתמש אין פרופיל."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
#, fuzzy
msgid "Error removing the block."
msgstr "שגיאה בשמירת המשתמש."
@@ -1672,7 +1810,7 @@ msgstr "שם משתמש או סיסמה לא נכונים."
msgid "Error setting user."
msgstr "שגיאה ביצירת שם המשתמש."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "היכנס"
@@ -2094,7 +2232,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "שפה"
@@ -2120,7 +2258,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיות)"
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr ""
@@ -2146,7 +2284,7 @@ msgstr "שמירת הפרופיל נכשלה."
msgid "Couldn't save tags."
msgstr "שמירת הפרופיל נכשלה."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "ההגדרות נשמרו."
@@ -2380,7 +2518,7 @@ msgstr "שגיאה באישור הקוד."
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "הירשם"
@@ -2424,7 +2562,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr ""
@@ -2512,7 +2650,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "כתובת הפרופיל שלך בשרות ביקרובלוג תואם אחר"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "הירשם כמנוי"
@@ -2587,6 +2725,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "תגובת עבור %s"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "למשתמש אין פרופיל."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2830,6 +2978,140 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#: actions/silence.php:65 actions/unsilence.php:65
+msgid "You cannot silence users on this site."
+msgstr ""
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "למשתמש אין פרופיל."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+msgid "Site"
+msgstr ""
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+msgid "You must have a valid contact email address"
+msgstr ""
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "הודעה חדשה"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+msgid "contact email address for your site"
+msgstr ""
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+msgid "Default site language"
+msgstr ""
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "פרטיות"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "שיחזור"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "הגדרות"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr ""
@@ -3101,6 +3383,21 @@ msgstr "אין הודעה כזו."
msgid "API method under construction."
msgstr ""
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "כבר נכנסת למערכת!"
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "למשתמש אין פרופיל."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "למשתמש אין פרופיל."
+
#: actions/unsubscribe.php:77
#, fuzzy
msgid "No profile id in request."
@@ -3121,6 +3418,31 @@ msgstr "בטל מנוי"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "מתשמש"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "אין משתמש כזה."
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+msgid "Invite-only"
+msgstr ""
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "אשר מנוי"
@@ -3280,11 +3602,15 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+msgid "You are banned from sending direct messages."
+msgstr ""
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr ""
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr ""
@@ -3314,15 +3640,15 @@ msgid ""
"few minutes."
msgstr ""
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s"
@@ -3353,10 +3679,6 @@ msgstr ""
msgid "Change email handling"
msgstr ""
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3409,101 +3731,106 @@ msgstr "התחבר"
msgid "Connect to services"
msgstr "נכשלה ההפניה לשרת: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "הרשמות"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout"
msgstr "צא"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:454
#, fuzzy
msgid "Create an account"
msgstr "צור חשבון חדש"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr ""
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "עזרה"
-#: lib/action.php:456
+#: lib/action.php:460
#, fuzzy
msgid "Help me!"
msgstr "עזרה"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "חיפוש"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:480
+#: lib/action.php:484
#, fuzzy
msgid "Site notice"
msgstr "הודעה חדשה"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr ""
-#: lib/action.php:612
+#: lib/action.php:616
#, fuzzy
msgid "Page notice"
msgstr "הודעה חדשה"
-#: lib/action.php:714
+#: lib/action.php:718
#, fuzzy
msgid "Secondary site navigation"
msgstr "הרשמות"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "אודות"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "רשימת שאלות נפוצות"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "פרטיות"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "מקור"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "צור קשר"
-#: lib/action.php:736
+#: lib/action.php:740
msgid "Badge"
msgstr ""
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3512,12 +3839,12 @@ msgstr ""
"**%%site.name%%** הוא שרות ביקרובלוג הניתן על ידי [%%site.broughtby%%](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** הוא שרות ביקרובלוג."
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3528,37 +3855,58 @@ msgstr ""
"s, המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)"
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "הודעה חדשה"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr ""
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr ""
-#: lib/action.php:1061
+#: lib/action.php:1076
#, fuzzy
msgid "After"
msgstr "<< אחרי"
-#: lib/action.php:1069
+#: lib/action.php:1084
#, fuzzy
msgid "Before"
msgstr "לפני >>"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr ""
+#: lib/adminpanelaction.php:96
+msgid "You cannot make changes to this site."
+msgstr ""
+
+#: lib/adminpanelaction.php:195
+msgid "showForm() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:224
+msgid "saveSettings() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "הרשמות"
+
+#: lib/adminpanelaction.php:276
+msgid "Design configuration"
+msgstr ""
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3734,30 +4082,36 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה"
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "לא שלחנו אלינו את הפרופיל הזה"
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
+msgstr[1] "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "הרשמה מרוחקת"
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "הרשמה מרוחקת"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "הרשמה מרוחקת"
+msgstr[1] "הרשמה מרוחקת"
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "לא שלחנו אלינו את הפרופיל הזה"
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
+msgstr[1] "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3796,20 +4150,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "אין קוד אישור."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
msgid "Go to the installer."
msgstr ""
@@ -3829,10 +4183,6 @@ msgstr ""
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3843,66 +4193,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "שנה סיסמה"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "התחבר"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "חיפוש"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "טקסט"
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "היכנס"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4140,12 +4430,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s"
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4165,29 +4455,29 @@ msgstr ""
" שלך,\n"
" %4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr ""
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr ""
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
"\n"
msgstr ""
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4200,21 +4490,21 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr ""
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4230,12 +4520,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4254,12 +4544,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4280,12 +4570,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4427,7 +4717,11 @@ msgstr "שגיאה בהכנסת פרופיל מרוחק"
msgid "Duplicate notice"
msgstr "הודעה חדשה"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "הכנסת מנוי חדש נכשלה."
@@ -4443,10 +4737,6 @@ msgstr "תגובות"
msgid "Favorites"
msgstr "מועדפים"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "מתשמש"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr ""
@@ -4498,6 +4788,15 @@ msgstr "חבר מאז"
msgid "All groups"
msgstr ""
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "אין מסמך כזה."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "ציבורי"
@@ -4519,6 +4818,15 @@ msgstr ""
msgid "Popular"
msgstr "אנשים"
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr ""
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "אין משתמש כזה."
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4558,6 +4866,16 @@ msgstr ""
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "הודעה חדשה"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "אין משתמש כזה."
+
#: lib/subgroupnav.php:83
#, fuzzy, php-format
msgid "People %s subscribes to"
@@ -4587,29 +4905,29 @@ msgstr ""
msgid "(none)"
msgstr ""
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
#, fuzzy
msgid "User has blocked you."
msgstr "למשתמש אין פרופיל."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr ""
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr ""
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "לא מנוי!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "מחיקת המנוי לא הצליחה."
@@ -4622,6 +4940,29 @@ msgstr "לא"
msgid "Top posters"
msgstr ""
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "אין משתמש כזה."
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "אין משתמש כזה."
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "אין משתמש כזה."
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr ""
@@ -4726,3 +5067,7 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "הרשמה מרוחקת"
diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo
index 0d3848efd..9a9203ec0 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 e871d86a5..e1a93b509 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:43:36+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:01+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -42,7 +42,7 @@ msgstr "Ekkert þannig merki."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Enginn svoleiðis notandi."
@@ -144,7 +144,8 @@ msgstr "Gat ekki uppfært notanda."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -229,12 +230,12 @@ msgstr "Öll bein skilaboð til %s"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -369,6 +370,13 @@ msgstr ""
msgid "Alias can't be the same as nickname."
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 "Aðferð í forritsskilum fannst ekki!"
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -459,13 +467,13 @@ msgstr "%s / Uppáhaldsbabl frá %s"
msgid "%s updates favorited by %s / %s."
msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s."
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "Rás %s"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -552,7 +560,8 @@ msgstr "Upphafleg mynd"
msgid "Preview"
msgstr "Forsýn"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "Eyða"
@@ -564,7 +573,7 @@ msgstr "Hlaða upp"
msgid "Crop"
msgstr "Skera af"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -574,7 +583,7 @@ msgstr "Skera af"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr "Það kom upp vandamál með setutókann þinn. Vinsamlegast reyndu aftur."
@@ -639,71 +648,50 @@ msgstr ""
msgid "Unblock user from group"
msgstr ""
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Opna"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "Opna á þennan notanda"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Ekki innskráð(ur)."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Engin persónuleg síða tilgreind"
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Engin persónulega síða með þessu einkenni"
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Þú hefur nú þegar lokað á þennan notanda."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "Loka á notanda"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "Nei"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Opna á þennan notanda"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Já"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr "Loka á þennan notanda"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "Þú hefur nú þegar lokað á þennan notanda."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "Mistókst að vista upplýsingar um notendalokun"
@@ -769,6 +757,15 @@ msgstr "Babl"
msgid "No such notice."
msgstr "Ekkert svoleiðis babl."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Ekki innskráð(ur)."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Get ekki eytt þessu babli."
@@ -799,6 +796,141 @@ msgstr "Eyða þessu babli"
msgid "There was a problem with your session token. Try again, please."
msgstr ""
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Gat ekki uppfært notanda."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Þú getur ekki eytt stöðu annars notanda."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "Eyða"
+
+#: 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 "Eyða þessu babli"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "Þessi síða er ekki aðgengileg í "
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Breyta"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "Skrá þig út af síðunni"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, 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:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+msgid "Change colours"
+msgstr ""
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+msgid "Content"
+msgstr ""
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr ""
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Texti"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+msgid "Links"
+msgstr ""
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Vista"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "Þetta babl er ekki í uppáhaldi!"
@@ -941,14 +1073,6 @@ 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:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Vista"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -962,7 +1086,7 @@ msgstr "Ekkert tölvupóstfang."
msgid "Cannot normalize that email address"
msgstr "Get ekki staðlað þetta tölvupóstfang"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "Ekki tækt tölvupóstfang"
@@ -1161,6 +1285,18 @@ msgstr "Ekkert svoleiðis babl."
msgid "Cannot read file."
msgstr "Týndum skránni okkar"
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "Engin persónuleg síða tilgreind"
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "Engin persónulega síða með þessu einkenni"
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1271,11 +1407,11 @@ msgstr "Hópmeðlimir %s, síða %d"
msgid "A list of the users in this group."
msgstr "Listi yfir notendur í þessum hóp."
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "Stjórnandi"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "Loka"
@@ -1358,7 +1494,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr ""
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr "Vill kom upp við að aflétta notendalokun."
@@ -1670,7 +1806,7 @@ msgstr "Rangt notendanafn eða lykilorð."
msgid "Error setting user."
msgstr "Villa kom upp í stillingu notanda."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Innskráning"
@@ -2100,7 +2236,7 @@ msgstr ""
"Merki fyrir þig (bókstafir, tölustafir, -, ., og _), aðskilin með kommu eða "
"bili"
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Tungumál"
@@ -2128,7 +2264,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Lýsingin er of löng (í mesta lagi 140 tákn)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "Tímabelti ekki valið."
@@ -2153,7 +2289,7 @@ msgstr "Gat ekki vistað persónulega síðu."
msgid "Couldn't save tags."
msgstr "Gat ekki vistað merki."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Stillingar vistaðar."
@@ -2386,7 +2522,7 @@ msgstr ""
msgid "Registration successful"
msgstr "Nýskráning tókst"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Nýskrá"
@@ -2431,7 +2567,7 @@ msgid "Same as password above. Required."
msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Tölvupóstur"
@@ -2536,7 +2672,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Veffang persónulegrar síðu á samvirkandi örbloggsþjónustu"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Gerast áskrifandi"
@@ -2614,6 +2750,15 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Skilaboð til %1$s á %2$s"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Þú getur ekki sent þessum notanda skilaboð."
+
+#: actions/sandbox.php:72
+msgid "User is already sandboxed."
+msgstr ""
+
#: actions/showfavorites.php:79
#, php-format
msgid "%s's favorite notices, page %d"
@@ -2853,6 +2998,144 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "Þú getur ekki sent þessum notanda skilaboð."
+
+#: actions/silence.php:72
+msgid "User is already silenced."
+msgstr ""
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "Bjóða"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Ekki tækt tölvupóstfang"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Babl vefsíðunnar"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Nýtt tölvupóstfang til að senda á %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Tungumál (ákjósanlegt)"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Friðhelgi"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Endurheimta"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Stillingar fyrir mynd"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "SMS stillingar"
@@ -3124,6 +3407,21 @@ msgstr "Ekkert þannig merki."
msgid "API method under construction."
msgstr "Aðferð í forritsskilum er í þróun."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Þú hefur nú þegar lokað á þennan notanda."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Notandi hefur ekkert nýtt babl"
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "Notandi hefur enga persónulega síðu."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr "Ekkert einkenni persónulegrar síðu í beiðni."
@@ -3141,6 +3439,31 @@ 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
+msgid "User"
+msgstr "Notandi"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+msgid "Closed"
+msgstr ""
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Bjóða"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Heimila áskriftir"
@@ -3299,11 +3622,16 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Villa kom upp við að senda bein skilaboð"
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "Gat ekki skeytt skilaboðum inn í."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "Gat ekki uppfært skilaboð með nýju veffangi."
@@ -3333,15 +3661,15 @@ msgid ""
"few minutes."
msgstr ""
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Vandamál komu upp við að vista babl."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Gagnagrunnsvilla við innsetningu svars: %s"
@@ -3371,10 +3699,6 @@ msgstr "Breyta lykilorðinu þínu"
msgid "Change email handling"
msgstr "Breyta tölvupóstumsjón"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
msgid "Design your profile"
msgstr ""
@@ -3427,96 +3751,101 @@ msgstr "Tengjast"
msgid "Connect to services"
msgstr "Gat ekki framsent til vefþjóns: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Stikl aðalsíðu"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Bjóða"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 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:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Útskráning"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "Skrá þig út af síðunni"
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr "Búa til aðgang"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "Skrá þig inn á síðuna"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Hjálp"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr "Hjálp!"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Leita"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "Leita að fólki eða texta"
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr "Babl vefsíðunnar"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr "Staðbundin sýn"
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr "Babl síðunnar"
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr "Stikl undirsíðu"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Um"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "Spurt og svarað"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Friðhelgi"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Frumþula"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Tengiliður"
-#: lib/action.php:736
+#: lib/action.php:740
msgid "Badge"
msgstr ""
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr "Hugbúnaðarleyfi StatusNet"
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3525,12 +3854,12 @@ msgstr ""
"**%%site.name%%** er örbloggsþjónusta í boði [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er örbloggsþjónusta."
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3541,35 +3870,60 @@ msgstr ""
"sem er gefinn út undir [GNU Affero almenningsleyfinu](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "Hugbúnaðarleyfi StatusNet"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr "Allt "
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "leyfi."
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "Uppröðun"
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "Eftir"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "Áður"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr "Það komu upp vandamál varðandi setutókann þinn."
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "Þú getur ekki sent þessum notanda skilaboð."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "Skipun hefur ekki verið fullbúin"
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "Skipun hefur ekki verið fullbúin"
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Staðfesting tölvupóstfangs"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "SMS staðfesting"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3744,30 +4098,36 @@ msgstr "Þú ert ekki áskrifandi."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Þú ert ekki áskrifandi."
+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."
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Fólk sem eru áskrifendur að %s"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
+msgstr[1] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Þú ert ekki meðlimur í þessum hópi."
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Þú ert ekki meðlimur í þessum hópi."
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "Þú ert ekki meðlimur í þessum hópi."
+msgstr[1] "Þú ert ekki meðlimur í þessum hópi."
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3806,20 +4166,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Enginn staðfestingarlykill."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
#, fuzzy
msgid "Go to the installer."
msgstr "Skrá þig inn á síðuna"
@@ -3840,10 +4200,6 @@ msgstr "Færslur sendar með SMS"
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
msgid "Upload file"
msgstr ""
@@ -3853,62 +4209,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-msgid "Change colours"
-msgstr ""
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-msgid "Content"
-msgstr ""
-
-#: lib/designsettings.php:204
-msgid "Sidebar"
-msgstr ""
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Texti"
-
-#: lib/designsettings.php:230
-msgid "Links"
-msgstr ""
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4138,12 +4438,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s er að hlusta á bablið þitt á %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4158,17 +4458,17 @@ msgid ""
"Change your email address or notification options at %8$s\n"
msgstr ""
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "Staðsetning: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "Vefsíða: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
@@ -4177,12 +4477,12 @@ msgstr ""
"Lýsing: %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "Nýtt tölvupóstfang til að senda á %s"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4203,21 +4503,21 @@ msgstr ""
"Með kærri kveðju,\n"
"%4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "Staða %s"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "SMS staðfesting"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "%s ýtti við þér"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4233,12 +4533,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "Ný persónuleg skilaboð frá %s"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4257,12 +4557,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s heldur upp á babl frá þér"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4283,12 +4583,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4426,7 +4726,12 @@ msgstr "Villa kom upp við að setja inn persónulega fjarsíðu"
msgid "Duplicate notice"
msgstr "Eyða babli"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Gat ekki sett inn nýja áskrift."
@@ -4442,10 +4747,6 @@ msgstr "Svör"
msgid "Favorites"
msgstr "Uppáhald"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "Notandi"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "Innhólf"
@@ -4495,6 +4796,15 @@ msgstr "Meðlimur síðan"
msgid "All groups"
msgstr "Allir hópar"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Ekkert einkenni gefið upp."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Almenn"
@@ -4515,6 +4825,16 @@ msgstr "Í sviðsljósinu"
msgid "Popular"
msgstr "Vinsælt"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Innhólf"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Opna á þennan notanda"
+
#: lib/searchaction.php:120
msgid "Search site"
msgstr ""
@@ -4551,6 +4871,16 @@ msgstr "Ónafngreindur hluti"
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Babl vefsíðunnar"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Loka á þennan notanda"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4580,28 +4910,28 @@ msgstr ""
msgid "(none)"
msgstr "(ekkert)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "Notandinn hefur lokað á þig."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "Gat ekki farið í áskrift."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Ekki í áskrift!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Gat ekki eytt áskrift."
@@ -4613,6 +4943,29 @@ msgstr "Ekkert"
msgid "Top posters"
msgstr "Aðalbablararnir"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Opna á þennan notanda"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Opna á þennan notanda"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Opna á þennan notanda"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Hætta sem áskrifandi að þessum notanda"
@@ -4714,3 +5067,7 @@ msgstr "Afsakið en þetta er ekki móttökutölvupóstfangið þitt."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Því miður er móttökutölvupóstur ekki leyfður."
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Fólk sem eru áskrifendur að %s"
diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo
index 479d105b0..2dec03ba7 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 231078cc7..c1a19d165 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:43:39+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:04+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -43,7 +43,7 @@ msgstr "Nessuna tale etichetta."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Nessun tale utente."
@@ -146,7 +146,8 @@ msgstr "Impossibile aggiornare l'utente."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -232,12 +233,12 @@ msgstr "Tutti i messaggi diretti inviati a %s"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -378,6 +379,13 @@ msgstr "Soprannome già in uso. Prova con un altro."
msgid "Alias can't be the same as nickname."
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 "Metodo delle API non trovato!"
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -469,13 +477,13 @@ msgstr "%s / Preferiti da %s"
msgid "%s updates favorited by %s / %s."
msgstr "%s aggiornamenti preferiti da %s / %s"
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "Attività di %s"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -563,7 +571,8 @@ msgstr "Originale"
msgid "Preview"
msgstr "Anteprima"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "Elimina"
@@ -575,7 +584,7 @@ msgstr "Carica"
msgid "Crop"
msgstr "Ritaglia"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -585,7 +594,7 @@ msgstr "Ritaglia"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr "C'è stato un problema con il tuo token di sessione. Prova di nuovo."
@@ -652,71 +661,50 @@ msgstr "Un elenco degli utenti in questo gruppo."
msgid "Unblock user from group"
msgstr "Sblocco dell'utente non riuscito."
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Sblocca"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "Sblocca questo utente"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Non connesso."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Nessun profilo specificato."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Nessun profilo con quel ID."
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Hai già bloccato questo utente."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "Blocca utente"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "No"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Sblocca questo utente"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Sì"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr "Blocca questo utente"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "Hai già bloccato questo utente."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "Salvataggio delle informazioni per il blocco non riuscito."
@@ -782,6 +770,15 @@ msgstr "Messaggi"
msgid "No such notice."
msgstr "Nessun tale messaggio."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Non connesso."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Impossibile eliminare questo messaggio."
@@ -817,6 +814,146 @@ msgstr "Elimina questo messaggio"
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/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Impossibile aggiornare l'utente."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Non puoi eliminare lo stato di un altro utente."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "Elimina"
+
+#: 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 "Elimina questo messaggio"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Impossibile salvare le tue impostazioni di Twitter!"
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "Questa pagina non è disponibile in un "
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Modifica"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "Sconnettiti dal sito"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, 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:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Modifica la tua password"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Connetti"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Ricerca"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Testo"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Elenco"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Salva"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "Questo messaggio non è un preferito!"
@@ -963,14 +1100,6 @@ 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:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Salva"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -984,7 +1113,7 @@ msgstr "Nessun indirizzo email."
msgid "Cannot normalize that email address"
msgstr "Impossibile normalizzare l'indirizzo email"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "Non è un indirizzo email valido"
@@ -1186,6 +1315,18 @@ msgstr "Nessun tale messaggio."
msgid "Cannot read file."
msgstr "Perso il nostro file."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "Nessun profilo specificato."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "Nessun profilo con quel ID."
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
#, fuzzy
@@ -1308,11 +1449,11 @@ msgstr "Membri del gruppo %s, pagina %d"
msgid "A list of the users in this group."
msgstr "Un elenco degli utenti in questo gruppo."
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "Amministra"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "Blocca"
@@ -1401,7 +1542,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "L'utente ti ha bloccato."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr "Errore nel rimuovere il blocco."
@@ -1713,7 +1854,7 @@ msgstr "Nome utente o password non corretto."
msgid "Error setting user."
msgstr "Errore nell'impostare l'utente."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Accedi"
@@ -2140,7 +2281,7 @@ msgid ""
msgstr ""
"Le tue etichette (lettere, numeri, -, . e _), separate da virgole o spazi"
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Lingua"
@@ -2168,7 +2309,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "La biografia è troppo lunga (max 140 caratteri)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "Fuso orario non selezionato"
@@ -2193,7 +2334,7 @@ msgstr "Impossibile salvare il profilo."
msgid "Couldn't save tags."
msgstr "Impossibile salvare le etichette."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Impostazioni salvate."
@@ -2431,7 +2572,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:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registra"
@@ -2476,7 +2617,7 @@ msgid "Same as password above. Required."
msgstr "Stessa password di sopra. Richiesta."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2584,7 +2725,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL del tuo profilo su un altro servizio di micro-blog compatibile"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Abbonati"
@@ -2660,6 +2801,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Messaggio a %1$s su %2$s"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Non puoi inviare un messaggio a questo utente."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "L'utente ti ha bloccato."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2905,6 +3056,145 @@ msgstr ""
"**%s** ha un account su %%%%site.name%%%%, un servizio di [micro-blog]"
"(http://it.wikipedia.org/wiki/Microblogging) "
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "Non puoi inviare un messaggio a questo utente."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "L'utente ti ha bloccato."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "Invita"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Non è un indirizzo email valido"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Messaggio del sito"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Nuovo indirizzo email per inviare messaggi a %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Lingua preferita"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Privacy"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Recupera"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Impostazioni immagine"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "Impostazioni SMS"
@@ -3178,6 +3468,21 @@ msgstr "Nessuna tale etichetta."
msgid "API method under construction."
msgstr "Metodo delle API in lavorazione."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Hai già bloccato questo utente."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "L'utente ti ha bloccato."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "L'utente non ha un profilo."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr "Nessun ID di profilo nella richiesta."
@@ -3195,6 +3500,32 @@ msgstr "Annullato abbonamento"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Utente"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Blocca"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Invita"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autorizza abbonamento"
@@ -3357,11 +3688,16 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Errore nell'inviare il messaggio diretto."
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "Impossibile inserire messaggio."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "Impossibile aggiornare il messaggio con il nuovo URI."
@@ -3395,15 +3731,15 @@ msgstr ""
"Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra "
"qualche minuto."
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr "Ti è proibito inviare messaggi su questo sito."
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Problema nel salvare il messaggio."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Errore del DB nell'inserire la risposta: %s"
@@ -3433,10 +3769,6 @@ msgstr "Modifica la tua password"
msgid "Change email handling"
msgstr "Modifica la gestione dell'email"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3488,97 +3820,102 @@ msgstr "Connetti"
msgid "Connect to services"
msgstr "Impossibile redirigere al server: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Esplorazione sito primaria"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invita"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 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:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Esci"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "Sconnettiti dal sito"
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr "Crea un account"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "Accedi al sito"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Aiuto"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr "Aiutami!"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Ricerca"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "Ricerca persone o per testo"
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr "Messaggio del sito"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr "Viste locali"
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr "Pagina messaggio"
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr "Esplorazione secondaria del sito"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Informazioni"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Sorgenti"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Contatti"
-#: lib/action.php:736
+#: lib/action.php:740
#, fuzzy
msgid "Badge"
msgstr "Richiama"
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr "Licenza del software statusnet"
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3587,12 +3924,12 @@ msgstr ""
"**%%site.name%%** è un servizio di micro-blog offerto da [%%site.broughtby%%]"
"(%%site.broughtbyurl%%). "
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** è un servizio di micro-blog. "
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3603,35 +3940,60 @@ msgstr ""
"%s, disponibile sotto licenza [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "Licenza del software statusnet"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr "Tutto "
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "licenza."
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "Paginazione"
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "Successivi"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "Precedenti"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr "C'è stato un problema con il tuo token di sessione."
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "Non puoi inviare un messaggio a questo utente."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "Comando non ancora implementato."
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "Comando non ancora implementato."
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Conferma indirizzo email"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "Conferma SMS"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3807,30 +4169,36 @@ msgstr "Non sei abbonato a quel profilo."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Non sei abbonato a quel profilo."
+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."
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Impossibile abbonare altri a te."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Persone abbonate a %s"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "Impossibile abbonare altri a te."
+msgstr[1] "Impossibile abbonare altri a te."
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Non sei un membro di quel gruppo."
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Non sei un membro di quel gruppo."
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "Non sei un membro di quel gruppo."
+msgstr[1] "Non sei un membro di quel gruppo."
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3869,20 +4237,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Nessun codice di conferma."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
#, fuzzy
msgid "Go to the installer."
msgstr "Accedi al sito"
@@ -3903,10 +4271,6 @@ msgstr "Aggiornamenti via SMS"
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3917,66 +4281,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Modifica la tua password"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Connetti"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Ricerca"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Testo"
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Elenco"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4206,12 +4510,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s sta ora seguendo i tuoi messaggi su %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4232,17 +4536,17 @@ msgstr ""
"Cordiali saluti,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "Ubicazione: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "Pagina web: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
@@ -4251,12 +4555,12 @@ msgstr ""
"Biografia: %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "Nuovo indirizzo email per inviare messaggi a %s"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4277,21 +4581,21 @@ msgstr ""
"Cordiali saluti,\n"
"%4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "stato di %s"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "Conferma SMS"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "%s ti ha richiamato"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4307,12 +4611,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "Nuovo messaggio privato da %s"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4331,12 +4635,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s ha aggiunto il tuo messaggio tra i suoi preferiti"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4357,12 +4661,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4500,7 +4804,12 @@ msgstr "Errore nell'inserire un profilo remoto"
msgid "Duplicate notice"
msgstr "Elimina messaggio"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Quell'utente ti ha bloccato dall'abbonarti."
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Impossibile inserire un nuovo abbonamento."
@@ -4516,10 +4825,6 @@ msgstr "Risposte"
msgid "Favorites"
msgstr "Preferiti"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "Utente"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "In arrivo"
@@ -4570,6 +4875,15 @@ msgstr "Membro dal"
msgid "All groups"
msgstr "Tutti i gruppi"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Nessun argomento ID."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Pubblico"
@@ -4590,6 +4904,16 @@ msgstr "In evidenza"
msgid "Popular"
msgstr "Famosi"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "In arrivo"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Sblocca questo utente"
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4628,6 +4952,16 @@ msgstr "Sezione senza nome"
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Messaggio del sito"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Blocca questo utente"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4657,28 +4991,28 @@ msgstr ""
msgid "(none)"
msgstr "(nessuna)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "L'utente ti ha bloccato."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "Impossibile abbonarsi."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "Impossibile abbonare altri a te."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Non abbonato!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Impossibile eliminare l'abbonamento."
@@ -4690,6 +5024,29 @@ msgstr "Nessuno"
msgid "Top posters"
msgstr "Chi scrive più messaggi"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Sblocca questo utente"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Sblocca questo utente"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Sblocca questo utente"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Annulla l'abbonamento da questo utente"
@@ -4793,3 +5150,7 @@ msgstr "Quella non è la tua email di ricezione."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Email di ricezione non consentita."
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Persone abbonate a %s"
diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo
index 3fd89d064..eeceb93e6 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 eb63104c8..bb8298c7a 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:43:42+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:07+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -43,7 +43,7 @@ msgstr "そのような通知はありません。"
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "そのようなユーザはいません。"
@@ -146,7 +146,8 @@ msgstr "ユーザを更新できません"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -231,12 +232,12 @@ msgstr ""
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -378,6 +379,13 @@ msgstr "そのニックネームは既に使用されています。他のもの
msgid "Alias can't be the same as nickname."
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 メソッドが見つかりません!"
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -469,13 +477,13 @@ msgstr ""
msgid "%s updates favorited by %s / %s."
msgstr ""
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "%s のタイムライン"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -564,7 +572,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "削除"
@@ -576,7 +585,7 @@ msgstr "アップロード"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -586,7 +595,7 @@ msgstr ""
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -654,73 +663,51 @@ msgstr ""
msgid "Unblock user from group"
msgstr "ユーザのアンブロックに失敗しました。"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "アンブロック"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "このユーザをアンブロックする"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "ログインしていません。"
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr ""
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "既にログイン済みです。"
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
#, fuzzy
msgid "Block user"
msgstr "そのようなユーザはいません。"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr ""
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "このユーザをアンブロックする"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr ""
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr "このユーザをブロックする"
-#: actions/block.php:165
-#, fuzzy
-msgid "You have already blocked this user."
-msgstr "既にログイン済みです。"
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr ""
@@ -785,6 +772,15 @@ msgstr "通知"
msgid "No such notice."
msgstr "そのような通知はありません。"
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "ログインしていません。"
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "この通知を削除できません。"
@@ -816,6 +812,144 @@ msgstr "この通知を削除"
msgid "There was a problem with your session token. Try again, please."
msgstr ""
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "ユーザを更新できません"
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "ローカルサブスクリプションを使用可能です!"
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+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 "この通知を削除"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "変更"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "サイトからログアウト"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, 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:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "パスワードの変更"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+msgid "Content"
+msgstr "内容"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "検索"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr ""
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "ログイン"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "保存"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr ""
@@ -960,14 +1094,6 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "保存"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -981,7 +1107,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr "そのメールアドレスを正規化できません"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr ""
@@ -1184,6 +1310,18 @@ msgstr "そのような通知はありません。"
msgid "Cannot read file."
msgstr "そのような通知はありません。"
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr ""
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr ""
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1303,11 +1441,11 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "管理者"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "ブロック"
@@ -1396,7 +1534,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "プロファイルがありません。"
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr "ブロックの削除エラー"
@@ -1700,7 +1838,7 @@ msgstr "ユーザ名またはパスワードが間違っています。"
msgid "Error setting user."
msgstr "ユーザ設定エラー"
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "ログイン"
@@ -2119,7 +2257,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr ""
@@ -2145,7 +2283,7 @@ msgstr "自分を購読している者を自動的に購読する (非人間に
msgid "Bio is too long (max %d chars)."
msgstr "自己紹介が長すぎます (最長140文字)。"
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr ""
@@ -2171,7 +2309,7 @@ msgstr "プロファイルを保存できません"
msgid "Couldn't save tags."
msgstr "プロファイルを保存できません"
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "設定が保存されました。"
@@ -2405,7 +2543,7 @@ msgstr "確認コードにエラーがあります。"
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "登録"
@@ -2450,7 +2588,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "メール"
@@ -2556,7 +2694,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "購読"
@@ -2631,6 +2769,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "%s への返信"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "そのプロファイルは送信されていません。"
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "プロファイルがありません。"
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2875,6 +3023,142 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#: actions/silence.php:65 actions/unsilence.php:65
+msgid "You cannot silence users on this site."
+msgstr ""
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "プロファイルがありません。"
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+msgid "Site"
+msgstr ""
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "有効なメールアドレスではありません。"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "新しい通知"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "そのユーザにはメールアドレスの登録がありません。"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+msgid "Default site language"
+msgstr ""
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "プライバシー"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "回復"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "設定"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr ""
@@ -3146,6 +3430,21 @@ msgstr "そのような通知はありません。"
msgid "API method under construction."
msgstr "API メソッドが工事中です。"
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "既にログイン済みです。"
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "プロファイルがありません。"
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "プロファイルがありません。"
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr "リクエスト内にプロファイルIDがありません。"
@@ -3163,6 +3462,31 @@ msgstr "サブスクライブ解除済み"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "ブロック"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+msgid "Invite-only"
+msgstr ""
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "購読を許可"
@@ -3318,11 +3642,15 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+msgid "You are banned from sending direct messages."
+msgstr ""
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr ""
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr ""
@@ -3352,15 +3680,15 @@ msgid ""
"few minutes."
msgstr ""
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "通知を保存する際に問題が発生しました。"
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "返信を追加する際にデータベースエラー : %s"
@@ -3390,10 +3718,6 @@ msgstr "パスワードの変更"
msgid "Change email handling"
msgstr "メールの扱いを変更"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3445,100 +3769,105 @@ msgstr "接続"
msgid "Connect to services"
msgstr "サーバへリダイレクトできません : %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "サブスクリプション"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout"
msgstr "ログアウト"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "サイトからログアウト"
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr "アカウントを作成"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "サイトへログイン"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "ヘルプ"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr "助けて!"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "検索"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "人々かテキストを検索"
-#: lib/action.php:480
+#: lib/action.php:484
#, fuzzy
msgid "Site notice"
msgstr "新しい通知"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr ""
-#: lib/action.php:612
+#: lib/action.php:616
#, fuzzy
msgid "Page notice"
msgstr "新しい通知"
-#: lib/action.php:714
+#: lib/action.php:718
#, fuzzy
msgid "Secondary site navigation"
msgstr "サブスクリプション"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "解説"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "よくある質問"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "プライバシー"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "ソース"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "連絡先"
-#: lib/action.php:736
+#: lib/action.php:740
#, fuzzy
msgid "Badge"
msgstr "突く"
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3547,12 +3876,12 @@ msgstr ""
"**%%site.name%%** は [%%site.broughtby%%](%%site.broughtbyurl%%) が提供するマ"
"イクロブログサービスです。 "
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** はマイクロブログサービスです。 "
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3563,37 +3892,59 @@ msgstr ""
"いています。 ライセンス [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)。"
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "新しい通知"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "ライセンス。"
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr ""
-#: lib/action.php:1061
+#: lib/action.php:1076
#, fuzzy
msgid "After"
msgstr "<< 前"
-#: lib/action.php:1069
+#: lib/action.php:1084
#, fuzzy
msgid "Before"
msgstr "前 >>"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr ""
+#: lib/adminpanelaction.php:96
+msgid "You cannot make changes to this site."
+msgstr ""
+
+#: lib/adminpanelaction.php:195
+msgid "showForm() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:224
+msgid "saveSettings() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "メールアドレス確認"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "メールアドレス確認"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3769,30 +4120,36 @@ msgstr "そのプロファイルは送信されていません。"
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "そのプロファイルは送信されていません。"
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "そのプロファイルは送信されていません。"
+msgstr[1] "そのプロファイルは送信されていません。"
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "リモートサブスクライブ"
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "リモートサブスクライブ"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "リモートサブスクライブ"
+msgstr[1] "リモートサブスクライブ"
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "そのプロファイルは送信されていません。"
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "そのプロファイルは送信されていません。"
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "そのプロファイルは送信されていません。"
+msgstr[1] "そのプロファイルは送信されていません。"
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3831,20 +4188,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "確認コードがありません。"
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
#, fuzzy
msgid "Go to the installer."
msgstr "サイトへログイン"
@@ -3865,10 +4222,6 @@ msgstr ""
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3879,65 +4232,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "パスワードの変更"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-msgid "Content"
-msgstr "内容"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "検索"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr ""
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "ログイン"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4167,12 +4461,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s は %2$s であなたの通知を購読しています。"
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4193,29 +4487,29 @@ msgstr ""
"確かにあなたの,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "場所: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "ホームページ: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
"\n"
msgstr ""
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4228,21 +4522,21 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "%s の状態"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "あなたは %s に突かれています"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4258,12 +4552,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4282,12 +4576,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1$s は %2$s であなたの通知を聞いています。"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4308,12 +4602,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4452,7 +4746,11 @@ msgstr "リモートプロファイル追加エラー"
msgid "Duplicate notice"
msgstr "新しい通知"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "サブスクリプションを追加できません"
@@ -4468,10 +4766,6 @@ msgstr "返信"
msgid "Favorites"
msgstr ""
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr ""
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr ""
@@ -4522,6 +4816,15 @@ msgstr "からのメンバー"
msgid "All groups"
msgstr ""
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "そのようなドキュメントはありません。"
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "パブリック"
@@ -4542,6 +4845,15 @@ msgstr ""
msgid "Popular"
msgstr "人気"
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr ""
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "このユーザをアンブロックする"
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4580,6 +4892,16 @@ msgstr "名称未設定のセクション"
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "新しい通知"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "このユーザをブロックする"
+
#: lib/subgroupnav.php:83
#, fuzzy, php-format
msgid "People %s subscribes to"
@@ -4609,29 +4931,29 @@ msgstr ""
msgid "(none)"
msgstr "(なし)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
#, fuzzy
msgid "User has blocked you."
msgstr "プロファイルがありません。"
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr ""
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr ""
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "購読していません!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "サブスクリプションを削除できません"
@@ -4643,6 +4965,29 @@ msgstr ""
msgid "Top posters"
msgstr "上位投稿者"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "このユーザをアンブロックする"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "このユーザをアンブロックする"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "このユーザをアンブロックする"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "このユーザからのサブスクライブを解除する"
@@ -4746,3 +5091,7 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "リモートサブスクライブ"
diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo
index 870956380..19e0ecb93 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 19a9f4a6e..b3cf335b8 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:43:45+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:10+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -42,7 +42,7 @@ msgstr "그러한 태그가 없습니다."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "그러한 사용자는 없습니다."
@@ -145,7 +145,8 @@ msgstr "사용자를 업데이트 할 수 없습니다."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -231,12 +232,12 @@ msgstr "%s에게 모든 직접 메시지"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -377,6 +378,13 @@ msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십
msgid "Alias can't be the same as nickname."
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 메서드를 찾을 수 없습니다."
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -468,13 +476,13 @@ msgstr "%s / %s의 좋아하는 글들"
msgid "%s updates favorited by %s / %s."
msgstr "%s 좋아하는 글이 업데이트 됐습니다. %S에 의해 / %s."
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "%s 타임라인"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -562,7 +570,8 @@ msgstr "원래 설정"
msgid "Preview"
msgstr "미리보기"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "삭제"
@@ -574,7 +583,7 @@ msgstr "올리기"
msgid "Crop"
msgstr "자르기"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -584,7 +593,7 @@ msgstr "자르기"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr "세션토큰에 문제가 있습니다. 다시 시도해주세요."
@@ -651,71 +660,50 @@ msgstr "이 그룹의 회원리스트"
msgid "Unblock user from group"
msgstr "사용자 차단 해제에 실패했습니다."
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "차단해제"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "이 사용자를 차단해제합니다."
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "로그인하고 있지 않습니다."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "프로필을 지정하지 않았습니다."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "해당 ID의 프로필이 없습니다."
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "당신은 이미 이 사용자를 차단하고 있습니다."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "사용자를 차단합니다."
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "아니오"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "이 사용자를 차단해제합니다."
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "네, 맞습니다."
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr "이 사용자 차단하기"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "당신은 이미 이 사용자를 차단하고 있습니다."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "정보차단을 저장하는데 실패했습니다."
@@ -781,6 +769,15 @@ msgstr "통지"
msgid "No such notice."
msgstr "그러한 통지는 없습니다."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "로그인하고 있지 않습니다."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "이 통지를 지울 수 없습니다."
@@ -815,6 +812,146 @@ msgstr "이 게시글 삭제하기"
msgid "There was a problem with your session token. Try again, please."
msgstr "세션토큰에 문제가 있습니다. 다시 시도해주세요."
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "사용자를 업데이트 할 수 없습니다."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "당신은 다른 사용자의 상태를 삭제하지 않아도 된다."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+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 "이 게시글 삭제하기"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "트위터 환경설정을 저장할 수 없습니다."
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "변환"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "이 사이트로부터 로그아웃"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, fuzzy, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다."
+
+#: actions/designadminpanel.php:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "비밀번호 바꾸기"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "연결"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "검색"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "문자"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "로그인"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "저장"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "이 메시지는 favorite이 아닙니다."
@@ -958,14 +1095,6 @@ msgstr "이메일로 통보를 포스트 하길 원합니다."
msgid "Publish a MicroID for my email address."
msgstr "이메일 주소를 위한 MicroID의 생성"
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "저장"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -979,7 +1108,7 @@ msgstr "이메일이 추가 되지 않았습니다."
msgid "Cannot normalize that email address"
msgstr "그 이메일 주소를 정규화 할 수 없습니다."
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "유효한 이메일 주소가 아닙니다."
@@ -1179,6 +1308,18 @@ msgstr "그러한 통지는 없습니다."
msgid "Cannot read file."
msgstr "파일을 잃어버렸습니다."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "프로필을 지정하지 않았습니다."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "해당 ID의 프로필이 없습니다."
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
#, fuzzy
@@ -1301,11 +1442,11 @@ msgstr "%s 그룹 회원, %d페이지"
msgid "A list of the users in this group."
msgstr "이 그룹의 회원리스트"
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "관리자"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "차단하기"
@@ -1394,7 +1535,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "회원이 당신을 차단해왔습니다."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr "차단 제거 에러!"
@@ -1694,7 +1835,7 @@ msgstr "틀린 계정 또는 비밀 번호"
msgid "Error setting user."
msgstr "사용자 세팅 오류"
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "로그인"
@@ -2116,7 +2257,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr "당신을 위한 태그, (문자,숫자,-, ., _로 구성) 콤마 혹은 공백으로 구분."
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "언어"
@@ -2142,7 +2283,7 @@ msgstr "나에게 구독하는 사람에게 자동 구독 신청"
msgid "Bio is too long (max %d chars)."
msgstr "자기소개가 너무 깁니다. (최대 140글자)"
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "타임존이 설정 되지 않았습니다."
@@ -2167,7 +2308,7 @@ msgstr "프로필을 저장 할 수 없습니다."
msgid "Couldn't save tags."
msgstr "태그를 저장할 수 없습니다."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "설정 저장"
@@ -2403,7 +2544,7 @@ msgstr "확인 코드 오류"
msgid "Registration successful"
msgstr "회원 가입이 성공적입니다."
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "회원가입"
@@ -2449,7 +2590,7 @@ msgid "Same as password above. Required."
msgstr "위와 같은 비밀 번호. 필수 사항."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "이메일"
@@ -2554,7 +2695,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "다른 마이크로블로깅 서비스의 귀하의 프로필 URL"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "구독"
@@ -2630,6 +2771,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "%2$s에서 %1$s까지 메시지"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "회원이 당신을 차단해왔습니다."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2875,6 +3026,145 @@ msgstr ""
"**%s**는 %%%%site.name%%%% [마이크로블로깅](http://en.wikipedia.org/wiki/"
"Micro-blogging) 서비스에 계정을 갖고 있습니다."
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "회원이 당신을 차단해왔습니다."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "초대"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "유효한 이메일 주소가 아닙니다."
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "사이트 공지"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "%s에 포스팅 할 새로운 이메일 주소"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "언어 설정"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "개인정보 취급방침"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "복구"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "아바타 설정"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "SMS 세팅"
@@ -3144,6 +3434,21 @@ msgstr "그러한 태그가 없습니다."
msgid "API method under construction."
msgstr "API 메서드를 구성중 입니다."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "당신은 이미 이 사용자를 차단하고 있습니다."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "회원이 당신을 차단해왔습니다."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "이용자가 프로필을 가지고 있지 않습니다."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr "요청한 프로필id가 없습니다."
@@ -3161,6 +3466,32 @@ msgstr "구독취소 되었습니다."
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "이용자"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "차단하기"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "초대"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "구독을 허가"
@@ -3321,11 +3652,16 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "직접 메시지 보내기 오류."
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "메시지를 삽입할 수 없습니다."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "새 URI와 함께 메시지를 업데이트할 수 없습니다."
@@ -3359,15 +3695,15 @@ msgstr ""
"너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 "
"해보세요."
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었습니다."
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "통지를 저장하는데 문제가 발생했습니다."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s"
@@ -3397,10 +3733,6 @@ msgstr "비밀번호 바꾸기"
msgid "Change email handling"
msgstr "이메일 처리 변경"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3452,97 +3784,102 @@ msgstr "연결"
msgid "Connect to services"
msgstr "서버에 재접속 할 수 없습니다 : %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "주 사이트 네비게이션"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "초대"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "%s에 친구를 가입시키기 위해 친구와 동료를 초대합니다."
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout"
msgstr "로그아웃"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "이 사이트로부터 로그아웃"
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr "계정 만들기"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "이 사이트 로그인"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "도움말"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr "도움이 필요해!"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "검색"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "프로필이나 텍스트 검색"
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr "사이트 공지"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr "로컬 뷰"
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr "페이지 공지"
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr "보조 사이트 네비게이션"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "정보"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "자주 묻는 질문"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "개인정보 취급방침"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "소스 코드"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "연락하기"
-#: lib/action.php:736
+#: lib/action.php:740
#, fuzzy
msgid "Badge"
msgstr "찔러 보기"
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr "라코니카 소프트웨어 라이선스"
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3551,12 +3888,12 @@ msgstr ""
"**%%site.name%%** 는 [%%site.broughtby%%](%%site.broughtbyurl%%)가 제공하는 "
"마이크로블로깅서비스입니다."
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3567,35 +3904,60 @@ msgstr ""
"을 사용합니다. StatusNet는 [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 있습니다."
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "라코니카 소프트웨어 라이선스"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr "모든 것"
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "라이선스"
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "페이지수"
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "뒷 페이지"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "앞 페이지"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr "당신의 세션토큰관련 문제가 있습니다."
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "명령이 아직 실행되지 않았습니다."
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "명령이 아직 실행되지 않았습니다."
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "이메일 주소 확인서"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "SMS 인증"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3771,30 +4133,36 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "당신은 이 프로필에 구독되지 않고있습니다."
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "당신은 이 프로필에 구독되지 않고있습니다."
+msgstr[1] "당신은 이 프로필에 구독되지 않고있습니다."
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "다른 사람을 구독 하실 수 없습니다."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "%s에 의해 구독되는 사람들"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "다른 사람을 구독 하실 수 없습니다."
+msgstr[1] "다른 사람을 구독 하실 수 없습니다."
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "당신은 해당 그룹의 멤버가 아닙니다."
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "당신은 해당 그룹의 멤버가 아닙니다."
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다."
+msgstr[1] "당신은 해당 그룹의 멤버가 아닙니다."
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3833,20 +4201,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "확인 코드가 없습니다."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
#, fuzzy
msgid "Go to the installer."
msgstr "이 사이트 로그인"
@@ -3867,10 +4235,6 @@ msgstr "SMS에 의한 업데이트"
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3881,66 +4245,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "비밀번호 바꾸기"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "연결"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "검색"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "문자"
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "로그인"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4170,12 +4474,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4194,17 +4498,17 @@ msgstr ""
"\n"
"그럼 이만,%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "위치: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "홈페이지: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
@@ -4213,12 +4517,12 @@ msgstr ""
"소개: %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "%s에 포스팅 할 새로운 이메일 주소"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4233,21 +4537,21 @@ msgstr ""
"포스팅 주소는 %1$s입니다.새 메시지를 등록하려면 %2$ 주소로 이메일을 보내십시"
"오.이메일 사용법은 %3$s 페이지를 보십시오.안녕히,%4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "%s 상태"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "SMS 인증"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "%s 사용자가 찔러 봤습니다."
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4263,12 +4567,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "%s로부터 새로운 비밀 메시지가 도착하였습니다."
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4287,12 +4591,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s님이 당신의 게시글을 좋아하는 글로 추가했습니다."
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4313,12 +4617,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4456,7 +4760,12 @@ msgstr "리모트 프로필 추가 오류"
msgid "Duplicate notice"
msgstr "통지 삭제"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "이 회원은 구독으로부터 당신을 차단해왔다."
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "예약 구독을 추가 할 수 없습니다."
@@ -4472,10 +4781,6 @@ msgstr "답신"
msgid "Favorites"
msgstr "좋아하는 글들"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "이용자"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "받은 쪽지함"
@@ -4526,6 +4831,15 @@ msgstr "가입한 때"
msgid "All groups"
msgstr "모든 그룹"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "id 인자가 없습니다."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "공개"
@@ -4546,6 +4860,16 @@ msgstr "피쳐링됨"
msgid "Popular"
msgstr "인기있는"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "받은 쪽지함"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "이 사용자를 차단해제합니다."
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4584,6 +4908,16 @@ msgstr "제목없는 섹션"
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "사이트 공지"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "이 사용자 차단하기"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4613,28 +4947,28 @@ msgstr ""
msgid "(none)"
msgstr "(없습니다)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "회원이 당신을 차단해왔습니다."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "구독 하실 수 없습니다."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "다른 사람을 구독 하실 수 없습니다."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "구독하고 있지 않습니다!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "예약 구독을 삭제 할 수 없습니다."
@@ -4646,6 +4980,29 @@ msgstr "없음"
msgid "Top posters"
msgstr "상위 게시글 등록자"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "이 사용자를 차단해제합니다."
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "이 사용자를 차단해제합니다."
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "이 사용자를 차단해제합니다."
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "이 사용자로부터 구독취소합니다."
@@ -4749,3 +5106,7 @@ msgstr "죄송합니다. 귀하의 이메일이 아닙니다."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "죄송합니다. 이메일이 허용되지 않습니다."
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "%s에 의해 구독되는 사람들"
diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo
index 6b2713593..a3e2cb11a 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 d011d7379..15b72bd19 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:43:48+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:13+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -43,7 +43,7 @@ msgstr "Нема такво известување."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Нема таков корисник."
@@ -146,7 +146,8 @@ msgstr "Корисникот не може да се освежи/"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -231,12 +232,12 @@ msgstr ""
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -375,6 +376,13 @@ msgstr "Тој прекар е во употреба. Одберете друг.
msgid "Alias can't be the same as nickname."
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 "Не е пронаједено барање."
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -466,13 +474,13 @@ msgstr ""
msgid "%s updates favorited by %s / %s."
msgstr ""
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr ""
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -562,7 +570,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr ""
@@ -574,7 +583,7 @@ msgstr "Товари"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -584,7 +593,7 @@ msgstr ""
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -651,75 +660,53 @@ msgstr ""
msgid "Unblock user from group"
msgstr "Нема таков корисник."
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
#, fuzzy
msgid "Unblock this user"
msgstr "Нема таков корисник."
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Не сте пријавени."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr ""
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Веќе сте пријавени!"
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
#, fuzzy
msgid "Block user"
msgstr "Нема таков корисник."
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr ""
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Нема таков корисник."
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr ""
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Нема таков корисник."
-#: actions/block.php:165
-#, fuzzy
-msgid "You have already blocked this user."
-msgstr "Веќе сте пријавени!"
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr ""
@@ -784,6 +771,15 @@ msgstr "Известувања"
msgid "No such notice."
msgstr "Нема такво известување."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Не сте пријавени."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr ""
@@ -815,6 +811,143 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Корисникот не може да се освежи/"
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Може да ја користите локалната претплата."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+msgid "Delete user"
+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 "Нема таков корисник."
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате."
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Промени"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+msgid "Theme for the site."
+msgstr ""
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, 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:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Промени ја лозинката"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Поврзи се"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Барај"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr ""
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Пријави се"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Сними"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr ""
@@ -957,14 +1090,6 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Сними"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -978,7 +1103,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr ""
@@ -1178,6 +1303,18 @@ msgstr "Нема такво известување."
msgid "Cannot read file."
msgstr "Нема такво известување."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr ""
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr ""
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1297,11 +1434,11 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr ""
@@ -1390,7 +1527,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "Корисникот нема профил."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
#, fuzzy
msgid "Error removing the block."
msgstr "Грешка во снимањето на корисникот."
@@ -1670,7 +1807,7 @@ msgstr "Неточно корисничко име или лозинка"
msgid "Error setting user."
msgstr "Грешка во поставувањето на корисникот."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Пријави се"
@@ -2096,7 +2233,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr ""
@@ -2122,7 +2259,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Биографијата е предолга (максимумот е 140 знаци)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr ""
@@ -2148,7 +2285,7 @@ msgstr "Профилот не може да се сними."
msgid "Couldn't save tags."
msgstr "Профилот не може да се сними."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Поставките се снимени."
@@ -2386,7 +2523,7 @@ msgstr "Грешка со кодот за потврдување."
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистрирај се"
@@ -2430,7 +2567,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Е-пошта"
@@ -2522,7 +2659,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL на Вашиот профил на друго компатибилно место за микроблогирање."
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Претплати се"
@@ -2597,6 +2734,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Одговори испратени до %s"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Не ни го испративте тој профил."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Корисникот нема профил."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2840,6 +2987,142 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#: actions/silence.php:65 actions/unsilence.php:65
+msgid "You cannot silence users on this site."
+msgstr ""
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "Корисникот нема профил."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+msgid "Site"
+msgstr ""
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Неправилна адреса за е-пошта."
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Ново известување"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Нема регистрирана адреса за е-пошта за тој корисник."
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+msgid "Default site language"
+msgstr ""
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Приватност"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Пронајди"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Поставки"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr ""
@@ -3111,6 +3394,21 @@ msgstr "Нема такво известување."
msgid "API method under construction."
msgstr ""
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Веќе сте пријавени!"
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Корисникот нема профил."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "Корисникот нема профил."
+
#: actions/unsubscribe.php:77
#, fuzzy
msgid "No profile id in request."
@@ -3131,6 +3429,31 @@ msgstr "Откажи ја претплатата"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Нема таков корисник."
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+msgid "Invite-only"
+msgstr ""
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Одобрете ја претплатата"
@@ -3291,11 +3614,15 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+msgid "You are banned from sending direct messages."
+msgstr ""
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr ""
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr ""
@@ -3325,15 +3652,15 @@ msgid ""
"few minutes."
msgstr ""
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Проблем во снимањето на известувањето."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Одговор од внесот во базата: %s"
@@ -3364,10 +3691,6 @@ msgstr ""
msgid "Change email handling"
msgstr ""
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3420,101 +3743,106 @@ msgstr "Поврзи се"
msgid "Connect to services"
msgstr "Не може да се пренасочи кон серверот: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Претплати"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Одјави се"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:454
#, fuzzy
msgid "Create an account"
msgstr "Креирај нова сметка"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr ""
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Помош"
-#: lib/action.php:456
+#: lib/action.php:460
#, fuzzy
msgid "Help me!"
msgstr "Помош"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Барај"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:480
+#: lib/action.php:484
#, fuzzy
msgid "Site notice"
msgstr "Ново известување"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr ""
-#: lib/action.php:612
+#: lib/action.php:616
#, fuzzy
msgid "Page notice"
msgstr "Ново известување"
-#: lib/action.php:714
+#: lib/action.php:718
#, fuzzy
msgid "Secondary site navigation"
msgstr "Претплати"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "За"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "ЧПП"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Приватност"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Изворен код"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:736
+#: lib/action.php:740
msgid "Badge"
msgstr ""
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3523,12 +3851,12 @@ msgstr ""
"**%%site.name%%** е сервис за микроблогирање што ви го овозможува [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** е сервис за микроблогирање."
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3539,37 +3867,59 @@ msgstr ""
"верзија %s, достапен пд [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "Ново известување"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr ""
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr ""
-#: lib/action.php:1061
+#: lib/action.php:1076
#, fuzzy
msgid "After"
msgstr "« Следни"
-#: lib/action.php:1069
+#: lib/action.php:1084
#, fuzzy
msgid "Before"
msgstr "Предходни »"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr ""
+#: lib/adminpanelaction.php:96
+msgid "You cannot make changes to this site."
+msgstr ""
+
+#: lib/adminpanelaction.php:195
+msgid "showForm() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:224
+msgid "saveSettings() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Потврдување на адресата"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "Потврдување на адресата"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3745,30 +4095,36 @@ msgstr "Не ни го испративте тој профил."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Не ни го испративте тој профил."
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "Не ни го испративте тој профил."
+msgstr[1] "Не ни го испративте тој профил."
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Оддалечена претплата"
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Оддалечена претплата"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "Оддалечена претплата"
+msgstr[1] "Оддалечена претплата"
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Не ни го испративте тој профил."
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Не ни го испративте тој профил."
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "Не ни го испративте тој профил."
+msgstr[1] "Не ни го испративте тој профил."
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3807,20 +4163,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Нема код за потврда."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
msgid "Go to the installer."
msgstr ""
@@ -3840,10 +4196,6 @@ msgstr ""
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3854,66 +4206,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Промени ја лозинката"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Поврзи се"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Барај"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr ""
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Пријави се"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4151,12 +4443,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s сега ги следи вашите забелешки за %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4177,29 +4469,29 @@ msgstr ""
"Искрено ваш,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr ""
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr ""
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
"\n"
msgstr ""
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4212,21 +4504,21 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr ""
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4242,12 +4534,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4266,12 +4558,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1$s сега ги следи вашите забелешки за %2$s."
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4292,12 +4584,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4438,7 +4730,11 @@ msgstr "Грешка во внесувањето на оддалечениот
msgid "Duplicate notice"
msgstr "Дуплирано известување"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Не може да се внесе нова претплата."
@@ -4454,10 +4750,6 @@ msgstr "Одговори"
msgid "Favorites"
msgstr ""
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr ""
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr ""
@@ -4508,6 +4800,15 @@ msgstr "Член од"
msgid "All groups"
msgstr ""
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Нема таков документ."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Јавен"
@@ -4529,6 +4830,15 @@ msgstr ""
msgid "Popular"
msgstr "Пребарување на луѓе"
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr ""
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Нема таков корисник."
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4568,6 +4878,16 @@ msgstr ""
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Ново известување"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Нема таков корисник."
+
#: lib/subgroupnav.php:83
#, fuzzy, php-format
msgid "People %s subscribes to"
@@ -4597,29 +4917,29 @@ msgstr ""
msgid "(none)"
msgstr ""
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
#, fuzzy
msgid "User has blocked you."
msgstr "Корисникот нема профил."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr ""
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr ""
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Не сте претплатени!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Претплата не може да се избрише."
@@ -4631,6 +4951,29 @@ msgstr ""
msgid "Top posters"
msgstr ""
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Нема таков корисник."
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Нема таков корисник."
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Нема таков корисник."
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr ""
@@ -4734,3 +5077,7 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Оддалечена претплата"
diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo
index ee9dea03a..00a1f197f 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 0ced02905..51c5cbac6 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:43:51+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:16+0000\n"
"Language-Team: Norwegian (bokmål)‬\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -48,7 +48,7 @@ msgstr "Klarte ikke å lagre profil."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr ""
@@ -151,7 +151,8 @@ msgstr "Klarte ikke å oppdatere bruker."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -236,12 +237,12 @@ msgstr ""
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -381,6 +382,13 @@ msgstr "Det nicket er allerede i bruk. Prøv et annet."
msgid "Alias can't be the same as nickname."
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-metode ikke funnet!"
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -470,13 +478,13 @@ msgstr ""
msgid "%s updates favorited by %s / %s."
msgstr ""
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "%s tidslinje"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -565,7 +573,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
#, fuzzy
msgid "Delete"
msgstr "slett"
@@ -578,7 +587,7 @@ msgstr "Last opp"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -588,7 +597,7 @@ msgstr ""
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -655,72 +664,50 @@ msgstr ""
msgid "Unblock user from group"
msgstr ""
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr ""
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Ikke logget inn."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr ""
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Du er allerede logget inn!"
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr ""
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr ""
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Kan ikke slette notisen."
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr ""
-#: actions/block.php:165
-#, fuzzy
-msgid "You have already blocked this user."
-msgstr "Du er allerede logget inn!"
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr ""
@@ -785,6 +772,15 @@ msgstr ""
msgid "No such notice."
msgstr ""
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Ikke logget inn."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Kan ikke slette notisen."
@@ -816,6 +812,144 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Klarte ikke å oppdatere bruker."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Ugyldig OpenID"
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "slett"
+
+#: 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 "Kan ikke slette notisen."
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: actions/designadminpanel.php:301
+#, php-format
+msgid "Theme not available: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Endre"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+msgid "Theme for the site."
+msgstr ""
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr ""
+
+#: actions/designadminpanel.php:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Endre passordet ditt"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Koble til"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Søk"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Tekst"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Logg inn"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Lagre"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr ""
@@ -959,14 +1093,6 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr "Publiser en MicroID for min e-postadresse."
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Lagre"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -980,7 +1106,7 @@ msgstr "Ingen e-postadresse."
msgid "Cannot normalize that email address"
msgstr "Klarer ikke normalisere epostadressen"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "Ugyldig e-postadresse"
@@ -1178,6 +1304,18 @@ msgstr "Klarte ikke å lagre profil."
msgid "Cannot read file."
msgstr "Klarte ikke å lagre profil."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr ""
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr ""
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1291,11 +1429,11 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr ""
@@ -1380,7 +1518,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr ""
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr ""
@@ -1672,7 +1810,7 @@ msgstr "Feil brukernavn eller passord"
msgid "Error setting user."
msgstr ""
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
@@ -2084,7 +2222,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Språk"
@@ -2111,7 +2249,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "«Om meg» er for lang (maks 140 tegn)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr ""
@@ -2137,7 +2275,7 @@ msgstr "Klarte ikke å lagre profil."
msgid "Couldn't save tags."
msgstr "Klarte ikke å lagre profil."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr ""
@@ -2369,7 +2507,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -2414,7 +2552,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-post"
@@ -2517,7 +2655,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr ""
@@ -2590,6 +2728,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Svar til %s"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Du er allerede logget inn!"
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Du er allerede logget inn!"
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2831,6 +2979,139 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#: actions/silence.php:65 actions/unsilence.php:65
+msgid "You cannot silence users on this site."
+msgstr ""
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "Du er allerede logget inn!"
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+msgid "Site"
+msgstr ""
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Ugyldig e-postadresse"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+msgid "Site name"
+msgstr ""
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+msgid "contact email address for your site"
+msgstr ""
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+msgid "Default site language"
+msgstr ""
+
+#: actions/siteadminpanel.php:282
+msgid "Private"
+msgstr ""
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Gjenopprett"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Innstillinger for IM"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "Innstillinger for SMS"
@@ -3100,6 +3381,19 @@ msgstr ""
msgid "API method under construction."
msgstr "API-metode under utvikling."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Du er allerede logget inn!"
+
+#: actions/unsandbox.php:72
+msgid "User is not sandboxed."
+msgstr ""
+
+#: actions/unsilence.php:72
+msgid "User is not silenced."
+msgstr ""
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr ""
@@ -3117,6 +3411,30 @@ msgstr ""
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+msgid "Closed"
+msgstr ""
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+msgid "Invite-only"
+msgstr ""
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autoriser abonnementet"
@@ -3266,11 +3584,15 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+msgid "You are banned from sending direct messages."
+msgstr ""
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr ""
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr ""
@@ -3298,15 +3620,15 @@ msgid ""
"few minutes."
msgstr ""
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
@@ -3336,10 +3658,6 @@ msgstr "Endre passordet ditt"
msgid "Change email handling"
msgstr "Endre eposthåndtering"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3391,98 +3709,102 @@ msgstr "Koble til"
msgid "Connect to services"
msgstr ""
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+msgid "Change site configuration"
+msgstr ""
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Logg ut"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:454
#, fuzzy
msgid "Create an account"
msgstr "Opprett en ny konto"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr ""
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Hjelp"
-#: lib/action.php:456
+#: lib/action.php:460
#, fuzzy
msgid "Help me!"
msgstr "Hjelp"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Søk"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr ""
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr ""
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr ""
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Om"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "OSS/FAQ"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr ""
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Kilde"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:736
+#: lib/action.php:740
msgid "Badge"
msgstr ""
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3491,12 +3813,12 @@ msgstr ""
"**%%site.name%%** er en mikrobloggingtjeneste av [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er en mikrobloggingtjeneste. "
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3504,35 +3826,55 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:785
+#: lib/action.php:789
msgid "Site content license"
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr ""
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr ""
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr ""
-#: lib/action.php:1069
+#: lib/action.php:1084
#, fuzzy
msgid "Before"
msgstr "Tidligere »"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr ""
+#: lib/adminpanelaction.php:96
+msgid "You cannot make changes to this site."
+msgstr ""
+
+#: lib/adminpanelaction.php:195
+msgid "showForm() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:224
+msgid "saveSettings() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:273
+msgid "Basic site configuration"
+msgstr ""
+
+#: lib/adminpanelaction.php:276
+msgid "Design configuration"
+msgstr ""
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3707,30 +4049,36 @@ msgstr "Ikke autorisert."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Svar til %s"
+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"
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Svar til %s"
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Svar til %s"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "Svar til %s"
+msgstr[1] "Svar til %s"
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du er allerede logget inn!"
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Du er allerede logget inn!"
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "Du er allerede logget inn!"
+msgstr[1] "Du er allerede logget inn!"
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3769,20 +4117,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Fant ikke bekreftelseskode."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
msgid "Go to the installer."
msgstr ""
@@ -3802,10 +4150,6 @@ msgstr ""
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3816,66 +4160,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Endre passordet ditt"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Koble til"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Søk"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Tekst"
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Logg inn"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4113,12 +4397,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s lytter nå til dine notiser på %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4139,29 +4423,29 @@ msgstr ""
"Vennlig hilsen,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr ""
-#: lib/mail.php:255
+#: lib/mail.php:256
#, fuzzy, php-format
msgid "Homepage: %s\n"
msgstr "Hjemmesiden: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
"\n"
msgstr ""
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4174,21 +4458,21 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "%s status"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4204,12 +4488,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4228,12 +4512,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4254,12 +4538,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4397,7 +4681,11 @@ msgstr ""
msgid "Duplicate notice"
msgstr ""
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr ""
@@ -4413,10 +4701,6 @@ msgstr "Svar"
msgid "Favorites"
msgstr ""
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr ""
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr ""
@@ -4467,6 +4751,14 @@ msgstr "Medlem siden"
msgid "All groups"
msgstr ""
+#: lib/profileformaction.php:123
+msgid "No return-to arguments"
+msgstr ""
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
#, fuzzy
msgid "Public"
@@ -4489,6 +4781,15 @@ msgstr ""
msgid "Popular"
msgstr ""
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr ""
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Kan ikke slette notisen."
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4527,6 +4828,15 @@ msgstr ""
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+msgid "Silence"
+msgstr ""
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Kan ikke slette notisen."
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4556,28 +4866,28 @@ msgstr ""
msgid "(none)"
msgstr ""
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr ""
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr ""
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr ""
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Alle abonnementer"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr ""
@@ -4589,6 +4899,29 @@ msgstr ""
msgid "Top posters"
msgstr ""
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Kan ikke slette notisen."
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Kan ikke slette notisen."
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Kan ikke slette notisen."
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr ""
@@ -4692,3 +5025,7 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#, 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 ff15e5ade..5384ea6b4 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 2f3944f4e..2335a82cf 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:43:59+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:22+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -43,7 +43,7 @@ msgstr "Deze pagina bestaat niet"
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Onbekende gebruiker."
@@ -154,7 +154,8 @@ msgstr "Het was niet mogelijk de gebruiker te actualiseren."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -241,12 +242,12 @@ msgstr "Alle directe berichten verzonden aan %s"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -385,6 +386,13 @@ msgstr "De alias \"%s\" wordt al gebruikt. Geef een ander alias op."
msgid "Alias can't be the same as nickname."
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!"
+
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
msgstr "U bent al lid van die groep."
@@ -474,13 +482,13 @@ msgstr "%s / Favorieten van %s"
msgid "%s updates favorited by %s / %s."
msgstr "%s updates op de favorietenlijst geplaatst door %s / %s"
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "%s tijdlijn"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -568,7 +576,8 @@ msgstr "Origineel"
msgid "Preview"
msgstr "Voorvertoning"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "Verwijderen"
@@ -580,7 +589,7 @@ msgstr "Uploaden"
msgid "Crop"
msgstr "Uitsnijden"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -590,7 +599,7 @@ msgstr "Uitsnijden"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -656,40 +665,24 @@ msgstr "Een lijst met voor deze groep geblokkeerde gebruikers."
msgid "Unblock user from group"
msgstr "Deze gebruiker weer toegang geven tot de groep"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Deblokkeer"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "Deblokkeer deze gebruiker."
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Niet aangemeld."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Er is geen profiel opgegeven."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Er is geen profiel met dat ID."
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "U hebt deze gebruiker reeds geblokkeerd."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "Gebruiker blokkeren"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -700,30 +693,25 @@ msgstr ""
"toekomst niet op u abonneren. U wordt niet op de hoogte gesteld van \"@\"-"
"antwoorden van de gebruiker."
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "Nee"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
msgid "Do not block this user"
msgstr "Gebruiker deblokkeren"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr "Deze gebruiker blokkeren"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "U hebt deze gebruiker reeds geblokkeerd."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
@@ -787,6 +775,15 @@ msgstr "Mededelingen"
msgid "No such notice."
msgstr "De mededeling bestaat niet."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Niet aangemeld."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Deze mededeling kan niet verwijderd worden."
@@ -820,6 +817,144 @@ msgid "There was a problem with your session token. Try again, please."
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."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "U kunt de status van een andere gebruiker niet verwijderen."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "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 ""
+
+#: actions/deleteuser.php:148 lib/deleteuserform.php:77
+#, fuzzy
+msgid "Delete this user"
+msgstr "Deze mededeling verwijderen"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr "Ontwerp"
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan."
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "IM is niet beschikbaar."
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Wijzigen"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "Van de site afmelden"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr "Achtergrondafbeelding wijzigen"
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "Achtergrond"
+
+#: actions/designadminpanel.php:429
+#, fuzzy, 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."
+
+#: actions/designadminpanel.php:459 lib/designsettings.php:139
+msgid "On"
+msgstr "Aan"
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr "Uit"
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr "Achtergrondafbeelding inschakelen of uitschakelen."
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr "Achtergrondafbeelding naast elkaar"
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Kleuren wijzigen"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+msgid "Content"
+msgstr "Inhoud"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "Menubalk"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Tekst"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+msgid "Links"
+msgstr "Verwijzingen"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "Standaardinstellingen gebruiken"
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr "Standaardontwerp toepassen"
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr "Standaardinstellingen toepassen"
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Opslaan"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr "Ontwerp opslaan"
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "Deze mededeling staats niet op uw favorietenlijst."
@@ -965,14 +1100,6 @@ msgstr "Ik wil mededelingen per e-mail versturen."
msgid "Publish a MicroID for my email address."
msgstr "Een MicroID voor mijn e-mailadres publiceren."
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Opslaan"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -986,7 +1113,7 @@ msgstr "Geen e-mailadres"
msgid "Cannot normalize that email address"
msgstr "Kan het emailadres niet normaliseren"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "Geen geldig e-mailadres."
@@ -1190,6 +1317,18 @@ msgstr "Het bestand bestaat niet."
msgid "Cannot read file."
msgstr "Het bestand kon niet gelezen worden."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "Er is geen profiel opgegeven."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "Er is geen profiel met dat ID."
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1309,11 +1448,11 @@ msgstr "% groeps leden, pagina %d"
msgid "A list of the users in this group."
msgstr "Ledenlijst van deze groep"
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "Beheerder"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "Blokkeren"
@@ -1409,7 +1548,7 @@ msgstr "Alleen beheerders kunnen groepsleden deblokkeren."
msgid "User is not blocked from group."
msgstr "De gebruiker is niet de toegang tot de groep ontzegd."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr "Er is een fout opgetreden bij het verwijderen van de blokkade."
@@ -1720,7 +1859,7 @@ msgstr "De gebruikersnaam of wachtwoord is onjuist."
msgid "Error setting user."
msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Aanmelden"
@@ -2148,7 +2287,7 @@ msgstr ""
"Eigen labels (letter, getallen, -, ., en _). Gescheiden door komma's of "
"spaties"
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Taal"
@@ -2176,7 +2315,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "De beschrijving is te lang (maximaal %d tekens)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "Er is geen tijdzone geselecteerd."
@@ -2203,7 +2342,7 @@ msgstr "Het profiel kon niet opgeslagen worden."
msgid "Couldn't save tags."
msgstr "Het was niet mogelijk de labels op te slaan."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "De instellingen zijn opgeslagen."
@@ -2456,7 +2595,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:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registreren"
@@ -2502,7 +2641,7 @@ msgid "Same as password above. Required."
msgstr "Gelijk aan het wachtwoord hierboven. Verplicht"
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -2609,7 +2748,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "De URL van uw profiel bij een andere, compatibele microblogdienst"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Abonneren"
@@ -2690,6 +2829,16 @@ msgstr ""
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."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Deze gebruiker is al de toegang tot de groep ontzegd."
+
#: actions/showfavorites.php:79
#, php-format
msgid "%s's favorite notices, page %d"
@@ -2959,6 +3108,145 @@ msgstr ""
"(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software "
"[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."
+
+#: 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:272
+#, fuzzy
+msgid "Site"
+msgstr "Uitnodigen"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Geen geldig e-mailadres."
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Kennisgeving van site"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Nieuw e-mailadres om e-mail te versturen aan %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Voorkeurstaal"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Privacy"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Herstellen"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Avatarinstellingen"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "SMS-instellingen"
@@ -3241,6 +3529,21 @@ msgstr "Onbekend label."
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."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "De gebruiker is niet de toegang tot de groep ontzegd."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "Deze gebruiker heeft geen profiel."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr "Het profiel-ID was niet aanwezig in het verzoek."
@@ -3260,6 +3563,32 @@ 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
+msgid "User"
+msgstr "Gebruiker"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Geblokkeerd"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Uitnodigen"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Abonneren"
@@ -3424,11 +3753,16 @@ msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
"Een bestand van deze grootte overschijdt uw maandelijkse quota van %d bytes."
-#: classes/Message.php:55
+#: 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."
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "Het was niet mogelijk het bericht in te voegen."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI."
@@ -3464,16 +3798,16 @@ msgstr ""
"Te veel duplicaatberichten te snel achter elkaar. Neem een adempauze en "
"plaats over een aantal minuten pas weer een bericht."
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr ""
"U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site."
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
@@ -3504,10 +3838,6 @@ msgstr "Uw wachtwoord wijzigen"
msgid "Change email handling"
msgstr "E-mailafhandeling wijzigen"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr "Ontwerp"
-
#: lib/accountsettingsaction.php:124
msgid "Design your profile"
msgstr "Uw profiel ontwerpen"
@@ -3557,96 +3887,101 @@ msgstr "Koppelen"
msgid "Connect to services"
msgstr "Met diensten verbinden"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Primaire sitenavigatie"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Uitnodigen"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 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:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Afmelden"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "Van de site afmelden"
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr "Gebruiker aanmaken"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "Bij de site aanmelden"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Help"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Zoeken"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "Naar gebruikers of tekst zoeken"
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr "Kennisgeving van site"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr "Lokale weergaven"
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr "Kennisgeving van pagina"
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr "Secundaire sitenavigatie"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Over"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "Veelgestelde vragen"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr "TOS"
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Bron"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:736
+#: lib/action.php:740
msgid "Badge"
msgstr "Naamplaatje"
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr "Licentie van de StatusNet-software"
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3655,12 +3990,12 @@ msgstr ""
"**%%site.name%%** is een microblogdienst van [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** is een microblogdienst. "
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3671,34 +4006,59 @@ msgstr ""
"versie %s, beschikbaar onder de [GNU Affero General Public License](http://"
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:785
+#: lib/action.php:789
msgid "Site content license"
msgstr "Licentie voor siteinhoud"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr "Alle "
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "licentie."
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "Na"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "Voor"
-#: lib/action.php:1117
+#: lib/action.php:1132
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."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "Dit commando is nog niet geïmplementeerd."
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "Dit commando is nog niet geïmplementeerd."
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "E-mailadresbevestiging"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "SMS-bevestiging"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "Bijlagen"
@@ -3876,37 +4236,39 @@ msgstr ""
"geldig: %s"
#: lib/command.php:618
-#, fuzzy
msgid "You are not subscribed to anyone."
-msgstr "U bent niet geabonneerd op dat profiel."
+msgstr "U bent op geen enkele gebruiker geabonneerd."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "U bent niet geabonneerd op dat profiel."
+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: "
-#: lib/command.php:637
-#, fuzzy
+#: lib/command.php:640
msgid "No one is subscribed to you."
-msgstr "Het was niet mogelijk om een ander op u te laten abonneren"
+msgstr "Niemand heeft een abonnenment op u."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Gebruikers met een abonnement op %s"
+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."
-#: lib/command.php:656
-#, fuzzy
+#: lib/command.php:662
msgid "You are not a member of any groups."
-msgstr "U bent geen lid van deze groep"
+msgstr "U bent lid van geen enkele groep."
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "U bent geen lid van deze groep."
+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: "
-#: lib/command.php:670
-#, fuzzy
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3949,6 +4311,9 @@ msgstr ""
"off - notificaties uitschakelen\n"
"help - deze hulptekst weergeven\n"
"follow <gebruiker> - abonneren op gebruiker\n"
+"groups - geef uw groepslidmaatschappen weer\n"
+"subscriptions - geeft uw gebruikersabonnenmenten weer\n"
+"subscribers - geeft de gebruikers die een abonnement op u hebben weer\n"
"leave <gebruiker> - abonnement op gebruiker opzeggen\n"
"d <gebruiker> <tekst> - direct bericht aan gebruiker\n"
"get <gebruiker> - laatste mededeling van gebruiker opvragen\n"
@@ -3979,20 +4344,20 @@ msgstr ""
"tracks - nog niet beschikbaar\n"
"tracking - nog niet beschikbaar\n"
-#: lib/common.php:192
+#: lib/common.php:203
msgid "No configuration file found. "
msgstr "Er is geen instellingenbestand aangetroffen. "
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen: "
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
"U kunt proberen de installer uit te voeren om dit probleem op te lossen."
-#: lib/common.php:195
+#: lib/common.php:206
msgid "Go to the installer."
msgstr "Naar het installatieprogramma gaan."
@@ -4012,10 +4377,6 @@ msgstr "Updates via SMS"
msgid "Database error"
msgstr "Databasefout"
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr "Achtergrondafbeelding wijzigen"
-
#: lib/designsettings.php:105
msgid "Upload file"
msgstr "Bestand uploaden"
@@ -4027,62 +4388,6 @@ msgstr ""
"U kunt een persoonlijke achtergrondafbeelding uploaden. De maximale "
"bestandsgroote is 2 megabyte."
-#: lib/designsettings.php:139
-msgid "On"
-msgstr "Aan"
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr "Uit"
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr "Achtergrondafbeelding inschakelen of uitschakelen."
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr "Achtergrondafbeelding naast elkaar"
-
-#: lib/designsettings.php:170
-msgid "Change colours"
-msgstr "Kleuren wijzigen"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr "Achtergrond"
-
-#: lib/designsettings.php:191
-msgid "Content"
-msgstr "Inhoud"
-
-#: lib/designsettings.php:204
-msgid "Sidebar"
-msgstr "Menubalk"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Tekst"
-
-#: lib/designsettings.php:230
-msgid "Links"
-msgstr "Verwijzingen"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr "Standaardinstellingen gebruiken"
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr "Standaardontwerp toepassen"
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr "Standaardinstellingen toepassen"
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr "Ontwerp opslaan"
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr "Foutieve standaard kleurinstellingen: "
@@ -4325,12 +4630,12 @@ msgstr ""
"Dank u wel voor uw tijd.\n"
"%s\n"
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s volgt nu uw berichten %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4355,17 +4660,17 @@ msgstr ""
"----\n"
"Wijzig uw e-mailadres of instellingen op %8$s\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "Locatie: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "Thuispagina: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
@@ -4374,12 +4679,12 @@ msgstr ""
"Beschrijving: %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "Nieuw e-mailadres om e-mail te versturen aan %s"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4400,21 +4705,21 @@ msgstr ""
"Met vriendelijke groet,\n"
"%4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "%s status"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "SMS-bevestiging"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "%s heeft u gepord"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4442,12 +4747,12 @@ msgstr ""
"Met vriendelijke groet,\n"
"%4$s\n"
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "U hebt een nieuw privébericht van %s."
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4481,12 +4786,12 @@ msgstr ""
"Met vriendelijke groet,\n"
"%5$s\n"
-#: lib/mail.php:554
+#: lib/mail.php:559
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) heeft uw mededeling als favoriet toegevoegd"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4524,12 +4829,12 @@ msgstr ""
"Met vriendelijke groet,\n"
"%6$s\n"
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) heeft u een mededeling gestuurd"
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4682,7 +4987,13 @@ msgstr ""
msgid "Duplicate notice"
msgstr "Kennisgeving van duplicaat"
-#: lib/oauthstore.php:487
+#: 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."
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Kon nieuw abonnement niet toevoegen."
@@ -4698,10 +5009,6 @@ msgstr "Antwoorden"
msgid "Favorites"
msgstr "Favorieten"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "Gebruiker"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "Postvak IN"
@@ -4751,6 +5058,15 @@ msgstr "Lid sinds"
msgid "All groups"
msgstr "Alle groepen"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Geen ID-argument."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Openbaar"
@@ -4771,6 +5087,16 @@ msgstr "Uitgelicht"
msgid "Popular"
msgstr "Populair"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Postvak IN"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Deblokkeer deze gebruiker."
+
#: lib/searchaction.php:120
msgid "Search site"
msgstr "Site doorzoeken"
@@ -4807,6 +5133,16 @@ msgstr "Naamloze sectie"
msgid "More..."
msgstr "Meer..."
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Kennisgeving van site"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Deze gebruiker blokkeren"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4836,27 +5172,27 @@ msgstr ""
msgid "(none)"
msgstr "(geen)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr "U bent al gebonneerd!"
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "Deze gebruiker negeert u."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "Kan niet abonneren "
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "Het was niet mogelijk om een ander op u te laten abonneren"
-#: lib/subs.php:124
+#: lib/subs.php:128
msgid "Not subscribed!"
msgstr "Niet geabonneerd!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Kon abonnement niet verwijderen."
@@ -4868,6 +5204,29 @@ msgstr "Geen"
msgid "Top posters"
msgstr "Meest actieve gebruikers"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Deblokkeer deze gebruiker."
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Deblokkeer deze gebruiker."
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Deblokkeer deze gebruiker."
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Uitschrijven van deze gebruiker"
@@ -4969,3 +5328,6 @@ msgstr "Dit is niet uw inkomende e-mailadres."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Inkomende e-mail is niet toegestaan."
+
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "De volgende gebruikers hebben een abonnement op u: "
diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo
index abb9b6191..306a5b624 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 7dcdcb0df..dc1a70e1e 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:43:54+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:19+0000\n"
"Language-Team: Norwegian Nynorsk\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -42,7 +42,7 @@ msgstr "Dette emneord finst ikkje."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Brukaren finst ikkje."
@@ -145,7 +145,8 @@ msgstr "Kan ikkje oppdatera brukar."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -231,12 +232,12 @@ msgstr "Alle direkte meldingar sendt til %s"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -375,6 +376,13 @@ msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
msgid "Alias can't be the same as nickname."
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 "Fann ikkje API-metode."
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -466,13 +474,13 @@ msgstr "%s / Favorittar frå %s"
msgid "%s updates favorited by %s / %s."
msgstr "%s oppdateringar favorisert av %s / %s."
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "%s tidsline"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -560,7 +568,8 @@ msgstr "Original"
msgid "Preview"
msgstr "Forhandsvis"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "Slett"
@@ -572,7 +581,7 @@ msgstr "Last opp"
msgid "Crop"
msgstr "Skaler"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -582,7 +591,7 @@ msgstr "Skaler"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt."
@@ -649,71 +658,50 @@ msgstr "Ei liste over brukarane i denne gruppa."
msgid "Unblock user from group"
msgstr "De-blokkering av brukar feila."
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Lås opp"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "Lås opp brukaren"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Ikkje logga inn"
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Ingen vald profil."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Fann ingen profil med den IDen."
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Du har allereie blokkert denne brukaren."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "Blokker brukaren"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "Nei"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Lås opp brukaren"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Jau"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr "Blokkér denne brukaren"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "Du har allereie blokkert denne brukaren."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "Lagring av informasjon feila."
@@ -779,6 +767,15 @@ msgstr "Notisar"
msgid "No such notice."
msgstr "Denne notisen finst ikkje."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Ikkje logga inn"
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Kan ikkje sletta notisen."
@@ -814,6 +811,146 @@ msgstr "Slett denne notisen"
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/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Kan ikkje oppdatera brukar."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Du kan ikkje sletta statusen til ein annan brukar."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "Slett"
+
+#: 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 "Slett denne notisen"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "Denne sida er ikkje tilgjengleg i eit"
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Endra"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "Logg ut or sida"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, 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:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Endra passordet ditt"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Kopla til"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Søk"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Tekst"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Logg inn"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Lagra"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "Denne notisen er ikkje ein favoritt!"
@@ -958,14 +1095,6 @@ 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:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Lagra"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -979,7 +1108,7 @@ msgstr "Ingen epostadresse."
msgid "Cannot normalize that email address"
msgstr "Klarar ikkje normalisera epostadressa"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "Ikkje ei gyldig epostadresse"
@@ -1179,6 +1308,18 @@ msgstr "Denne notisen finst ikkje."
msgid "Cannot read file."
msgstr "Mista fila vår."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "Ingen vald profil."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "Fann ingen profil med den IDen."
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
#, fuzzy
@@ -1301,11 +1442,11 @@ msgstr "%s medlemmar i gruppa, side %d"
msgid "A list of the users in this group."
msgstr "Ei liste over brukarane i denne gruppa."
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "Blokkér"
@@ -1394,7 +1535,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "Brukar har blokkert deg."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr "Feil ved fjerning av blokka."
@@ -1696,7 +1837,7 @@ msgstr "Feil brukarnamn eller passord"
msgid "Error setting user."
msgstr "Feil ved å setja brukar."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
@@ -2124,7 +2265,7 @@ msgstr ""
"merkelappar for deg sjølv ( bokstavar, nummer, -, ., og _ ), komma eller "
"mellomroms separert."
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Språk"
@@ -2151,7 +2292,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "«Om meg» er for lang (maks 140 "
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "Tidssone er ikkje valt."
@@ -2176,7 +2317,7 @@ msgstr "Kan ikkje lagra profil."
msgid "Couldn't save tags."
msgstr "Kan ikkje lagra merkelapp."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Lagra innstillingar."
@@ -2413,7 +2554,7 @@ msgstr "Feil med stadfestingskode."
msgid "Registration successful"
msgstr "Registreringa gikk bra"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrér"
@@ -2459,7 +2600,7 @@ msgid "Same as password above. Required."
msgstr "Samme som passord over. Påkrevd."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Epost"
@@ -2567,7 +2708,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL til profilsida di på ei anna kompatibel mikrobloggingteneste."
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Ting"
@@ -2643,6 +2784,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Melding til %1$s på %2$s"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Du kan ikkje sende melding til denne brukaren."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Brukar har blokkert deg."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2888,6 +3039,145 @@ msgstr ""
"**%s** har ein konto på %%%%site.name%%%%, ei [mikroblogging](http://en."
"wikipedia.org/wiki/Micro-blogging)-teneste"
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "Du kan ikkje sende melding til denne brukaren."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "Brukar har blokkert deg."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "Invitér"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Ikkje ei gyldig epostadresse"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Statusmelding"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Ny epostadresse for å oppdatera %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Foretrukke språk"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Personvern"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Gjenopprett"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Avatar-innstillingar"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "SMS innstillingar"
@@ -3161,6 +3451,21 @@ msgstr "Dette emneord finst ikkje."
msgid "API method under construction."
msgstr "API-metoden er ikkje ferdig enno."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Du har allereie blokkert denne brukaren."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Brukar har blokkert deg."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "Brukaren har inga profil."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr "Ingen profil-ID i førespurnaden."
@@ -3178,6 +3483,32 @@ msgstr "Fjerna tinging"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Brukar"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Blokkér"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Invitér"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autoriser tinging"
@@ -3339,11 +3670,16 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Ein feil oppstod ved sending av direkte melding."
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "Kunne ikkje lagre melding."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "Kunne ikkje oppdatere melding med ny URI."
@@ -3375,15 +3711,15 @@ msgid ""
msgstr ""
"For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Databasefeil, kan ikkje lagra svar: %s"
@@ -3413,10 +3749,6 @@ msgstr "Endra passordet ditt"
msgid "Change email handling"
msgstr "Endra eposthandtering"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3468,97 +3800,102 @@ msgstr "Kopla til"
msgid "Connect to services"
msgstr "Klarte ikkje å omdirigera til tenaren: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Navigasjon for hovudsida"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invitér"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 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:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Logg ut"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "Logg ut or sida"
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr "Opprett ny konto"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "Logg inn or sida"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Hjelp"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr "Hjelp meg!"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Søk"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "Søk etter folk eller innhald"
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr "Statusmelding"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr "Lokale syningar"
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr "Sidenotis"
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr "Andrenivås side navigasjon"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Om"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "OSS"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Personvern"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Kjeldekode"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:736
+#: lib/action.php:740
#, fuzzy
msgid "Badge"
msgstr "Dult"
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr "StatusNets programvarelisens"
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3567,12 +3904,12 @@ msgstr ""
"**%%site.name%%** er ei mikrobloggingteneste av [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er ei mikrobloggingteneste. "
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3583,35 +3920,60 @@ msgstr ""
"%s, tilgjengeleg under [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "StatusNets programvarelisens"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr "Alle"
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "lisens."
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "« Etter"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "Før »"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr "Det var eit problem med sesjons billetten din."
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "Du kan ikkje sende melding til denne brukaren."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "Kommando ikkje implementert."
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "Kommando ikkje implementert."
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Stadfesting av epostadresse"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "SMS bekreftelse"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3787,30 +4149,36 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Du tingar ikkje oppdateringar til den profilen."
+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."
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Kan ikkje tinga andre til deg."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Mennesker som tingar %s"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "Kan ikkje tinga andre til deg."
+msgstr[1] "Kan ikkje tinga andre til deg."
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du er ikkje medlem av den gruppa."
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Du er ikkje medlem av den gruppa."
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "Du er ikkje medlem av den gruppa."
+msgstr[1] "Du er ikkje medlem av den gruppa."
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3849,20 +4217,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Ingen stadfestingskode."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
#, fuzzy
msgid "Go to the installer."
msgstr "Logg inn or sida"
@@ -3883,10 +4251,6 @@ msgstr "Oppdateringar over SMS"
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3897,66 +4261,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Endra passordet ditt"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Kopla til"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Søk"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Tekst"
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Logg inn"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4186,12 +4490,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s høyrer no på notisane dine på %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4212,17 +4516,17 @@ msgstr ""
"Beste helsing,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "Stad: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "Heimeside: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
@@ -4231,12 +4535,12 @@ msgstr ""
"Bio: %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "Ny epostadresse for å oppdatera %s"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4256,21 +4560,21 @@ msgstr ""
"\n"
"Helsing frå %4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "%s status"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "SMS bekreftelse"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "Du har blitt dulta av %s"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4286,12 +4590,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "Ny privat melding fra %s"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4310,12 +4614,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s la til di melding som ein favoritt"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4336,12 +4640,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4479,7 +4783,12 @@ msgstr "Feil med å henta inn ekstern profil"
msgid "Duplicate notice"
msgstr "Slett notis"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Kan ikkje leggja til ny tinging."
@@ -4495,10 +4804,6 @@ msgstr "Svar"
msgid "Favorites"
msgstr "Favorittar"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "Brukar"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "Innboks"
@@ -4549,6 +4854,15 @@ msgstr "Medlem sidan"
msgid "All groups"
msgstr "Alle gruppar"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Manglar argumentet ID."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Offentleg"
@@ -4569,6 +4883,16 @@ msgstr "Framheva"
msgid "Popular"
msgstr "Populære"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Innboks"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Lås opp brukaren"
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4607,6 +4931,16 @@ msgstr "Seksjon utan tittel"
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Statusmelding"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Blokkér denne brukaren"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4636,28 +4970,28 @@ msgstr ""
msgid "(none)"
msgstr "(ingen)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "Brukar har blokkert deg."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "Kan ikkje tinga."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "Kan ikkje tinga andre til deg."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Ikkje tinga."
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Kan ikkje sletta tinging."
@@ -4669,6 +5003,29 @@ msgstr "Ingen"
msgid "Top posters"
msgstr "Med flest meldingar"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Lås opp brukaren"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Lås opp brukaren"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Lås opp brukaren"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Fjern tinging fra denne brukaren"
@@ -4772,3 +5129,7 @@ msgstr "Beklager, det er ikkje di inngåande epost addresse."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Beklager, inngåande epost er ikkje tillatt."
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Mennesker som tingar %s"
diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo
index d3ab4e974..b9d95d0d3 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 94fb477f1..e9bb0fd74 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:44:02+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:25+0000\n"
"Language-Team: Polish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -42,7 +42,7 @@ msgstr "Nie ma takiego znacznika."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Brak takiego użytkownika."
@@ -153,7 +153,8 @@ msgstr "Nie można zaktualizować użytkownika."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -243,12 +244,12 @@ msgstr "Wszystkie bezpośrednie wiadomości wysłane do użytkownika %s"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -382,6 +383,13 @@ msgstr "Alias \"%s\" jest już używany. Spróbuj innego."
msgid "Alias can't be the same as nickname."
msgstr "Alias nie może być taki sam jak pseudonim."
+#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
+#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#, fuzzy
+msgid "Group not found!"
+msgstr "Nie znaleziono metody API!"
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -473,13 +481,13 @@ msgstr "%s/ulubione wpisy od %s"
msgid "%s updates favorited by %s / %s."
msgstr "Użytkownik %s aktualizuje ulubione według %s/%s."
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "Oś czasu użytkownika %s"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -566,7 +574,8 @@ msgstr "Oryginał"
msgid "Preview"
msgstr "Podgląd"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "Usuń"
@@ -578,7 +587,7 @@ msgstr "Wyślij"
msgid "Crop"
msgstr "Przytnij"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -588,7 +597,7 @@ msgstr "Przytnij"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
@@ -652,40 +661,24 @@ msgstr "Lista użytkowników zablokowanych w tej grupie."
msgid "Unblock user from group"
msgstr "Odblokuj użytkownika w tej grupie"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Odblokuj"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "Odblokuj tego użytkownika"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Niezalogowany."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Nie podano profilu."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Brak profilu o tym identyfikatorze."
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Ten użytkownik został już zablokowany."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "Zablokuj użytkownika"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -695,31 +688,26 @@ msgstr ""
"do Ciebie zostanie usunięta, nie będzie mógł Cię zasubskrybować w "
"przyszłości i nie będziesz powiadamiany o żadnych odpowiedziach @ od niego."
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "Nie"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Odblokuj tego użytkownika"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Tak"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr "Zablokuj tego użytkownika"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "Ten użytkownik został już zablokowany."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "Zapisanie informacji o blokadzie nie powiodło się."
@@ -784,6 +772,15 @@ msgstr "Wpisy"
msgid "No such notice."
msgstr "Nie ma takiego wpisu."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Niezalogowany."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Nie można usunąć tego wpisu."
@@ -816,6 +813,142 @@ msgstr "Usuń ten wpis"
msgid "There was a problem with your session token. Try again, please."
msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Nie można zaktualizować użytkownika."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Nie można usuwać statusów innych użytkowników."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "Usuń"
+
+#: 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 "Usuń ten wpis"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr "Wygląd"
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Nie można zapisać ustawień wyglądu!"
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "Ta strona nie jest dostępna w "
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Zmień"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "Wyloguj się ze strony"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr "Zmień obraz tłas"
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "Tło"
+
+#: actions/designadminpanel.php:429
+#, 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:459 lib/designsettings.php:139
+msgid "On"
+msgstr "Włączone"
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr "Wyłączone"
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr "Włącz lub wyłącz obraz tła."
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr "Kafelkowy obraz tła"
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Zmień kolory"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+msgid "Content"
+msgstr "Zawartość"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "Panel boczny"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Tekst"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+msgid "Links"
+msgstr "Odnośniki"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "Użyj domyślnych"
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr "Przywróć domyślny wygląd"
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr "Przywróć domyślne ustawienia"
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Zapisz"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr "Zapisz wygląd"
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "Ten wpis nie jest ulubiony!"
@@ -959,14 +1092,6 @@ 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:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Zapisz"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -980,7 +1105,7 @@ msgstr "Brak adresu e-mail."
msgid "Cannot normalize that email address"
msgstr "Nie można znormalizować tego adresu e-mail"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "To nie jest prawidłowy adres e-mail"
@@ -1185,6 +1310,18 @@ msgstr "Nie ma takiego wpisu."
msgid "Cannot read file."
msgstr "Utracono plik."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "Nie podano profilu."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "Brak profilu o tym identyfikatorze."
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1298,11 +1435,11 @@ msgstr "Członkowie grupy %s, strona %d"
msgid "A list of the users in this group."
msgstr "Lista użytkowników znajdujących się w tej grupie."
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "Zablokuj"
@@ -1396,7 +1533,7 @@ msgstr "Tylko administrator może odblokowywać członków grupy."
msgid "User is not blocked from group."
msgstr "Użytkownik nie został zablokowany w grupie."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr "Błąd podczas usuwania blokady."
@@ -1709,7 +1846,7 @@ msgstr "Niepoprawna nazwa użytkownika lub hasło."
msgid "Error setting user."
msgstr "Błąd podczas ustawiania użytkownika."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Zaloguj się"
@@ -2139,7 +2276,7 @@ msgstr ""
"Znaczniki dla siebie (litery, liczby, -, . i _), oddzielone przecinkami lub "
"spacjami"
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Język"
@@ -2167,7 +2304,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Wpis \"O mnie\" jest za długi (maksymalnie 140 znaków)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "Nie wybrano strefy czasowej."
@@ -2192,7 +2329,7 @@ msgstr "Nie można zapisać profilu."
msgid "Couldn't save tags."
msgstr "Nie można zapisać znaczników."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Zapisano ustawienia."
@@ -2436,7 +2573,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:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Zarejestruj się"
@@ -2487,7 +2624,7 @@ msgid "Same as password above. Required."
msgstr "Takie samo jak powyższe hasło. Wymagane."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -2593,7 +2730,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Zasubskrybuj"
@@ -2675,6 +2812,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Wiadomość do użytkownika %1$s na %2$s"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Nie można wysłać wiadomości do tego użytkownika."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Użytkownik został już zablokował w grupie."
+
#: actions/showfavorites.php:79
#, php-format
msgid "%s's favorite notices, page %d"
@@ -2945,6 +3092,145 @@ msgstr ""
"pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym narzędziu [StatusNet]"
"(http://status.net/). "
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "Nie można wysłać wiadomości do tego użytkownika."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "Użytkownik został już zablokował w grupie."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "Zaproś"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "To nie jest prawidłowy adres e-mail"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Wpis strony"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Nowy adres e-mail do wysyłania do %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Preferowany język"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Prywatność"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Przywróć"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Ustawienia awatara"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "Ustawienia SMS"
@@ -3227,6 +3513,21 @@ msgstr "Nie ma takiego znacznika."
msgid "API method under construction."
msgstr "Metoda API jest w trakcie tworzenia."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Ten użytkownik został już zablokowany."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Użytkownik nie został zablokowany w grupie."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "Użytkownik nie posiada profilu."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr "Brak identyfikatora profilu w żądaniu."
@@ -3244,6 +3545,32 @@ 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
+msgid "User"
+msgstr "Użytkownik"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Zablokowano"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Zaproś"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Upoważnij subskrypcję"
@@ -3407,11 +3734,16 @@ msgstr ""
"Plik tej wielkości przekroczyłby miesięczny przydział użytkownika wynoszący %"
"d bajty."
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Błąd podczas wysyłania bezpośredniej wiadomości."
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "Nie można wprowadzić wiadomości."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL."
@@ -3443,15 +3775,15 @@ msgstr ""
"Za dużo takich samych wiadomości w za krótkim czasie, weź głęboki oddech i "
"wyślij ponownie za kilka minut."
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr "Zabroniono Ci wysyłania wpisów na tej stronie."
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Problem podczas zapisywania wpisu."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s"
@@ -3481,10 +3813,6 @@ msgstr "Zmień hasło"
msgid "Change email handling"
msgstr "Zmień obsługę adresu e-mail"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr "Wygląd"
-
#: lib/accountsettingsaction.php:124
msgid "Design your profile"
msgstr "Wygląd profilu"
@@ -3535,96 +3863,101 @@ msgstr "Połącz"
msgid "Connect to services"
msgstr "Nie można przekierować do serwera: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Główna nawigacja strony"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Zaproś"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 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:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Wyloguj się"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "Wyloguj się ze strony"
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr "Utwórz konto"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "Zaloguj się na stronę"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Pomoc"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr "Pomóż mi!"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Znajdź"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "Znajdź osoby lub tekst"
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr "Wpis strony"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr "Lokalne widoki"
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr "Wpis strony"
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr "Druga nawigacja strony"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "O usłudze"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr "TOS"
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Prywatność"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Kod źródłowy"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:736
+#: lib/action.php:740
msgid "Badge"
msgstr "Odznaka"
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr "Licencja oprogramowania StatusNet"
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3633,12 +3966,12 @@ msgstr ""
"**%%site.name%%** jest usługą mikroblogowania prowadzoną przez [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** jest usługą mikroblogowania. "
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3649,35 +3982,60 @@ 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:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "Licencja oprogramowania StatusNet"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr "Wszystko "
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "licencja."
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "Paginacja"
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "Następne"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "Wcześniej"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr "Wystąpił problem z tokenem sesji."
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "Nie można wysłać wiadomości do tego użytkownika."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "Nie zaimplementowano polecenia."
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "Nie zaimplementowano polecenia."
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Potwierdzenie adresu e-mail"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "Potwierdzenie SMS"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "Załączniki"
@@ -3855,30 +4213,36 @@ msgstr "Nie jesteś zasubskrybowany do tego profilu."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Nie jesteś zasubskrybowany do tego profilu."
+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."
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Nie można zasubskrybować innych do Ciebie."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Osoby zasubskrybowane do %s"
+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."
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Nie jesteś członkiem tej grupy."
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Nie jesteś członkiem tej grupy."
+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."
-#: lib/command.php:670
+#: lib/command.php:678
#, fuzzy
msgid ""
"Commands:\n"
@@ -3944,20 +4308,20 @@ msgstr ""
"tracks - jeszcze nie zaimplementowano.\n"
"tracking - jeszcze nie zaimplementowano.\n"
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Brak kodu potwierdzającego."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
#, fuzzy
msgid "Go to the installer."
msgstr "Zaloguj się na stronę"
@@ -3978,10 +4342,6 @@ msgstr "Aktualizacje przez wiadomości SMS"
msgid "Database error"
msgstr "Błąd bazy danych"
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr "Zmień obraz tłas"
-
#: lib/designsettings.php:105
msgid "Upload file"
msgstr "Wyślij plik"
@@ -3991,62 +4351,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr "Można wysłać swój osobisty obraz. Maksymalny rozmiar pliku to 2 MB."
-#: lib/designsettings.php:139
-msgid "On"
-msgstr "Włączone"
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr "Wyłączone"
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr "Włącz lub wyłącz obraz tła."
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr "Kafelkowy obraz tła"
-
-#: lib/designsettings.php:170
-msgid "Change colours"
-msgstr "Zmień kolory"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr "Tło"
-
-#: lib/designsettings.php:191
-msgid "Content"
-msgstr "Zawartość"
-
-#: lib/designsettings.php:204
-msgid "Sidebar"
-msgstr "Panel boczny"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Tekst"
-
-#: lib/designsettings.php:230
-msgid "Links"
-msgstr "Odnośniki"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr "Użyj domyślnych"
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr "Przywróć domyślny wygląd"
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr "Przywróć domyślne ustawienia"
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr "Zapisz wygląd"
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr "Błędne domyślne ustawienia koloru: "
@@ -4295,12 +4599,12 @@ msgstr ""
"Dziękujemy za Twój czas, \n"
"%s\n"
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "Użytkownik %1$s obserwuje teraz Twoje wpisy na %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4325,17 +4629,17 @@ msgstr ""
"----\n"
"Zmień adres e-mail lub opcje powiadamiania na %8$s\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "Położenie: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "Strona domowa: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
@@ -4344,12 +4648,12 @@ msgstr ""
"O mnie: %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "Nowy adres e-mail do wysyłania do %s"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4370,21 +4674,21 @@ msgstr ""
"Z poważaniem,\n"
"%4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "Status użytkownika %s"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "Potwierdzenie SMS"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "Zostałeś szturchnięty przez %s"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4411,12 +4715,12 @@ msgstr ""
"Z poważaniem,\n"
"%4$s\n"
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "Nowa prywatna wiadomość od użytkownika %s"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4449,12 +4753,12 @@ msgstr ""
"Z poważaniem,\n"
"%5$s\n"
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "Użytkownik %s dodał Twój wpis jako ulubiony"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, fuzzy, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4491,12 +4795,12 @@ msgstr ""
"Z poważaniem,\n"
"%6$s\n"
-#: lib/mail.php:611
+#: lib/mail.php:620
#, fuzzy, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "Użytkownik %s wysłał wpis wymagający Twojej uwagi"
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4635,7 +4939,12 @@ msgstr "Błąd podczas wprowadzania zdalnego profilu"
msgid "Duplicate notice"
msgstr "Usuń wpis"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Ten użytkownik zablokował Cię z subskrypcji."
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Nie można wprowadzić nowej subskrypcji."
@@ -4651,10 +4960,6 @@ msgstr "Odpowiedzi"
msgid "Favorites"
msgstr "Ulubione"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "Użytkownik"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "Odebrane"
@@ -4704,6 +5009,15 @@ msgstr "Członek od"
msgid "All groups"
msgstr "Wszystkie grupy"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Brak parametru identyfikatora."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Publiczny"
@@ -4724,6 +5038,16 @@ msgstr "Znane"
msgid "Popular"
msgstr "Popularne"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Odebrane"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Odblokuj tego użytkownika"
+
#: lib/searchaction.php:120
msgid "Search site"
msgstr "Znajdź stronę"
@@ -4760,6 +5084,16 @@ msgstr "Sekcja bez nazwy"
msgid "More..."
msgstr "Więcej..."
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Wpis strony"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Zablokuj tego użytkownika"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4789,28 +5123,28 @@ msgstr "Chmura znaczników osób ze znacznikami"
msgid "(none)"
msgstr "(brak)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "Użytkownik zablokował Cię."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "Nie można zasubskrybować."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "Nie można zasubskrybować innych do Ciebie."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Nie zasubskrybowane!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Nie można usunąć subskrypcji."
@@ -4822,6 +5156,29 @@ msgstr "Brak"
msgid "Top posters"
msgstr "Najczęściej wysyłający wpisy"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Odblokuj tego użytkownika"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Odblokuj tego użytkownika"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Odblokuj tego użytkownika"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Zrezygnuj z subskrypcji tego użytkownika"
@@ -4925,3 +5282,7 @@ msgstr "Przepraszamy, to nie jest twój przychodzący adres e-mail."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Przepraszamy, przychodzący e-mail nie jest dozwolony."
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Osoby zasubskrybowane do %s"
diff --git a/locale/pt/LC_MESSAGES/statusnet.mo b/locale/pt/LC_MESSAGES/statusnet.mo
index 9d79df32c..b969c15b7 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 4577be669..d15d53cd8 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:44:05+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:28+0000\n"
"Language-Team: Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -46,7 +46,7 @@ msgstr ""
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr ""
@@ -149,7 +149,8 @@ msgstr "Não foi possível actualizar o utilizador."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -234,12 +235,12 @@ msgstr ""
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -376,6 +377,13 @@ msgstr "Alcunha já em uso. Tente outra diferente."
msgid "Alias can't be the same as nickname."
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 "Método da API não encontrado!"
+
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
msgstr ""
@@ -464,13 +472,13 @@ msgstr ""
msgid "%s updates favorited by %s / %s."
msgstr ""
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "Mensagens de %s"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -557,7 +565,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr ""
@@ -569,7 +578,7 @@ msgstr ""
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -579,7 +588,7 @@ msgstr ""
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -645,71 +654,50 @@ msgstr ""
msgid "Unblock user from group"
msgstr "Desbloquear este utilizador"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Desbloquear"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "Desbloquear este utilizador"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr ""
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr ""
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Desbloquear este utilizador"
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr ""
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "Não"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Desbloquear este utilizador"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr ""
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr ""
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr ""
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr ""
@@ -774,6 +762,15 @@ msgstr ""
msgid "No such notice."
msgstr ""
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr ""
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Não é possível remover a mensagem."
@@ -807,6 +804,142 @@ msgstr "Não é possível remover a mensagem."
msgid "There was a problem with your session token. Try again, please."
msgstr ""
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Não foi possível actualizar o utilizador."
+
+#: actions/deleteuser.php:74
+msgid "You can only delete local users."
+msgstr ""
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "Apagar mensagem"
+
+#: 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 "Não é possível remover a mensagem."
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: actions/designadminpanel.php:301
+#, php-format
+msgid "Theme not available: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Modificar"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+msgid "Theme for the site."
+msgstr ""
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr ""
+
+#: actions/designadminpanel.php:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Modificar a sua palavra-passe"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Ligar"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr ""
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr ""
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Entrar"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr ""
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr ""
@@ -949,14 +1082,6 @@ msgstr "Quero postar mensagens por email."
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr ""
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -970,7 +1095,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr "Não é possível normalizar esse endereço de email"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr ""
@@ -1168,6 +1293,18 @@ msgstr ""
msgid "Cannot read file."
msgstr "Não foi possível salvar o perfil."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr ""
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr ""
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1281,11 +1418,11 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "Bloquear"
@@ -1370,7 +1507,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "O utilizador bloqueou-o."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr ""
@@ -1666,7 +1803,7 @@ msgstr "Nome de utilizador ou palavra-passe incorrecta"
msgid "Error setting user."
msgstr "Erro ao configurar utilizador."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Entrar"
@@ -2081,7 +2218,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Linguagem"
@@ -2109,7 +2246,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Bio é demasiada extensa (máx 140 car)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr ""
@@ -2134,7 +2271,7 @@ msgstr "Não foi possível salvar o perfil."
msgid "Couldn't save tags."
msgstr ""
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr ""
@@ -2368,7 +2505,7 @@ msgstr "Erro no código de confirmação."
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -2412,7 +2549,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2515,7 +2652,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr ""
@@ -2589,6 +2726,15 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr ""
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+msgid "You cannot sandbox users on this site."
+msgstr ""
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "O utilizador bloqueou-o."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2828,6 +2974,140 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#: actions/silence.php:65 actions/unsilence.php:65
+msgid "You cannot silence users on this site."
+msgstr ""
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "O utilizador bloqueou-o."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "Convidar"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Não é possível normalizar esse endereço de email"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+msgid "Site name"
+msgstr ""
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "O endereço de email de recepção removido."
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+msgid "Default site language"
+msgstr ""
+
+#: actions/siteadminpanel.php:282
+msgid "Private"
+msgstr ""
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+msgid "Never"
+msgstr ""
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Definições do Email"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr ""
@@ -3091,6 +3371,21 @@ msgstr ""
msgid "API method under construction."
msgstr "Método da API em construcção."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Desbloquear este utilizador"
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "O utilizador bloqueou-o."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "O utilizador bloqueou-o."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr ""
@@ -3108,6 +3403,32 @@ msgstr ""
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Bloquear"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Convidar"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autorizar subscrição"
@@ -3256,11 +3577,15 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+msgid "You are banned from sending direct messages."
+msgstr ""
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr ""
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr ""
@@ -3288,15 +3613,15 @@ msgid ""
"few minutes."
msgstr ""
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s"
@@ -3326,10 +3651,6 @@ msgstr "Modificar a sua palavra-passe"
msgid "Change email handling"
msgstr "Alterar email handling"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
msgid "Design your profile"
msgstr ""
@@ -3382,97 +3703,101 @@ msgstr "Ligar"
msgid "Connect to services"
msgstr "Não foi possível redireccionar para o servidor: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+msgid "Change site configuration"
+msgstr ""
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Convidar"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Sair"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:454
#, fuzzy
msgid "Create an account"
msgstr "Ligar conta existente"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr ""
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr ""
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr ""
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr ""
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Sobre"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr ""
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:736
+#: lib/action.php:740
msgid "Badge"
msgstr ""
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3481,12 +3806,12 @@ msgstr ""
"**%%site.name%%*** é um serviço de microblogging trazido até sí por [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** é um serviço de microblogging. "
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3494,36 +3819,58 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "Encontrar conteúdo dos mensagens"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr ""
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr ""
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr ""
-#: lib/action.php:1069
+#: lib/action.php:1084
#, fuzzy
msgid "Before"
msgstr "Antes »"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr ""
+#: lib/adminpanelaction.php:96
+msgid "You cannot make changes to this site."
+msgstr ""
+
+#: lib/adminpanelaction.php:195
+msgid "showForm() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:224
+msgid "saveSettings() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Confirmação do Endereço de Email"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "Confirmação do Endereço de Email"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3699,28 +4046,34 @@ msgstr "Não foi possível subscrever outros a si."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Já subscrito!."
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "Já subscrito!."
+msgstr[1] "Já subscrito!."
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Não foi possível subscrever outros a si."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Já subscrito!."
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "Não foi possível subscrever outros a si."
+msgstr[1] "Não foi possível subscrever outros a si."
-#: lib/command.php:656
+#: lib/command.php:662
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:658
-msgid "You are a member of these groups: "
-msgstr ""
+#: lib/command.php:664
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] ""
+msgstr[1] ""
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3759,20 +4112,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Código de confirmação não encontrado"
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
msgid "Go to the installer."
msgstr ""
@@ -3792,10 +4145,6 @@ msgstr ""
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
msgid "Upload file"
msgstr ""
@@ -3805,65 +4154,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Modificar a sua palavra-passe"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Ligar"
-
-#: lib/designsettings.php:204
-msgid "Sidebar"
-msgstr ""
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr ""
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Entrar"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4093,12 +4383,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4119,29 +4409,29 @@ msgstr ""
"Sinceramente,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr ""
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr ""
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
"\n"
msgstr ""
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4154,21 +4444,21 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "Estado de %s"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4184,12 +4474,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4208,12 +4498,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4234,12 +4524,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4379,7 +4669,11 @@ msgstr "Erro ao inserir perfil remoto"
msgid "Duplicate notice"
msgstr "Apagar mensagem"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Não foi possível inserir nova subscrição."
@@ -4395,10 +4689,6 @@ msgstr ""
msgid "Favorites"
msgstr ""
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr ""
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr ""
@@ -4449,6 +4739,14 @@ msgstr "Membro desde"
msgid "All groups"
msgstr ""
+#: lib/profileformaction.php:123
+msgid "No return-to arguments"
+msgstr ""
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr ""
@@ -4469,6 +4767,15 @@ msgstr ""
msgid "Popular"
msgstr ""
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr ""
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Desbloquear este utilizador"
+
#: lib/searchaction.php:120
msgid "Search site"
msgstr ""
@@ -4505,6 +4812,15 @@ msgstr ""
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+msgid "Silence"
+msgstr ""
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Desbloquear este utilizador"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4534,28 +4850,28 @@ msgstr ""
msgid "(none)"
msgstr ""
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "O utilizador bloqueou-o."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "Não foi possível subscrever. "
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "Não foi possível subscrever outros a si."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Não foi possível subscrever. "
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Não foi possível apagar a subscrição."
@@ -4567,6 +4883,29 @@ msgstr "Nenhum"
msgid "Top posters"
msgstr "Top posters"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Desbloquear este utilizador"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Desbloquear este utilizador"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Desbloquear este utilizador"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Des-Subscrever deste utilizador"
@@ -4670,3 +5009,7 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#, 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 634c68c24..fcec3270e 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 73b63476b..b8780318e 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:44:09+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:31+0000\n"
"Language-Team: Brazilian Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -44,7 +44,7 @@ msgstr "Essa etiqueta não existe."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Usuário não encontrado."
@@ -147,7 +147,8 @@ msgstr "Não foi possível atualizar o usuário."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -235,12 +236,12 @@ msgstr "Todas as mensagens diretas enviadas para %s"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -383,6 +384,13 @@ msgstr "Este apelido já está em uso. Tente outro."
msgid "Alias can't be the same as nickname."
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!"
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -473,13 +481,13 @@ msgstr "%s / Favoritas de %s"
msgid "%s updates favorited by %s / %s."
msgstr "%s atualizações de favoritas por %s / %s."
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "Mensagens de %s"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -567,7 +575,8 @@ msgstr "Original"
msgid "Preview"
msgstr "Visualização"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "Excluir"
@@ -579,7 +588,7 @@ msgstr "Enviar"
msgid "Crop"
msgstr "Cortar"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -589,7 +598,7 @@ msgstr "Cortar"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -656,72 +665,51 @@ msgstr ""
msgid "Unblock user from group"
msgstr "Não foi possível desbloquear o usuário."
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Desbloquear"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "Desbloquear este usuário"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Você não está logado."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Não foi especificado nenhum perfil."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Não foi encontrado nenhum perfil com esse ID."
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Você já bloqueou esse usuário."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "Bloquear usuário"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "Não"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Desbloquear este usuário"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Sim"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Bloquear usuário"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "Você já bloqueou esse usuário."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "Não foi possível salvar a informação de bloqueio."
@@ -786,6 +774,15 @@ msgstr "Mensagens"
msgid "No such notice."
msgstr "Essa mensagem não existe."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Você não está logado."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Não é possível excluir esta mensagem."
@@ -822,6 +819,146 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Não foi possível atualizar o usuário."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+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"
+
+#: 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 "Excluir esta mensagem"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Não foi possível salvar suas configurações do Twitter!"
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "Esta página não está disponível em um "
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Alterar"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "Sair deste site"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, fuzzy, 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."
+
+#: actions/designadminpanel.php:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Altere a sua senha"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Conectar"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Procurar"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Texto"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Lista"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Salvar"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "Essa mensagem não é uma favorita!"
@@ -967,14 +1104,6 @@ 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:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Salvar"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -988,7 +1117,7 @@ msgstr "Nenhum endereço de e-mail."
msgid "Cannot normalize that email address"
msgstr "Não foi possível normalizar este endereço de e-mail"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "Não é um endereço de e-mail válido"
@@ -1192,6 +1321,18 @@ msgstr "Essa mensagem não existe."
msgid "Cannot read file."
msgstr "Nosso arquivo foi perdido."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "Não foi especificado nenhum perfil."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "Não foi encontrado nenhum perfil com esse ID."
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
#, fuzzy
@@ -1316,11 +1457,11 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "Bloquear"
@@ -1412,7 +1553,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "O usuário bloqueou você."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr "Erro na remoção do bloqueio."
@@ -1731,7 +1872,7 @@ msgstr "Nome de usuário e/ou senha incorreto(s)."
msgid "Error setting user."
msgstr "Erro na configuração do usuário."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logar"
@@ -2166,7 +2307,7 @@ msgstr ""
"Suas etiquetas (letras, números, -, ., e _), separadas por vírgulas ou "
"espaços"
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Idioma"
@@ -2192,7 +2333,7 @@ msgstr "Assinar automaticamente à quem me assinar"
msgid "Bio is too long (max %d chars)."
msgstr "Descrição muito extensa (máximo 140 caracteres)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "O fuso horário não foi selecionado."
@@ -2217,7 +2358,7 @@ msgstr "Não foi possível salvar o perfil."
msgid "Couldn't save tags."
msgstr "Não foi possível salvar as etiquetas."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "As configurações foram salvas."
@@ -2459,7 +2600,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:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrar"
@@ -2504,7 +2645,7 @@ msgid "Same as password above. Required."
msgstr "Igual à senha acima. Obrigatório."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -2612,7 +2753,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL do seu perfil em outro serviço de microblogagem compatível"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Assinar"
@@ -2688,6 +2829,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Mensagem para %1$s no %2$s"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Você não pode enviar uma mensagem para esse usuário."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "O usuário bloqueou você."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2938,6 +3089,145 @@ msgstr ""
"Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/"
"wiki/Microblogging)"
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "Você não pode enviar uma mensagem para esse usuário."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "O usuário bloqueou você."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "Convidar"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Não é um endereço de e-mail válido"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Nova mensagem"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Novo endereço de e-mail para postar para %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Idioma preferencial"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Privacidade"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Recuperar"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Configurações do avatar"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "Configuração de SMS"
@@ -3214,6 +3504,21 @@ msgstr "Essa etiqueta não existe."
msgid "API method under construction."
msgstr "O método da API está em construção."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Você já bloqueou esse usuário."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "O usuário bloqueou você."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "O usuário não tem perfil."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr "Nenhuma ID de perfil na requisição."
@@ -3231,6 +3536,32 @@ msgstr "Cancelado"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Usuário"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Bloquear"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Convidar"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autorizar a assinatura"
@@ -3393,11 +3724,16 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Ocorreu um erro durante o envio da mensagem direta."
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "Não foi possível inserir a mensagem."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "Não foi possível atualizar a mensagem com a nova URI."
@@ -3431,15 +3767,15 @@ msgstr ""
"Muitas mensagens em um período curto de tempo; dê uma respirada e publique "
"novamente daqui a alguns minutos."
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr "Você foi banido de publicar mensagens nesse site."
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Problema ao salvar a mensagem."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Erro no banco de dados na inserção da reposta: %s"
@@ -3469,10 +3805,6 @@ msgstr "Altere a sua senha"
msgid "Change email handling"
msgstr "Configurações de uso do e-mail"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3524,100 +3856,105 @@ msgstr "Conectar"
msgid "Connect to services"
msgstr "Não foi possível redirecionar para o servidor: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Navegação primária no site"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Convidar"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 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:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Sair"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "Sair deste site"
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr "Criar uma nova conta"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "Entrar"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr "Ajuda"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Procurar"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "Pesquisar por pessoa ou texto"
-#: lib/action.php:480
+#: lib/action.php:484
#, fuzzy
msgid "Site notice"
msgstr "Nova mensagem"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr ""
-#: lib/action.php:612
+#: lib/action.php:616
#, fuzzy
msgid "Page notice"
msgstr "Nova mensagem"
-#: lib/action.php:714
+#: lib/action.php:718
#, fuzzy
msgid "Secondary site navigation"
msgstr "Navegação pelas assinaturas"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Sobre"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Privacidade"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Fonte"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Contato"
-#: lib/action.php:736
+#: lib/action.php:740
#, fuzzy
msgid "Badge"
msgstr "Chamar a atenção"
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3626,12 +3963,12 @@ msgstr ""
"**%%site.name%%** é um serviço de microblogagem disponibilizado por [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** é um serviço de microblogagem. "
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3642,37 +3979,62 @@ 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:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "Procure no conteúdo das mensagens"
-#: lib/action.php:794
+#: lib/action.php:798
#, fuzzy
msgid "All "
msgstr "Todas"
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "licença"
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "Paginação"
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "Próximo"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "Anterior"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr ""
"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "Você não pode enviar uma mensagem para esse usuário."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "O comando não foi implementado ainda."
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "O comando não foi implementado ainda."
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Confirmação do endereço de e-mail"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "Confirmação de SMS"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3851,30 +4213,36 @@ msgstr "Você não está assinando esse perfil."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Você não está assinando esse perfil."
+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."
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Não foi possível fazer com que o outros o sigam."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Assinantes de %s"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "Não foi possível fazer com que o outros o sigam."
+msgstr[1] "Não foi possível fazer com que o outros o sigam."
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Você não está assinando esse perfil."
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Você não está assinando esse perfil."
+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."
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3913,20 +4281,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Nenhum código de confirmação."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
#, fuzzy
msgid "Go to the installer."
msgstr "Entrar"
@@ -3947,10 +4315,6 @@ msgstr "Atualizações via SMS"
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3961,66 +4325,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Altere a sua senha"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Conectar"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Procurar"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Texto"
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Lista"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4250,12 +4554,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s agora está acompanhando suas mensagens em %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4276,17 +4580,17 @@ msgstr ""
"Cordialmente,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "Localização: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "Site: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
@@ -4295,12 +4599,12 @@ msgstr ""
"Descrição: %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "Novo endereço de e-mail para postar para %s"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4321,21 +4625,21 @@ msgstr ""
"Atenciosamente,\n"
"%4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "Status de %s"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "Confirmação de SMS"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "Você teve a atenção chamada por %s"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4351,12 +4655,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "Nova mensagem particular de %s"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4375,12 +4679,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s marcaram sua mensagem como favorita"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4401,12 +4705,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4545,7 +4849,12 @@ msgstr "Erro na inserção do perfil remoto"
msgid "Duplicate notice"
msgstr "Excluir a mensagem"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Esse usuário bloqueou o seu pedido de assinatura."
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Não foi possível inserir a nova assinatura."
@@ -4561,10 +4870,6 @@ msgstr "Respostas"
msgid "Favorites"
msgstr "Favoritas"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "Usuário"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "Recebidas"
@@ -4616,6 +4921,15 @@ msgstr "Membro desde"
msgid "All groups"
msgstr ""
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Nenhum argumento de ID."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Público"
@@ -4636,6 +4950,16 @@ msgstr "Destacada"
msgid "Popular"
msgstr "Popular"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Recebidas"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Desbloquear este usuário"
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4674,6 +4998,16 @@ msgstr "Seção sem título"
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Nova mensagem"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Bloquear usuário"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4703,28 +5037,28 @@ msgstr ""
msgid "(none)"
msgstr "(nenhum)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "O usuário bloqueou você."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "Não foi possível assinar."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "Não foi possível fazer com que o outros o sigam."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Não é seguido!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Não foi possível excluir a assinatura."
@@ -4736,6 +5070,29 @@ msgstr "Nenhuma"
msgid "Top posters"
msgstr "Quem mais publica"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Desbloquear este usuário"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Desbloquear este usuário"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Desbloquear este usuário"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Cancelar a assinatura deste usuário"
@@ -4842,3 +5199,7 @@ msgstr "Desculpe-me, mas este não é seu endereço de e-mail para recebimento."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Desculpe-me, mas não é permitido o recebimento de emails."
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Assinantes de %s"
diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo
index 13d14c0f9..978cb29f4 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 521b67091..99845f550 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -1,17 +1,18 @@
# Translation of StatusNet to Russian
#
+# Author@translatewiki.net: Lockal
# Author@translatewiki.net: Александр Сигачёв
# --
msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:44:12+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:36+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -42,7 +43,7 @@ msgstr "Нет такой страницы"
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Нет такого пользователя."
@@ -68,9 +69,9 @@ msgid "Feed for friends of %s (RSS 2.0)"
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
@@ -114,9 +115,8 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!"
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountupdateprofile.php:97
-#, fuzzy
msgid "API method not found."
-msgstr "Метод API не найден!"
+msgstr "Метод API не найден."
#: actions/apiaccountupdatedeliverydevice.php:85
#: actions/apiaccountupdateprofilebackgroundimage.php:86
@@ -145,7 +145,8 @@ msgstr "Не удаётся обновить пользователя."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -233,12 +234,12 @@ msgstr "Все прямые сообщения посланные для %s"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -293,14 +294,12 @@ msgid "Two user ids or screen_names must be supplied."
msgstr "Надо представить два имени пользователя или кода."
#: actions/apifriendshipsshow.php:135
-#, fuzzy
msgid "Could not determine source user."
-msgstr "Не удаётся вернуть публичный поток."
+msgstr "Не удаётся определить исходного пользователя."
#: actions/apifriendshipsshow.php:143
-#, fuzzy
msgid "Could not find target user."
-msgstr "Нет статусов."
+msgstr "Не удаётся найти целевого пользователя."
#: actions/apigroupcreate.php:136 actions/newgroup.php:204
msgid "Could not create group."
@@ -348,9 +347,9 @@ msgid "Full name is too long (max 255 chars)."
msgstr "Полное имя слишком длинное (не больше 255 знаков)."
#: actions/apigroupcreate.php:261
-#, fuzzy, php-format
+#, php-format
msgid "Description is too long (max %d chars)."
-msgstr "Слишком длинное описание (максимум 140 символов)"
+msgstr "Слишком длинное описание (максимум %d символов)"
#: actions/apigroupcreate.php:272 actions/editgroup.php:204
#: actions/newgroup.php:148 actions/profilesettings.php:225
@@ -381,10 +380,16 @@ msgstr "Такое имя уже используется. Попробуйте
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupjoin.php:110
+#: 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 не найден!"
+
+#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
-msgstr "Вы уже являетесь членом этой группы"
+msgstr "Вы уже являетесь членом этой группы."
#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
msgid "You have been blocked from that group by the admin."
@@ -434,9 +439,8 @@ msgid "You may not delete another user's status."
msgstr "Вы не можете удалять статус других пользователей."
#: actions/apistatusesshow.php:138
-#, fuzzy
msgid "Status deleted."
-msgstr "Аватар обновлён."
+msgstr "Статус удалён."
#: actions/apistatusesshow.php:144
msgid "No status with that ID found."
@@ -444,9 +448,9 @@ msgstr "Не найдено статуса с таким ID."
#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
-#, fuzzy, php-format
+#, php-format
msgid "That's too long. Max notice size is %d chars."
-msgstr "Слишком длинная запись. Максимальная длина - 140 знаков."
+msgstr "Слишком длинная запись. Максимальная длина — %d знаков."
#: actions/apistatusesupdate.php:198
msgid "Not found"
@@ -458,9 +462,8 @@ msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
-#, fuzzy
msgid "Unsupported format."
-msgstr "Неподдерживаемый формат файла изображения."
+msgstr "Неподдерживаемый формат."
#: actions/apitimelinefavorites.php:107
#, php-format
@@ -472,13 +475,13 @@ msgstr "%s / Любимое от %s"
msgid "%s updates favorited by %s / %s."
msgstr "%s обновлённые любимые записи от %s / %s."
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "%s хронология"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -541,9 +544,10 @@ msgid "Avatar"
msgstr "Аватар"
#: actions/avatarsettings.php:78
-#, fuzzy, php-format
+#, php-format
msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr "Тут вы можете загрузить свой аватар."
+msgstr ""
+"Вы можете загрузить свой аватар. Максимальный размер файла составляет %s."
#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
@@ -566,7 +570,8 @@ msgstr "Оригинал"
msgid "Preview"
msgstr "Просмотр"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "Удалить"
@@ -578,7 +583,7 @@ msgstr "Загрузить"
msgid "Crop"
msgstr "Обрезать"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -588,7 +593,7 @@ msgstr "Обрезать"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
@@ -617,9 +622,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
@@ -636,9 +640,9 @@ msgid "No such group"
msgstr "Нет такой группы"
#: actions/blockedfromgroup.php:90
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked profiles"
-msgstr "Профиль пользователя"
+msgstr "%s заблокированных профилей"
#: actions/blockedfromgroup.php:93
#, fuzzy, php-format
@@ -651,75 +655,52 @@ msgid "A list of the users blocked from joining this group."
msgstr "Список пользователей, являющихся членами этой группы."
#: actions/blockedfromgroup.php:281
-#, fuzzy
msgid "Unblock user from group"
-msgstr "Неудача при разблокировке пользователя."
+msgstr "Разблокировать пользователя в группе."
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Разблокировать"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "Разблокировать пользователя."
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Не авторизован."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Профиль не определен."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Нет профиля с таким ID."
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Вы уже заблокировали этого пользователя."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "Заблокировать пользователя."
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "Нет"
-#: actions/block.php:149
-#, fuzzy
+#: actions/block.php:143 actions/deleteuser.php:147
msgid "Do not block this user"
-msgstr "Разблокировать пользователя."
+msgstr "Не блокировать этого пользователя"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Да"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr "Заблокировать пользователя."
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "Вы уже заблокировали этого пользователя."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "Не удаётся сохранить информацию о блокировании."
@@ -769,12 +750,11 @@ msgstr "Подтвердить адрес"
#: actions/confirmaddress.php:159
#, php-format
msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Адрес \"%s\" подтвержден для вашего аккаунта."
+msgstr "Адрес «%s» подтверждён для вашего аккаунта."
#: actions/conversation.php:99
-#, fuzzy
msgid "Conversation"
-msgstr "Код подтверждения"
+msgstr "Дискуссия"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
#: lib/profileaction.php:206
@@ -785,6 +765,15 @@ msgstr "Записи"
msgid "No such notice."
msgstr "Нет такой записи."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Не авторизован."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Не удаётся удалить эту запись."
@@ -807,9 +796,8 @@ msgid "Are you sure you want to delete this notice?"
msgstr "Вы уверены, что хотите удалить эту запись?"
#: actions/deletenotice.php:145
-#, fuzzy
msgid "Do not delete this notice"
-msgstr "Не удаётся удалить эту запись."
+msgstr "Не удалять эту запись"
#: actions/deletenotice.php:146 lib/noticelist.php:522
msgid "Delete this notice"
@@ -820,6 +808,142 @@ msgstr "Удалить эту запись"
msgid "There was a problem with your session token. Try again, please."
msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Не удаётся обновить пользователя."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Вы не можете удалять статус других пользователей."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+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 "Удалить эту запись"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Не удаётся сохранить Ваши установки по Твиттеру!"
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "Страница недоступна для того типа, который Вы задействовали."
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Изменить"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "Выйти"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr "Изменение фонового изображения"
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "Фон"
+
+#: actions/designadminpanel.php:429
+#, fuzzy, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr "Тут вы можете загрузить логотип для группы."
+
+#: actions/designadminpanel.php:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Изменение цветовой гаммы"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+msgid "Content"
+msgstr "Содержание"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "Боковая панель"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Текст"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+msgid "Links"
+msgstr "Ссылки"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "Использовать значения по умолчанию"
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Сохранить"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "Эта запись не входит в число ваших любимых записей!"
@@ -851,17 +975,17 @@ msgid "Use this form to edit the group."
msgstr "Заполните информацию о группе в следующие поля"
#: actions/editgroup.php:201 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
msgid "description is too long (max %d chars)."
-msgstr "Слишком длинное описание (максимум 140 символов)"
+msgstr "Слишком длинное описание (максимум %d символов)"
#: actions/editgroup.php:253
msgid "Could not update group."
-msgstr "Не удаётся обновить информацию о группе"
+msgstr "Не удаётся обновить информацию о группе."
#: actions/editgroup.php:269
msgid "Options saved."
-msgstr "Настройки сохранены"
+msgstr "Настройки сохранены."
#: actions/emailsettings.php:60
msgid "Email Settings"
@@ -892,8 +1016,8 @@ msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
-"Ждём подтверждения этого адреса. Проверь свой почтовый ящик (и папку для "
-"спама!), там будут дальнейшие инструкции."
+"Ожидание подтверждения этого адреса. Проверьте свой почтовый ящик (и папку "
+"для спама!), там будут дальнейшие инструкции."
#: actions/emailsettings.php:117 actions/imsettings.php:120
#: actions/smssettings.php:126
@@ -961,7 +1085,7 @@ msgstr ""
#: actions/emailsettings.php:179
msgid "Allow friends to nudge me and send me an email."
msgstr ""
-"Разрешить друзьям \"подталкивать\" меня и посылать мне электронные сообщения."
+"Разрешить друзьям «подталкивать» меня и посылать мне электронные сообщения."
#: actions/emailsettings.php:185
msgid "I want to post notices by email."
@@ -971,14 +1095,6 @@ msgstr "Я хочу отправлять записи по электронно
msgid "Publish a MicroID for my email address."
msgstr "Опубликовать MicroID для моего электронного адреса."
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Сохранить"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -992,7 +1108,7 @@ msgstr "Нет электронного адреса."
msgid "Cannot normalize that email address"
msgstr "Не удаётся стандартизировать этот электронный адрес"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "Неверный электронный адрес"
@@ -1159,9 +1275,8 @@ msgid "That user has blocked you from subscribing."
msgstr "Этот пользователь заблокировал вас на его подписку."
#: actions/finishremotesubscribe.php:106
-#, fuzzy
msgid "You are not authorized."
-msgstr "Не авторизовано."
+msgstr "Вы не авторизованы."
#: actions/finishremotesubscribe.php:109
#, fuzzy
@@ -1169,9 +1284,8 @@ msgid "Could not convert request token to access token."
msgstr "Не удаётся преобразовать запросы в доступы."
#: actions/finishremotesubscribe.php:114
-#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Неизвестная версия OMB-протокола."
+msgstr "Удалённый сервис использует неизвестную версию протокола OMB."
#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
msgid "Error updating remote profile"
@@ -1184,20 +1298,30 @@ msgid "No such group."
msgstr "Нет такой группы."
#: actions/getfile.php:75
-#, fuzzy
msgid "No such file."
-msgstr "Нет такой записи."
+msgstr "Нет такого файла."
#: actions/getfile.php:79
#, fuzzy
msgid "Cannot read file."
msgstr "Потерян файл."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "Профиль не определен."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "Нет профиля с таким ID."
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
-#, fuzzy
msgid "No group specified."
-msgstr "Профиль не определен."
+msgstr "Группа не определена."
#: actions/groupblock.php:91
msgid "Only an admin can block group members."
@@ -1315,11 +1439,11 @@ msgstr "Участники группы %s, страница %d"
msgid "A list of the users in this group."
msgstr "Список пользователей, являющихся членами этой группы."
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "Настройки"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "Блокировать"
@@ -1408,7 +1532,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "Пользователь заблокировал Вас."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr "Ошибка при удалении данного блока."
@@ -1720,7 +1844,7 @@ msgstr "Некорректное имя или пароль."
msgid "Error setting user."
msgstr "Ошибка в установках пользователя."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
@@ -1824,9 +1948,8 @@ msgid ""
msgstr "Не посылайте сообщения сами себе; просто потихоньку скажите это себе."
#: actions/newmessage.php:181
-#, fuzzy
msgid "Message sent"
-msgstr "Сообщение"
+msgstr "Сообщение отправлено"
#: actions/newmessage.php:185 lib/command.php:375
#, php-format
@@ -1935,7 +2058,7 @@ msgstr "Поиск в записях"
#: actions/othersettings.php:60
msgid "Other Settings"
-msgstr "Другие установки"
+msgstr "Другие настройки"
#: actions/othersettings.php:71
msgid "Manage various other options."
@@ -1954,9 +2077,8 @@ msgid "Automatic shortening service to use."
msgstr "Автоматически использовать выбранный сервис"
#: actions/othersettings.php:122
-#, fuzzy
msgid "View profile designs"
-msgstr "Настройки профиля"
+msgstr "Показать оформления профиля"
#: actions/othersettings.php:123
msgid "Show or hide profile designs."
@@ -1984,7 +2106,7 @@ msgstr ""
#: actions/passwordsettings.php:58
msgid "Change password"
-msgstr "Изменить пароль"
+msgstr "Изменение пароля"
#: actions/passwordsettings.php:69
msgid "Change your password."
@@ -2009,11 +2131,11 @@ msgstr "6 или больше знаков"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
-msgstr "Подтвердить"
+msgstr "Подтверждение"
#: actions/passwordsettings.php:113
msgid "same as password above"
-msgstr "повторить пароль сверху"
+msgstr "тот же пароль, что и выше"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2110,18 +2232,17 @@ msgid "URL of your homepage, blog, or profile on another site"
msgstr "Адрес твоей страницы, дневника или профиля на другом портале"
#: actions/profilesettings.php:122 actions/register.php:460
-#, fuzzy, php-format
+#, php-format
msgid "Describe yourself and your interests in %d chars"
-msgstr "Опиши себя и свои увлечения при помощи 140 символов"
+msgstr "Опишите себя и свои увлечения при помощи %d символов"
#: actions/profilesettings.php:125 actions/register.php:463
-#, fuzzy
msgid "Describe yourself and your interests"
-msgstr "Опиши себя и свои интересы при помощи 140 символов."
+msgstr "Опишите себя и свои интересы"
#: actions/profilesettings.php:127 actions/register.php:465
msgid "Bio"
-msgstr "Био"
+msgstr "Биография"
#: actions/profilesettings.php:132 actions/register.php:470
#: actions/showgroup.php:256 actions/tagother.php:112
@@ -2147,13 +2268,13 @@ msgstr ""
"Теги для самого себя (буквы, цифры, -, ., и _), разделенные запятой или "
"пробелом"
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Язык"
#: actions/profilesettings.php:145
msgid "Preferred language"
-msgstr "Любимый язык"
+msgstr "Предпочитаемый язык"
#: actions/profilesettings.php:154
msgid "Timezone"
@@ -2169,11 +2290,11 @@ msgid ""
msgstr "Автоматически подписываться на всех, кто подписался на меня"
#: actions/profilesettings.php:221 actions/register.php:223
-#, fuzzy, php-format
+#, php-format
msgid "Bio is too long (max %d chars)."
-msgstr "Слишком длинное био (максимум 140 символов)."
+msgstr "Слишком длинная биография (максимум %d символов)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "Часовой пояс не выбран."
@@ -2184,7 +2305,7 @@ msgstr "Слишком длинный язык (более 50 символов).
#: actions/profilesettings.php:246 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
-msgstr "Неверный тег: \"%s\""
+msgstr "Неверный тег: «%s»"
#: actions/profilesettings.php:295
msgid "Couldn't update user for autosubscribe."
@@ -2198,7 +2319,7 @@ msgstr "Не удаётся сохранить профиль."
msgid "Couldn't save tags."
msgstr "Не удаётся сохранить теги."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Настройки сохранены."
@@ -2221,19 +2342,16 @@ msgid "Public timeline"
msgstr "Общая лента"
#: actions/public.php:151
-#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Лента публичного потока"
+msgstr "Лента публичного потока (RSS 1.0)"
#: actions/public.php:155
-#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Лента публичного потока"
+msgstr "Лента публичного потока (RSS 2.0)"
#: actions/public.php:159
-#, fuzzy
msgid "Public Stream Feed (Atom)"
-msgstr "Лента публичного потока"
+msgstr "Лента публичного потока (Atom)"
#: actions/public.php:179
#, php-format
@@ -2260,7 +2378,7 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-"%%site.name%% - это сайт для [микроблогинга](http://ru.wikipedia.org/wiki/"
+"%%site.name%% — это сайт для [микроблогинга](http://ru.wikipedia.org/wiki/"
"Микроблоггинг), созданный с использованием свободного программного "
"обеспечения [StatusNet](http://status.net/). [Стань участником](%%action."
"register%%), чтобы держать в курсе своих событий поклонников, друзей, "
@@ -2279,12 +2397,12 @@ msgstr ""
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
-msgstr "Общее облако тэгов"
+msgstr "Общее облако тегов"
#: actions/publictagcloud.php:63
#, php-format
msgid "These are most popular recent tags on %s "
-msgstr "Самые популярные тэги на %s на текущий момент"
+msgstr "Самые популярные теги на %s на текущий момент"
#: actions/publictagcloud.php:69
#, php-format
@@ -2304,7 +2422,7 @@ msgstr ""
#: actions/publictagcloud.php:135
msgid "Tag cloud"
-msgstr "Облако тэгов"
+msgstr "Облако тегов"
#: actions/recoverpassword.php:36
msgid "You are already logged in!"
@@ -2332,7 +2450,7 @@ msgstr "Код подтверждения слишком старый. Попр
#: actions/recoverpassword.php:111
msgid "Could not update user with confirmed email address."
-msgstr "Не удаётся одновить пользователя с подтверждённым электронным адресом."
+msgstr "Не удаётся обновить пользователя с подтверждённым электронным адресом."
#: actions/recoverpassword.php:152
msgid ""
@@ -2386,7 +2504,7 @@ msgstr "Тот же пароль, что и выше"
#: actions/recoverpassword.php:243
msgid "Reset"
-msgstr "Переустановить"
+msgstr "Сбросить"
#: actions/recoverpassword.php:252
msgid "Enter a nickname or email address."
@@ -2441,7 +2559,7 @@ msgstr "Ошибка, связанная с кодом подтверждени
msgid "Registration successful"
msgstr "Регистрация успешна!"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистрация"
@@ -2492,7 +2610,7 @@ msgid "Same as password above. Required."
msgstr "Тот же пароль что и сверху. Обязательно."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2599,7 +2717,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Адрес URL твоего профиля на другом подходящем сервисе микроблогинга"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Подписаться"
@@ -2635,19 +2753,19 @@ msgid "Replies to %s, page %d"
msgstr "Ответы для %s, страница %d"
#: actions/replies.php:144
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Лента записей для %s"
+msgstr "Лента записей для %s (RSS 1.0)"
#: actions/replies.php:151
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Лента записей для %s"
+msgstr "Лента записей для %s (RSS 2.0)"
#: actions/replies.php:158
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (Atom)"
-msgstr "Лента записей для %s"
+msgstr "Лента записей для %s (Atom)"
#: actions/replies.php:198
#, php-format
@@ -2675,6 +2793,16 @@ msgstr ""
msgid "Replies to %1$s on %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 "Вы не можете послать сообщение этому пользователю."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Пользователь заблокировал Вас."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2695,9 +2823,9 @@ msgid "Feed for favorites of %s (RSS 2.0)"
msgstr "Лента друзей %s (RSS 2.0)"
#: actions/showfavorites.php:184
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (Atom)"
-msgstr "Лента друзей %s"
+msgstr "Лента друзей %s (Atom)"
#: actions/showfavorites.php:205
msgid ""
@@ -2757,19 +2885,19 @@ msgid "Group actions"
msgstr "Действия группы"
#: actions/showgroup.php:328
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "Лента записей от группы %s"
+msgstr "Лента записей группы %s (RSS 1.0)"
#: actions/showgroup.php:334
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "Лента записей от группы %s"
+msgstr "Лента записей группы %s (RSS 2.0)"
#: actions/showgroup.php:340
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (Atom)"
-msgstr "Лента записей от группы %s"
+msgstr "Лента записей группы %s (Atom)"
#: actions/showgroup.php:345
#, fuzzy, php-format
@@ -2829,9 +2957,8 @@ msgstr ""
"net/). Участники обмениваются короткими сообщениями о своих новостях. "
#: actions/showgroup.php:482
-#, fuzzy
msgid "Admins"
-msgstr "Настройки"
+msgstr "Администраторы"
#: actions/showmessage.php:81
msgid "No such message."
@@ -2867,24 +2994,24 @@ msgid "%s, page %d"
msgstr "Входящие для %s - страница %d"
#: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s tagged %s (RSS 1.0)"
-msgstr "Лента записей от группы %s"
+msgstr "Лента записей %s с тегом %s (RSS 1.0)"
#: actions/showstream.php:129
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s (RSS 1.0)"
-msgstr "Лента записей для %s"
+msgstr "Лента записей для %s (RSS 1.0)"
#: actions/showstream.php:136
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s (RSS 2.0)"
-msgstr "Лента записей для %s"
+msgstr "Лента записей для %s (RSS 2.0)"
#: actions/showstream.php:143
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s (Atom)"
-msgstr "Лента записей для %s"
+msgstr "Лента записей для %s (Atom)"
#: actions/showstream.php:148
#, fuzzy, php-format
@@ -2936,6 +3063,145 @@ msgstr ""
"использованием свободного программного обеспечения [StatusNet](http://status."
"net/)."
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "Вы не можете послать сообщение этому пользователю."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "Пользователь заблокировал Вас."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "Пригласить"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Неверный электронный адрес"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Новая запись"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Новый электронный адрес для постинга %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Предпочитаемый язык"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Пользовательское соглашение"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Восстановление"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Настройки аватара"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "Установки СМС"
@@ -2947,9 +3213,8 @@ msgstr ""
"Вы можете отправлять СМС-сообщения по электронному адресу от %%site.name%%."
#: actions/smssettings.php:91
-#, fuzzy
msgid "SMS is not available."
-msgstr "Страница недоступна для того типа, который Вы задействовали."
+msgstr "Отправка СМС недоступна."
#: actions/smssettings.php:112
msgid "Current confirmed SMS-enabled phone number."
@@ -3001,14 +3266,12 @@ msgid "That phone number already belongs to another user."
msgstr "Этот телефонный номер уже задействован другим пользователем."
#: actions/smssettings.php:347
-#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr ""
-"Код подтверждения выслан на мобильный номер, который вы добавили. "
-"Посмотрите Ваши входящие сообщения (и папку для спама тоже!) для нахождения "
-"этого кода и инструкций по его использованию."
+"Код подтверждения выслан на мобильный номер, который вы добавили. Проверьте "
+"телефон для нахождения этого кода и инструкций по его использованию."
#: actions/smssettings.php:374
msgid "That is the wrong confirmation number."
@@ -3033,8 +3296,8 @@ msgid ""
"email but isn't listed here, send email to let us know at %s."
msgstr ""
"Провайдер Вашего мобильного телефона. Если вы знаете провайдера, который "
-"принимает CVC при помощи электронных адресов и которого нет в списке ниже, "
-"то пошлите нам об этом электронное сообщение %s."
+"принимает СМС при помощи электронных адресов и которого нет в списке ниже, "
+"то сообщите нам об этом по электронной почте %s."
#: actions/smssettings.php:498
msgid "No code entered"
@@ -3059,7 +3322,7 @@ msgstr "Подписано"
#: actions/subscribers.php:50
#, php-format
msgid "%s subscribers"
-msgstr "%s подписчики"
+msgstr "Подписчики %s"
#: actions/subscribers.php:52
#, php-format
@@ -3146,7 +3409,7 @@ msgstr "Нет ID аргумента."
#: actions/tagother.php:65
#, php-format
msgid "Tag %s"
-msgstr "Тэги %s"
+msgstr "Теги %s"
#: actions/tagother.php:77 lib/userprofile.php:75
msgid "User profile"
@@ -3158,7 +3421,7 @@ msgstr "Фото"
#: actions/tagother.php:141
msgid "Tag user"
-msgstr "Тэги для пользователя"
+msgstr "Теги для пользователя"
#: actions/tagother.php:151
msgid ""
@@ -3212,6 +3475,21 @@ msgstr "Нет такого тега."
msgid "API method under construction."
msgstr "Метод API реконструируется."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Вы уже заблокировали этого пользователя."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Пользователь заблокировал Вас."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "У пользователя нет профиля."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr "Нет ID профиля в запросе."
@@ -3229,6 +3507,32 @@ msgstr "Отписано"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Пользователь"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Блокировать"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Пригласить"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Авторизовать подписку"
@@ -3339,15 +3643,16 @@ msgid "No id."
msgstr "Нет идентификатора."
#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
msgid "Profile design"
-msgstr "Настройки профиля"
+msgstr "Оформление профиля"
#: actions/userdesignsettings.php:87 lib/designsettings.php:76
msgid ""
"Customize the way your profile looks with a background image and a colour "
"palette of your choice."
msgstr ""
+"Настройте внешний вид своего профиля, установив фоновое изображение и "
+"цветовую гамму на свой выбор."
#: actions/userdesignsettings.php:282
msgid "Enjoy your hotdog!"
@@ -3359,9 +3664,8 @@ msgid "%s groups, page %d"
msgstr "Группы %s, страница %d"
#: actions/usergroups.php:130
-#, fuzzy
msgid "Search for more groups"
-msgstr "Искать людей или текст"
+msgstr "Искать другие группы"
#: actions/usergroups.php:153
#, fuzzy, php-format
@@ -3390,11 +3694,16 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Ошибка при отправке прямого сообщения."
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "Не удаётся вставить сообщение."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "Не удаётся обновить сообщение с новым URI."
@@ -3428,15 +3737,15 @@ msgstr ""
"Слишком много записей за столь короткий срок; передохните немного и "
"попробуйте вновь через пару минут."
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr "Вам запрещено поститься на этом сайте (бан)"
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Проблемы с сохранением записи."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Ошибка баз данных при вставке ответа для %s"
@@ -3460,16 +3769,12 @@ msgstr "Загрузить аватар"
#: lib/accountsettingsaction.php:116
msgid "Change your password"
-msgstr "Изменить ваш пароль"
+msgstr "Измените свой пароль"
#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Изменить электронный адрес"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3517,101 +3822,105 @@ msgid "Connect"
msgstr "Соединить"
#: lib/action.php:435
-#, fuzzy
msgid "Connect to services"
-msgstr "Не удаётся перенаправить на сервер: %s"
+msgstr "Соединить с сервисами"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Главная навигация"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Пригласить"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Пригласи друзей и коллег стать такими же как ты участниками %s"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Выход"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "Выйти"
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr "Создать новый аккаунт"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "Войти"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Помощь"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr "Помощь"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Поиск"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "Искать людей или текст"
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr "Новая запись"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr "Локальные виды"
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr "Новая запись"
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr "Навигация по подпискам"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "О проекте"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "ЧаВо"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Пользовательское соглашение"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
-msgstr "Исходник"
+msgstr "Исходный код"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
-msgstr "Контакты"
+msgstr "Контактная информация"
-#: lib/action.php:736
+#: lib/action.php:740
#, fuzzy
msgid "Badge"
msgstr "\"Подтолкнуть\""
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr "StatusNet лицензия"
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3620,12 +3929,12 @@ msgstr ""
"**%%site.name%%** — это сервис микроблогинга, созданный для вас при помощи [%"
"%site.broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** — сервис микроблогинга. "
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3637,35 +3946,60 @@ msgstr ""
"лицензией [GNU Affero General Public License](http://www.fsf.org/licensing/"
"licenses/agpl-3.0.html)."
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "StatusNet лицензия"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr "Все"
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "лицензия."
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "Пагинация"
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "Сюда"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "Туда"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "Вы не можете послать сообщение этому пользователю."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "Команда ещё не выполнена."
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "Команда ещё не выполнена."
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Подтверждение электронного адреса"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "Подтверждение СМС"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3841,30 +4175,36 @@ msgstr "Вы не подписаны на этот профиль."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Вы не подписаны на этот профиль."
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "Вы не подписаны на этот профиль."
+msgstr[1] "Вы не подписаны на этот профиль."
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Не удаётся подписать других на вашу ленту."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Люди подписанные на %s"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "Не удаётся подписать других на вашу ленту."
+msgstr[1] "Не удаётся подписать других на вашу ленту."
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Вы не являетесь членом этой группы."
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Вы не являетесь членом этой группы."
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "Вы не являетесь членом этой группы."
+msgstr[1] "Вы не являетесь членом этой группы."
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3903,20 +4243,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Нет кода подтверждения."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
#, fuzzy
msgid "Go to the installer."
msgstr "Войти"
@@ -3937,10 +4277,6 @@ msgstr "Обновления по СМС"
msgid "Database error"
msgstr "Ошибка базы данных"
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3950,66 +4286,8 @@ msgstr "Загрузить"
msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Изменить Ваш пароль"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Соединить"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Поиск"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Текст"
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Список"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
+"Вы можете загрузить собственное фоновое изображение. Максимальный размер "
+"файла составляет 2Mb."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4053,7 +4331,7 @@ msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
-msgstr "Фильтровать тэги"
+msgstr "Фильтровать теги"
#: lib/galleryaction.php:131
msgid "All"
@@ -4066,7 +4344,7 @@ msgstr "Выбор провайдера"
#: lib/galleryaction.php:140
msgid "Tag"
-msgstr "Тэги"
+msgstr "Теги"
#: lib/galleryaction.php:141
msgid "Choose a tag to narrow list"
@@ -4148,7 +4426,7 @@ msgstr "Группы с наибольшим количеством записе
#: lib/grouptagcloudsection.php:56
#, php-format
msgid "Tags in %s group's notices"
-msgstr "Тэги записей группы %s"
+msgstr "Теги записей группы %s"
#: lib/htmloutputter.php:104
msgid "This page is not available in a media type you accept"
@@ -4190,7 +4468,7 @@ msgstr ""
#: lib/joinform.php:114
msgid "Join"
-msgstr "Авторизация"
+msgstr "Присоединиться"
#: lib/leaveform.php:114
msgid "Leave"
@@ -4239,12 +4517,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s сейчас слушает ваши заметки на %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4259,17 +4537,17 @@ msgid ""
"Change your email address or notification options at %8$s\n"
msgstr ""
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "Месторасположение: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "Домашняя страница: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
@@ -4278,12 +4556,12 @@ msgstr ""
"Био: %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "Новый электронный адрес для постинга %s"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4304,21 +4582,21 @@ msgstr ""
"Искренне Ваш,\n"
"%4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "%s статус"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "Подтверждение СМС"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "Вас \"подтолкнул\" пользователь %s"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4334,12 +4612,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "Новое приватное сообщение от %s"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4358,12 +4636,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s добавил вашу запись в состав своих любимых"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4384,12 +4662,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4528,7 +4806,12 @@ msgstr "Ошибка вставки удалённого профиля"
msgid "Duplicate notice"
msgstr "Удалить запись"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Этот пользователь заблокировал вас на его подписку."
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Не удаётся вставить новую подписку."
@@ -4544,10 +4827,6 @@ msgstr "Ответы"
msgid "Favorites"
msgstr "Любимое"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "Пользователь"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "Входящие"
@@ -4567,7 +4846,7 @@ msgstr "Ваши исходящие сообщения"
#: lib/personaltagcloudsection.php:56
#, php-format
msgid "Tags in %s's notices"
-msgstr "Тэги записей пользователя %s"
+msgstr "Теги записей пользователя %s"
#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
msgid "Subscriptions"
@@ -4586,9 +4865,8 @@ msgid "All subscribers"
msgstr "Все подписчики"
#: lib/profileaction.php:177
-#, fuzzy
msgid "User ID"
-msgstr "Пользователь"
+msgstr "ID пользователя"
#: lib/profileaction.php:182
msgid "Member since"
@@ -4598,6 +4876,15 @@ msgstr "Регистрация"
msgid "All groups"
msgstr "Все группы"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Нет ID аргумента."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Общее"
@@ -4618,6 +4905,16 @@ msgstr "Особые"
msgid "Popular"
msgstr "Популярное"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Входящие"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Разблокировать пользователя."
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4656,6 +4953,16 @@ msgstr "Секция без названия"
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Новая запись"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Заблокировать пользователя."
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4685,28 +4992,28 @@ msgstr ""
msgid "(none)"
msgstr "(пока ничего нет)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "Пользователь заблокировал Вас."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "Подписка неудачна."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "Не удаётся подписать других на вашу ленту."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Не подписан!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Не удаётся удалить подписку."
@@ -4718,6 +5025,29 @@ msgstr "Нет тэгов"
msgid "Top posters"
msgstr "Самые активные"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Разблокировать пользователя."
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Разблокировать пользователя."
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Разблокировать пользователя."
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Отписаться от этого пользователя"
@@ -4736,9 +5066,8 @@ msgid "User actions"
msgstr "Действия пользователя"
#: lib/userprofile.php:248
-#, fuzzy
msgid "Edit profile settings"
-msgstr "Настройки профиля"
+msgstr "Изменение настроек профиля"
#: lib/userprofile.php:249
msgid "Edit"
@@ -4821,3 +5150,7 @@ msgstr "Простите, это не Ваш входящий электронн
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Простите, входящих писем нет."
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Люди подписанные на %s"
diff --git a/locale/statusnet.po b/locale/statusnet.po
index 0d0ea85f6..925808159 100644
--- a/locale/statusnet.po
+++ b/locale/statusnet.po
@@ -8,13 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -42,7 +43,7 @@ msgstr ""
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr ""
@@ -142,7 +143,8 @@ msgstr ""
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -225,12 +227,12 @@ msgstr ""
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -363,6 +365,12 @@ msgstr ""
msgid "Alias can't be the same as nickname."
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
+msgid "Group not found!"
+msgstr ""
+
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
msgstr ""
@@ -450,13 +458,13 @@ msgstr ""
msgid "%s updates favorited by %s / %s."
msgstr ""
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr ""
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -543,7 +551,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr ""
@@ -555,7 +564,7 @@ msgstr ""
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -565,7 +574,7 @@ msgstr ""
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -629,70 +638,48 @@ msgstr ""
msgid "Unblock user from group"
msgstr ""
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr ""
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr ""
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
+#: actions/block.php:69
+msgid "You already blocked that user."
msgstr ""
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr ""
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr ""
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
msgid "Do not block this user"
msgstr ""
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr ""
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr ""
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr ""
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr ""
@@ -756,6 +743,15 @@ msgstr ""
msgid "No such notice."
msgstr ""
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr ""
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr ""
@@ -786,6 +782,135 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
+#: actions/deleteuser.php:67
+msgid "You cannot delete users."
+msgstr ""
+
+#: actions/deleteuser.php:74
+msgid "You can only delete local users."
+msgstr ""
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+msgid "Delete user"
+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
+msgid "Delete this user"
+msgstr ""
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: actions/designadminpanel.php:301
+#, php-format
+msgid "Theme not available: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:406
+msgid "Change theme"
+msgstr ""
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+msgid "Theme for the site."
+msgstr ""
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr ""
+
+#: actions/designadminpanel.php:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+msgid "Change colours"
+msgstr ""
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+msgid "Content"
+msgstr ""
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr ""
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr ""
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+msgid "Links"
+msgstr ""
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr ""
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr ""
@@ -926,14 +1051,6 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr ""
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -947,7 +1064,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr ""
@@ -1137,6 +1254,18 @@ msgstr ""
msgid "Cannot read file."
msgstr ""
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr ""
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr ""
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1247,11 +1376,11 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr ""
@@ -1334,7 +1463,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr ""
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr ""
@@ -1600,7 +1729,7 @@ msgstr ""
msgid "Error setting user."
msgstr ""
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr ""
@@ -2006,7 +2135,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr ""
@@ -2032,7 +2161,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr ""
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr ""
@@ -2057,7 +2186,7 @@ msgstr ""
msgid "Couldn't save tags."
msgstr ""
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr ""
@@ -2286,7 +2415,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -2330,7 +2459,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr ""
@@ -2414,7 +2543,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr ""
@@ -2487,6 +2616,14 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr ""
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+msgid "You cannot sandbox users on this site."
+msgstr ""
+
+#: actions/sandbox.php:72
+msgid "User is already sandboxed."
+msgstr ""
+
#: actions/showfavorites.php:79
#, php-format
msgid "%s's favorite notices, page %d"
@@ -2725,6 +2862,135 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#: actions/silence.php:65 actions/unsilence.php:65
+msgid "You cannot silence users on this site."
+msgstr ""
+
+#: actions/silence.php:72
+msgid "User is already silenced."
+msgstr ""
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+msgid "Site"
+msgstr ""
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+msgid "You must have a valid contact email address"
+msgstr ""
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+msgid "Site name"
+msgstr ""
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+msgid "contact email address for your site"
+msgstr ""
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+msgid "Default site language"
+msgstr ""
+
+#: actions/siteadminpanel.php:282
+msgid "Private"
+msgstr ""
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+msgid "Never"
+msgstr ""
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+msgid "Save site settings"
+msgstr ""
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr ""
@@ -2984,6 +3250,18 @@ msgstr ""
msgid "API method under construction."
msgstr ""
+#: actions/unblock.php:59
+msgid "You haven't blocked that user."
+msgstr ""
+
+#: actions/unsandbox.php:72
+msgid "User is not sandboxed."
+msgstr ""
+
+#: actions/unsilence.php:72
+msgid "User is not silenced."
+msgstr ""
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr ""
@@ -3001,6 +3279,30 @@ msgstr ""
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+msgid "Closed"
+msgstr ""
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+msgid "Invite-only"
+msgstr ""
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr ""
@@ -3148,11 +3450,15 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+msgid "You are banned from sending direct messages."
+msgstr ""
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr ""
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr ""
@@ -3180,15 +3486,15 @@ msgid ""
"few minutes."
msgstr ""
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
@@ -3218,10 +3524,6 @@ msgstr ""
msgid "Change email handling"
msgstr ""
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
msgid "Design your profile"
msgstr ""
@@ -3271,108 +3573,112 @@ msgstr ""
msgid "Connect to services"
msgstr ""
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+msgid "Change site configuration"
+msgstr ""
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr ""
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr ""
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr ""
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr ""
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr ""
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr ""
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr ""
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr ""
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr ""
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr ""
-#: lib/action.php:736
+#: lib/action.php:740
msgid "Badge"
msgstr ""
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3380,34 +3686,54 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:785
+#: lib/action.php:789
msgid "Site content license"
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr ""
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr ""
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr ""
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr ""
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr ""
+#: lib/adminpanelaction.php:96
+msgid "You cannot make changes to this site."
+msgstr ""
+
+#: lib/adminpanelaction.php:195
+msgid "showForm() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:224
+msgid "saveSettings() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:273
+msgid "Basic site configuration"
+msgstr ""
+
+#: lib/adminpanelaction.php:276
+msgid "Design configuration"
+msgstr ""
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3579,26 +3905,32 @@ msgid "You are not subscribed to anyone."
msgstr ""
#: lib/command.php:620
-msgid "You are subscribed to these people: "
-msgstr ""
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] ""
+msgstr[1] ""
-#: lib/command.php:637
+#: lib/command.php:640
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:639
-msgid "These people are subscribed to you: "
-msgstr ""
+#: lib/command.php:642
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] ""
+msgstr[1] ""
-#: lib/command.php:656
+#: lib/command.php:662
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:658
-msgid "You are a member of these groups: "
-msgstr ""
+#: lib/command.php:664
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] ""
+msgstr[1] ""
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3637,19 +3969,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
msgid "Go to the installer."
msgstr ""
@@ -3669,10 +4001,6 @@ msgstr ""
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
msgid "Upload file"
msgstr ""
@@ -3682,62 +4010,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-msgid "Change colours"
-msgstr ""
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-msgid "Content"
-msgstr ""
-
-#: lib/designsettings.php:204
-msgid "Sidebar"
-msgstr ""
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr ""
-
-#: lib/designsettings.php:230
-msgid "Links"
-msgstr ""
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -3963,12 +4235,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
-#: lib/mail.php:240
+#: lib/mail.php:241
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -3983,29 +4255,29 @@ msgid ""
"Change your email address or notification options at %8$s\n"
msgstr ""
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr ""
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr ""
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
"\n"
msgstr ""
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4018,21 +4290,21 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr ""
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4048,12 +4320,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4072,12 +4344,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4098,12 +4370,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4239,7 +4511,11 @@ msgstr ""
msgid "Duplicate notice"
msgstr ""
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr ""
@@ -4255,10 +4531,6 @@ msgstr ""
msgid "Favorites"
msgstr ""
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr ""
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr ""
@@ -4308,6 +4580,14 @@ msgstr ""
msgid "All groups"
msgstr ""
+#: lib/profileformaction.php:123
+msgid "No return-to arguments"
+msgstr ""
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr ""
@@ -4328,6 +4608,14 @@ msgstr ""
msgid "Popular"
msgstr ""
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr ""
+
+#: lib/sandboxform.php:78
+msgid "Sandbox this user"
+msgstr ""
+
#: lib/searchaction.php:120
msgid "Search site"
msgstr ""
@@ -4364,6 +4652,14 @@ msgstr ""
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+msgid "Silence"
+msgstr ""
+
+#: lib/silenceform.php:78
+msgid "Silence this user"
+msgstr ""
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4393,27 +4689,27 @@ msgstr ""
msgid "(none)"
msgstr ""
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr ""
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr ""
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr ""
-#: lib/subs.php:124
+#: lib/subs.php:128
msgid "Not subscribed!"
msgstr ""
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr ""
@@ -4425,6 +4721,26 @@ msgstr ""
msgid "Top posters"
msgstr ""
+#: lib/unblockform.php:80
+msgid "Unlock this user"
+msgstr ""
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+msgid "Unsandbox this user"
+msgstr ""
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+msgid "Unsilence this user"
+msgstr ""
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.mo b/locale/sv/LC_MESSAGES/statusnet.mo
index ed78309b1..7a03482ed 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 437c4b244..45732d233 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:44:15+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:39+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -42,7 +42,7 @@ msgstr "Inget sådant meddelande."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Ingen sådan användare"
@@ -145,7 +145,8 @@ msgstr "Kunde inte uppdatera användare."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -232,12 +233,12 @@ msgstr "Alla direktmeddelanden skickade till %s"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -379,6 +380,13 @@ msgstr "Användarnamnet används redan, försök med ett annat."
msgid "Alias can't be the same as nickname."
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-metoden hittades inte!"
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -470,13 +478,13 @@ msgstr "%s / Favoriter från %s"
msgid "%s updates favorited by %s / %s."
msgstr "%s uppdaterade favoriter av %s / %s."
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "%s tidslinje"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -566,7 +574,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
#, fuzzy
msgid "Delete"
msgstr "Ta bort"
@@ -579,7 +588,7 @@ msgstr "Ladda upp"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -589,7 +598,7 @@ msgstr ""
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr "Det var något problem med din session. Försök igen, tack."
@@ -657,77 +666,53 @@ msgstr ""
msgid "Unblock user from group"
msgstr "Ingen sådan användare"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
#, fuzzy
msgid "Unblock this user"
msgstr "Ingen sådan användare"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Inte inloggad."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+#: actions/block.php:69
#, fuzzy
-msgid "No profile specified."
-msgstr "Ingen mottagare tillagd."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-#, fuzzy
-msgid "No profile with that ID."
-msgstr "Ingen status hittad med det ID"
+msgid "You already blocked that user."
+msgstr "Du prenumererar redan på dessa användare:"
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
#, fuzzy
msgid "Block user"
msgstr "Ingen sådan användare"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "Nej"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Ingen sådan användare"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Ingen sådan användare"
-#: actions/block.php:165
-#, fuzzy
-msgid "You have already blocked this user."
-msgstr "Du prenumererar redan på dessa användare:"
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr ""
@@ -792,6 +777,15 @@ msgstr "Inlägg"
msgid "No such notice."
msgstr "Inget sådant inlägg."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Inte inloggad."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Kan inte ta bort detta inlägg."
@@ -828,6 +822,145 @@ msgstr "Ta bort inlägg"
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/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Kunde inte uppdatera användare."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Du kan inte tabort nån annan användares status."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "Ta bort"
+
+#: 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 "Ta bort inlägg"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Kunde inte spara dina Twitter inställningar!"
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Ändra"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+msgid "Theme for the site."
+msgstr ""
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, 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:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Ändra ditt lösenord"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Anslut"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Sök"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Text"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Logga in"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Spara"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "Det inlägget är ingen favorit!"
@@ -976,14 +1109,6 @@ 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:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Spara"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -997,7 +1122,7 @@ msgstr "Ingen emailadress."
msgid "Cannot normalize that email address"
msgstr "Kan inte normalisera den emailadressen"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "Ingen giltig emailadress"
@@ -1202,6 +1327,20 @@ msgstr "Inget sådant inlägg."
msgid "Cannot read file."
msgstr "Inget sådant inlägg."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+#, fuzzy
+msgid "No profile specified."
+msgstr "Ingen mottagare tillagd."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+#, fuzzy
+msgid "No profile with that ID."
+msgstr "Ingen status hittad med det ID"
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
#, fuzzy
@@ -1324,11 +1463,11 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr ""
@@ -1418,7 +1557,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "Användaren har ingen profil."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
#, fuzzy
msgid "Error removing the block."
msgstr "Fel uppstog när användaren skulle sparas."
@@ -1731,7 +1870,7 @@ msgstr "Felaktigt användarnamn eller lösenord."
msgid "Error setting user."
msgstr "Fel uppstog i användarens inställning"
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logga in"
@@ -2157,7 +2296,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Språk"
@@ -2185,7 +2324,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Biografin är för lång (max 140 tecken)"
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "Du har inte valt tidszon"
@@ -2211,7 +2350,7 @@ msgstr "Kunde inte spara profil."
msgid "Couldn't save tags."
msgstr "Kunde inte spara profil."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Inställningar sparade."
@@ -2448,7 +2587,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:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrera"
@@ -2494,7 +2633,7 @@ msgid "Same as password above. Required."
msgstr "Samma som lösenordet ovan. Måste fyllas i."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Epost"
@@ -2603,7 +2742,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL till din profil på en annan kompatibel mikroblogg"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Prenumerera"
@@ -2678,6 +2817,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "Meddelande till %1$s på %2$s"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Du kan inte skicka meddelande till den användaren."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Användaren har ingen profil."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2921,6 +3070,145 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "Du kan inte skicka meddelande till den användaren."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "Användaren har ingen profil."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "Bjud in"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Ingen giltig emailadress"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Nytt inlägg"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Ny emailadress för att skicka till %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Språkval"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Sekretesspolicy"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Återställ"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Twitter inställningar"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "SMS Inställningar"
@@ -3202,6 +3490,21 @@ msgstr "Inget sådant meddelande."
msgid "API method under construction."
msgstr "API-metoden är under uppbyggnad."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Du prenumererar redan på dessa användare:"
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Användaren har ingen profil."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "Användaren har ingen profil."
+
#: actions/unsubscribe.php:77
#, fuzzy
msgid "No profile id in request."
@@ -3222,6 +3525,32 @@ 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
+msgid "User"
+msgstr ""
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Ingen sådan användare"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Bjud in"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Tillåt prenumeration."
@@ -3383,11 +3712,15 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+msgid "You are banned from sending direct messages."
+msgstr ""
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr ""
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr ""
@@ -3417,15 +3750,15 @@ msgid ""
"few minutes."
msgstr ""
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Det var ett problem när inlägget sparades."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Databasfel för svar: %s"
@@ -3456,10 +3789,6 @@ msgstr "Ändra ditt lösenord"
msgid "Change email handling"
msgstr "Ändra email hantering"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3513,103 +3842,108 @@ msgstr "Anslut"
msgid "Connect to services"
msgstr "Kunde inte skicka vidare till servern: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Prenumerationer"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Bjud in"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 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:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Logga ut"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:454
#, fuzzy
msgid "Create an account"
msgstr "Skapa ett nytt konto"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr ""
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Hjälp"
-#: lib/action.php:456
+#: lib/action.php:460
#, fuzzy
msgid "Help me!"
msgstr "Hjälp"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Sök"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:480
+#: lib/action.php:484
#, fuzzy
msgid "Site notice"
msgstr "Nytt inlägg"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr ""
-#: lib/action.php:612
+#: lib/action.php:616
#, fuzzy
msgid "Page notice"
msgstr "Nytt inlägg"
-#: lib/action.php:714
+#: lib/action.php:718
#, fuzzy
msgid "Secondary site navigation"
msgstr "Prenumerationer"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Om"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "Frågor & svar"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Sekretesspolicy"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Källa"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Kontakta"
-#: lib/action.php:736
+#: lib/action.php:740
msgid "Badge"
msgstr ""
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3618,12 +3952,12 @@ msgstr ""
"**%%site.name%%** är en mikroblogg service för dig ifrån [%%site.broughtby%%]"
"(%%site.broughtbyurl%%)"
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** är en mikroblogg service."
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3634,38 +3968,61 @@ msgstr ""
"version %s, tillgängligt under [GNU Affero General Public License](http://"
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "Sök innehåll i inlägg"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr ""
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr ""
-#: lib/action.php:1061
+#: lib/action.php:1076
#, fuzzy
msgid "After"
msgstr "« Nyare"
-#: lib/action.php:1069
+#: lib/action.php:1084
#, fuzzy
msgid "Before"
msgstr "Tidigare »"
-#: lib/action.php:1117
+#: lib/action.php:1132
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Det var något problem med din session. Försök igen, tack."
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "Du kan inte skicka meddelande till den användaren."
+
+#: lib/adminpanelaction.php:195
+msgid "showForm() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:224
+msgid "saveSettings() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Bekräfta epostadress"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "SMS Bekräftelse"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3841,30 +4198,36 @@ msgstr "Du skickade inte oss den profilen"
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Du skickade inte oss den profilen"
+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"
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Kunde inte prenumerera på annat åt dig."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Fjärrprenumerera"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "Kunde inte prenumerera på annat åt dig."
+msgstr[1] "Kunde inte prenumerera på annat åt dig."
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du skickade inte oss den profilen"
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Du skickade inte oss den profilen"
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "Du skickade inte oss den profilen"
+msgstr[1] "Du skickade inte oss den profilen"
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3903,20 +4266,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Ingen bekräftelsekod."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
msgid "Go to the installer."
msgstr ""
@@ -3936,10 +4299,6 @@ msgstr "Uppdateringar via SMS"
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3950,66 +4309,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Ändra ditt lösenord"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Anslut"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Sök"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Text"
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Logga in"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4253,12 +4552,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s lyssnar nu på dina meddelanden i %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4277,29 +4576,29 @@ msgstr ""
"\tHälsningar,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, fuzzy, php-format
msgid "Location: %s\n"
msgstr "Plats: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, fuzzy, php-format
msgid "Homepage: %s\n"
msgstr "Hemsida: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
"\n"
msgstr ""
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "Ny emailadress för att skicka till %s"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4320,21 +4619,21 @@ msgstr ""
"Mvh,\n"
"%4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "%s status"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "SMS Bekräftelse"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "You've been nudged by %s"
msgstr "Du är identifierad. Skriv in"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4350,12 +4649,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4374,12 +4673,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s la till ditt inlägg som favorit"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4400,12 +4699,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4549,7 +4848,11 @@ msgstr "Fel uppstog när fjärrprofilen skulle läggas till"
msgid "Duplicate notice"
msgstr "Tabort inlägg"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Kunde inte lägga till ny prenumeration."
@@ -4565,10 +4868,6 @@ msgstr "Svar"
msgid "Favorites"
msgstr ""
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr ""
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr ""
@@ -4619,6 +4918,15 @@ msgstr "Medlem sedan"
msgid "All groups"
msgstr ""
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Inget sådant dokument."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Publik"
@@ -4641,6 +4949,15 @@ msgstr ""
msgid "Popular"
msgstr "Personer"
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr ""
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Ingen sådan användare"
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4681,6 +4998,16 @@ msgstr ""
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Nytt inlägg"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Ingen sådan användare"
+
#: lib/subgroupnav.php:83
#, fuzzy, php-format
msgid "People %s subscribes to"
@@ -4710,29 +5037,29 @@ msgstr ""
msgid "(none)"
msgstr ""
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
#, fuzzy
msgid "User has blocked you."
msgstr "Användaren har ingen profil."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "Kunde inte prenumerera."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "Kunde inte prenumerera på annat åt dig."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Ingen prenumerant!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Kunde inte radera prenumerationen. "
@@ -4745,6 +5072,29 @@ msgstr "Nej"
msgid "Top posters"
msgstr ""
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Ingen sådan användare"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Ingen sådan användare"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Ingen sådan användare"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr ""
@@ -4851,3 +5201,7 @@ msgstr "Ledsen, men det är inte din inkommande emailadress."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Ledsen, men inga inkommande email är tillåtna."
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Fjärrprenumerera"
diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo
index 059365e86..9a225e09b 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 b45d8a5a9..5aabf0d0e 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:44:17+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:42+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -42,7 +42,7 @@ msgstr "అటువంటి పేజీ లేదు"
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "అటువంటి వాడుకరి లేరు."
@@ -144,7 +144,8 @@ msgstr "వాడుకరిని తాజాకరించలేకున
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -229,12 +230,12 @@ msgstr ""
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -371,6 +372,13 @@ msgstr "\"%s\" అన్న మారుపేరుని ఇప్పటిక
msgid "Alias can't be the same as nickname."
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 "దొరకలేదు"
+
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు."
@@ -459,13 +467,13 @@ msgstr ""
msgid "%s updates favorited by %s / %s."
msgstr ""
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "%s కాలరేఖ"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -553,7 +561,8 @@ msgstr "అసలు"
msgid "Preview"
msgstr "మునుజూపు"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "తొలగించు"
@@ -565,7 +574,7 @@ msgstr "ఎగుమతించు"
msgid "Crop"
msgstr "కత్తిరించు"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -575,7 +584,7 @@ msgstr "కత్తిరించు"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -641,71 +650,50 @@ msgstr ""
msgid "Unblock user from group"
msgstr "అటువంటి వాడుకరి లేరు."
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
#, fuzzy
msgid "Unblock this user"
msgstr "అటువంటి వాడుకరి లేరు."
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "లోనికి ప్రవేశించలేదు."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr ""
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "మీరు ఇప్పటికే ఈ వాడుకరిని నిరోధించారు."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "వాడుకరిని నిరోధించు"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "కాదు"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
msgid "Do not block this user"
msgstr "ఈ వాడుకరిని నిరోధించకు"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "అవును"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr "ఈ వాడుకరిని నిరోధించు"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "మీరు ఇప్పటికే ఈ వాడుకరిని నిరోధించారు."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "నిరోధపు సమాచారాన్ని భద్రపరచడంలో విఫలమయ్యాం."
@@ -769,6 +757,15 @@ msgstr "సందేశాలు"
msgid "No such notice."
msgstr "అటువంటి సందేశమేమీ లేదు."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "లోనికి ప్రవేశించలేదు."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "ఈ నోటీసుని తొలగించలేము."
@@ -800,6 +797,141 @@ msgstr "ఈ నోటీసుని తొలగించు"
msgid "There was a problem with your session token. Try again, please."
msgstr ""
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "ఇతర వాడుకరుల స్థితిని మీరు తొలగించలేరు."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+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 "ఈ నోటీసుని తొలగించు"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr "రూపురేఖలు"
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "హోమ్ పేజీ URL సరైనది కాదు."
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "మార్చు"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+msgid "Theme for the site."
+msgstr ""
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr "నేపథ్య చిత్రాన్ని మార్చు"
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "నేపథ్యం"
+
+#: actions/designadminpanel.php:429
+#, 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:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+msgid "Change colours"
+msgstr "రంగులను మార్చు"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "అనుసంధానించు"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "పక్కపట్టీ"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "పాఠ్యం"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+msgid "Links"
+msgstr "లంకెలు"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "భద్రపరచు"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr "రూపురేఖలని భద్రపరచు"
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr ""
@@ -941,14 +1073,6 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "భద్రపరచు"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -962,7 +1086,7 @@ msgstr "ఈమెయిలు చిరునామా లేదు."
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "సరైన ఈమెయిలు చిరునామా కాదు"
@@ -1153,6 +1277,18 @@ msgstr "అటువంటి ఫైలు లేదు."
msgid "Cannot read file."
msgstr "ఫైలుని చదవలేకపోతున్నాం."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr ""
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr ""
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1268,11 +1404,11 @@ msgstr "%s గుంపు సభ్యులు, పేజీ %d"
msgid "A list of the users in this group."
msgstr "ఈ గుంపులో వాడుకరులు జాబితా."
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "నిరోధించు"
@@ -1358,7 +1494,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "వాడుకరికి ప్రొఫైలు లేదు."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
#, fuzzy
msgid "Error removing the block."
msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు."
@@ -1627,7 +1763,7 @@ msgstr "వాడుకరిపేరు లేదా సంకేతపదం
msgid "Error setting user."
msgstr ""
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "ప్రవేశించండి"
@@ -2042,7 +2178,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "భాష"
@@ -2068,7 +2204,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "స్వపరిచయం చాలా పెద్దగా ఉంది (140 అక్షరాలు గరిష్ఠం)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "కాలమండలాన్ని ఎంచుకోలేదు."
@@ -2093,7 +2229,7 @@ msgstr "ప్రొఫైలుని భద్రపరచలేకున్
msgid "Couldn't save tags."
msgstr "ట్యాగులని భద్రపరచలేకున్నాం."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "అమరికలు భద్రమయ్యాయి."
@@ -2327,7 +2463,7 @@ msgstr "నిర్ధారణ సంకేతంలో పొరపాటు.
msgid "Registration successful"
msgstr "నమోదు విజయవంతం"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "నమోదు"
@@ -2371,7 +2507,7 @@ msgid "Same as password above. Required."
msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "ఈమెయిల్"
@@ -2457,7 +2593,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "చందాచేరు"
@@ -2530,6 +2666,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "%sకి స్పందనలు"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2769,6 +2915,144 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#: actions/silence.php:65 actions/unsilence.php:65
+msgid "You cannot silence users on this site."
+msgstr ""
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "ఆహ్వానించు"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "సరైన ఈమెయిలు చిరునామా కాదు"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "కొత్త సందేశం"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "ఈ వాడుకరికై నమోదైన ఈమెయిల్ చిరునామాలు ఏమీ లేవు."
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "ప్రాథాన్యతా భాష"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "అంతరంగికత"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "వైదొలగు"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "అవతారపు అమరికలు"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "SMS అమరికలు"
@@ -3036,6 +3320,21 @@ msgstr "అటువంటి సందేశమేమీ లేదు."
msgid "API method under construction."
msgstr ""
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "మీరు ఇప్పటికే ఈ వాడుకరిని నిరోధించారు."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "వాడుకరికి ప్రొఫైలు లేదు."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "వాడుకరికి ప్రొఫైలు లేదు."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr ""
@@ -3054,6 +3353,32 @@ msgstr "చందాదార్లు"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "వాడుకరి"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "అటువంటి వాడుకరి లేరు."
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "ఆహ్వానించు"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr ""
@@ -3203,11 +3528,16 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "మీకు వచ్చిన సందేశాలు"
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr ""
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr ""
@@ -3237,15 +3567,15 @@ msgid ""
"few minutes."
msgstr ""
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
@@ -3275,10 +3605,6 @@ msgstr "మీ సంకేతపదాన్ని మార్చుకోం
msgid "Change email handling"
msgstr ""
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr "రూపురేఖలు"
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3329,100 +3655,105 @@ msgstr "అనుసంధానించు"
msgid "Connect to services"
msgstr ""
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "చందాలు"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "ఆహ్వానించు"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout"
msgstr "నిష్క్రమించు"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr "కొత్త ఖాతా సృష్టించు"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr ""
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "సహాయం"
-#: lib/action.php:456
+#: lib/action.php:460
#, fuzzy
msgid "Help me!"
msgstr "సహాయం"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "వెతుకు"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:480
+#: lib/action.php:484
#, fuzzy
msgid "Site notice"
msgstr "కొత్త సందేశం"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr ""
-#: lib/action.php:612
+#: lib/action.php:616
#, fuzzy
msgid "Page notice"
msgstr "కొత్త సందేశం"
-#: lib/action.php:714
+#: lib/action.php:718
#, fuzzy
msgid "Secondary site navigation"
msgstr "చందాలు"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "గురించి"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "ప్రశ్నలు"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr "సేవా నియమాలు"
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "అంతరంగికత"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "మూలము"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "సంప్రదించు"
-#: lib/action.php:736
+#: lib/action.php:740
msgid "Badge"
msgstr ""
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3431,12 +3762,12 @@ msgstr ""
"**%%site.name%%** అనేది [%%site.broughtby%%](%%site.broughtbyurl%%) వారు "
"అందిస్తున్న మైక్రో బ్లాగింగు సదుపాయం. "
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం."
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3447,35 +3778,57 @@ msgstr ""
"html) కింద లభ్యమయ్యే [స్టేటస్&zwnj;నెట్](http://status.net/) మైక్రోబ్లాగింగ్ ఉపకరణం సంచిక %s "
"పై నడుస్తుంది."
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "కొత్త సందేశం"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr "అన్నీ "
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr ""
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "పేజీకరణ"
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "తర్వాత"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "ఇంతక్రితం"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr ""
+#: lib/adminpanelaction.php:96
+msgid "You cannot make changes to this site."
+msgstr ""
+
+#: lib/adminpanelaction.php:195
+msgid "showForm() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:224
+msgid "saveSettings() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "ఈమెయిల్ చిరునామా నిర్ధారణ"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "SMS నిర్ధారణ"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "జోడింపులు"
@@ -3654,30 +4007,36 @@ msgstr "%sకి స్పందనలు"
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "%sకి స్పందనలు"
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "%sకి స్పందనలు"
+msgstr[1] "%sకి స్పందనలు"
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "%sకి స్పందనలు"
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "%sకి స్పందనలు"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "%sకి స్పందనలు"
+msgstr[1] "%sకి స్పందనలు"
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
+msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3716,20 +4075,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "నిర్ధారణ సంకేతం లేదు."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
msgid "Go to the installer."
msgstr ""
@@ -3749,10 +4108,6 @@ msgstr ""
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr "నేపథ్య చిత్రాన్ని మార్చు"
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3763,63 +4118,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr "మీ స్వంత నేపథ్యపు చిత్రాన్ని మీరు ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం 2మెబై."
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-msgid "Change colours"
-msgstr "రంగులను మార్చు"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr "నేపథ్యం"
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "అనుసంధానించు"
-
-#: lib/designsettings.php:204
-msgid "Sidebar"
-msgstr "పక్కపట్టీ"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "పాఠ్యం"
-
-#: lib/designsettings.php:230
-msgid "Links"
-msgstr "లంకెలు"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr "రూపురేఖలని భద్రపరచు"
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4052,12 +4350,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
-#: lib/mail.php:240
+#: lib/mail.php:241
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4072,29 +4370,29 @@ msgid ""
"Change your email address or notification options at %8$s\n"
msgstr ""
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "ప్రాంతం: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "హోమ్ పేజీ: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
"\n"
msgstr ""
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4107,21 +4405,21 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "%s స్థితి"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "SMS నిర్ధారణ"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4137,12 +4435,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "%s నుండి కొత్త అంతరంగిక సందేశం"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4161,12 +4459,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4187,12 +4485,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4333,7 +4631,11 @@ msgstr "దూరపు ప్రొపైలుని చేర్చటంల
msgid "Duplicate notice"
msgstr "కొత్త సందేశం"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr ""
@@ -4349,10 +4651,6 @@ msgstr "స్పందనలు"
msgid "Favorites"
msgstr "ఇష్టాంశాలు"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "వాడుకరి"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr ""
@@ -4402,6 +4700,15 @@ msgstr "సభ్యులైన తేదీ"
msgid "All groups"
msgstr "అన్ని గుంపులు"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "అటువంటి పత్రమేమీ లేదు."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "ప్రజా"
@@ -4422,6 +4729,15 @@ msgstr "విశేషం"
msgid "Popular"
msgstr "ప్రాచుర్యం"
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr ""
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "అటువంటి వాడుకరి లేరు."
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4461,6 +4777,16 @@ msgstr ""
msgid "More..."
msgstr "మరింత..."
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "కొత్త సందేశం"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "ఈ వాడుకరిని నిరోధించు"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4490,28 +4816,28 @@ msgstr ""
msgid "(none)"
msgstr "(ఏమీలేవు)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "వాడుకరి మిమ్మల్ని నిరోధించారు."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr ""
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr ""
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "చందాదార్లు"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "చందాని తొలగించలేకపోయాం."
@@ -4523,6 +4849,29 @@ msgstr "ఏమీలేదు"
msgid "Top posters"
msgstr ""
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "అటువంటి వాడుకరి లేరు."
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "అటువంటి వాడుకరి లేరు."
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "అటువంటి వాడుకరి లేరు."
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr ""
@@ -4625,3 +4974,7 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "%sకి స్పందనలు"
diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo
index 84e32897a..c2079ecf0 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 78261edbb..82688a58f 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:44:20+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:45+0000\n"
"Language-Team: Turkish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -42,7 +42,7 @@ msgstr "Böyle bir durum mesajı yok."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Böyle bir kullanıcı yok."
@@ -145,7 +145,8 @@ msgstr "Kullanıcı güncellenemedi."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -231,12 +232,12 @@ msgstr ""
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -377,6 +378,13 @@ msgstr "Takma ad kullanımda. Başka bir tane deneyin."
msgid "Alias can't be the same as nickname."
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 "İstek bulunamadı!"
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -469,13 +477,13 @@ msgstr ""
msgid "%s updates favorited by %s / %s."
msgstr ""
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr ""
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -565,7 +573,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr ""
@@ -577,7 +586,7 @@ msgstr "Yükle"
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -587,7 +596,7 @@ msgstr ""
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -655,75 +664,53 @@ msgstr ""
msgid "Unblock user from group"
msgstr "Böyle bir kullanıcı yok."
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
#, fuzzy
msgid "Unblock this user"
msgstr "Böyle bir kullanıcı yok."
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Giriş yapılmadı."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr ""
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Zaten giriş yapmış durumdasıznız!"
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
#, fuzzy
msgid "Block user"
msgstr "Böyle bir kullanıcı yok."
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr ""
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Böyle bir kullanıcı yok."
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr ""
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Böyle bir kullanıcı yok."
-#: actions/block.php:165
-#, fuzzy
-msgid "You have already blocked this user."
-msgstr "Zaten giriş yapmış durumdasıznız!"
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr ""
@@ -788,6 +775,15 @@ msgstr "Durum mesajları"
msgid "No such notice."
msgstr "Böyle bir durum mesajı yok."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Giriş yapılmadı."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr ""
@@ -819,6 +815,144 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Kullanıcı güncellenemedi."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Yerel aboneliği kullanabilirsiniz!"
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+msgid "Delete user"
+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 "Böyle bir kullanıcı yok."
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: actions/designadminpanel.php:301
+#, 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:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Değiştir"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+msgid "Theme for the site."
+msgstr ""
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, fuzzy, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr ""
+"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
+
+#: actions/designadminpanel.php:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Parolayı değiştir"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Bağlan"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Ara"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr ""
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Giriş"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Kaydet"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr ""
@@ -961,14 +1095,6 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Kaydet"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -982,7 +1108,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr ""
@@ -1180,6 +1306,18 @@ msgstr "Böyle bir durum mesajı yok."
msgid "Cannot read file."
msgstr "Böyle bir durum mesajı yok."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr ""
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr ""
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1299,11 +1437,11 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr ""
@@ -1393,7 +1531,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "Kullanıcının profili yok."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
#, fuzzy
msgid "Error removing the block."
msgstr "Kullanıcıyı kaydetmede hata oluştu."
@@ -1673,7 +1811,7 @@ msgstr "Yanlış kullanıcı adı veya parola."
msgid "Error setting user."
msgstr "Kullanıcı ayarlamada hata oluştu."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Giriş"
@@ -2104,7 +2242,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr ""
@@ -2130,7 +2268,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr ""
@@ -2156,7 +2294,7 @@ msgstr "Profil kaydedilemedi."
msgid "Couldn't save tags."
msgstr "Profil kaydedilemedi."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Ayarlar kaydedildi."
@@ -2392,7 +2530,7 @@ msgstr "Onay kodu hatası."
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Kayıt"
@@ -2436,7 +2574,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Eposta"
@@ -2525,7 +2663,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Abone ol"
@@ -2599,6 +2737,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "%s için cevaplar"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Bize o profili yollamadınız"
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Kullanıcının profili yok."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2842,6 +2990,142 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#: actions/silence.php:65 actions/unsilence.php:65
+msgid "You cannot silence users on this site."
+msgstr ""
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "Kullanıcının profili yok."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+msgid "Site"
+msgstr ""
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Geçersiz bir eposta adresi."
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Yeni durum mesajı"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+msgid "Default site language"
+msgstr ""
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Gizlilik"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Geri al"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Ayarlar"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr ""
@@ -3113,6 +3397,21 @@ msgstr "Böyle bir durum mesajı yok."
msgid "API method under construction."
msgstr ""
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Zaten giriş yapmış durumdasıznız!"
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Kullanıcının profili yok."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "Kullanıcının profili yok."
+
#: actions/unsubscribe.php:77
#, fuzzy
msgid "No profile id in request."
@@ -3132,6 +3431,31 @@ 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
+msgid "User"
+msgstr ""
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Böyle bir kullanıcı yok."
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+msgid "Invite-only"
+msgstr ""
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Takip isteğini onayla"
@@ -3286,11 +3610,15 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+msgid "You are banned from sending direct messages."
+msgstr ""
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr ""
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr ""
@@ -3320,15 +3648,15 @@ msgid ""
"few minutes."
msgstr ""
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Cevap eklenirken veritabanı hatası: %s"
@@ -3359,10 +3687,6 @@ msgstr ""
msgid "Change email handling"
msgstr ""
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3415,101 +3739,106 @@ msgstr "Bağlan"
msgid "Connect to services"
msgstr "Sunucuya yönlendirme yapılamadı: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Abonelikler"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Çıkış"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:454
#, fuzzy
msgid "Create an account"
msgstr "Yeni hesap oluştur"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr ""
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Yardım"
-#: lib/action.php:456
+#: lib/action.php:460
#, fuzzy
msgid "Help me!"
msgstr "Yardım"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Ara"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:480
+#: lib/action.php:484
#, fuzzy
msgid "Site notice"
msgstr "Yeni durum mesajı"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr ""
-#: lib/action.php:612
+#: lib/action.php:616
#, fuzzy
msgid "Page notice"
msgstr "Yeni durum mesajı"
-#: lib/action.php:714
+#: lib/action.php:718
#, fuzzy
msgid "Secondary site navigation"
msgstr "Abonelikler"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Hakkında"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "SSS"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Gizlilik"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Kaynak"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "İletişim"
-#: lib/action.php:736
+#: lib/action.php:740
msgid "Badge"
msgstr ""
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3518,12 +3847,12 @@ msgstr ""
"**%%site.name%%** [%%site.broughtby%%](%%site.broughtbyurl%%)\" tarafından "
"hazırlanan anında mesajlaşma ağıdır. "
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3534,37 +3863,59 @@ 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:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "Yeni durum mesajı"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr ""
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr ""
-#: lib/action.php:1061
+#: lib/action.php:1076
#, fuzzy
msgid "After"
msgstr "« Sonra"
-#: lib/action.php:1069
+#: lib/action.php:1084
#, fuzzy
msgid "Before"
msgstr "Önce »"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr ""
+#: lib/adminpanelaction.php:96
+msgid "You cannot make changes to this site."
+msgstr ""
+
+#: lib/adminpanelaction.php:195
+msgid "showForm() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:224
+msgid "saveSettings() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Eposta adresi onayı"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "Eposta adresi onayı"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3740,30 +4091,36 @@ msgstr "Bize o profili yollamadınız"
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Bize o profili yollamadınız"
+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:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Uzaktan abonelik"
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Uzaktan abonelik"
+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:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Bize o profili yollamadınız"
+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:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3802,20 +4159,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Onay kodu yok."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
msgid "Go to the installer."
msgstr ""
@@ -3835,10 +4192,6 @@ msgstr ""
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3849,66 +4202,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Parolayı değiştir"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Bağlan"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Ara"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr ""
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Giriş"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4148,12 +4441,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s %2$s'da durumunuzu takip ediyor"
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4174,29 +4467,29 @@ msgstr ""
"Kendisini durumsuz bırakmayın!,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr ""
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr ""
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
"\n"
msgstr ""
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4209,21 +4502,21 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "%s durum"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4239,12 +4532,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4263,12 +4556,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1$s %2$s'da durumunuzu takip ediyor"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4289,12 +4582,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4436,7 +4729,11 @@ msgstr "Uzak profil eklemede hata oluştu"
msgid "Duplicate notice"
msgstr "Yeni durum mesajı"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Yeni abonelik eklenemedi."
@@ -4452,10 +4749,6 @@ msgstr "Cevaplar"
msgid "Favorites"
msgstr ""
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr ""
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr ""
@@ -4506,6 +4799,15 @@ msgstr "Üyelik başlangıcı"
msgid "All groups"
msgstr ""
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Böyle bir belge yok."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Genel"
@@ -4527,6 +4829,15 @@ msgstr ""
msgid "Popular"
msgstr "Kişi Arama"
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr ""
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Böyle bir kullanıcı yok."
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4566,6 +4877,16 @@ msgstr ""
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Yeni durum mesajı"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Böyle bir kullanıcı yok."
+
#: lib/subgroupnav.php:83
#, fuzzy, php-format
msgid "People %s subscribes to"
@@ -4595,29 +4916,29 @@ msgstr ""
msgid "(none)"
msgstr ""
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
#, fuzzy
msgid "User has blocked you."
msgstr "Kullanıcının profili yok."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr ""
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr ""
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Abonelik silinemedi."
@@ -4629,6 +4950,29 @@ msgstr ""
msgid "Top posters"
msgstr ""
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Böyle bir kullanıcı yok."
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Böyle bir kullanıcı yok."
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Böyle bir kullanıcı yok."
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr ""
@@ -4732,3 +5076,7 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Uzaktan abonelik"
diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo
index 9cbb4440f..4cb71655b 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 2c54591aa..4db942e5d 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:44:23+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:48+0000\n"
"Language-Team: Ukrainian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -42,7 +42,7 @@ msgstr "Такого тегу немає."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Такого користувача немає."
@@ -145,7 +145,8 @@ msgstr "Не вдалося оновити користувача."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -232,12 +233,12 @@ msgstr "Всі прямі повідомлення надіслані до %s"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -378,6 +379,13 @@ msgstr "Це ім'я вже використовується. Спробуйте
msgid "Alias can't be the same as nickname."
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 метод не знайдено!"
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -469,13 +477,13 @@ msgstr "%s / Обрані від %s"
msgid "%s updates favorited by %s / %s."
msgstr "%s оновлення обраних від %s / %s."
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "%s хронологія"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -563,7 +571,8 @@ msgstr "Оригінал"
msgid "Preview"
msgstr "Перегляд"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr "Видалити"
@@ -575,7 +584,7 @@ msgstr "Завантажити"
msgid "Crop"
msgstr "Втяти"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -585,7 +594,7 @@ msgstr "Втяти"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -653,71 +662,50 @@ msgstr "Список учасників цієї групи."
msgid "Unblock user from group"
msgstr "Спроба розблокувати користувача невдала."
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Розблокувати"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "Розблокувати цього користувача"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Не увійшли."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Не визначено жодного профілю."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Не визначено профілю з таким ID."
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Цього користувача вже заблоковано."
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
msgstr "Блокувати користувача."
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "Ні"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Розблокувати цього користувача"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Так"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокувати користувача"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "Цього користувача вже заблоковано."
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "Збереження інформації про блокування завершилось невдачею."
@@ -783,6 +771,15 @@ msgstr "Повідомлення"
msgid "No such notice."
msgstr "Такого повідомлення немає."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Не увійшли."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Не можна видалити це повідомлення."
@@ -819,6 +816,146 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
"Виникли певні проблеми з токеном поточної сесії. Спробуйте знов, будь ласка."
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Не вдалося оновити користувача."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Ви не можете видалити статус іншого користувача."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+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 "Видалити повідомлення"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Не маю можливості зберегти ваші налаштування Твіттера!"
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "Ця сторінка не доступна в "
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Змінити"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "Вийти з сайту"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, fuzzy, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr "Ви маєте можливість завантажити логотип для вашої группи."
+
+#: actions/designadminpanel.php:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Змінити ваш пароль"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "З'єднання"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Пошук"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Текст"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Увійти"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Зберегти"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "Це повідомлення не є обраним!"
@@ -963,14 +1100,6 @@ msgstr "Я хочу надсилати повідомлення поштою."
msgid "Publish a MicroID for my email address."
msgstr "Позначати міткою MicroID мою електронну адресу."
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Зберегти"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -984,7 +1113,7 @@ msgstr "Немає електронної адреси."
msgid "Cannot normalize that email address"
msgstr "Не можна полагодити цю поштову адресу"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "Це недійсна електронна адреса"
@@ -1185,6 +1314,18 @@ msgstr "Такого повідомлення немає."
msgid "Cannot read file."
msgstr "Файл втрачено."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "Не визначено жодного профілю."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "Не визначено профілю з таким ID."
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
#, fuzzy
@@ -1307,11 +1448,11 @@ msgstr "Учасники групи %s, сторінка %d"
msgid "A list of the users in this group."
msgstr "Список учасників цієї групи."
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "Адмін"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "Блок"
@@ -1401,7 +1542,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "Користувач заблокував вас."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
msgstr "Помилка при розблокуванні."
@@ -1716,7 +1857,7 @@ msgstr "Неточне ім'я або пароль."
msgid "Error setting user."
msgstr "Помилка в налаштуваннях користувача."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Увійти"
@@ -2149,7 +2290,7 @@ msgstr ""
"Позначте себе тегами (літери, цифри, -, . та _), відокремлюючи кожен комою "
"або пробілом"
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Мова"
@@ -2177,7 +2318,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "Ви перевищили ліміт (140 знаків це максимум)"
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "Часовий пояс не обрано."
@@ -2202,7 +2343,7 @@ msgstr "Не вдалося зберегти профіль."
msgid "Couldn't save tags."
msgstr "Не вдалося зберегти теги."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Налаштування збережено."
@@ -2441,7 +2582,7 @@ msgstr "Помилка з кодом підтвердження."
msgid "Registration successful"
msgstr "Реєстрація успішна"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Реєстрація"
@@ -2487,7 +2628,7 @@ msgid "Same as password above. Required."
msgstr "Такий само, як і пароль вище. Неодмінно."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Пошта"
@@ -2595,7 +2736,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL-адреса вашого профілю на іншому сумісному сервісі"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Підписатись"
@@ -2671,6 +2812,16 @@ msgstr ""
msgid "Replies to %1$s on %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 "Ви не можете надіслати повідомлення цьому користувачеві."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Користувач заблокував вас."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2916,6 +3067,145 @@ msgstr ""
"**%s** є власником рахунку на сайті %%%%site.name%%%% - сервісі "
"[мікроблогів] (http://en.wikipedia.org/wiki/Micro-blogging) "
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "Ви не можете надіслати повідомлення цьому користувачеві."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "Користувач заблокував вас."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "Запросити"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Це недійсна електронна адреса"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Зауваження сайту"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Нова електронна адреса для надсилання повідомлень на %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Мова, якій надаєте перевагу"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Конфіденційність"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Відновити"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Налаштування аватари"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "Налаштування СМС"
@@ -3188,6 +3478,21 @@ msgstr "Такого тегу немає."
msgid "API method under construction."
msgstr "API метод наразі знаходиться у розробці."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Цього користувача вже заблоковано."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Користувач заблокував вас."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "Користувач не має профілю."
+
#: actions/unsubscribe.php:77
msgid "No profile id in request."
msgstr "У запиті відсутній ID профілю."
@@ -3205,6 +3510,32 @@ msgstr "Відписано"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Користувач"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Блок"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Запросити"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Авторизувати підписку"
@@ -3368,11 +3699,16 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Помилка при відправці прямого повідомлення."
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "Не можна долучити повідомлення."
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "Не можна оновити повідомлення з новим URI."
@@ -3406,15 +3742,15 @@ msgstr ""
"Дуже багато повідомлень за короткий термін; відпочиньте трошки і "
"повертайтесь за кілька хвилин."
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr "Вам заборонено надсилати дописи до цього сайту."
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Проблема при збереженні повідомлення."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Помилка бази даних при додаванні відповіді: %s"
@@ -3444,10 +3780,6 @@ msgstr "Змінити ваш пароль"
msgid "Change email handling"
msgstr "Змінити електронну адресу вручну"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3499,97 +3831,102 @@ msgstr "З'єднання"
msgid "Connect to services"
msgstr "Невдале перенаправлення на сервер: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Відправна навігація по сайту"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Запросити"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Запросіть друзів та колег приєднатись до вас на %s"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Вийти"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "Вийти з сайту"
-#: lib/action.php:450
+#: lib/action.php:454
msgid "Create an account"
msgstr "Створити новий рахунок"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "Увійти на сайт"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Допомога"
-#: lib/action.php:456
+#: lib/action.php:460
msgid "Help me!"
msgstr "Допоможіть!"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Пошук"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "Пошук людей або текстів"
-#: lib/action.php:480
+#: lib/action.php:484
msgid "Site notice"
msgstr "Зауваження сайту"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr "Огляд"
-#: lib/action.php:612
+#: lib/action.php:616
msgid "Page notice"
msgstr "Зауваження сторінки"
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr "Другорядна навігація по сайту"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Про"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "ЧаПи"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Конфіденційність"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Джерело"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:736
+#: lib/action.php:740
#, fuzzy
msgid "Badge"
msgstr "\"Розштовхати\""
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr "Ліцензія StatusNet software"
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3598,12 +3935,12 @@ msgstr ""
"**%%site.name%%** це сервіс мікроблогів наданий вам [%%site.broughtby%%](%%"
"site.broughtbyurl%%). "
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** це сервіс мікроблогів. "
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3614,35 +3951,60 @@ msgstr ""
"для мікроблогів, версія %s, доступному під [GNU Affero General Public "
"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "Ліцензія StatusNet software"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr "Всі "
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "ліцензія."
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "Нумерація сторінок"
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr "Вперед"
-#: lib/action.php:1069
+#: lib/action.php:1084
msgid "Before"
msgstr "Назад"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr "Виникли певні проблеми з токеном поточної сесії."
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "Ви не можете надіслати повідомлення цьому користувачеві."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "Виконання команди ще не завершено."
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "Виконання команди ще не завершено."
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Підтвердження електронної адреси"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "Підтвердження СМС"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3818,30 +4180,36 @@ msgstr "Ви не підписані до цього профілю."
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Ви не підписані до цього профілю."
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "Ви не підписані до цього профілю."
+msgstr[1] "Ви не підписані до цього профілю."
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Не вдалося підписати іншого до вас."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Люди підписані до %s"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "Не вдалося підписати іншого до вас."
+msgstr[1] "Не вдалося підписати іншого до вас."
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Ви не є учасником цієї групи."
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Ви не є учасником цієї групи."
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "Ви не є учасником цієї групи."
+msgstr[1] "Ви не є учасником цієї групи."
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3880,20 +4248,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Немає коду підтвердження."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
#, fuzzy
msgid "Go to the installer."
msgstr "Увійти на сайт"
@@ -3914,10 +4282,6 @@ msgstr "Оновлення через SMS"
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3928,66 +4292,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Змінити ваш пароль"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "З'єднання"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Пошук"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Текст"
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Увійти"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4218,12 +4522,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s тепер слідкує за вашими повідомленями на %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4244,17 +4548,17 @@ msgstr ""
"Щиро ваші,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
msgstr "Локація: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
msgstr "Веб-сторінка: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
@@ -4263,12 +4567,12 @@ msgstr ""
"Про себе: %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "Нова електронна адреса для надсилання повідомлень на %s"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4289,21 +4593,21 @@ msgstr ""
"Щиро ваші,\n"
"%4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "%s статус"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "Підтвердження СМС"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "Вас спробував \"розштовхати\" %s"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4319,12 +4623,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "Нове приватне повідомлення від %s"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4343,12 +4647,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s додав(ла) ваше повідомлення до обраних"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4369,12 +4673,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4512,7 +4816,12 @@ msgstr "Помилка при додаванні віддаленого проф
msgid "Duplicate notice"
msgstr "Видалити повідомлення"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Цей користувач заблокував вашу можливість підписатись."
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Не вдалося додати нову підписку."
@@ -4528,10 +4837,6 @@ msgstr "Відповіді"
msgid "Favorites"
msgstr "Обрані"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "Користувач"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "Вхідні"
@@ -4582,6 +4887,15 @@ msgstr "З нами від"
msgid "All groups"
msgstr "Всі групи"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Немає аргументу ID."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Загал"
@@ -4602,6 +4916,16 @@ msgstr "Постаті"
msgid "Popular"
msgstr "Популярне"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Вхідні"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Розблокувати цього користувача"
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4640,6 +4964,16 @@ msgstr "Розділ без заголовку"
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Зауваження сайту"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Блокувати користувача"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -4669,28 +5003,28 @@ msgstr ""
msgid "(none)"
msgstr "(пусто)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr "Користувач заблокував вас."
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "Невдала підписка."
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "Не вдалося підписати іншого до вас."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Не підписано!."
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Не вдалося видалити підписку."
@@ -4702,6 +5036,29 @@ msgstr "Пусто"
msgid "Top posters"
msgstr "Топ дописувачів"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Розблокувати цього користувача"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Розблокувати цього користувача"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Розблокувати цього користувача"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Відписатись від цього користувача"
@@ -4806,3 +5163,7 @@ msgstr "Вибачте, але це не є вашою електронною а
msgid "Sorry, no incoming email allowed."
msgstr ""
"Вибачте, але не затверджено жодної електронної адреси для вхідної пошти."
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Люди підписані до %s"
diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo
index 0480dfd01..2c799667d 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 c0616649e..94b4c9be6 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:44:26+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:50+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -42,7 +42,7 @@ msgstr "Không có tin nhắn nào."
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "Không có user nào."
@@ -145,7 +145,8 @@ msgstr "Không thể cập nhật thành viên."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -233,12 +234,12 @@ msgstr ""
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -381,6 +382,13 @@ msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
msgid "Alias can't be the same as nickname."
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 "Phương thức API không tìm thấy!"
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -472,13 +480,13 @@ msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
msgid "%s updates favorited by %s / %s."
msgstr "Tất cả các cập nhật của %s"
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, fuzzy, php-format
msgid "%s timeline"
msgstr "Dòng tin nhắn của %s"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -570,7 +578,8 @@ msgstr ""
msgid "Preview"
msgstr "Xem trước"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
#, fuzzy
msgid "Delete"
msgstr "Xóa tin nhắn"
@@ -584,7 +593,7 @@ msgstr "Tải file"
msgid "Crop"
msgstr "Nhóm"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -594,7 +603,7 @@ msgstr "Nhóm"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
@@ -662,75 +671,52 @@ msgstr ""
msgid "Unblock user from group"
msgstr "Bỏ chặn người dùng này"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Bỏ chặn"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
msgid "Unblock this user"
msgstr "Bỏ chặn người dùng này"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Chưa đăng nhập."
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/block.php:69
#, fuzzy
-msgid "No profile with that ID."
-msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
+msgid "You already blocked that user."
+msgstr "Bạn đã theo những người này:"
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
#, fuzzy
msgid "Block user"
msgstr "Ban user"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "Không"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "Bỏ chặn người dùng này"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "Có"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Ban user"
-#: actions/block.php:165
-#, fuzzy
-msgid "You have already blocked this user."
-msgstr "Bạn đã theo những người này:"
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr ""
@@ -795,6 +781,15 @@ msgstr "Tin nhắn"
msgid "No such notice."
msgstr "Không có tin nhắn nào."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Chưa đăng nhập."
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "Không thể xóa tin nhắn này."
@@ -829,6 +824,151 @@ msgstr "Xóa tin nhắn"
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/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Không thể cập nhật thành viên."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Bạn đã không xóa trạng thái của những người khác."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "Xóa tin nhắn"
+
+#: 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 "Xóa tin nhắn"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Không thể lưu thông tin Twitter của bạn!"
+
+#: actions/designadminpanel.php:301
+#, 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:406
+#, fuzzy
+msgid "Change theme"
+msgstr "Thay đổi"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+msgid "Theme for the site."
+msgstr ""
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#, fuzzy
+msgid "Change background image"
+msgstr "Background Theme:"
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+#, fuzzy
+msgid "Background"
+msgstr "Background Theme:"
+
+#: actions/designadminpanel.php:429
+#, fuzzy, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+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:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#, fuzzy
+msgid "Tile background image"
+msgstr "Background Theme:"
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Thay đổi mật khẩu của bạn"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Kết nối"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Tìm kiếm"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "Chuỗi bất kỳ"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Đăng nhập"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Lưu"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#, fuzzy
+msgid "Save design"
+msgstr "Lưu"
+
#: actions/disfavor.php:81
#, fuzzy
msgid "This notice is not a favorite!"
@@ -982,14 +1122,6 @@ 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:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Lưu"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -1004,7 +1136,7 @@ msgstr "Không có địa chỉ email."
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/emailsettings.php:330 actions/siteadminpanel.php:156
#, fuzzy
msgid "Not a valid email address"
msgstr "Địa chỉ email không hợp lệ."
@@ -1216,6 +1348,19 @@ msgstr "Không có tin nhắn nào."
msgid "Cannot read file."
msgstr "Không có tin nhắn nào."
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr ""
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+#, fuzzy
+msgid "No profile with that ID."
+msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1339,11 +1484,11 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr ""
@@ -1435,7 +1580,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "Người dùng không có thông tin."
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
#, fuzzy
msgid "Error removing the block."
msgstr "Lỗi xảy ra khi lưu thành viên."
@@ -1752,7 +1897,7 @@ msgstr "Sai tên đăng nhập hoặc mật khẩu."
msgid "Error setting user."
msgstr "Lỗi xảy ra khi tạo thành viên."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Đăng nhập"
@@ -2189,7 +2334,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "Ngôn ngữ"
@@ -2215,7 +2360,7 @@ msgstr "Tự động theo những người nào đăng ký theo tôi"
msgid "Bio is too long (max %d chars)."
msgstr "Lý lịch quá dài (không quá 140 ký tự)"
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr ""
@@ -2243,7 +2388,7 @@ msgstr "Không thể lưu hồ sơ cá nhân."
msgid "Couldn't save tags."
msgstr "Không thể lưu hồ sơ cá nhân."
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "Đã lưu các điều chỉnh."
@@ -2481,7 +2626,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:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Đăng ký"
@@ -2528,7 +2673,7 @@ msgid "Same as password above. Required."
msgstr "Cùng mật khẩu ở trên. Bắt buộc."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2632,7 +2777,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL trong hồ sơ cá nhân của bạn ở trên các trang microblogging khác"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "Theo bạn này"
@@ -2707,6 +2852,16 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "%s chào mừng bạn "
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Bạn đã theo những người này:"
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Người dùng không có thông tin."
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2952,6 +3107,145 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "Bạn đã theo những người này:"
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "Người dùng không có thông tin."
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "Thư mời"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Địa chỉ email không hợp lệ."
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "Thông báo mới"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "Dia chi email moi de gui tin nhan den %s"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "Ngôn ngữ bạn thích"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "Riêng tư"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "Khôi phục"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Thay đổi hình đại diện"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "Thiết lập SMS"
@@ -3238,6 +3532,21 @@ msgstr "Không có tin nhắn nào."
msgid "API method under construction."
msgstr "Phương thức API dưới cấu trúc có sẵn."
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Bạn đã theo những người này:"
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Người dùng không có thông tin."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "Người dùng không có thông tin."
+
#: actions/unsubscribe.php:77
#, fuzzy
msgid "No profile id in request."
@@ -3258,6 +3567,32 @@ 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
+msgid "User"
+msgstr ""
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Ban user"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Thư mời"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Đăng nhận cho phép"
@@ -3419,12 +3754,17 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Thư bạn đã gửi"
+
+#: classes/Message.php:61
#, fuzzy
msgid "Could not insert message."
msgstr "Không thể chèn thêm vào đăng nhận."
-#: classes/Message.php:65
+#: classes/Message.php:71
#, fuzzy
msgid "Could not update message with new URI."
msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
@@ -3455,15 +3795,15 @@ msgid ""
"few minutes."
msgstr ""
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
@@ -3494,10 +3834,6 @@ msgstr "Thay đổi mật khẩu của bạn"
msgid "Change email handling"
msgstr "Đang thực hiện việc thay đổi email"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3552,104 +3888,109 @@ msgstr "Kết nối"
msgid "Connect to services"
msgstr "Không thể chuyển đến máy chủ: %s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Tôi theo"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Thư mời"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 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:445
+#: lib/action.php:449
msgid "Logout"
msgstr "Thoát"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:454
#, fuzzy
msgid "Create an account"
msgstr "Tạo tài khoản mới"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr ""
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "Hướng dẫn"
-#: lib/action.php:456
+#: lib/action.php:460
#, fuzzy
msgid "Help me!"
msgstr "Hướng dẫn"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "Tìm kiếm"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:480
+#: lib/action.php:484
#, fuzzy
msgid "Site notice"
msgstr "Thông báo mới"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr ""
-#: lib/action.php:612
+#: lib/action.php:616
#, fuzzy
msgid "Page notice"
msgstr "Thông báo mới"
-#: lib/action.php:714
+#: lib/action.php:718
#, fuzzy
msgid "Secondary site navigation"
msgstr "Tôi theo"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "Giới thiệu"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "Riêng tư"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "Nguồn"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "Liên hệ"
-#: lib/action.php:736
+#: lib/action.php:740
#, fuzzy
msgid "Badge"
msgstr "Tin đã gửi"
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3658,12 +3999,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:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn. "
-#: lib/action.php:771
+#: lib/action.php:775
#, fuzzy, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3674,38 +4015,61 @@ msgstr ""
"quyền [GNU Affero General Public License](http://www.fsf.org/licensing/"
"licenses/agpl-3.0.html)."
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "Tìm theo nội dung của tin nhắn"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr ""
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr ""
-#: lib/action.php:1061
+#: lib/action.php:1076
#, fuzzy
msgid "After"
msgstr "Sau"
-#: lib/action.php:1069
+#: lib/action.php:1084
#, fuzzy
msgid "Before"
msgstr "Trước"
-#: lib/action.php:1117
+#: lib/action.php:1132
#, 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."
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "Bạn đã theo những người này:"
+
+#: lib/adminpanelaction.php:195
+msgid "showForm() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:224
+msgid "saveSettings() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Xac nhan dia chi email"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "Xác nhận SMS"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3888,30 +4252,36 @@ msgstr "Bạn chưa cập nhật thông tin riêng"
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "Bạn chưa cập nhật thông tin riêng"
+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"
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Không thể tạo favorite."
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "Theo nhóm này"
+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:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "Bạn chưa cập nhật thông tin riêng"
+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:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3950,20 +4320,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "Không có mã số xác nhận."
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
msgid "Go to the installer."
msgstr ""
@@ -3983,11 +4353,6 @@ msgstr "Thay đổi bởi SMS"
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-#, fuzzy
-msgid "Change background image"
-msgstr "Background Theme:"
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3998,69 +4363,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-#, fuzzy
-msgid "Tile background image"
-msgstr "Background Theme:"
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Thay đổi mật khẩu của bạn"
-
-#: lib/designsettings.php:178
-#, fuzzy
-msgid "Background"
-msgstr "Background Theme:"
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Kết nối"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Tìm kiếm"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Chuỗi bất kỳ"
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Đăng nhập"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-#, fuzzy
-msgid "Save design"
-msgstr "Lưu"
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4321,12 +4623,12 @@ msgstr ""
"%4$s\n"
"\n"
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s đang theo dõi lưu ý của bạn trên %2$s."
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4347,29 +4649,29 @@ msgstr ""
"Người bạn trung thành của bạn,\n"
"%4$s.\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, fuzzy, php-format
msgid "Location: %s\n"
msgstr "Thành phố: %s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, fuzzy, php-format
msgid "Homepage: %s\n"
msgstr "Trang chủ hoặc Blog: %s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
"\n"
msgstr ""
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "Dia chi email moi de gui tin nhan den %s"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4390,21 +4692,21 @@ msgstr ""
"Chúc sức khỏe,\n"
"%4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, fuzzy, php-format
msgid "%s status"
msgstr "Trạng thái của %1$s vào %2$s"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "Xác nhận SMS"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4420,12 +4722,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "Bạn có tin nhắn riêng từ %s"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4458,12 +4760,12 @@ msgstr ""
"Chúc sức khỏe,\n"
"%5$s\n"
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, fuzzy, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4497,12 +4799,12 @@ msgstr ""
"Chúc sức khỏe,\n"
"%5$s\n"
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4647,7 +4949,11 @@ msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân"
msgid "Duplicate notice"
msgstr "Xóa tin nhắn"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "Không thể chèn thêm vào đăng nhận."
@@ -4663,10 +4969,6 @@ msgstr "Trả lời"
msgid "Favorites"
msgstr "Ưa thích"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr ""
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "Hộp thư đến"
@@ -4718,6 +5020,15 @@ msgstr "Gia nhập từ"
msgid "All groups"
msgstr "Nhóm"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "Không có tài liệu nào."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "Công cộng"
@@ -4741,6 +5052,16 @@ msgstr ""
msgid "Popular"
msgstr "Tên tài khoản"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Hộp thư đến"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Bỏ chặn người dùng này"
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4781,6 +5102,16 @@ msgstr ""
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Thông báo mới"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Ban user"
+
#: lib/subgroupnav.php:83
#, fuzzy, php-format
msgid "People %s subscribes to"
@@ -4810,31 +5141,31 @@ msgstr ""
msgid "(none)"
msgstr ""
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
#, fuzzy
msgid "User has blocked you."
msgstr "Người dùng không có thông tin."
-#: lib/subs.php:56
+#: lib/subs.php:60
#, fuzzy
msgid "Could not subscribe."
msgstr "Chưa đăng nhận!"
-#: lib/subs.php:75
+#: lib/subs.php:79
#, fuzzy
msgid "Could not subscribe other to you."
msgstr "Không thể tạo favorite."
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "Chưa đăng nhận!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "Không thể xóa đăng nhận."
@@ -4848,6 +5179,29 @@ msgstr "Không"
msgid "Top posters"
msgstr "Top posters"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "Bỏ chặn người dùng này"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Bỏ chặn người dùng này"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Bỏ chặn người dùng này"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Ngừng đăng ký từ người dùng này"
@@ -4955,3 +5309,7 @@ msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập v
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Xin lỗi, không có địa chỉ email cho phép."
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "Theo nhóm này"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo
index 4fd7cd1dc..6f41c554e 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 722af7d34..763aa3410 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:44:29+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:53+0000\n"
"Language-Team: Simplified Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -47,7 +47,7 @@ msgstr "未找到此消息。"
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "没有这个用户。"
@@ -150,7 +150,8 @@ msgstr "无法更新用户。"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -236,12 +237,12 @@ msgstr "发给 %s 的直接消息"
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -381,6 +382,13 @@ msgstr "昵称已被使用,换一个吧。"
msgid "Alias can't be the same as nickname."
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 方法未实现!"
+
#: actions/apigroupjoin.php:110
#, fuzzy
msgid "You are already a member of that group."
@@ -472,13 +480,13 @@ msgstr "%s 的收藏 / %s"
msgid "%s updates favorited by %s / %s."
msgstr "%s 收藏了 %s 的 %s 通告。"
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr "%s 时间表"
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -567,7 +575,8 @@ msgstr "原来的"
msgid "Preview"
msgstr "预览"
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
#, fuzzy
msgid "Delete"
msgstr "删除"
@@ -580,7 +589,7 @@ msgstr "上传"
msgid "Crop"
msgstr "剪裁"
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -590,7 +599,7 @@ msgstr "剪裁"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr "会话标识有问题,请重试。"
@@ -658,76 +667,53 @@ msgstr "该组成员列表。"
msgid "Unblock user from group"
msgstr "取消阻止用户失败。"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "取消阻止"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
#, fuzzy
msgid "Unblock this user"
msgstr "取消阻止次用户"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "未登录。"
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+#: actions/block.php:69
#, fuzzy
-msgid "No profile specified."
-msgstr "没有收件人。"
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-#, fuzzy
-msgid "No profile with that ID."
-msgstr "没有找到此ID的信息。"
+msgid "You already blocked that user."
+msgstr "您已成功阻止该用户:"
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
#, fuzzy
msgid "Block user"
msgstr "阻止用户"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr "否"
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "取消阻止次用户"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr "是"
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "阻止该用户"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "您已成功阻止该用户:"
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr "保存阻止信息失败。"
@@ -793,6 +779,15 @@ msgstr "通告"
msgid "No such notice."
msgstr "没有这份通告。"
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "未登录。"
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr "无法删除通告。"
@@ -827,6 +822,146 @@ msgstr "删除通告"
msgid "There was a problem with your session token. Try again, please."
msgstr "会话标识有问题,请重试。"
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "无法更新用户。"
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "您不能删除其他用户的状态。"
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+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 "删除通告"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "无法保存 Twitter 设置!"
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "这个页面不提供您想要的媒体类型"
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "修改"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+#, fuzzy
+msgid "Theme for the site."
+msgstr "登出本站"
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, 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:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "修改密码"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "连接"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "搜索"
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr "文本"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "登录"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "保存"
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "此通告未被收藏!"
@@ -970,14 +1105,6 @@ msgstr "我希望通过邮件发布信息。"
msgid "Publish a MicroID for my email address."
msgstr "公开电子邮件的 MicroID。"
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "保存"
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -991,7 +1118,7 @@ msgstr "没有电子邮件地址。"
msgid "Cannot normalize that email address"
msgstr "无法识别此电子邮件"
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr "不是有效的电子邮件"
@@ -1194,6 +1321,20 @@ msgstr "没有这份通告。"
msgid "Cannot read file."
msgstr "没有这份通告。"
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+#, fuzzy
+msgid "No profile specified."
+msgstr "没有收件人。"
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+#, fuzzy
+msgid "No profile with that ID."
+msgstr "没有找到此ID的信息。"
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
#, fuzzy
@@ -1317,11 +1458,11 @@ msgstr "%s 组成员, 第 %d 页"
msgid "A list of the users in this group."
msgstr "该组成员列表。"
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr "admin管理员"
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr "阻止"
@@ -1411,7 +1552,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr "用户没有个人信息。"
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
#, fuzzy
msgid "Error removing the block."
msgstr "保存用户时出错。"
@@ -1710,7 +1851,7 @@ msgstr "用户名或密码不正确。"
msgid "Error setting user."
msgstr "保存用户设置时出错。"
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "登录"
@@ -2131,7 +2272,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr "你的标签 (字母letters, 数字numbers, -, ., 和 _), 以逗号或空格分隔"
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr "语言"
@@ -2157,7 +2298,7 @@ msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器
msgid "Bio is too long (max %d chars)."
msgstr "自述过长(不能超过140字符)。"
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr "未选择时区。"
@@ -2183,7 +2324,7 @@ msgstr "无法保存个人信息。"
msgid "Couldn't save tags."
msgstr "无法保存个人信息。"
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr "设置已保存。"
@@ -2420,7 +2561,7 @@ msgstr "验证码出错。"
msgid "Registration successful"
msgstr "注册成功。"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "注册"
@@ -2464,7 +2605,7 @@ msgid "Same as password above. Required."
msgstr "相同的密码。此项必填。"
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "电子邮件"
@@ -2565,7 +2706,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "您在其他兼容的微博客服务的个人信息URL"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr "订阅"
@@ -2641,6 +2782,16 @@ msgstr ""
msgid "Replies to %1$s on %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 "无法向此用户发送消息。"
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "用户没有个人信息。"
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2889,6 +3040,145 @@ msgstr ""
"**%s** 有一个帐号在 %%%%site.name%%%%, 一个微博客服务 [micro-blogging]"
"(http://en.wikipedia.org/wiki/Micro-blogging)"
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "无法向此用户发送消息。"
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "用户没有个人信息。"
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#, fuzzy
+msgid "Site"
+msgstr "邀请"
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "不是有效的电子邮件"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "新通告"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "新的电子邮件地址,用于发布 %s 信息"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+#, fuzzy
+msgid "Default site language"
+msgstr "首选语言"
+
+#: actions/siteadminpanel.php:282
+#, fuzzy
+msgid "Private"
+msgstr "隐私"
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Never"
+msgstr "恢复"
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "头像设置"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "SMS短信设置"
@@ -3167,6 +3457,21 @@ msgstr "未找到此消息。"
msgid "API method under construction."
msgstr "API 方法尚未实现。"
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "您已成功阻止该用户:"
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "用户没有个人信息。"
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "用户没有个人信息。"
+
#: actions/unsubscribe.php:77
#, fuzzy
msgid "No profile id in request."
@@ -3187,6 +3492,32 @@ msgstr "退订"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "用户"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "阻止"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "邀请"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "确认订阅"
@@ -3345,11 +3676,16 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "发送消息出错。"
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr "无法添加信息。"
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr "无法添加新URI的信息。"
@@ -3380,15 +3716,15 @@ msgid ""
"few minutes."
msgstr "你在短时间里发布了过多的消息,请深呼吸,过几分钟再发消息。"
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr "在这个网站你被禁止发布消息。"
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr "保存通告时出错。"
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "添加回复时数据库出错:%s"
@@ -3418,10 +3754,6 @@ msgstr "修改密码"
msgid "Change email handling"
msgstr "修改电子邮件"
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3474,102 +3806,107 @@ msgstr "连接"
msgid "Connect to services"
msgstr "无法重定向到服务器:%s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "主站导航"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr "邀请"
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 lib/subgroupnav.php:106
#, fuzzy, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "使用这个表单来邀请好友和同事加入。"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout"
msgstr "登出"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr "登出本站"
-#: lib/action.php:450
+#: lib/action.php:454
#, fuzzy
msgid "Create an account"
msgstr "创建新帐号"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr "登入本站"
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "帮助"
-#: lib/action.php:456
+#: lib/action.php:460
#, fuzzy
msgid "Help me!"
msgstr "帮助"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr "搜索"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr "检索人或文字"
-#: lib/action.php:480
+#: lib/action.php:484
#, fuzzy
msgid "Site notice"
msgstr "新通告"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr "本地显示"
-#: lib/action.php:612
+#: lib/action.php:616
#, fuzzy
msgid "Page notice"
msgstr "新通告"
-#: lib/action.php:714
+#: lib/action.php:718
#, fuzzy
msgid "Secondary site navigation"
msgstr "次项站导航"
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "关于"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "常见问题FAQ"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr "隐私"
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr "来源"
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "联系人"
-#: lib/action.php:736
+#: lib/action.php:740
#, fuzzy
msgid "Badge"
msgstr "呼叫"
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr "StatusNet软件注册证"
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3578,12 +3915,12 @@ msgstr ""
"**%%site.name%%** 是一个微博客服务,提供者为 [%%site.broughtby%%](%%site."
"broughtbyurl%%)。"
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** 是一个微博客服务。"
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3594,38 +3931,63 @@ msgstr ""
"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
"授权。"
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "StatusNet软件注册证"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr "全部"
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr "注册证"
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr "分页"
-#: lib/action.php:1061
+#: lib/action.php:1076
#, fuzzy
msgid "After"
msgstr "« 之后"
-#: lib/action.php:1069
+#: lib/action.php:1084
#, fuzzy
msgid "Before"
msgstr "之前 »"
-#: lib/action.php:1117
+#: lib/action.php:1132
#, fuzzy
msgid "There was a problem with your session token."
msgstr "会话标识有问题,请重试。"
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "无法向此用户发送消息。"
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "命令尚未实现。"
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "命令尚未实现。"
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "电子邮件地址确认"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "SMS短信确认"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3801,30 +4163,36 @@ msgstr "您未告知此个人信息"
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "您未告知此个人信息"
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "您未告知此个人信息"
+msgstr[1] "您未告知此个人信息"
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "无法订阅他人更新。"
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "订阅 %s"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "无法订阅他人更新。"
+msgstr[1] "无法订阅他人更新。"
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "您未告知此个人信息"
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "您未告知此个人信息"
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "您未告知此个人信息"
+msgstr[1] "您未告知此个人信息"
-#: lib/command.php:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3863,20 +4231,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "没有验证码"
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
#, fuzzy
msgid "Go to the installer."
msgstr "登入本站"
@@ -3897,10 +4265,6 @@ msgstr "使用SMS短信更新"
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3911,66 +4275,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "修改密码"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "连接"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "搜索"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "文本"
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "登录"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4213,12 +4517,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s 开始关注您的 %2$s 信息。"
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4238,17 +4542,17 @@ msgstr ""
"\n"
"为您效力的 %4$s\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, fuzzy, php-format
msgid "Location: %s\n"
msgstr "位置:%s\n"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, fuzzy, php-format
msgid "Homepage: %s\n"
msgstr "主页:%s\n"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
@@ -4257,12 +4561,12 @@ msgstr ""
"自传Bio: %s\n"
"\n"
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "新的电子邮件地址,用于发布 %s 信息"
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4282,21 +4586,21 @@ msgstr ""
"\n"
"为您效力的 %4$s"
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr "%s 状态"
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr "SMS短信确认"
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr "%s 振铃呼叫你"
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4312,12 +4616,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr "%s 发送了新的私人信息"
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4336,12 +4640,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s 收藏了您的通告"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4362,12 +4666,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4511,7 +4815,12 @@ msgstr "添加远程的个人信息出错"
msgid "Duplicate notice"
msgstr "删除通告"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "那个用户阻止了你的订阅。"
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "无法添加新的订阅。"
@@ -4527,10 +4836,6 @@ msgstr "回复"
msgid "Favorites"
msgstr "收藏夹"
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "用户"
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr "收件箱"
@@ -4582,6 +4887,15 @@ msgstr "用户始于"
msgid "All groups"
msgstr "所有组"
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "没有这份文档。"
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr "公告"
@@ -4604,6 +4918,16 @@ msgstr "特征"
msgid "Popular"
msgstr "用户"
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "收件箱"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "取消阻止次用户"
+
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
@@ -4644,6 +4968,16 @@ msgstr "无标题章节"
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "新通告"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "阻止该用户"
+
#: lib/subgroupnav.php:83
#, fuzzy, php-format
msgid "People %s subscribes to"
@@ -4673,29 +5007,29 @@ msgstr ""
msgid "(none)"
msgstr "(none 没有)"
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
#, fuzzy
msgid "User has blocked you."
msgstr "用户没有个人信息。"
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr "无法订阅。"
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr "无法订阅他人更新。"
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "未订阅!"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "无法删除订阅。"
@@ -4709,6 +5043,29 @@ msgstr "否"
msgid "Top posters"
msgstr "灌水精英"
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "取消阻止次用户"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "取消阻止次用户"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "取消阻止次用户"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
#, fuzzy
msgid "Unsubscribe from this user"
@@ -4816,3 +5173,7 @@ msgstr "对不起,这个发布用的电子邮件属于其他用户。"
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "对不起,发布用的电子邮件无法使用。"
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "订阅 %s"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo
index 0db278848..89afaf8af 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 d251d4aa4..0e6e27d53 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:44:31+0000\n"
+"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:56+0000\n"
"Language-Team: Traditional Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); 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"
@@ -47,7 +47,7 @@ msgstr "無此通知"
#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
#: lib/command.php:364 lib/command.php:411 lib/command.php:466
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
msgstr "無此使用者"
@@ -150,7 +150,8 @@ msgstr "無法更新使用者"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: lib/designsettings.php:283
#, php-format
msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
@@ -235,12 +236,12 @@ msgstr ""
#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
@@ -379,6 +380,13 @@ msgstr "此暱稱已有人使用。再試試看別的吧。"
msgid "Alias can't be the same as nickname."
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 "目前無請求"
+
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
msgstr ""
@@ -468,13 +476,13 @@ msgstr ""
msgid "%s updates favorited by %s / %s."
msgstr ""
-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
msgstr ""
-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -564,7 +572,8 @@ msgstr ""
msgid "Preview"
msgstr ""
-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
msgid "Delete"
msgstr ""
@@ -576,7 +585,7 @@ msgstr ""
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:237 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
@@ -586,7 +595,7 @@ msgstr ""
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/tagother.php:166 actions/unsubscribe.php:69
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
@@ -654,74 +663,53 @@ msgstr ""
msgid "Unblock user from group"
msgstr "無此使用者"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr ""
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
#, fuzzy
msgid "Unblock this user"
msgstr "無此使用者"
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr ""
-
-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr ""
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "無此使用者"
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
#, fuzzy
msgid "Block user"
msgstr "無此使用者"
-#: actions/block.php:136
+#: actions/block.php:130
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
msgid "No"
msgstr ""
-#: actions/block.php:149
+#: actions/block.php:143 actions/deleteuser.php:147
#, fuzzy
msgid "Do not block this user"
msgstr "無此使用者"
-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
msgstr ""
-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "無此使用者"
-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr ""
-
-#: actions/block.php:170
+#: actions/block.php:162
msgid "Failed to save block information."
msgstr ""
@@ -786,6 +774,15 @@ msgstr ""
msgid "No such notice."
msgstr "無此通知"
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr ""
+
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
msgstr ""
@@ -817,6 +814,142 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "無法更新使用者"
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "無此使用者"
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+msgid "Delete user"
+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 "無此使用者"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:220
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: actions/designadminpanel.php:301
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "個人首頁位址錯誤"
+
+#: actions/designadminpanel.php:406
+#, fuzzy
+msgid "Change theme"
+msgstr "更改"
+
+#: actions/designadminpanel.php:410
+msgid "Theme"
+msgstr ""
+
+#: actions/designadminpanel.php:411
+msgid "Theme for the site."
+msgstr ""
+
+#: actions/designadminpanel.php:420 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: actions/designadminpanel.php:429
+#, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr ""
+
+#: actions/designadminpanel.php:459 lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: actions/designadminpanel.php:475 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: actions/designadminpanel.php:476 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: actions/designadminpanel.php:481 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "更改密碼"
+
+#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "連結"
+
+#: actions/designadminpanel.php:524 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr ""
+
+#: actions/designadminpanel.php:537 lib/designsettings.php:217
+msgid "Text"
+msgstr ""
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "登入"
+
+#: actions/designadminpanel.php:611 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: actions/designadminpanel.php:612 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: actions/designadminpanel.php:618 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr ""
+
+#: actions/designadminpanel.php:621 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr ""
@@ -958,14 +1091,6 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr ""
-
#: actions/emailsettings.php:301 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
@@ -979,7 +1104,7 @@ msgstr ""
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
msgid "Not a valid email address"
msgstr ""
@@ -1176,6 +1301,18 @@ msgstr "無此通知"
msgid "Cannot read file."
msgstr "無此通知"
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr ""
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr ""
+
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
@@ -1292,11 +1429,11 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
msgid "Admin"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
msgstr ""
@@ -1381,7 +1518,7 @@ msgstr ""
msgid "User is not blocked from group."
msgstr ""
-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:77
#, fuzzy
msgid "Error removing the block."
msgstr "儲存使用者發生錯誤"
@@ -1651,7 +1788,7 @@ msgstr "使用者名稱或密碼錯誤"
msgid "Error setting user."
msgstr "使用者設定發生錯誤"
-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "登入"
@@ -2062,7 +2199,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
msgid "Language"
msgstr ""
@@ -2088,7 +2225,7 @@ msgstr ""
msgid "Bio is too long (max %d chars)."
msgstr "自我介紹過長(共140個字元)"
-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
msgid "Timezone not selected."
msgstr ""
@@ -2114,7 +2251,7 @@ msgstr "無法儲存個人資料"
msgid "Couldn't save tags."
msgstr "無法儲存個人資料"
-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
msgstr ""
@@ -2345,7 +2482,7 @@ msgstr "確認碼發生錯誤"
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -2389,7 +2526,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "電子信箱"
@@ -2474,7 +2611,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:321
+#: lib/userprofile.php:356
msgid "Subscribe"
msgstr ""
@@ -2548,6 +2685,15 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "&s的微型部落格"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "無法連結到伺服器:%s"
+
+#: actions/sandbox.php:72
+msgid "User is already sandboxed."
+msgstr ""
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%s's favorite notices, page %d"
@@ -2790,6 +2936,139 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#: actions/silence.php:65 actions/unsilence.php:65
+msgid "You cannot silence users on this site."
+msgstr ""
+
+#: actions/silence.php:72
+msgid "User is already silenced."
+msgstr ""
+
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+msgid "Site"
+msgstr ""
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:145
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:153
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "此信箱無效"
+
+#: actions/siteadminpanel.php:171
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
+
+#: actions/siteadminpanel.php:178
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:184
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:190
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:241
+#, fuzzy
+msgid "Site name"
+msgstr "新訊息"
+
+#: actions/siteadminpanel.php:242
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:245
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:246
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:249
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:250
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:254
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "查無此使用者所註冊的信箱"
+
+#: actions/siteadminpanel.php:268
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:269
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:276
+msgid "Default site language"
+msgstr ""
+
+#: actions/siteadminpanel.php:282
+msgid "Private"
+msgstr ""
+
+#: actions/siteadminpanel.php:284
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:291
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:292
+msgid "Never"
+msgstr ""
+
+#: actions/siteadminpanel.php:294
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:302
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:309
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "線上即時通設定"
+
#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr ""
@@ -3060,6 +3339,19 @@ msgstr "無此通知"
msgid "API method under construction."
msgstr ""
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "無此使用者"
+
+#: actions/unsandbox.php:72
+msgid "User is not sandboxed."
+msgstr ""
+
+#: actions/unsilence.php:72
+msgid "User is not silenced."
+msgstr ""
+
#: actions/unsubscribe.php:77
#, fuzzy
msgid "No profile id in request."
@@ -3079,6 +3371,31 @@ msgstr "此帳號已註冊"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "無此使用者"
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+msgid "Invite-only"
+msgstr ""
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "註冊確認"
@@ -3227,11 +3544,15 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
-#: classes/Message.php:55
+#: classes/Message.php:45
+msgid "You are banned from sending direct messages."
+msgstr ""
+
+#: classes/Message.php:61
msgid "Could not insert message."
msgstr ""
-#: classes/Message.php:65
+#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr ""
@@ -3261,15 +3582,15 @@ msgid ""
"few minutes."
msgstr ""
-#: classes/Notice.php:202
+#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1120
+#: classes/Notice.php:1117
#, php-format
msgid "DB error inserting reply: %s"
msgstr "增加回覆時,資料庫發生錯誤: %s"
@@ -3300,10 +3621,6 @@ msgstr ""
msgid "Change email handling"
msgstr ""
-#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
@@ -3356,100 +3673,104 @@ msgstr "連結"
msgid "Connect to services"
msgstr "無法連結到伺服器:%s"
-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:439
+msgid "Change site configuration"
+msgstr ""
+
+#: lib/action.php:443 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:444 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout"
msgstr "登出"
-#: lib/action.php:445
+#: lib/action.php:449
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:450
+#: lib/action.php:454
#, fuzzy
msgid "Create an account"
msgstr "新增帳號"
-#: lib/action.php:453
+#: lib/action.php:457
msgid "Login to the site"
msgstr ""
-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:460 lib/action.php:723
msgid "Help"
msgstr "求救"
-#: lib/action.php:456
+#: lib/action.php:460
#, fuzzy
msgid "Help me!"
msgstr "求救"
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:463
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:480
+#: lib/action.php:484
#, fuzzy
msgid "Site notice"
msgstr "新訊息"
-#: lib/action.php:546
+#: lib/action.php:550
msgid "Local views"
msgstr ""
-#: lib/action.php:612
+#: lib/action.php:616
#, fuzzy
msgid "Page notice"
msgstr "新訊息"
-#: lib/action.php:714
+#: lib/action.php:718
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:721
+#: lib/action.php:725
msgid "About"
msgstr "關於"
-#: lib/action.php:723
+#: lib/action.php:727
msgid "FAQ"
msgstr "常見問題"
-#: lib/action.php:727
+#: lib/action.php:731
msgid "TOS"
msgstr ""
-#: lib/action.php:730
+#: lib/action.php:734
msgid "Privacy"
msgstr ""
-#: lib/action.php:732
+#: lib/action.php:736
msgid "Source"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:738
msgid "Contact"
msgstr "好友名單"
-#: lib/action.php:736
+#: lib/action.php:740
msgid "Badge"
msgstr ""
-#: lib/action.php:764
+#: lib/action.php:768
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:767
+#: lib/action.php:771
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3458,12 +3779,12 @@ msgstr ""
"**%%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所提供的微型"
"部落格服務"
-#: lib/action.php:769
+#: lib/action.php:773
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%**是個微型部落格"
-#: lib/action.php:771
+#: lib/action.php:775
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3471,36 +3792,58 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:785
+#: lib/action.php:789
#, fuzzy
msgid "Site content license"
msgstr "新訊息"
-#: lib/action.php:794
+#: lib/action.php:798
msgid "All "
msgstr ""
-#: lib/action.php:799
+#: lib/action.php:803
msgid "license."
msgstr ""
-#: lib/action.php:1052
+#: lib/action.php:1067
msgid "Pagination"
msgstr ""
-#: lib/action.php:1061
+#: lib/action.php:1076
msgid "After"
msgstr ""
-#: lib/action.php:1069
+#: lib/action.php:1084
#, fuzzy
msgid "Before"
msgstr "之前的內容»"
-#: lib/action.php:1117
+#: lib/action.php:1132
msgid "There was a problem with your session token."
msgstr ""
+#: lib/adminpanelaction.php:96
+msgid "You cannot make changes to this site."
+msgstr ""
+
+#: lib/adminpanelaction.php:195
+msgid "showForm() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:224
+msgid "saveSettings() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:273
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "確認信箱"
+
+#: lib/adminpanelaction.php:276
+#, fuzzy
+msgid "Design configuration"
+msgstr "確認信箱"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -3674,30 +4017,36 @@ msgstr "此帳號已註冊"
#: lib/command.php:620
#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "此帳號已註冊"
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "此帳號已註冊"
+msgstr[1] "此帳號已註冊"
-#: lib/command.php:637
+#: lib/command.php:640
#, fuzzy
msgid "No one is subscribed to you."
msgstr "無此訂閱"
-#: lib/command.php:639
+#: lib/command.php:642
#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "此帳號已註冊"
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "無此訂閱"
+msgstr[1] "無此訂閱"
-#: lib/command.php:656
+#: lib/command.php:662
#, fuzzy
msgid "You are not a member of any groups."
msgstr "無法連結到伺服器:%s"
-#: lib/command.php:658
+#: lib/command.php:664
#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "無法連結到伺服器:%s"
+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:670
+#: lib/command.php:678
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3736,20 +4085,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:203
#, fuzzy
msgid "No configuration file found. "
msgstr "無確認碼"
-#: lib/common.php:193
+#: lib/common.php:204
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:205
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:195
+#: lib/common.php:206
msgid "Go to the installer."
msgstr ""
@@ -3769,10 +4118,6 @@ msgstr ""
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-
#: lib/designsettings.php:105
#, fuzzy
msgid "Upload file"
@@ -3783,65 +4128,6 @@ msgid ""
"You can upload your personal background image. The maximum file size is 2Mb."
msgstr ""
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "更改密碼"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "連結"
-
-#: lib/designsettings.php:204
-msgid "Sidebar"
-msgstr ""
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr ""
-
-#: lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "登入"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
#: lib/designsettings.php:372
msgid "Bad default color settings: "
msgstr ""
@@ -4076,12 +4362,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:235
+#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "現在%1$s在%2$s成為你的粉絲囉"
-#: lib/mail.php:240
+#: lib/mail.php:241
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -4103,29 +4389,29 @@ msgstr ""
"%4$s.\n"
"敬上。\n"
-#: lib/mail.php:253
+#: lib/mail.php:254
#, fuzzy, php-format
msgid "Location: %s\n"
msgstr "地點"
-#: lib/mail.php:255
+#: lib/mail.php:256
#, fuzzy, php-format
msgid "Homepage: %s\n"
msgstr "個人首頁"
-#: lib/mail.php:257
+#: lib/mail.php:258
#, php-format
msgid ""
"Bio: %s\n"
"\n"
msgstr ""
-#: lib/mail.php:285
+#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr ""
-#: lib/mail.php:288
+#: lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4138,21 +4424,21 @@ msgid ""
"%4$s"
msgstr ""
-#: lib/mail.php:412
+#: lib/mail.php:413
#, php-format
msgid "%s status"
msgstr ""
-#: lib/mail.php:438
+#: lib/mail.php:439
msgid "SMS confirmation"
msgstr ""
-#: lib/mail.php:462
+#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#: lib/mail.php:466
+#: lib/mail.php:467
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4168,12 +4454,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:509
+#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
msgstr ""
-#: lib/mail.php:513
+#: lib/mail.php:514
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4192,12 +4478,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:554
+#: lib/mail.php:559
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "現在%1$s在%2$s成為你的粉絲囉"
-#: lib/mail.php:556
+#: lib/mail.php:561
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4218,12 +4504,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:611
+#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:613
+#: lib/mail.php:622
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4364,7 +4650,11 @@ msgstr "新增外部個人資料發生錯誤(Error inserting remote profile)"
msgid "Duplicate notice"
msgstr "新訊息"
-#: lib/oauthstore.php:487
+#: lib/oauthstore.php:466 lib/subs.php:48
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "無法新增訂閱"
@@ -4380,10 +4670,6 @@ msgstr ""
msgid "Favorites"
msgstr ""
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr ""
-
#: lib/personalgroupnav.php:124
msgid "Inbox"
msgstr ""
@@ -4434,6 +4720,15 @@ msgstr "何時加入會員的呢?"
msgid "All groups"
msgstr ""
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "無此文件"
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
#: lib/publicgroupnav.php:78
msgid "Public"
msgstr ""
@@ -4454,6 +4749,15 @@ msgstr ""
msgid "Popular"
msgstr ""
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr ""
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "無此使用者"
+
#: lib/searchaction.php:120
msgid "Search site"
msgstr ""
@@ -4491,6 +4795,16 @@ msgstr ""
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "新訊息"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "無此使用者"
+
#: lib/subgroupnav.php:83
#, fuzzy, php-format
msgid "People %s subscribes to"
@@ -4520,28 +4834,28 @@ msgstr ""
msgid "(none)"
msgstr ""
-#: lib/subs.php:48
+#: lib/subs.php:52
msgid "Already subscribed!"
msgstr ""
-#: lib/subs.php:52
+#: lib/subs.php:56
msgid "User has blocked you."
msgstr ""
-#: lib/subs.php:56
+#: lib/subs.php:60
msgid "Could not subscribe."
msgstr ""
-#: lib/subs.php:75
+#: lib/subs.php:79
msgid "Could not subscribe other to you."
msgstr ""
-#: lib/subs.php:124
+#: lib/subs.php:128
#, fuzzy
msgid "Not subscribed!"
msgstr "此帳號已註冊"
-#: lib/subs.php:136
+#: lib/subs.php:140
msgid "Couldn't delete subscription."
msgstr "無法刪除帳號"
@@ -4553,6 +4867,29 @@ msgstr ""
msgid "Top posters"
msgstr ""
+#: lib/unblockform.php:80
+#, fuzzy
+msgid "Unlock this user"
+msgstr "無此使用者"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "無此使用者"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "無此使用者"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr ""
@@ -4656,3 +4993,7 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "此帳號已註冊"
diff --git a/plugins/Authentication/AuthenticationPlugin.php b/plugins/Authentication/AuthenticationPlugin.php
index 1b9084187..cd1de1149 100644
--- a/plugins/Authentication/AuthenticationPlugin.php
+++ b/plugins/Authentication/AuthenticationPlugin.php
@@ -2,7 +2,7 @@
/**
* StatusNet, the distributed open-source microblogging tool
*
- * Superclass for plugins that do authentication and/or authorization
+ * Superclass for plugins that do authentication
*
* PHP version 5
*
diff --git a/plugins/Authorization/AuthorizationPlugin.php b/plugins/Authorization/AuthorizationPlugin.php
new file mode 100644
index 000000000..e4e046d08
--- /dev/null
+++ b/plugins/Authorization/AuthorizationPlugin.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Superclass for plugins that do authorization
+ *
+ * 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 Plugin
+ * @package StatusNet
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+ exit(1);
+}
+
+/**
+ * Superclass for plugins that do authorization
+ *
+ * @category Plugin
+ * @package StatusNet
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+abstract class AuthorizationPlugin extends Plugin
+{
+ //is this plugin authoritative for authorization?
+ public $authoritative = false;
+
+ //------------Auth plugin should implement some (or all) of these methods------------\\
+
+ /**
+ * Is a user allowed to log in?
+ * @param user
+ * @return boolean true if the user is allowed to login, false if explicitly not allowed to login, null if we don't explicitly allow or deny login
+ */
+ function loginAllowed($user) {
+ return null;
+ }
+
+ /**
+ * Does a profile grant the user a named role?
+ * @param profile
+ * @return boolean true if the profile has the role, false if not
+ */
+ function hasRole($profile, $name) {
+ return false;
+ }
+
+ //------------Below are the methods that connect StatusNet to the implementing Auth plugin------------\\
+ function onInitializePlugin(){
+
+ }
+
+ function onStartSetUser(&$user) {
+ $loginAllowed = $this->loginAllowed($user);
+ if($loginAllowed === true){
+ return;
+ }else if($loginAllowed === false){
+ $user = null;
+ return false;
+ }else{
+ if($this->authoritative) {
+ $user = null;
+ return false;
+ }else{
+ return;
+ }
+ }
+ }
+
+ function onStartSetApiUser(&$user) {
+ return $this->onStartSetUser(&$user);
+ }
+
+ function onStartHasRole($profile, $name, &$has_role) {
+ if($this->hasRole($profile, $name)){
+ $has_role = true;
+ return false;
+ }else{
+ if($this->authoritative) {
+ $has_role = false;
+ return false;
+ }else{
+ return;
+ }
+ }
+ }
+}
+
diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
index ad5dd3a02..8caacff46 100644
--- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
+++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
@@ -2,7 +2,7 @@
/**
* StatusNet, the distributed open-source microblogging tool
*
- * Plugin to enable LDAP Authentication and Authorization
+ * Plugin to enable LDAP Authentication
*
* PHP version 5
*
@@ -63,6 +63,9 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
if(!isset($this->attributes['username'])){
throw new Exception("must specify a username attribute");
}
+ if($this->password_changeable && (! isset($this->attributes['password']) || !isset($this->password_encoding))){
+ throw new Exception("if password_changeable is set, the password attribute and password_encoding must also be specified");
+ }
}
//---interface implementation---//
@@ -156,20 +159,21 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
}
function ldap_get_connection($config = null){
- if($config == null){
- $config = $this->ldap_get_config();
+ if($config == null && isset($this->default_ldap)){
+ return $this->default_ldap;
}
//cannot use Net_LDAP2::connect() as StatusNet uses
//PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
//PEAR handling can be overridden on instance objects, so we do that.
- $ldap = new Net_LDAP2($config);
+ $ldap = new Net_LDAP2(isset($config)?$config:$this->ldap_get_config());
$ldap->setErrorHandling(PEAR_ERROR_RETURN);
$err=$ldap->bind();
if (Net_LDAP2::isError($err)) {
common_log(LOG_WARNING, 'Could not connect to LDAP server: '.$err->getMessage());
return false;
}
+ if($config == null) $this->default_ldap=$ldap;
return $ldap;
}
@@ -186,7 +190,6 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
}
$filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals', $username);
$options = array(
- 'scope' => 'sub',
'attributes' => $attributes
);
$search = $ldap->search(null,$filter,$options);
diff --git a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php
new file mode 100644
index 000000000..5e759c379
--- /dev/null
+++ b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php
@@ -0,0 +1,211 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin to enable LDAP Authorization
+ *
+ * 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 Plugin
+ * @package StatusNet
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+ exit(1);
+}
+
+require_once INSTALLDIR.'/plugins/Authorization/AuthorizationPlugin.php';
+require_once 'Net/LDAP2.php';
+
+class LdapAuthorizationPlugin extends AuthorizationPlugin
+{
+ public $host=null;
+ public $port=null;
+ public $version=null;
+ public $starttls=null;
+ public $binddn=null;
+ public $bindpw=null;
+ public $basedn=null;
+ public $options=null;
+ public $filter=null;
+ public $scope=null;
+ public $provider_name = null;
+ public $uniqueMember_attribute = null;
+ public $roles_to_groups = array();
+ public $login_group = null;
+ public $attributes = array();
+
+ function onInitializePlugin(){
+ parent::onInitializePlugin();
+ if(!isset($this->host)){
+ throw new Exception("must specify a host");
+ }
+ if(!isset($this->basedn)){
+ throw new Exception("must specify a basedn");
+ }
+ if(!isset($this->provider_name)){
+ throw new Exception("provider_name must be set. Use the provider_name from the LDAP Authentication plugin.");
+ }
+ if(!isset($this->uniqueMember_attribute)){
+ throw new Exception("uniqueMember_attribute must be set.");
+ }
+ if(!isset($this->attributes['username'])){
+ throw new Exception("username attribute must be set.");
+ }
+ }
+
+ //---interface implementation---//
+ function loginAllowed($user) {
+ $user_username = new User_username();
+ $user_username->user_id=$user->id;
+ $user_username->provider_name=$this->provider_name;
+ if($user_username->find() && $user_username->fetch()){
+ $entry = $this->ldap_get_user($user_username->username);
+ if($entry){
+ if(isset($this->login_group)){
+ if(is_array($this->login_group)){
+ foreach($this->login_group as $group){
+ if($this->ldap_is_dn_member_of_group($entry->dn(),$group)){
+ return true;
+ }
+ }
+ }else{
+ if($this->ldap_is_dn_member_of_group($entry->dn(),$this->login_group)){
+ return true;
+ }
+ }
+ return null;
+ }else{
+ //if a user exists, we can assume he's allowed to login
+ return true;
+ }
+ }else{
+ return null;
+ }
+ }else{
+ return null;
+ }
+ }
+
+ function hasRole($profile, $name) {
+ $user_username = new User_username();
+ $user_username->user_id=$profile->id;
+ $user_username->provider_name=$this->provider_name;
+ if($user_username->find() && $user_username->fetch()){
+ $entry = $this->ldap_get_user($user_username->username);
+ if($entry){
+ if(isset($this->roles_to_groups[$name])){
+ if(is_array($this->roles_to_groups[$name])){
+ foreach($this->roles_to_groups[$name] as $group){
+ if($this->ldap_is_dn_member_of_group($entry->dn(),$group)){
+ return true;
+ }
+ }
+ }else{
+ if($this->ldap_is_dn_member_of_group($entry->dn(),$this->roles_to_groups[$name])){
+ return true;
+ }
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ function ldap_is_dn_member_of_group($userDn, $groupDn)
+ {
+ $ldap = $this->ldap_get_connection();
+ $link = $ldap->getLink();
+ $r = ldap_compare($link, $groupDn, $this->uniqueMember_attribute, $userDn);
+ if ($r === true){
+ return true;
+ }else if($r === false){
+ return false;
+ }else{
+ common_log(LOG_ERR, ldap_error($r));
+ return false;
+ }
+ }
+
+ function ldap_get_config(){
+ $config = array();
+ $keys = array('host','port','version','starttls','binddn','bindpw','basedn','options','filter','scope');
+ foreach($keys as $key){
+ $value = $this->$key;
+ if($value!==null){
+ $config[$key]=$value;
+ }
+ }
+ return $config;
+ }
+
+ //-----the below function were copied from LDAPAuthenticationPlugin. They will be moved to a utility class soon.----\\
+ function ldap_get_connection($config = null){
+ if($config == null && isset($this->default_ldap)){
+ return $this->default_ldap;
+ }
+
+ //cannot use Net_LDAP2::connect() as StatusNet uses
+ //PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
+ //PEAR handling can be overridden on instance objects, so we do that.
+ $ldap = new Net_LDAP2(isset($config)?$config:$this->ldap_get_config());
+ $ldap->setErrorHandling(PEAR_ERROR_RETURN);
+ $err=$ldap->bind();
+ if (Net_LDAP2::isError($err)) {
+ common_log(LOG_WARNING, 'Could not connect to LDAP server: '.$err->getMessage());
+ return false;
+ }
+ if($config == null) $this->default_ldap=$ldap;
+ return $ldap;
+ }
+
+ /**
+ * get an LDAP entry for a user with a given username
+ *
+ * @param string $username
+ * $param array $attributes LDAP attributes to retrieve
+ * @return string DN
+ */
+ function ldap_get_user($username,$attributes=array(),$ldap=null){
+ if($ldap==null) {
+ $ldap = $this->ldap_get_connection();
+ }
+ $filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals', $username);
+ $options = array(
+ 'attributes' => $attributes
+ );
+ $search = $ldap->search(null,$filter,$options);
+
+ if (PEAR::isError($search)) {
+ common_log(LOG_WARNING, 'Error while getting DN for user: '.$search->getMessage());
+ return false;
+ }
+
+ if($search->count()==0){
+ return false;
+ }else if($search->count()==1){
+ $entry = $search->shiftEntry();
+ return $entry;
+ }else{
+ common_log(LOG_WARNING, 'Found ' . $search->count() . ' ldap user with the username: ' . $username);
+ return false;
+ }
+ }
+}
diff --git a/plugins/LdapAuthorization/README b/plugins/LdapAuthorization/README
new file mode 100644
index 000000000..44239d8e0
--- /dev/null
+++ b/plugins/LdapAuthorization/README
@@ -0,0 +1,91 @@
+The LDAP Authorization plugin allows for StatusNet to handle authorization
+through LDAP.
+
+Installation
+============
+add "addPlugin('ldapAuthorization',
+ array('setting'=>'value', 'setting2'=>'value2', ...);"
+to the bottom of your config.php
+
+You *cannot* use this plugin without the LDAP Authentication plugin
+
+Settings
+========
+provider_name*: name of the LDAP authentication provider that this plugin works with.
+authoritative (false): should this plugin be authoritative for
+ authorization?
+uniqueMember_attribute ('uniqueMember')*: the attribute of a group
+ that lists the DNs of its members
+roles_to_groups: array that maps StatusNet roles to LDAP groups
+ some StatusNet roles are: moderator, administrator, sandboxed, silenced
+login_group: if this is set to a group DN, only members of that group will be
+ allowed to login
+
+The below settings must be exact copies of the settings used for the
+ corresponding LDAP Authentication plugin.
+
+host*: LDAP server name to connect to. You can provide several hosts in an
+ array in which case the hosts are tried from left to right.
+ See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+port: Port on the server.
+ See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+version: LDAP version.
+ See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+starttls: TLS is started after connecting.
+ See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+binddn: The distinguished name to bind as (username).
+ See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+bindpw: Password for the binddn.
+ See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+basedn*: LDAP base name (root directory).
+ See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+options: See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+filter: Default search filter.
+ See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+scope: Default search scope.
+ See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+
+attributes: an array that relates StatusNet user attributes to LDAP ones
+ username*: LDAP attribute value entered when authenticating to StatusNet
+
+* required
+default values are in (parenthesis)
+
+Example
+=======
+Here's an example of an LDAP plugin configuration that connects to
+ Microsoft Active Directory.
+
+addPlugin('ldapAuthentication', array(
+ 'provider_name'=>'Example',
+ 'authoritative'=>true,
+ 'autoregistration'=>true,
+ 'binddn'=>'username',
+ 'bindpw'=>'password',
+ 'basedn'=>'OU=Users,OU=StatusNet,OU=US,DC=americas,DC=global,DC=loc',
+ 'host'=>array('server1', 'server2'),
+ 'password_encoding'=>'ad',
+ 'attributes'=>array(
+ 'username'=>'sAMAccountName',
+ 'nickname'=>'sAMAccountName',
+ 'email'=>'mail',
+ 'fullname'=>'displayName',
+ 'password'=>'unicodePwd')
+));
+addPlugin('ldapAuthorization', array(
+ 'provider_name'=>'Example',
+ 'authoritative'=>false,
+ 'uniqueMember_attribute'=>'member',
+ 'roles_to_groups'=> array(
+ 'moderator'=>'CN=SN-Moderators,OU=Users,OU=StatusNet,OU=US,DC=americas,DC=global,DC=loc',
+ 'administrator'=> array('CN=System-Adminstrators,OU=Users,OU=StatusNet,OU=US,DC=americas,DC=global,DC=loc',
+ 'CN=SN-Administrators,OU=Users,OU=StatusNet,OU=US,DC=americas,DC=global,DC=loc')
+ ),
+ 'binddn'=>'username',
+ 'bindpw'=>'password',
+ 'basedn'=>'OU=Users,OU=StatusNet,OU=US,DC=americas,DC=global,DC=loc',
+ 'host'=>array('server1', 'server2'),
+ 'attributes'=>array(
+ 'username'=>'sAMAccountName')
+));
+
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 0c7c1240c..2cff03d6c 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -101,8 +101,8 @@ class RealtimePlugin extends Plugin
$realtimeUI = ' RealtimeUpdate.initPopupWindow();';
}
else {
- $iconurl = common_path('plugins/Realtime/icon_external.gif');
- $realtimeUI = ' RealtimeUpdate.addPopup("'.$url.'", "'.$timeline.'", "'. $iconurl .'");';
+ $pluginPath = common_path('plugins/Realtime/');
+ $realtimeUI = ' RealtimeUpdate.initActions("'.$url.'", "'.$timeline.'", "'. $pluginPath .'");';
}
$action->elementStart('script', array('type' => 'text/javascript'));
@@ -118,6 +118,13 @@ class RealtimePlugin extends Plugin
return true;
}
+ function onEndShowStatusNetStyles($action)
+ {
+ $action->cssLink(common_path('plugins/Realtime/realtimeupdate.css'),
+ null, 'screen, projection, tv');
+ return true;
+ }
+
function onEndNoticeSave($notice)
{
$paths = array();
diff --git a/plugins/Realtime/icon_pause.gif b/plugins/Realtime/icon_pause.gif
new file mode 100644
index 000000000..ced0b6440
--- /dev/null
+++ b/plugins/Realtime/icon_pause.gif
Binary files differ
diff --git a/plugins/Realtime/icon_play.gif b/plugins/Realtime/icon_play.gif
new file mode 100644
index 000000000..794ec85b6
--- /dev/null
+++ b/plugins/Realtime/icon_play.gif
Binary files differ
diff --git a/plugins/Realtime/realtimeupdate.css b/plugins/Realtime/realtimeupdate.css
new file mode 100644
index 000000000..0ab5dd32b
--- /dev/null
+++ b/plugins/Realtime/realtimeupdate.css
@@ -0,0 +1,49 @@
+#notices_primary {
+position:relative;
+}
+
+#realtime_actions {
+position: absolute;
+top: -20px;
+right: 0;
+margin: 0 0 11px 0;
+}
+
+#realtime_actions li {
+margin-left: 18px;
+list-style-type: none;
+float: left;
+}
+
+#realtime_actions button {
+width: 16px;
+height: 16px;
+display: block;
+border: none;
+cursor: pointer;
+text-indent: -9999px;
+float: left;
+}
+
+#realtime_play {
+background: url(icon_play.gif) no-repeat 47% 47%;
+margin-left: 4px;
+}
+
+#realtime_pause {
+background: url(icon_pause.gif) no-repeat 47% 47%;
+}
+
+#realtime_popup {
+background: url(icon_external.gif) no-repeat 0 30%;
+}
+
+#queued_counter {
+float:left;
+line-height:1.2;
+}
+
+#showstream #notices_primary {
+margin-top: 18px;
+}
+
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index d1cf1d507..a2c4da113 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -36,6 +36,9 @@ RealtimeUpdate = {
_updatecounter: 0,
_maxnotices: 50,
_windowhasfocus: true,
+ _documenttitle: '',
+ _paused:false,
+ _queuedNotices:[],
init: function(userid, replyurl, favorurl, deleteurl)
{
@@ -44,7 +47,7 @@ RealtimeUpdate = {
RealtimeUpdate._favorurl = favorurl;
RealtimeUpdate._deleteurl = deleteurl;
- DT = document.title;
+ RealtimeUpdate._documenttitle = document.title;
$(window).bind('focus', function(){ RealtimeUpdate._windowhasfocus = true; });
@@ -54,7 +57,7 @@ RealtimeUpdate = {
$('#notices_primary .notice:first').addClass('mark-top');
RealtimeUpdate._updatecounter = 0;
- document.title = DT;
+ document.title = RealtimeUpdate._documenttitle;
RealtimeUpdate._windowhasfocus = false;
return false;
@@ -63,31 +66,48 @@ RealtimeUpdate = {
receive: function(data)
{
- id = data.id;
+ if (RealtimeUpdate._paused === false) {
+ RealtimeUpdate.purgeLastNoticeItem();
- // Don't add it if it already exists
- if ($("#notice-"+id).length > 0) {
- return;
+ RealtimeUpdate.insertNoticeItem(data);
}
+ else {
+ RealtimeUpdate._queuedNotices.push(data);
- var noticeItem = RealtimeUpdate.makeNoticeItem(data);
- $("#notices_primary .notices").prepend(noticeItem);
- $("#notices_primary .notice:first").css({display:"none"});
- $("#notices_primary .notice:first").fadeIn(1000);
-
- if ($('#notices_primary .notice').length > RealtimeUpdate._maxnotices) {
- $("#notices_primary .notice:last .form_disfavor").unbind('submit');
- $("#notices_primary .notice:last .form_favor").unbind('submit');
- $("#notices_primary .notice:last .notice_reply").unbind('click');
- $("#notices_primary .notice:last").remove();
+ RealtimeUpdate.updateQueuedCounter();
}
- SN.U.NoticeReply();
- SN.U.NoticeFavor();
+ RealtimeUpdate.updateWindowCounter();
+ },
+
+ insertNoticeItem: function(data) {
+ // Don't add it if it already exists
+ if ($("#notice-"+data.id).length > 0) {
+ return;
+ }
+
+ var noticeItem = RealtimeUpdate.makeNoticeItem(data);
+ $("#notices_primary .notices").prepend(noticeItem);
+ $("#notices_primary .notice:first").css({display:"none"});
+ $("#notices_primary .notice:first").fadeIn(1000);
+
+ SN.U.NoticeReply();
+ SN.U.NoticeFavor();
+ },
+
+ purgeLastNoticeItem: function() {
+ if ($('#notices_primary .notice').length > RealtimeUpdate._maxnotices) {
+ $("#notices_primary .notice:last .form_disfavor").unbind('submit');
+ $("#notices_primary .notice:last .form_favor").unbind('submit');
+ $("#notices_primary .notice:last .notice_reply").unbind('click');
+ $("#notices_primary .notice:last").remove();
+ }
+ },
+ updateWindowCounter: function() {
if (RealtimeUpdate._windowhasfocus === false) {
RealtimeUpdate._updatecounter += 1;
- document.title = '('+RealtimeUpdate._updatecounter+') ' + DT;
+ document.title = '('+RealtimeUpdate._updatecounter+') ' + RealtimeUpdate._documenttitle;
}
},
@@ -169,30 +189,83 @@ RealtimeUpdate = {
return dl;
},
- addPopup: function(url, timeline, iconurl)
+ initActions: function(url, timeline, path)
{
- var NP = $('#notices_primary');
- NP.css({'position':'relative'});
- NP.prepend('<button id="realtime_timeline" title="Pop up in a window">Pop up</button>');
-
- var RT = $('#realtime_timeline');
- RT.css({
- 'margin':'0 0 11px 0',
- 'background':'transparent url('+ iconurl + ') no-repeat 0 30%',
- 'padding':'0 0 0 20px',
- 'display':'block',
- 'position':'absolute',
- 'top':'-20px',
- 'right':'0',
- 'border':'none',
- 'cursor':'pointer',
- 'color':$('a').css('color'),
- 'font-weight':'bold',
- 'font-size':'1em'
- });
- $('#showstream #notices_primary').css({'margin-top':'18px'});
+ var NP = $('#notices_primary');
+ NP.prepend('<ul id="realtime_actions"><li id="realtime_playpause"></li><li id="realtime_timeline"></li></ul>');
+
+ RealtimeUpdate._pluginPath = path;
+
+ RealtimeUpdate.initPlayPause();
+ RealtimeUpdate.initAddPopup(url, timeline, RealtimeUpdate._pluginPath);
+ },
+
+ initPlayPause: function()
+ {
+ RealtimeUpdate.showPause();
+ },
+
+ showPause: function()
+ {
+ RT_PP = $('#realtime_playpause');
+ RT_PP.empty();
+ RT_PP.append('<button id="realtime_pause" class="pause" title="Pause">Pause</button>');
+
+ RT_P = $('#realtime_pause');
+ RT_P.bind('click', function() {
+ RealtimeUpdate._paused = true;
+
+ RealtimeUpdate.showPlay();
+ return false;
+ });
+ },
+
+ showPlay: function()
+ {
+ RT_PP = $('#realtime_playpause');
+ RT_PP.empty();
+ RT_PP.append('<span id="queued_counter"></span> <button id="realtime_play" class="play" title="Play">Play</button>');
+
+ RT_P = $('#realtime_play');
+ RT_P.bind('click', function() {
+ RealtimeUpdate._paused = false;
+
+ RealtimeUpdate.showPause();
+
+ RealtimeUpdate.showQueuedNotices();
+
+ return false;
+ });
+ },
+
+ showQueuedNotices: function()
+ {
+ $.each(RealtimeUpdate._queuedNotices, function(i, n) {
+ RealtimeUpdate.insertNoticeItem(n);
+ });
+
+ RealtimeUpdate._queuedNotices = [];
+
+ RealtimeUpdate.removeQueuedCounter();
+ },
+
+ updateQueuedCounter: function()
+ {
+ $('#realtime_playpause #queued_counter').html('('+RealtimeUpdate._queuedNotices.length+')');
+ },
+
+ removeQueuedCounter: function()
+ {
+ $('#realtime_playpause #queued_counter').empty();
+ },
+
+ initAddPopup: function(url, timeline, path)
+ {
+ var NP = $('#realtime_timeline');
+ NP.append('<button id="realtime_popup" title="Pop up in a window">Pop up</button>');
- RT.bind('click', function() {
+ var PP = $('#realtime_popup');
+ PP.bind('click', function() {
window.open(url,
'',
'toolbar=no,resizable=yes,scrollbars=yes,status=yes,width=500,height=550');
diff --git a/scripts/update_pot.sh b/scripts/update_pot.sh
index 9419e4337..de53fe7c9 100755
--- a/scripts/update_pot.sh
+++ b/scripts/update_pot.sh
@@ -1,3 +1,13 @@
cd `dirname $0`
cd ..
-xgettext --from-code=UTF-8 --default-domain=statusnet --output=locale/statusnet.po --language=PHP --join-existing actions/*.php classes/*.php lib/*.php scripts/*.php
+xgettext \
+ --from-code=UTF-8 \
+ --default-domain=statusnet \
+ --output=locale/statusnet.po \
+ --language=PHP \
+ --keyword="pgettext:1c,2" \
+ --keyword="npgettext:1c,2,3" \
+ actions/*.php \
+ classes/*.php \
+ lib/*.php \
+ scripts/*.php
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index e5f5df68c..d5917953f 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -107,6 +107,20 @@ clear:both;
.form_settings fieldset {
margin-bottom:29px;
}
+.form_settings fieldset fieldset {
+margin-bottom:41px;
+padding:3% 1.795% 1.795% 3%;
+border-radius:11px;
+-moz-border-radius:11px;
+-webkit-border-radius:11px;
+border-width:1px;
+border-style:solid;
+}
+.form_settings fieldset fieldset legend {
+line-height:0;
+}
+
+
.form_settings input.remove {
margin-left:11px;
}
@@ -172,8 +186,7 @@ font-weight:bold;
#form_password_recover legend,
#form_password_change legend,
.form_entity_block legend,
-#form_filter_bytag legend,
-#settings_design_theme legend {
+#form_filter_bytag legend {
display:none;
}
@@ -939,7 +952,7 @@ clear:left;
float:left;
font-size:0.95em;
margin-left:59px;
-width:50%;
+max-width:74%;
}
#showstream .notice div.entry-content,
#shownotice .notice div.entry-content {
@@ -961,7 +974,6 @@ position:relative;
font-size:0.95em;
width:90px;
float:right;
-margin-right:11px;
}
.notice-options a {
@@ -971,18 +983,12 @@ float:left;
.notice-options .notice_reply,
.notice-options .form_favor,
.notice-options .form_disfavor {
-position:absolute;
-top:0;
+float:left;
+margin-left:18px;
}
.notice-options .form_favor,
.notice-options .form_disfavor {
-left:0;
-}
-.notice-options .notice_reply {
-left:29px;
-}
-.notice-options .notice_delete {
-right:0;
+margin-left:0;
}
.notice-options input,
.notice-options a {
@@ -1344,7 +1350,7 @@ float:left;
}
#settings_design_color .form_data {
width:400px;
-margin-right:28px;
+margin-right:1%;
}
#settings_design_color .form_data li {
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 6edc66ad2..f4af07081 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -28,10 +28,19 @@ input, textarea, select,
.entity_remote_subscribe {
border-color:#AAAAAA;
}
+
+.form_settings fieldset fieldset {
+background:rgba(240, 240, 240, 0.2);
+box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+}
+
#filter_tags ul li,
.entity_send-a-message .form_notice,
.pagination .nav_prev a,
-.pagination .nav_next a {
+.pagination .nav_next a,
+.form_settings fieldset fieldset {
border-color:#DDDDDD;
}
@@ -52,8 +61,7 @@ input.submit,
.entity_remote_subscribe,
.entity_actions a,
.entity_actions input,
-button.close {
-background-color:#9BB43E;
+button {
box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 94bef339f..ff7311302 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -28,10 +28,19 @@ input, textarea, select,
.entity_remote_subscribe {
border-color:#AAAAAA;
}
+
+.form_settings fieldset fieldset {
+background:rgba(240, 240, 240, 0.2);
+box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
+}
+
#filter_tags ul li,
.entity_send-a-message .form_notice,
.pagination .nav_prev a,
-.pagination .nav_next a {
+.pagination .nav_next a,
+.form_settings fieldset fieldset {
border-color:#DDDDDD;
}
@@ -52,7 +61,7 @@ input.submit,
.entity_remote_subscribe,
.entity_actions a,
.entity_actions input,
-button.close {
+button {
box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);