diff --git a/actions/atompubmembershipfeed.php b/actions/atompubmembershipfeed.php
index 8e3db3f3de..57cf465a0c 100644
--- a/actions/atompubmembershipfeed.php
+++ b/actions/atompubmembershipfeed.php
@@ -217,7 +217,7 @@ class AtompubmembershipfeedAction extends ApiAuthAction
$this->auth_user->id != $this->_profile->id) {
// TRANS: Client exception thrown when trying subscribe someone else to a group.
throw new ClientException(_("Cannot add someone else's".
- " membership"), 403);
+ " membership."), 403);
}
$xml = file_get_contents('php://input');
diff --git a/actions/atompubshowfavorite.php b/actions/atompubshowfavorite.php
index 328f35d8f9..1727e0c3cf 100644
--- a/actions/atompubshowfavorite.php
+++ b/actions/atompubshowfavorite.php
@@ -149,7 +149,7 @@ class AtompubshowfavoriteAction extends ApiAuthAction
$this->auth_user->id != $this->_profile->id) {
// TRANS: Client exception thrown when trying to remove a favorite notice of another user.
throw new ClientException(_("Cannot delete someone else's".
- " favorite"), 403);
+ " favorite."), 403);
}
$this->_fave->delete();
diff --git a/actions/atompubshowmembership.php b/actions/atompubshowmembership.php
index 4454c7fd7a..a845ea23df 100644
--- a/actions/atompubshowmembership.php
+++ b/actions/atompubshowmembership.php
@@ -78,7 +78,7 @@ class AtompubshowmembershipAction extends ApiAuthAction
if (empty($this->_group)) {
// TRANS: Client exception thrown when referencing a non-existing group.
- throw new ClientException(_('No such group'), 404);
+ throw new ClientException(_('No such group.'), 404);
}
$kv = array('group_id' => $groupId,
@@ -88,7 +88,7 @@ class AtompubshowmembershipAction extends ApiAuthAction
if (empty($this->_membership)) {
// TRANS: Client exception thrown when trying to show membership of a non-subscribed group
- throw new ClientException(_('Not a member'), 404);
+ throw new ClientException(_('Not a member.'), 404);
}
return true;
@@ -113,7 +113,7 @@ class AtompubshowmembershipAction extends ApiAuthAction
break;
default:
// TRANS: Client exception thrown when using an unsupported HTTP method.
- throw new ClientException(_('HTTP method not supported'), 405);
+ throw new ClientException(_('HTTP method not supported.'), 405);
break;
}
return;
@@ -149,7 +149,7 @@ class AtompubshowmembershipAction extends ApiAuthAction
$this->auth_user->id != $this->_profile->id) {
// TRANS: Client exception thrown when deleting someone else's membership.
throw new ClientException(_("Cannot delete someone else's".
- " membership"), 403);
+ " membership."), 403);
}
if (Event::handle('StartLeaveGroup', array($this->_group, $this->auth_user))) {
diff --git a/actions/backupaccount.php b/actions/backupaccount.php
index 4f6fb936bd..7794826760 100644
--- a/actions/backupaccount.php
+++ b/actions/backupaccount.php
@@ -4,7 +4,7 @@
* Copyright (C) 2010, StatusNet, Inc.
*
* Download a backup of your own account to the browser
- *
+ *
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
@@ -48,17 +48,16 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
-
class BackupaccountAction extends Action
{
/**
* Returns the title of the page
- *
+ *
* @return string page title
*/
-
function title()
{
+ // TRANS: Title for backup account page.
return _("Backup account");
}
@@ -69,7 +68,6 @@ class BackupaccountAction extends Action
*
* @return boolean true
*/
-
function prepare($argarray)
{
parent::prepare($argarray);
@@ -77,10 +75,12 @@ class BackupaccountAction extends Action
$cur = common_current_user();
if (empty($cur)) {
+ // TRANS: Client exception thrown when trying to backup an account while not logged in.
throw new ClientException(_('Only logged-in users can backup their account.'), 403);
}
if (!$cur->hasRight(Right::BACKUPACCOUNT)) {
+ // TRANS: Client exception thrown when trying to backup an account without having backup rights.
throw new ClientException(_('You may not backup your account.'), 403);
}
@@ -94,7 +94,6 @@ class BackupaccountAction extends Action
*
* @return void
*/
-
function handle($argarray=null)
{
parent::handle($argarray);
@@ -109,7 +108,7 @@ class BackupaccountAction extends Action
/**
* Send a feed of the user's activities to the browser
- *
+ *
* Uses the UserActivityStream class; may take a long time!
*
* @return void
@@ -118,7 +117,7 @@ class BackupaccountAction extends Action
function sendFeed()
{
$cur = common_current_user();
-
+
$stream = new UserActivityStream($cur);
header('Content-Disposition: attachment; filename='.$cur->nickname.'.atom');
@@ -132,13 +131,13 @@ class BackupaccountAction extends Action
*
* @return void
*/
-
+
function showContent()
{
$form = new BackupAccountForm($this);
$form->show();
}
-
+
/**
* Return true if read only.
*
@@ -148,7 +147,6 @@ class BackupaccountAction extends Action
*
* @return boolean is read only action?
*/
-
function isReadOnly($args)
{
return false;
@@ -161,7 +159,6 @@ class BackupaccountAction extends Action
*
* @return string last modified http header
*/
-
function lastModified()
{
// For comparison with If-Last-Modified
@@ -176,7 +173,6 @@ class BackupaccountAction extends Action
*
* @return string etag http header
*/
-
function etag()
{
return null;
@@ -193,7 +189,6 @@ class BackupaccountAction extends Action
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
-
class BackupAccountForm extends Form
{
/**
@@ -201,7 +196,6 @@ class BackupAccountForm extends Form
*
* @return string the form's class
*/
-
function formClass()
{
return 'form_profile_backup';
@@ -212,7 +206,6 @@ class BackupAccountForm extends Form
*
* @return string the form's action URL
*/
-
function action()
{
return common_local_url('backupaccount');
@@ -220,18 +213,18 @@ class BackupAccountForm extends Form
/**
* Output form data
- *
+ *
* Really, just instructions for doing a backup.
*
* @return void
*/
-
function formData()
{
$msg =
+ // TRANS: Information displayed on the backup account page.
_('You can backup your account data in '.
'Activity Streams '.
- 'format. This is an experimental feature and provides an '.
+ 'format. This is an experimental feature and provides an '.
'incomplete backup; private account '.
'information like email and IM addresses is not backed up. '.
'Additionally, uploaded files and direct messages are not '.
@@ -243,18 +236,19 @@ class BackupAccountForm extends Form
/**
* Buttons for the form
- *
+ *
* In this case, a single submit button
*
* @return void
*/
-
function formActions()
{
$this->out->submit('submit',
+ // TRANS: Submit button to backup an account on the backup account page.
_m('BUTTON', 'Backup'),
'submit',
null,
+ // TRANS: Title for submit button to backup an account on the backup account page.
_('Backup your account'));
}
}
diff --git a/actions/deleteuser.php b/actions/deleteuser.php
index 02ded68b31..ac96b7b5d5 100644
--- a/actions/deleteuser.php
+++ b/actions/deleteuser.php
@@ -40,7 +40,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://status.net/
*/
-
class DeleteuserAction extends ProfileFormAction
{
var $user = null;
@@ -52,7 +51,6 @@ class DeleteuserAction extends ProfileFormAction
*
* @return boolean success flag
*/
-
function prepare($args)
{
if (!parent::prepare($args)) {
@@ -64,6 +62,7 @@ class DeleteuserAction extends ProfileFormAction
assert(!empty($cur)); // checked by parent
if (!$cur->hasRight(Right::DELETEUSER)) {
+ // TRANS: Client error displayed when trying to delete a user without having the right to delete users.
$this->clientError(_('You cannot delete users.'));
return false;
}
@@ -71,6 +70,7 @@ class DeleteuserAction extends ProfileFormAction
$this->user = User::staticGet('id', $this->profile->id);
if (empty($this->user)) {
+ // TRANS: Client error displayed when trying to delete a non-local user.
$this->clientError(_('You can only delete local users.'));
return false;
}
@@ -87,7 +87,6 @@ class DeleteuserAction extends ProfileFormAction
*
* @return void
*/
-
function handle($args)
{
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -107,7 +106,8 @@ class DeleteuserAction extends ProfileFormAction
}
function title() {
- return _('Delete user');
+ // TRANS: Title of delete user page.
+ return _m('TITLE','Delete user');
}
function showNoticeForm() {
@@ -130,9 +130,11 @@ class DeleteuserAction extends ProfileFormAction
'action' => common_local_url('deleteuser')));
$this->elementStart('fieldset');
$this->hidden('token', common_session_token());
+ // TRANS: Fieldset legend on delete user page.
$this->element('legend', _('Delete user'));
if (Event::handle('StartDeleteUserForm', array($this, $this->user))) {
$this->element('p', null,
+ // TRANS: Information text to request if a user is certain that the described action has to be performed.
_('Are you sure you want to delete this user? '.
'This will clear all data about the user from the '.
'database, without a backup.'));
@@ -153,7 +155,7 @@ class DeleteuserAction extends ProfileFormAction
'submit form_action-primary',
'no',
// TRANS: Submit button title for 'No' when deleting a user.
- _('Do not block this user'));
+ _('Do not delete this user'));
$this->submit('form_action-yes',
// TRANS: Button label on the delete user form.
_m('BUTTON','Yes'),
@@ -170,7 +172,6 @@ class DeleteuserAction extends ProfileFormAction
*
* @return void
*/
-
function handlePost()
{
if (Event::handle('StartDeleteUser', array($this, $this->user))) {
diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
index 321a8ee5eb..dd422bce91 100644
--- a/actions/designadminpanel.php
+++ b/actions/designadminpanel.php
@@ -44,10 +44,8 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-
class DesignadminpanelAction extends AdminPanelAction
{
-
/* The default site design */
var $design = null;
@@ -56,7 +54,6 @@ class DesignadminpanelAction extends AdminPanelAction
*
* @return string page title
*/
-
function title()
{
// TRANS: Message used as title for design settings for the site.
@@ -68,9 +65,9 @@ class DesignadminpanelAction extends AdminPanelAction
*
* @return string instructions
*/
-
function getInstructions()
{
+ // TRANS: Instructions for design adminsitration panel.
return _('Design settings for this StatusNet site');
}
@@ -79,7 +76,6 @@ class DesignadminpanelAction extends AdminPanelAction
*
* @return void
*/
-
function showForm()
{
$this->design = Design::siteDesign();
@@ -93,7 +89,6 @@ class DesignadminpanelAction extends AdminPanelAction
*
* @return void
*/
-
function saveSettings()
{
if ($this->arg('save')) {
@@ -101,6 +96,7 @@ class DesignadminpanelAction extends AdminPanelAction
} else if ($this->arg('defaults')) {
$this->restoreDefaults();
} else {
+ // TRANS: Client error displayed when the submitted form contains unexpected data.
$this->clientError(_('Unexpected form submission.'));
}
}
@@ -110,7 +106,6 @@ class DesignadminpanelAction extends AdminPanelAction
*
* @return void
*/
-
function saveDesignSettings()
{
// Workaround for PHP returning empty $_POST and $_FILES when POST
@@ -225,11 +220,10 @@ class DesignadminpanelAction extends AdminPanelAction
}
/**
- * Restore the default design
- *
- * @return void
- */
-
+ * Restore the default design
+ *
+ * @return void
+ */
function restoreDefaults()
{
$this->deleteSetting('site', 'logo');
@@ -257,7 +251,6 @@ class DesignadminpanelAction extends AdminPanelAction
*
* @return string $filename the filename of the image
*/
-
function saveBackgroundImage()
{
$filename = null;
@@ -302,7 +295,6 @@ class DesignadminpanelAction extends AdminPanelAction
* @throws ClientException for invalid theme archives
* @throws ServerException if trouble saving the theme files
*/
-
function saveCustomTheme()
{
if (common_config('theme_upload', 'enabled') &&
@@ -327,20 +319,23 @@ class DesignadminpanelAction extends AdminPanelAction
*
* @return void
*/
-
function validate(&$values)
{
if (!empty($values['logo']) &&
!Validate::uri($values['logo'], array('allowed_schemes' => array('http', 'https')))) {
+ // TRANS: Client error displayed when a logo URL does is not valid.
$this->clientError(_('Invalid logo URL.'));
}
if (!empty($values['ssllogo']) &&
!Validate::uri($values['ssllogo'], array('allowed_schemes' => array('https')))) {
+ // TRANS: Client error displayed when an SSL logo URL is invalid.
$this->clientError(_('Invalid SSL logo URL.'));
}
if (!in_array($values['theme'], Theme::listAvailable())) {
+ // TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+ // TRANS: %s is the chosen unavailable theme.
$this->clientError(sprintf(_("Theme not available: %s."), $values['theme']));
}
}
@@ -350,7 +345,6 @@ class DesignadminpanelAction extends AdminPanelAction
*
* @return void
*/
-
function showStylesheets()
{
parent::showStylesheets();
@@ -362,7 +356,6 @@ class DesignadminpanelAction extends AdminPanelAction
*
* @return void
*/
-
function showScripts()
{
parent::showScripts();
@@ -383,7 +376,6 @@ class DesignAdminPanelForm extends AdminForm
*
* @return int ID of the form
*/
-
function id()
{
return 'form_design_admin_panel';
@@ -394,7 +386,6 @@ class DesignAdminPanelForm extends AdminForm
*
* @return string class of the form
*/
-
function formClass()
{
return 'form_settings';
@@ -408,7 +399,6 @@ class DesignAdminPanelForm extends AdminForm
*
* @return string the method to use for submitting
*/
-
function method()
{
$this->enctype = 'multipart/form-data';
@@ -421,7 +411,6 @@ class DesignAdminPanelForm extends AdminForm
*
* @return string URL of the action
*/
-
function action()
{
return common_local_url('designadminpanel');
@@ -432,7 +421,6 @@ class DesignAdminPanelForm extends AdminForm
*
* @return void
*/
-
function formData()
{
$this->showLogo();
@@ -445,16 +433,25 @@ class DesignAdminPanelForm extends AdminForm
function showLogo()
{
$this->out->elementStart('fieldset', array('id' => 'settings_design_logo'));
+ // TRANS: Fieldset legend for form to change logo.
$this->out->element('legend', null, _('Change logo'));
$this->out->elementStart('ul', 'form_data');
$this->li();
- $this->input('logo', _('Site logo'), 'Logo for the site (full URL)');
+ $this->input('logo',
+ // TRANS: Field label for StatusNet site logo.
+ _('Site logo'),
+ // TRANS: Title for field label for StatusNet site logo.
+ 'Logo for the site (full URL)');
$this->unli();
$this->li();
- $this->input('ssllogo', _('SSL logo'), 'Logo to show on SSL pages');
+ $this->input('ssllogo',
+ // TRANS: Field label for SSL StatusNet site logo.
+ _('SSL logo'),
+ // TRANS: Title for field label for SSL StatusNet site logo.
+ 'Logo to show on SSL pages');
$this->unli();
$this->out->elementEnd('ul');
@@ -466,6 +463,7 @@ class DesignAdminPanelForm extends AdminForm
function showTheme()
{
$this->out->elementStart('fieldset', array('id' => 'settings_design_theme'));
+ // TRANS: Fieldset legend for form change StatusNet site's theme.
$this->out->element('legend', null, _('Change theme'));
$this->out->elementStart('ul', 'form_data');
@@ -483,17 +481,21 @@ class DesignAdminPanelForm extends AdminForm
$themes = array_combine($themes, $themes);
$this->li();
+ // TRANS: Field label for dropdown to choose site theme.
$this->out->dropdown('theme', _('Site theme'),
+ // TRANS: Title for field label for dropdown to choose site theme.
$themes, _('Theme for the site.'),
false, $this->value('theme'));
$this->unli();
if (common_config('theme_upload', 'enabled')) {
$this->li();
+ // TRANS: Field label for uploading a cutom theme.
$this->out->element('label', array('for' => 'design_upload_theme'), _('Custom theme'));
$this->out->element('input', array('id' => 'design_upload_theme',
'name' => 'design_upload_theme',
'type' => 'file'));
+ // TRANS: Form instructions for uploading a cutom StatusNet theme.
$this->out->element('p', 'form_guide', _('You can upload a custom StatusNet theme as a .ZIP archive.'));
$this->unli();
}
@@ -509,16 +511,19 @@ class DesignAdminPanelForm extends AdminForm
$this->out->elementStart('fieldset', array('id' =>
'settings_design_background-image'));
+ // TRANS: Fieldset legend for theme background image.
$this->out->element('legend', null, _('Change background image'));
$this->out->elementStart('ul', 'form_data');
$this->li();
$this->out->element('label', array('for' => 'design_background-image_file'),
+ // TRANS: Field label for background image on theme designer page.
_('Background'));
$this->out->element('input', array('name' => 'design_background-image_file',
'type' => 'file',
'id' => 'design_background-image_file'));
$this->out->element('p', 'form_guide',
+ // TRANS: Form guide for background image upload form on theme designer page.
sprintf(_('You can upload a background image for the site. ' .
'The maximum file size is %1$s.'), ImageFile::maxFileSize()));
$this->out->element('input', array('name' => 'MAX_FILE_SIZE',
@@ -568,11 +573,13 @@ class DesignAdminPanelForm extends AdminForm
'class' => 'radio'),
// TRANS: Used as radio button label to not add a background image.
_('Off'));
+ // TRANS: Form guide for turning background image on or off on theme designer page.
$this->out->element('p', 'form_guide', _('Turn background image on or off.'));
$this->unli();
$this->li();
$this->out->checkbox('design_background-image_repeat',
+ // TRANS: Checkbox label to title background image on theme designer page.
_('Tile background image'),
($design->disposition & BACKGROUND_TILE) ? true : false);
$this->unli();
@@ -587,7 +594,8 @@ class DesignAdminPanelForm extends AdminForm
$design = $this->out->design;
$this->out->elementStart('fieldset', array('id' => 'settings_design_color'));
- $this->out->element('legend', null, _('Change colours'));
+ // TRANS: Fieldset legend for theme colors.
+ $this->out->element('legend', null, _('Change colors'));
$this->out->elementStart('ul', 'form_data');
@@ -597,6 +605,7 @@ class DesignAdminPanelForm extends AdminForm
$bgcolor = new WebColor($design->backgroundcolor);
$this->li();
+ // TRANS: Field label for background color selector.
$this->out->element('label', array('for' => 'swatch-1'), _('Background'));
$this->out->element('input', array('name' => 'design_background',
'type' => 'text',
@@ -610,6 +619,7 @@ class DesignAdminPanelForm extends AdminForm
$ccolor = new WebColor($design->contentcolor);
$this->li();
+ // TRANS: Field label for content color selector.
$this->out->element('label', array('for' => 'swatch-2'), _('Content'));
$this->out->element('input', array('name' => 'design_content',
'type' => 'text',
@@ -623,6 +633,7 @@ class DesignAdminPanelForm extends AdminForm
$sbcolor = new WebColor($design->sidebarcolor);
$this->li();
+ // TRANS: Field label for sidebar color selector.
$this->out->element('label', array('for' => 'swatch-3'), _('Sidebar'));
$this->out->element('input', array('name' => 'design_sidebar',
'type' => 'text',
@@ -636,6 +647,7 @@ class DesignAdminPanelForm extends AdminForm
$tcolor = new WebColor($design->textcolor);
$this->li();
+ // TRANS: Field label for text color selector.
$this->out->element('label', array('for' => 'swatch-4'), _('Text'));
$this->out->element('input', array('name' => 'design_text',
'type' => 'text',
@@ -649,6 +661,7 @@ class DesignAdminPanelForm extends AdminForm
$lcolor = new WebColor($design->linkcolor);
$this->li();
+ // TRANS: Field label for link color selector.
$this->out->element('label', array('for' => 'swatch-5'), _('Links'));
$this->out->element('input', array('name' => 'design_links',
'type' => 'text',
@@ -674,10 +687,12 @@ class DesignAdminPanelForm extends AdminForm
{
if (common_config('custom_css', 'enabled')) {
$this->out->elementStart('fieldset', array('id' => 'settings_design_advanced'));
+ // TRANS: Fieldset legend for advanced theme design settings.
$this->out->element('legend', null, _('Advanced'));
$this->out->elementStart('ul', 'form_data');
$this->li();
+ // TRANS: Field label for custom CSS.
$this->out->element('label', array('for' => 'css'), _('Custom CSS'));
$this->out->element('textarea', array('name' => 'css',
'id' => 'css',
@@ -699,17 +714,25 @@ class DesignAdminPanelForm extends AdminForm
function formActions()
{
- $this->out->submit('defaults', _('Use defaults'), 'submit form_action-default',
+ // TRANS: Button text for resetting theme settings.
+ $this->out->submit('defaults', _m('BUTTON','Use defaults'), 'submit form_action-default',
+ // TRANS: Title for button for resetting theme settings.
'defaults', _('Restore default designs'));
$this->out->element('input', array('id' => 'settings_design_reset',
'type' => 'reset',
+ // TRANS: Button text for resetting theme settings.
'value' => 'Reset',
'class' => 'submit form_action-primary',
+ // TRANS: Title for button for resetting theme settings.
'title' => _('Reset back to default')));
- $this->out->submit('save', _('Save'), 'submit form_action-secondary',
- 'save', _('Save design'));
+ $this->out->submit('save',
+ // TRANS: Button text for saving theme settings.
+ _m('BUTTON','Save'),
+ 'submit form_action-secondary',
+ 'save',
+ // TRANS: Title for button for saving theme settings.
+ _('Save design'));
}
-
}
diff --git a/actions/disfavor.php b/actions/disfavor.php
index 3ccdd69af2..57f6f7ca18 100644
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -58,6 +58,7 @@ class DisfavorAction extends Action
{
parent::handle($args);
if (!common_logged_in()) {
+ // TRANS: Client error displayed when trying to remove a favorite while not logged in.
$this->clientError(_('Not logged in.'));
return;
}
@@ -71,6 +72,7 @@ class DisfavorAction extends Action
$notice = Notice::staticGet($id);
$token = $this->trimmed('token-'.$notice->id);
if (!$token || $token != common_session_token()) {
+ // TRANS: Client error displayed when the session token does not match or is not given.
$this->clientError(_('There was a problem with your session token. Try again, please.'));
return;
}
@@ -78,12 +80,14 @@ class DisfavorAction extends Action
$fave->user_id = $user->id;
$fave->notice_id = $notice->id;
if (!$fave->find(true)) {
+ // TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
$this->clientError(_('This notice is not a favorite!'));
return;
}
$result = $fave->delete();
if (!$result) {
common_log_db_error($fave, 'DELETE', __FILE__);
+ // TRANS: Server error displayed when removing a favorite from the database fails.
$this->serverError(_('Could not delete favorite.'));
return;
}
@@ -91,6 +95,7 @@ class DisfavorAction extends Action
if ($this->boolean('ajax')) {
$this->startHTML('text/xml;charset=utf-8');
$this->elementStart('head');
+ // TRANS: Title for page on which favorites can be added.
$this->element('title', null, _('Add to favorites'));
$this->elementEnd('head');
$this->elementStart('body');
@@ -105,4 +110,3 @@ class DisfavorAction extends Action
}
}
}
-
diff --git a/actions/doc.php b/actions/doc.php
index f876fb8beb..20cf9e2810 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -1,5 +1,4 @@
element('h1', array('class' => 'entry-title'), $this->title());
@@ -96,7 +94,6 @@ class DocAction extends Action
*
* @return void.
*/
-
function showContentBlock()
{
$this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
@@ -117,7 +114,6 @@ class DocAction extends Action
*
* @return void
*/
-
function showContent()
{
$this->raw($this->output);
@@ -142,7 +138,6 @@ class DocAction extends Action
*
* @return boolean read-only flag (false)
*/
-
function isReadOnly($args)
{
return true;
@@ -155,7 +150,9 @@ class DocAction extends Action
$this->filename = $this->getFilename();
if (empty($this->filename)) {
- throw new ClientException(sprintf(_('No such document "%s"'), $this->title), 404);
+ // TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+ // TRANS: %s is the non-existing document.
+ throw new ClientException(sprintf(_('No such document "%s".'), $this->title), 404);
}
$c = file_get_contents($this->filename);
diff --git a/actions/joingroup.php b/actions/joingroup.php
index f87e5dae29..7beaf4f64a 100644
--- a/actions/joingroup.php
+++ b/actions/joingroup.php
@@ -43,7 +43,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-
class JoingroupAction extends Action
{
var $group = null;
@@ -51,12 +50,12 @@ class JoingroupAction extends Action
/**
* Prepare to run
*/
-
function prepare($args)
{
parent::prepare($args);
if (!common_logged_in()) {
+ // TRANS: Client error displayed when trying to join a group while not logged in.
$this->clientError(_('You must be logged in to join a group.'));
return false;
}
@@ -79,17 +78,20 @@ class JoingroupAction extends Action
$local = Local_group::staticGet('nickname', $nickname);
if (!$local) {
+ // TRANS: Client error displayed when trying to join a non-local group.
$this->clientError(_('No such group.'), 404);
return false;
}
$this->group = User_group::staticGet('id', $local->group_id);
} else {
+ // TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
$this->clientError(_('No nickname or ID.'), 404);
return false;
}
if (!$this->group) {
+ // TRANS: Client error displayed when trying to join a non-existing group.
$this->clientError(_('No such group.'), 404);
return false;
}
@@ -97,11 +99,13 @@ class JoingroupAction extends Action
$cur = common_current_user();
if ($cur->isMember($this->group)) {
+ // TRANS: Client error displayed when trying to join a group while already a member.
$this->clientError(_('You are already a member of that group.'), 403);
return false;
}
if (Group_block::isBlocked($this->group, $cur->getProfile())) {
+ // TRANS: Client error displayed when trying to join a group while being blocked form joining it.
$this->clientError(_('You have been blocked from that group by the admin.'), 403);
return false;
}
@@ -118,7 +122,6 @@ class JoingroupAction extends Action
*
* @return void
*/
-
function handle($args)
{
parent::handle($args);
@@ -131,6 +134,8 @@ class JoingroupAction extends Action
Event::handle('EndJoinGroup', array($this->group, $cur));
}
} catch (Exception $e) {
+ // TRANS: Server error displayed when joining a group failed in the database.
+ // TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
$this->serverError(sprintf(_('Could not join user %1$s to group %2$s.'),
$cur->nickname, $this->group->nickname));
}
@@ -138,7 +143,8 @@ class JoingroupAction extends Action
if ($this->boolean('ajax')) {
$this->startHTML('text/xml;charset=utf-8');
$this->elementStart('head');
- $this->element('title', null, sprintf(_('%1$s joined group %2$s'),
+ // TRANS: Title for join group page after joining.
+ $this->element('title', null, sprintf(_m('TITLE','%1$s joined group %2$s'),
$cur->nickname,
$this->group->nickname));
$this->elementEnd('head');
@@ -153,4 +159,4 @@ class JoingroupAction extends Action
303);
}
}
-}
\ No newline at end of file
+}
diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index 329b5aafe1..f5d1ccd08c 100644
--- a/actions/leavegroup.php
+++ b/actions/leavegroup.php
@@ -43,7 +43,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-
class LeavegroupAction extends Action
{
var $group = null;
@@ -51,12 +50,12 @@ class LeavegroupAction extends Action
/**
* Prepare to run
*/
-
function prepare($args)
{
parent::prepare($args);
if (!common_logged_in()) {
+ // TRANS: Client error displayed when trying to leave a group while not logged in.
$this->clientError(_('You must be logged in to leave a group.'));
return false;
}
@@ -79,17 +78,20 @@ class LeavegroupAction extends Action
$local = Local_group::staticGet('nickname', $nickname);
if (!$local) {
+ // TRANS: Client error displayed when trying to leave a non-local group.
$this->clientError(_('No such group.'), 404);
return false;
}
$this->group = User_group::staticGet('id', $local->group_id);
} else {
+ // TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
$this->clientError(_('No nickname or ID.'), 404);
return false;
}
if (!$this->group) {
+ // TRANS: Client error displayed when trying to leave a non-existing group.
$this->clientError(_('No such group.'), 404);
return false;
}
@@ -97,6 +99,7 @@ class LeavegroupAction extends Action
$cur = common_current_user();
if (!$cur->isMember($this->group)) {
+ // TRANS: Client error displayed when trying to join a group while already a member.
$this->clientError(_('You are not a member of that group.'), 403);
return false;
}
@@ -113,7 +116,6 @@ class LeavegroupAction extends Action
*
* @return void
*/
-
function handle($args)
{
parent::handle($args);
@@ -126,6 +128,8 @@ class LeavegroupAction extends Action
Event::handle('EndLeaveGroup', array($this->group, $cur));
}
} catch (Exception $e) {
+ // TRANS: Server error displayed when leaving a group failed in the database.
+ // TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
$this->serverError(sprintf(_('Could not remove user %1$s from group %2$s.'),
$cur->nickname, $this->group->nickname));
return;
@@ -134,7 +138,8 @@ class LeavegroupAction extends Action
if ($this->boolean('ajax')) {
$this->startHTML('text/xml;charset=utf-8');
$this->elementStart('head');
- $this->element('title', null, sprintf(_('%1$s left group %2$s'),
+ // TRANS: Title for leave group page after leaving.
+ $this->element('title', null, sprintf(_m('TITLE','%1$s left group %2$s'),
$cur->nickname,
$this->group->nickname));
$this->elementEnd('head');
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 4ebbe188a4..ee50e104d8 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -213,6 +213,7 @@ class ProfilesettingsAction extends AccountSettingsAction
// CSRF protection
$token = $this->trimmed('token');
if (!$token || $token != common_session_token()) {
+ // TRANS: Form validation error.
$this->showForm(_('There was a problem with your session token. '.
'Try again, please.'));
return;
@@ -462,6 +463,7 @@ class ProfilesettingsAction extends AccountSettingsAction
$this->elementStart('li');
$this->element('a',
array('href' => common_local_url('backupaccount')),
+ // TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
_('Backup account'));
$this->elementEnd('li');
}
@@ -469,6 +471,7 @@ class ProfilesettingsAction extends AccountSettingsAction
$this->elementStart('li');
$this->element('a',
array('href' => common_local_url('deleteaccount')),
+ // TRANS: Option in profile settings to delete the account of the currently logged in user.
_('Delete account'));
$this->elementEnd('li');
}
@@ -476,6 +479,7 @@ class ProfilesettingsAction extends AccountSettingsAction
$this->elementStart('li');
$this->element('a',
array('href' => common_local_url('restoreaccount')),
+ // TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
_('Restore account'));
$this->elementEnd('li');
}
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 33b0440e40..c41edaeea4 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -33,6 +33,7 @@ class RecoverpasswordAction extends Action
{
parent::handle($args);
if (common_logged_in()) {
+ // TRANS: Client error displayed trying to recover password while already logged in.
$this->clientError(_('You are already logged in!'));
return;
} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -41,6 +42,7 @@ class RecoverpasswordAction extends Action
} else if ($this->arg('reset')) {
$this->resetPassword();
} else {
+ // TRANS: Client error displayed when unexpected data is posted in the password recovery form.
$this->clientError(_('Unexpected form submission.'));
}
} else {
@@ -54,15 +56,16 @@ class RecoverpasswordAction extends Action
function checkCode()
{
-
$code = $this->trimmed('code');
$confirm = Confirm_address::staticGet('code', $code);
if (!$confirm) {
+ // TRANS: Client error displayed when password recovery code is not correct.
$this->clientError(_('No such recovery code.'));
return;
}
if ($confirm->address_type != 'recover') {
+ // TRANS: Client error displayed when no proper password recovery code was submitted.
$this->clientError(_('Not a recovery code.'));
return;
}
@@ -70,6 +73,7 @@ class RecoverpasswordAction extends Action
$user = User::staticGet($confirm->user_id);
if (!$user) {
+ // TRANS: Server error displayed trying to recover password without providing a user.
$this->serverError(_('Recovery code for unknown user.'));
return;
}
@@ -83,6 +87,7 @@ class RecoverpasswordAction extends Action
if (!$result) {
common_log_db_error($confirm, 'DELETE', __FILE__);
+ // TRANS: Server error displayed removing a password recovery code from the database.
$this->serverError(_('Error with confirmation code.'));
return;
}
@@ -94,6 +99,7 @@ class RecoverpasswordAction extends Action
common_log(LOG_WARNING,
'Attempted redemption on recovery code ' .
'that is ' . $touched . ' seconds old. ');
+ // TRANS: Client error displayed trying to recover password with too old a recovery code.
$this->clientError(_('This confirmation code is too old. ' .
'Please start again.'));
return;
@@ -108,6 +114,7 @@ class RecoverpasswordAction extends Action
$result = $user->updateKeys($orig);
if (!$result) {
common_log_db_error($user, 'UPDATE', __FILE__);
+ // TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
$this->serverError(_('Could not update user with confirmed email address.'));
return;
}
@@ -149,14 +156,16 @@ class RecoverpasswordAction extends Action
$this->elementStart('div', 'instructions');
if ($this->mode == 'recover') {
$this->element('p', null,
+ // TRANS: Page notice for password recovery page.
_('If you have forgotten or lost your' .
' password, you can get a new one sent to' .
' the email address you have stored' .
' in your account.'));
} else if ($this->mode == 'reset') {
+ // TRANS: Page notice for password change page.
$this->element('p', null,
_('You have been identified. Enter a' .
- ' new password below. '));
+ ' new password below.'));
}
$this->elementEnd('div');
}
@@ -185,19 +194,24 @@ class RecoverpasswordAction extends Action
'class' => 'form_settings',
'action' => common_local_url('recoverpassword')));
$this->elementStart('fieldset');
+ // TRANS: Fieldset legend for password recovery page.
$this->element('legend', null, _('Password recovery'));
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
+ // TRANS: Field label on password recovery page.
$this->input('nicknameoremail', _('Nickname or email address'),
$this->trimmed('nicknameoremail'),
+ // TRANS: Title for field label on password recovery page.
_('Your nickname on this server, ' .
'or your registered email address.'));
$this->elementEnd('li');
$this->elementEnd('ul');
$this->element('input', array('name' => 'recover',
'type' => 'hidden',
+ // TRANS: Field label on password recovery page.
'value' => _('Recover')));
- $this->submit('recover', _('Recover'));
+ // TRANS: Button text on password recovery page.
+ $this->submit('recover', _m('BUTTON','Recover'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
@@ -205,11 +219,16 @@ class RecoverpasswordAction extends Action
function title()
{
switch ($this->mode) {
+ // TRANS: Title for password recovery page in password reset mode.
case 'reset': return _('Reset password');
+ // TRANS: Title for password recovery page in password recover mode.
case 'recover': return _('Recover password');
+ // TRANS: Title for password recovery page in email sent mode.
case 'sent': return _('Password recovery requested');
+ // TRANS: Title for password recovery page in password saved mode.
case 'saved': return _('Password saved.');
default:
+ // TRANS: Title for password recovery page when an unknown action has been specified.
return _('Unknown action');
}
}
@@ -228,19 +247,25 @@ class RecoverpasswordAction extends Action
'class' => 'form_settings',
'action' => common_local_url('recoverpassword')));
$this->elementStart('fieldset');
+ // TRANS: Fieldset legend for password reset form.
$this->element('legend', null, _('Password change'));
$this->hidden('token', common_session_token());
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
+ // TRANS: Field label for password reset form.
$this->password('newpassword', _('New password'),
- _('6 or more characters, and don\'t forget it!'));
+ // TRANS: Title for field label for password reset form.
+ _('6 or more characters, and do not forget it!'));
$this->elementEnd('li');
$this->elementStart('li');
+ // TRANS: Field label for password reset form where the password has to be typed again.
$this->password('confirm', _('Confirm'),
- _('Same as password above'));
+ // TRANS: Ttile for field label for password reset form where the password has to be typed again.
+ _('Same as password above.'));
$this->elementEnd('li');
$this->elementEnd('ul');
- $this->submit('reset', _('Reset'));
+ // TRANS: Button text for password reset form.
+ $this->submit('reset', _m('BUTTON','Reset'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
@@ -249,6 +274,7 @@ class RecoverpasswordAction extends Action
{
$nore = $this->trimmed('nicknameoremail');
if (!$nore) {
+ // TRANS: Form instructions for password recovery form.
$this->showForm(_('Enter a nickname or email address.'));
return;
}
@@ -279,6 +305,7 @@ class RecoverpasswordAction extends Action
}
if (!$user) {
+ // TRANS: Information on password recovery form if no known username or e-mail address was specified.
$this->showForm(_('No user with that email address or username.'));
return;
}
@@ -296,6 +323,7 @@ class RecoverpasswordAction extends Action
}
if (!$user->email && !$confirm_email) {
+ // TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
$this->clientError(_('No registered email address for that user.'));
return;
}
@@ -310,10 +338,12 @@ class RecoverpasswordAction extends Action
if (!$confirm->insert()) {
common_log_db_error($confirm, 'INSERT', __FILE__);
+ // TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
$this->serverError(_('Error saving address confirmation.'));
return;
}
+ // @todo FIXME: needs i18n.
$body = "Hey, $user->nickname.";
$body .= "\n\n";
$body .= 'Someone just asked for a new password ' .
@@ -332,9 +362,11 @@ class RecoverpasswordAction extends Action
$body .= "\n";
$headers = _mail_prepare_headers('recoverpassword', $user->nickname, $user->nickname);
+ // TRANS: Subject for password recovery e-mail.
mail_to_user($user, _('Password recovery requested'), $body, $headers, $confirm->address);
$this->mode = 'sent';
+ // TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
$this->msg = _('Instructions for recovering your password ' .
'have been sent to the email address registered to your ' .
'account.');
@@ -347,6 +379,7 @@ class RecoverpasswordAction extends Action
# CSRF protection
$token = $this->trimmed('token');
if (!$token || $token != common_session_token()) {
+ // TRANS: Form validation error message.
$this->showForm(_('There was a problem with your session token. Try again, please.'));
return;
}
@@ -354,6 +387,7 @@ class RecoverpasswordAction extends Action
$user = $this->getTempUser();
if (!$user) {
+ // TRANS: Client error displayed when trying to reset as password without providing a user.
$this->clientError(_('Unexpected password reset.'));
return;
}
@@ -362,10 +396,12 @@ class RecoverpasswordAction extends Action
$confirm = $this->trimmed('confirm');
if (!$newpassword || strlen($newpassword) < 6) {
+ // TRANS: Reset password form validation error message.
$this->showPasswordForm(_('Password must be 6 characters or more.'));
return;
}
if ($newpassword != $confirm) {
+ // TRANS: Reset password form validation error message.
$this->showPasswordForm(_('Password and confirmation do not match.'));
return;
}
@@ -378,13 +414,15 @@ class RecoverpasswordAction extends Action
if (!$user->update($original)) {
common_log_db_error($user, 'UPDATE', __FILE__);
- $this->serverError(_('Can\'t save new password.'));
+ // TRANS: Reset password form validation error message.
+ $this->serverError(_('Cannot save new password.'));
return;
}
$this->clearTempUser();
if (!common_set_user($user->nickname)) {
+ // TRANS: Server error displayed when something does wrong with the user object during password reset.
$this->serverError(_('Error setting user.'));
return;
}
@@ -392,6 +430,7 @@ class RecoverpasswordAction extends Action
common_real_login(true);
$this->mode = 'saved';
+ // TRANS: Success message for user after password reset.
$this->msg = _('New password successfully saved. ' .
'You are now logged in.');
$this->success = true;
diff --git a/actions/register.php b/actions/register.php
index 5d91aef70e..488d8901fc 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -430,16 +430,15 @@ class RegisterAction extends Action
if (Event::handle('StartRegistrationFormData', array($this))) {
$this->elementStart('li');
$this->input('nickname', _('Nickname'), $this->trimmed('nickname'),
- _('1-64 lowercase letters or numbers, '.
- 'no punctuation or spaces. Required.'));
+ _('1-64 lowercase letters or numbers, no punctuation or spaces.'));
$this->elementEnd('li');
$this->elementStart('li');
$this->password('password', _('Password'),
- _('6 or more characters. Required.'));
+ _('6 or more characters.'));
$this->elementEnd('li');
$this->elementStart('li');
$this->password('confirm', _('Confirm'),
- _('Same as password above. Required.'));
+ _('Same as password above.'));
$this->elementEnd('li');
$this->elementStart('li');
if ($this->invite && $this->invite->address_type == 'email') {
diff --git a/lib/deleteuserform.php b/lib/deleteuserform.php
index 09ea8f68d1..df8b480ed4 100644
--- a/lib/deleteuserform.php
+++ b/lib/deleteuserform.php
@@ -41,7 +41,6 @@ if (!defined('STATUSNET')) {
* @link http://status.net/
*
*/
-
class DeleteUserForm extends ProfileActionForm
{
/**
@@ -49,7 +48,6 @@ class DeleteUserForm extends ProfileActionForm
*
* @return string Name of the action, lowercased.
*/
-
function target()
{
return 'deleteuser';
@@ -60,9 +58,9 @@ class DeleteUserForm extends ProfileActionForm
*
* @return string Title of the form, internationalized
*/
-
function title()
{
+ // TRANS: Title of form for deleting a user.
return _('Delete');
}
@@ -71,9 +69,9 @@ class DeleteUserForm extends ProfileActionForm
*
* @return string description of the form, internationalized
*/
-
function description()
{
+ // TRANS: Description of form for deleting a user.
return _('Delete this user');
}
}
diff --git a/lib/groupeditform.php b/lib/groupeditform.php
index cc25f06886..8a111b4642 100644
--- a/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@ -46,13 +46,11 @@ require_once INSTALLDIR.'/lib/form.php';
*
* @see UnsubscribeForm
*/
-
class GroupEditForm extends Form
{
/**
* group for user to join
*/
-
var $group = null;
/**
@@ -61,7 +59,6 @@ class GroupEditForm extends Form
* @param Action $out output channel
* @param User_group $group group to join
*/
-
function __construct($out=null, $group=null)
{
parent::__construct($out);
@@ -74,7 +71,6 @@ class GroupEditForm extends Form
*
* @return string ID of the form
*/
-
function id()
{
if ($this->group) {
@@ -89,7 +85,6 @@ class GroupEditForm extends Form
*
* @return string of the form class
*/
-
function formClass()
{
return 'form_settings';
@@ -100,7 +95,6 @@ class GroupEditForm extends Form
*
* @return string URL of the action
*/
-
function action()
{
if ($this->group) {
@@ -116,7 +110,6 @@ class GroupEditForm extends Form
*
* @return void
*/
-
function formLegend()
{
$this->out->element('legend', null, _('Create a new group'));
@@ -127,7 +120,6 @@ class GroupEditForm extends Form
*
* @return void
*/
-
function formData()
{
if ($this->group) {
@@ -151,7 +143,7 @@ class GroupEditForm extends Form
$this->out->hidden('groupid', $id);
$this->out->input('nickname', _('Nickname'),
($this->out->arg('nickname')) ? $this->out->arg('nickname') : $nickname,
- _('1-64 lowercase letters or numbers, no punctuation or spaces'));
+ _('1-64 lowercase letters or numbers, no punctuation or spaces.'));
$this->out->elementEnd('li');
$this->out->elementStart('li');
$this->out->input('fullname', _('Full name'),
@@ -167,8 +159,8 @@ class GroupEditForm extends Form
if ($desclimit == 0) {
$descinstr = _('Describe the group or topic');
} else {
- $descinstr = sprintf(_m('Describe the group or topic in %d character or less',
- 'Describe the group or topic in %d characters or less',
+ $descinstr = sprintf(_m('Describe the group or topic in %d character or less.',
+ 'Describe the group or topic in %d characters or less.',
$desclimit),
$desclimit);
}
@@ -201,7 +193,6 @@ class GroupEditForm extends Form
*
* @return void
*/
-
function formActions()
{
$this->out->submit('submit', _m('BUTTON','Save'));
diff --git a/lib/webcolor.php b/lib/webcolor.php
index 7f264c6741..bf791bf794 100644
--- a/lib/webcolor.php
+++ b/lib/webcolor.php
@@ -45,7 +45,6 @@ class WebColor {
*
* @return nothing
*/
-
function __construct($color = null)
{
if (isset($color)) {
@@ -77,7 +76,9 @@ class WebColor {
if (preg_match('/(#([0-9A-Fa-f]{3,6})\b)/u', $color) > 0) {
$this->setHexColor($color);
} else {
- $errmsg = _('%s is not a valid color!');
+ // TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+ // TRANS: %s is the provided (invalid) color code.
+ $errmsg = _('%s is not a valid color! Use 3 or 6 hex characters.');
throw new WebColorException(sprintf($errmsg, $color));
}
}
@@ -115,8 +116,8 @@ class WebColor {
$hexcolor[1].$hexcolor[1],
$hexcolor[2].$hexcolor[2]);
} else {
- // TRANS: Validation error for a web colour.
- // TRANS: %s is the provided (invalid) text for colour.
+ // TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+ // TRANS: %s is the provided (invalid) color code.
$errmsg = _('%s is not a valid color! Use 3 or 6 hex characters.');
throw new WebColorException(sprintf($errmsg, $hexcolor));
}
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 4d58e73db5..deb8809e07 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:04:58+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:55:43+0000\n"
"Language-Team: Arabic \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
"99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -78,6 +78,7 @@ msgid "Save access settings"
msgstr "حفظ إعدادت الوصول"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -89,13 +90,13 @@ msgstr "حفظ إعدادت الوصول"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "احفظ"
@@ -322,7 +323,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "تعذّر تحديث المستخدم."
@@ -346,7 +347,7 @@ msgstr "ليس للمستخدم ملف شخصي."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "لم يمكن حفظ الملف."
@@ -356,7 +357,7 @@ msgstr "لم يمكن حفظ الملف."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -538,7 +539,8 @@ msgid "That status is not a favorite."
msgstr "تلك الحالة ليست مفضلة."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "تعذّر حذف المفضلة."
@@ -586,7 +588,7 @@ msgstr "تعذّر إيجاد المستخدم الهدف."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمًا آخرًا."
@@ -596,7 +598,7 @@ msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمً
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "ليس اسمًا مستعارًا صحيحًا."
@@ -608,7 +610,7 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
@@ -618,7 +620,7 @@ msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -650,7 +652,7 @@ msgstr[5] "المنظمة طويلة جدا (الأقصى %d حرفا)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -712,24 +714,28 @@ msgid "Group not found."
msgstr "المجموعة غير موجودة."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
#, fuzzy
msgid "You are already a member of that group."
msgstr "أنت بالفعل عضو في هذه المجموعة"
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
#, fuzzy
msgid "You have been blocked from that group by the admin."
msgstr "لم تمنع هذا المستخدم."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s."
@@ -741,9 +747,11 @@ msgstr "لست عضوًا في هذه المجموعة"
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -804,9 +812,12 @@ msgid "Request token already authorized."
msgstr "لا تملك تصريحًا."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -814,7 +825,7 @@ msgstr "لا تملك تصريحًا."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -836,18 +847,20 @@ msgstr "خطأ في قاعدة البيانات أثناء حذف مستخدم
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr ""
@@ -896,7 +909,7 @@ msgstr "الحساب"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "الاسم المستعار"
@@ -904,7 +917,7 @@ msgstr "الاسم المستعار"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "كلمة السر"
@@ -1013,10 +1026,12 @@ msgstr "كرر بالفعل هذه الملاحظة."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1298,7 +1313,7 @@ msgstr "أعضاء مجموعة %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "تعذّر إدراج اشتراك جديد."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1334,30 +1349,51 @@ msgstr "لا ملف كهذا."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "تعذّر حذف المفضلة."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "لا مجموعة كهذه"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+msgstr "لا مجموعة كهذه."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "جميع الأعضاء"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "لم يتم العثور على وسيلة API."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "تعذّر حفظ الاشتراك."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1529,35 +1565,42 @@ msgstr "فشل تحديث الأفتار."
msgid "Avatar deleted."
msgstr "حُذف الأفتار."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "الخلفية"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1588,14 +1631,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "لا"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "لا تمنع هذا المستخدم"
@@ -1607,7 +1649,7 @@ msgstr "لا تمنع هذا المستخدم"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "نعم"
@@ -1623,32 +1665,6 @@ msgstr "امنع هذا المستخدم"
msgid "Failed to save block information."
msgstr "فشل حفظ معلومات المنع."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "لا مجموعة كهذه."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1781,7 +1797,8 @@ msgid "Account deleted."
msgstr "حُذف الأفتار."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "أنشئ حسابًا"
@@ -1803,8 +1820,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "أكّد"
@@ -1876,8 +1894,10 @@ msgid "You must be logged in to delete a group."
msgstr "يجب أن تلج لتغادر مجموعة."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
#, fuzzy
msgid "No nickname or ID."
msgstr "لا اسم مستعار."
@@ -1930,10 +1950,11 @@ msgid "Delete this group"
msgstr "احذف هذا المستخدم"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1971,98 +1992,133 @@ msgstr "لا تحذف هذا الإشعار"
msgid "Delete this notice"
msgstr "احذف هذا الإشعار"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "لا يمكنك حذف المستخدمين."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "يمكنك حذف المستخدمين المحليين فقط."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "احذف المستخدم"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "احذف المستخدم"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
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 ""
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "لا تحذف هذا الإشعار"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "احذف هذا المستخدم"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "التصميم"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "مسار شعار غير صالح."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "مسار شعار غير صالح."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "السمة غير متوفرة: %s"
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "غيّر الشعار"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "شعار الموقع"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
#, fuzzy
msgid "SSL logo"
msgstr "شعار الموقع"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "غيّر السمة"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "سمة الموقع"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "سمة الموقع."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "سمة مخصصة"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "تغيير صورة الخلفية"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "الخلفية"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2070,99 +2126,109 @@ msgid ""
msgstr "بإمكانك رفع صورة خلفية للموقع. أقصى حجم للملف هو %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "مكّن"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "عطّل"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "مكّن صورة الخلفية أو عطّلها."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
#, fuzzy
msgid "Tile background image"
msgstr "تغيير صورة الخلفية"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "تغيير الألوان"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "المحتوى"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "الشريط الجانبي"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "النص"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "وصلات"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "متقدم"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "CSS مخصصة"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "استخدم المبدئيات"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "استعد التصميمات المبدئية"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "ارجع إلى المبدئي"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "أرسل"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "احفظ التصميم"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "هذا الشعار ليس مفضلًا!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "أضف إلى المفضلات"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "لا مستند باسم \"%s\""
#. TRANS: Title for "Edit application" form.
@@ -2880,7 +2946,7 @@ msgstr ""
"عبر الصياغة \"!اسم_المجموعة\". ألا ترى مجموعة تعجبك؟ جرّب [البحث عن مجموعة](%%"
"%%action.groupsearch%%%%) أو [ابدأ مجموعتك!](%%%%action.newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "أنشئ مجموعة جديدة"
@@ -3256,26 +3322,33 @@ msgid ""
"Sincerely, %2$s\n"
msgstr ""
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "يجب أن تلج لتنضم إلى مجموعة."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s انضم للمجموعة %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "يجب أن تلج لتغادر مجموعة."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "لست عضوا في تلك المجموعة."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s ترك المجموعة %2$s"
@@ -3380,6 +3453,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "أرسل"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr ""
@@ -3404,11 +3484,11 @@ msgstr "لُج"
msgid "Login to site"
msgstr "لُج إلى الموقع"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "تذكّرني"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "لُج تلقائيًا في المستقبل؛ هذا الخيار ليس مُعدًا للحواسيب المشتركة!"
@@ -3789,7 +3869,8 @@ msgstr "تغيير كلمة السر"
msgid "Change your password."
msgstr "غيّر كلمة سرك."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "تغيير كلمة السر"
@@ -3797,7 +3878,8 @@ msgstr "تغيير كلمة السر"
msgid "Old password"
msgstr "كلمة السر القديمة"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "كلمة السر الجديدة"
@@ -3805,7 +3887,7 @@ msgstr "كلمة السر الجديدة"
msgid "6 or more characters"
msgstr "6 أحرف أو أكثر"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "نفس كلمة السر أعلاه"
@@ -3829,11 +3911,12 @@ msgstr "كلمة السر القديمة غير صحيحة"
msgid "Error saving user; invalid."
msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "تعذّر حفظ كلمة السر الجديدة."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "حُفظت كلمة السر."
@@ -4173,23 +4256,24 @@ msgid "Profile information"
msgstr "معلومات الملف الشخصي"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "الاسم الكامل"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "الصفحة الرئيسية"
@@ -4202,7 +4286,7 @@ msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك ا
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4214,27 +4298,27 @@ msgstr[4] "تكلم عن نفسك واهتمامتك في %d حرف"
msgstr[5] "تكلم عن نفسك واهتمامتك في %d حرف"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "صِف نفسك واهتماماتك"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "السيرة"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "الموقع"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
@@ -4286,7 +4370,7 @@ msgstr "اشترك تلقائيًا بأي شخص يشترك بي (يفضل أن
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4298,49 +4382,50 @@ msgstr[4] "الاسم طويل جدا (الأقصى %d حرفا)."
msgstr[5] "الاسم طويل جدا (الأقصى %d حرفا)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "لم تُختر المنطقة الزمنية."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "الاسم طويل جدا (الأقصى 255 حرفا)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "وسم غير صالح: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "تعذّر تحديث سجل المستخدم."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "لم يمكن حفظ تفضيلات الموقع."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "تعذّر حفظ الوسوم."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "حُفظت الإعدادات."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "أنشئ حسابًا"
@@ -4458,129 +4543,180 @@ msgstr ""
msgid "Tag cloud"
msgstr "سحابة الوسوم"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "أنت والج بالفعل!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "لا رمز استعادة كهذا."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "ليس رمز استعادة."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "رمز استعادة لمستخدم غير معروف."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "خطأ في رمز التأكيد."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "رمز التأكيد هذا قديم جدًا. من فضلك ابدأ من جديد."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
#, fuzzy
msgid "Could not update user with confirmed email address."
msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr ""
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
msgstr ""
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "استعادة كلمة السر"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "الاسم المستعار أو البريد الإلكتروني"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr ""
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "استرجع"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "استرجع"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "أعد ضبط كلمة السر"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "استعد كلمة السر"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "طُلبت استعادة كلمة السر"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "إجراء غير معروف"
-#: actions/recoverpassword.php:236
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
#, fuzzy
-msgid "6 or more characters, and don't forget it!"
+msgid "6 or more characters, and do not forget it!"
msgstr "6 أحرف أو أكثر"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "نفس كلمة السر أعلاه"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "أعد الضبط"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكتروني."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
#, fuzzy
msgid "No user with that email address or username."
msgstr "لا يوجد عنوان بريد إلكتروني مُسجّل لهذا المستخدم."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "لا يوجد عنوان بريد إلكتروني مُسجّل لهذا المستخدم."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "خطأ أثناء حفظ تأكيد العنوان."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr ""
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
#, fuzzy
msgid "Unexpected password reset."
msgstr "أعد ضبط كلمة السر"
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "يجب أن تكون كلمة السر 6 محارف أو أكثر."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
#, fuzzy
msgid "Password and confirmation do not match."
msgstr "كلمتا السر غير متطابقتين."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "تعذّر حفظ كلمة السر الجديدة."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "خطأ أثناء ضبط المستخدم."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -4596,7 +4732,7 @@ msgstr "عذرا، رمز دعوة غير صالح."
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "سجّل"
@@ -4623,67 +4759,59 @@ msgid ""
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:433
+#: actions/register.php:437
#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 حروف أو أكثر. مطلوب."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "نفس كلمة السر أعلاه. مطلوب."
+msgid "6 or more characters."
+msgstr "6 أحرف أو أكثر"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "البريد الإلكتروني"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك الشخصي على موقع آخر"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "جميع الحقوق محفوظة."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4702,7 +4830,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5007,7 +5135,7 @@ msgstr "المنظمة"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "الوصف"
@@ -5031,8 +5159,9 @@ msgstr "معلومات التطبيق"
msgid "Reset key & secret"
msgstr ""
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "احذف"
@@ -5155,7 +5284,7 @@ msgid "Note"
msgstr "ملاحظة"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "الكنى"
@@ -7748,25 +7877,25 @@ msgstr ""
"tracking - لم يطبق بعد.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "لا رمز تأكيد."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
msgid "I looked for configuration files in the following places:"
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "اذهب إلى المُثبّت."
@@ -7837,12 +7966,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "عطّل"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "أعد الضبط"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "تغيير الألوان"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "استخدم المبدئيات"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7926,23 +8058,19 @@ msgstr "اذهب"
msgid "Grant this user the \"%s\" role"
msgstr ""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "مسار صفحة هذا التطبيق"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "صِف المجموعة أو الموضوع"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "صِف المجموعة أو الموضوع"
msgstr[1] "صِف المجموعة أو الموضوع"
msgstr[2] "صِف المجموعة أو الموضوع"
@@ -7950,13 +8078,13 @@ msgstr[3] "صِف المجموعة أو الموضوع"
msgstr[4] "صِف المجموعة أو الموضوع"
msgstr[5] "صِف المجموعة أو الموضوع"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9119,14 +9247,9 @@ msgstr[5] ""
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s ليس لونًا صحيحًا!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s ليس لونًا صحيحًا!"
@@ -9167,27 +9290,29 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "لا ملف كهذا."
+#~ msgid "No such group"
+#~ msgstr "لا مجموعة كهذه"
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "المجموعات التي %s عضو فيها"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "لم يتم العثور على وسيلة API."
+#~ msgid "Reset"
+#~ msgstr "أعد الضبط"
+
#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "الأشخاص المشتركون ب%s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
-#~ msgid "Couldn't update user."
-#~ msgstr "تعذّر تحديث المستخدم."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 حروف أو أكثر. مطلوب."
-#~ msgid "Couldn't save profile."
-#~ msgstr "تعذّر حفظ الملف الشخصي."
+#~ msgid "Same as password above. Required."
+#~ msgstr "نفس كلمة السر أعلاه. مطلوب."
-#~ msgid "Couldn't save tags."
-#~ msgstr "تعذّر حفظ الوسوم."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s ليس لونًا صحيحًا!"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index e94116d72a..717851daee 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:00+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:55:48+0000\n"
"Language-Team: Egyptian Spoken Arabic \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -81,6 +81,7 @@ msgid "Save access settings"
msgstr "اذف إعدادت الموقع"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -92,13 +93,13 @@ msgstr "اذف إعدادت الموقع"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
#, fuzzy
msgctxt "BUTTON"
msgid "Save"
@@ -326,7 +327,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "تعذّر تحديث المستخدم."
@@ -350,7 +351,7 @@ msgstr "ليس للمستخدم ملف شخصى."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "لم يمكن حفظ الملف."
@@ -360,7 +361,7 @@ msgstr "لم يمكن حفظ الملف."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -543,7 +544,8 @@ msgid "That status is not a favorite."
msgstr "الحاله دى مش محطوطه فى التفضيلات."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "تعذّر حذف المفضله."
@@ -592,7 +594,7 @@ msgstr "تعذّر إيجاد المستخدم الهدف."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr ""
@@ -602,7 +604,7 @@ msgstr ""
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "ليس اسمًا مستعارًا صحيحًا."
@@ -614,7 +616,7 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
@@ -624,7 +626,7 @@ msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -656,7 +658,7 @@ msgstr[5] "المنظمه طويله جدا (اكتر حاجه %d رمز)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -718,24 +720,28 @@ msgid "Group not found."
msgstr "لم يوجد."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
#, fuzzy
msgid "You are already a member of that group."
msgstr "انت اصلا عضو فى الجروپ ده"
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
#, fuzzy
msgid "You have been blocked from that group by the admin."
msgstr "لم تمنع هذا المستخدم."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "ما نفعش يضم %1$s للجروپ %2$s."
@@ -748,9 +754,11 @@ msgstr "لست عضوا فى تلك المجموعه."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -811,9 +819,12 @@ msgid "Request token already authorized."
msgstr "لا تملك تصريحًا."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -821,7 +832,7 @@ msgstr "لا تملك تصريحًا."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -843,18 +854,20 @@ msgstr "خطأ قاعده البيانات أثناء إدخال المستخد
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr ""
@@ -903,7 +916,7 @@ msgstr "الحساب"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "الاسم المستعار"
@@ -911,7 +924,7 @@ msgstr "الاسم المستعار"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "كلمه السر"
@@ -1021,10 +1034,12 @@ msgstr "الملاحظه اتكررت فعلا."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1309,7 +1324,7 @@ msgstr "أعضاء مجموعه %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "تعذّر إدراج اشتراك جديد."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1345,30 +1360,51 @@ msgstr "لا ملف كهذا."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "تعذّر حذف المفضله."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "لا مجموعه كهذه"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+msgstr "لا مجموعه كهذه."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "جميع الأعضاء"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "الـ API method مش موجوده."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "تعذّر حفظ الاشتراك."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1541,35 +1577,42 @@ msgstr "فشل تحديث الأفتار."
msgid "Avatar deleted."
msgstr "حُذف الأفتار."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "يحق للمُرسل والمستلم فقط قراءه هذه الرساله."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "الخلفية"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1600,14 +1643,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "ملاحظة"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "لا تمنع هذا المستخدم"
@@ -1619,7 +1661,7 @@ msgstr "لا تمنع هذا المستخدم"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
@@ -1636,32 +1678,6 @@ msgstr "امنع هذا المستخدم"
msgid "Failed to save block information."
msgstr "فشل حفظ معلومات المنع."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "لا مجموعه كهذه."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1795,7 +1811,8 @@ msgid "Account deleted."
msgstr "حُذف الأفتار."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "أنشئ مجموعه جديدة"
@@ -1817,8 +1834,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "أكّد"
@@ -1893,8 +1911,10 @@ msgid "You must be logged in to delete a group."
msgstr "يجب أن تكون والجًا لتنشئ مجموعه."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
#, fuzzy
msgid "No nickname or ID."
msgstr "لا اسم مستعار."
@@ -1947,10 +1967,11 @@ msgid "Delete this group"
msgstr "احذف هذا المستخدم"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1988,99 +2009,134 @@ msgstr "لا تحذف هذا الإشعار"
msgid "Delete this notice"
msgstr "احذف هذا الإشعار"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "لا يمكنك حذف المستخدمين."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "يمكنك حذف المستخدمين المحليين فقط."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "احذف المستخدم"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "احذف المستخدم"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
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 ""
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "لا تحذف هذا الإشعار"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "احذف هذا المستخدم"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "التصميم"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "مسار شعار غير صالح."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "مسار شعار غير صالح."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "المراسله الفوريه غير متوفره."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "غيّر الشعار"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "شعار الموقع"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
#, fuzzy
msgid "SSL logo"
msgstr "شعار الموقع"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "غيّر السمة"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "سمه الموقع"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "سمه الموقع."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
#, fuzzy
msgid "Custom theme"
msgstr "سمه الموقع"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "تغيير صوره الخلفية"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "الخلفية"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2088,99 +2144,109 @@ msgid ""
msgstr "تستطيع رفع صورتك الشخصيه. أقصى حجم للملف هو 2 م.ب."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "مكّن"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "عطّل"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "مكّن صوره الخلفيه أو عطّلها."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
#, fuzzy
msgid "Tile background image"
msgstr "تغيير صوره الخلفية"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "تغيير الألوان"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "المحتوى"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "الشريط الجانبي"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "النص"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "وصلات"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr ""
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "استخدم المبدئيات"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "استعد التصميمات المبدئية"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "ارجع إلى المبدئي"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "أرسل"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "احفظ التصميم"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "هذا الشعار ليس مفضلًا!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "أضف إلى المفضلات"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "لا مرفق كهذا."
#. TRANS: Title for "Edit application" form.
@@ -2908,7 +2974,7 @@ msgid ""
"%%%%)"
msgstr ""
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "أنشئ مجموعه جديدة"
@@ -3285,28 +3351,35 @@ msgid ""
"Sincerely, %2$s\n"
msgstr ""
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
#, fuzzy
msgid "You must be logged in to join a group."
msgstr "يجب أن تلج لتُعدّل المجموعات."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s دخل جروپ %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
#, fuzzy
msgid "You must be logged in to leave a group."
msgstr "يجب أن تكون والجًا لتنشئ مجموعه."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "لست عضوا فى تلك المجموعه."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s ساب جروپ %2$s"
@@ -3411,6 +3484,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "أرسل"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr ""
@@ -3435,11 +3515,11 @@ msgstr "لُج"
msgid "Login to site"
msgstr "لُج إلى الموقع"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "تذكّرني"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
@@ -3819,7 +3899,8 @@ msgstr "غيّر كلمه السر"
msgid "Change your password."
msgstr "غيّر كلمه سرك."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "تغيير كلمه السر"
@@ -3827,7 +3908,8 @@ msgstr "تغيير كلمه السر"
msgid "Old password"
msgstr "كلمه السر القديمة"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "كلمه سر جديدة"
@@ -3836,7 +3918,7 @@ msgstr "كلمه سر جديدة"
msgid "6 or more characters"
msgstr "6 حروف أو أكثر. مطلوب."
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "نفس كلمه السر أعلاه"
@@ -3860,11 +3942,12 @@ msgstr "كلمه السر القديمه غير صحيحة"
msgid "Error saving user; invalid."
msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "تعذّر حفظ كلمه السر الجديده."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "حُفظت كلمه السر."
@@ -4202,22 +4285,23 @@ msgid "Profile information"
msgstr "معلومات الملف الشخصي"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "الاسم الكامل"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "الصفحه الرئيسية"
@@ -4229,7 +4313,7 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4241,27 +4325,27 @@ msgstr[4] "صِف نفسك واهتماماتك"
msgstr[5] "صِف نفسك واهتماماتك"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "صِف نفسك واهتماماتك"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "السيرة"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "الموقع"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -4313,7 +4397,7 @@ msgstr "أشرك المستخدمين الجدد بهذا المستخدم تل
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4325,49 +4409,50 @@ msgstr[4] "الاسم طويل جدا (اكتر حاجه %d رمز)."
msgstr[5] "الاسم طويل جدا (اكتر حاجه %d رمز)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "لم تُختر المنطقه الزمنيه."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "الاسم طويل جدا (اكتر حاجه 255 رمز)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "وسم غير صالح: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "تعذّر تحديث المستخدم."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "لم يمكن حفظ تفضيلات الموقع."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "تعذّر حفظ الوسوم."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "حُفظت الإعدادات."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "أنشئ مجموعه جديدة"
@@ -4485,130 +4570,181 @@ msgstr ""
msgid "Tag cloud"
msgstr "سحابه الوسوم"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "أنت والج بالفعل!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "لا رمز استعاده كهذا."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "ليس رمز استعاده."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "رمز استعاده لمستخدم غير معروف."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "خطأ فى رمز التأكيد."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "رمز التأكيد هذا قديم جدًا. من فضلك ابدأ من جديد."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
#, fuzzy
msgid "Could not update user with confirmed email address."
msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr ""
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
msgstr ""
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "استعاده كلمه السر"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "الاسم المستعار أو البريد الإلكتروني"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr ""
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "استرجع"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "استرجع"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "أعد ضبط كلمه السر"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "استعد كلمه السر"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "طُلبت استعاده كلمه السر"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "إجراء غير معروف"
-#: actions/recoverpassword.php:236
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
#, fuzzy
-msgid "6 or more characters, and don't forget it!"
+msgid "6 or more characters, and do not forget it!"
msgstr "6 حروف أو أكثر. مطلوب."
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "نفس كلمه السر أعلاه"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "أعد الضبط"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكترونى."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
#, fuzzy
msgid "No user with that email address or username."
msgstr "عنوان البريد الإلكترونى للاتصال بموقعك"
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
#, fuzzy
msgid "No registered email address for that user."
msgstr "عنوان البريد الإلكترونى للاتصال بموقعك"
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "خطأ أثناء حفظ تأكيد العنوان."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr ""
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
#, fuzzy
msgid "Unexpected password reset."
msgstr "أعد ضبط كلمه السر"
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "يجب أن تكون كلمه السر 6 محارف أو أكثر."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
#, fuzzy
msgid "Password and confirmation do not match."
msgstr "كلمتا السر غير متطابقتين."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "تعذّر حفظ كلمه السر الجديده."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "خطأ أثناء ضبط المستخدم."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -4624,7 +4760,7 @@ msgstr "عذرا، رمز دعوه غير صالح."
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "سجّل"
@@ -4651,66 +4787,59 @@ msgid ""
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
msgstr "6 حروف أو أكثر. مطلوب."
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "نفس كلمه السر أعلاه. مطلوب."
-
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "البريد الإلكتروني"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4729,7 +4858,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5035,7 +5164,7 @@ msgstr "المنظمه"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "الوصف"
@@ -5059,8 +5188,9 @@ msgstr "OAuth applications"
msgid "Reset key & secret"
msgstr ""
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "احذف"
@@ -5185,7 +5315,7 @@ msgid "Note"
msgstr "ملاحظة"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "الكنى"
@@ -7771,25 +7901,25 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "لا رمز تأكيد."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
msgid "I looked for configuration files in the following places:"
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "اذهب إلى المُثبّت."
@@ -7860,12 +7990,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "عطّل"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "أعد الضبط"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "تغيير الألوان"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "استخدم المبدئيات"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7949,24 +8082,20 @@ msgstr "اذهب"
msgid "Grant this user the \"%s\" role"
msgstr ""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "انت مش بتملك الapplication دى."
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
#, fuzzy
msgid "Describe the group or topic"
msgstr "اوصف الapplication بتاعتك"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "اوصف الapplication بتاعتك"
msgstr[1] "اوصف الapplication بتاعتك"
msgstr[2] "اوصف الapplication بتاعتك"
@@ -7974,12 +8103,12 @@ msgstr[3] "اوصف الapplication بتاعتك"
msgstr[4] "اوصف الapplication بتاعتك"
msgstr[5] "اوصف الapplication بتاعتك"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9124,14 +9253,9 @@ msgstr[5] ""
msgid "about a year ago"
msgstr "قبل سنه تقريبًا"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s ليس لونًا صحيحًا!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s ليس لونًا صحيحًا!"
@@ -9172,27 +9296,21 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "لا ملف كهذا."
+#~ msgid "No such group"
+#~ msgstr "لا مجموعه كهذه"
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "المجموعات التى %s عضو فيها"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "الـ API method مش موجوده."
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "الأشخاص المشتركون ب%s"
+#~ msgid "Reset"
+#~ msgstr "أعد الضبط"
-#~ msgid "Couldn't update user."
-#~ msgstr "تعذّر تحديث المستخدم."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 حروف أو أكثر. مطلوب."
-#~ msgid "Couldn't save profile."
-#~ msgstr "تعذّر حفظ الملف الشخصى."
+#~ msgid "Same as password above. Required."
+#~ msgstr "نفس كلمه السر أعلاه. مطلوب."
-#~ msgid "Couldn't save tags."
-#~ msgstr "تعذّر حفظ الوسوم."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s ليس لونًا صحيحًا!"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 8665ea59a6..ce865ea049 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:01+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:55:56+0000\n"
"Language-Team: Bulgarian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -75,6 +75,7 @@ msgid "Save access settings"
msgstr "Запазване настройките за достъп"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -86,13 +87,13 @@ msgstr "Запазване настройките за достъп"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Запазване"
@@ -317,7 +318,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Грешка при обновяване на потребителя."
@@ -341,7 +342,7 @@ msgstr "Потребителят няма профил."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Грешка при запазване на профила."
@@ -351,7 +352,7 @@ msgstr "Грешка при запазване на профила."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -531,7 +532,8 @@ msgid "That status is not a favorite."
msgstr "Тази бележка не е отбелязана като любима."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Грешка при изтриване на любима бележка."
@@ -578,7 +580,7 @@ msgstr "Целевият потребител не беше открит."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Опитайте друг псевдоним, този вече е зает."
@@ -588,7 +590,7 @@ msgstr "Опитайте друг псевдоним, този вече е за
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Неправилен псевдоним."
@@ -600,7 +602,7 @@ msgstr "Неправилен псевдоним."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Адресът на личната страница не е правилен URL."
@@ -610,7 +612,7 @@ msgstr "Адресът на личната страница не е правил
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -638,7 +640,7 @@ msgstr[1] "Описанието е твърде дълго (до %d символ
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -696,23 +698,27 @@ msgid "Group not found."
msgstr "Групата не е открита."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Вече членувате в тази група."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
#, fuzzy
msgid "You have been blocked from that group by the admin."
msgstr "Не сте блокирали този потребител."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Грешка при обновяване на групата."
@@ -724,9 +730,11 @@ msgstr "Не членувате в тази група."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -787,9 +795,12 @@ msgid "Request token already authorized."
msgstr "Не сте абонирани за никого."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -797,7 +808,7 @@ msgstr "Не сте абонирани за никого."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -819,18 +830,20 @@ msgstr "Грешка в базата от данни — отговор при
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Неочаквано изпращане на форма."
@@ -879,7 +892,7 @@ msgstr "Сметка"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Псевдоним"
@@ -887,7 +900,7 @@ msgstr "Псевдоним"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Парола"
@@ -994,10 +1007,12 @@ msgstr "Вече сте повторили тази бележка."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1270,7 +1285,7 @@ msgstr "Членове на групата %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Грешка при добавяне на нов абонамент."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1306,30 +1321,51 @@ msgstr "Няма такъв файл."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Грешка при изтриване на любима бележка."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "Няма такава група"
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "Всички членове"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Не е открит методът в API."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Грешка при добавяне на нов абонамент."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1502,35 +1538,42 @@ msgstr "Неуспешно обновяване на аватара."
msgid "Avatar deleted."
msgstr "Аватарът е изтрит."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Само влезли потребители могат да повтарят бележки."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Фон"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1561,14 +1604,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Не"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Да не се блокира този потребител"
@@ -1580,7 +1622,7 @@ msgstr "Да не се блокира този потребител"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Да"
@@ -1596,32 +1638,6 @@ msgstr "Блокиране на потребителя"
msgid "Failed to save block information."
msgstr "Грешка при записване данните за блокирането."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Няма такава група"
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1754,7 +1770,8 @@ msgid "Account deleted."
msgstr "Аватарът е изтрит."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Създаване на нова сметка"
@@ -1776,8 +1793,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Потвърждаване"
@@ -1849,8 +1867,10 @@ msgid "You must be logged in to delete a group."
msgstr "За напуснете група, трябва да сте влезли."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
#, fuzzy
msgid "No nickname or ID."
msgstr "Няма псевдоним."
@@ -1903,10 +1923,11 @@ msgid "Delete this group"
msgstr "Изтриване на този потребител"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1944,103 +1965,138 @@ msgstr "Да не се изтрива бележката"
msgid "Delete this notice"
msgstr "Изтриване на бележката"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Не можете да изтривате потребители."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Може да изтривате само локални потребители."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Изтриване на потребител"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Изтриване на потребител"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
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 ""
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Да не се изтрива бележката"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Изтриване на този потребител"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
#, fuzzy
msgid "Design"
msgstr "Версия"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
#, fuzzy
msgid "Invalid logo URL."
msgstr "Неправилен размер."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "Неправилен размер."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Страницата не е достъпна във вида медия, който приемате"
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Смяна на логото"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Лого на сайта"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
#, fuzzy
msgid "SSL logo"
msgstr "Лого на сайта"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
#, fuzzy
msgid "Change theme"
msgstr "Промяна"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Път до сайта"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
#, fuzzy
msgid "Theme for the site."
msgstr "Излизане от сайта"
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
#, fuzzy
msgid "Custom theme"
msgstr "Нова бележка"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Смяна на изображението за фон"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Фон"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2050,101 +2106,110 @@ msgstr ""
"2MB."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "Вкл."
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Изкл."
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
#, fuzzy
msgid "Turn background image on or off."
msgstr "Смяна на изображението за фон"
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
#, fuzzy
msgid "Tile background image"
msgstr "Смяна на изображението за фон"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Смяна на цветовете"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Съдържание"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Страничен панел"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Текст"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Лиценз"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr ""
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr ""
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr ""
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr ""
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Запазване"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
#, fuzzy
msgid "Save design"
msgstr "Запазване настройките на сайта"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Тази бележка не е отбелязана като любима!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Добавяне към любимите"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Няма такава бележка."
#. TRANS: Title for "Edit application" form.
@@ -2874,7 +2939,7 @@ msgid ""
"%%%%)"
msgstr ""
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Създаване на нова група"
@@ -3276,26 +3341,33 @@ msgstr ""
"\n"
"Искрено ваши, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "За да се присъедините към група, трябва да сте влезли."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s напусна групата %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "За напуснете група, трябва да сте влезли."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Не членувате в тази група."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s напусна групата %2$s"
@@ -3400,6 +3472,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Запазване"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr ""
@@ -3425,11 +3504,11 @@ msgstr "Вход"
msgid "Login to site"
msgstr "Вход в сайта"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Запомни ме"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "Автоматично влизане занапред. Да не се ползва на общи компютри!"
@@ -3821,7 +3900,8 @@ msgstr "Смяна на паролата"
msgid "Change your password."
msgstr "Смяна на паролата."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
#, fuzzy
msgid "Password change"
msgstr "Паролата е записана."
@@ -3830,7 +3910,8 @@ msgstr "Паролата е записана."
msgid "Old password"
msgstr "Стара парола"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Нова парола"
@@ -3838,7 +3919,7 @@ msgstr "Нова парола"
msgid "6 or more characters"
msgstr "6 или повече знака"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Също като паролата по-горе"
@@ -3862,11 +3943,12 @@ msgstr "Грешна стара парола"
msgid "Error saving user; invalid."
msgstr "Грешка при запазване на потребител — невалидност."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Грешка при запазване на новата парола."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Паролата е записана."
@@ -4202,23 +4284,24 @@ msgid "Profile information"
msgstr "Данни на профила"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Пълно име"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Лична страница"
@@ -4231,7 +4314,7 @@ msgstr "Адрес на личната ви страница, блог или п
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4239,27 +4322,27 @@ msgstr[0] "Опишете себе си и интересите си в до %d
msgstr[1] "Опишете себе си и интересите си в до %d букви"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Опишете себе си и интересите си"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "За мен"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Местоположение"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Къде се намирате (град, община, държава и т.н.)"
@@ -4312,7 +4395,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4320,49 +4403,50 @@ msgstr[0] "Биографията е твърде дълга (до %d симво
msgstr[1] "Биографията е твърде дълга (до %d символа)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Не е избран часови пояс"
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "Името на езика е твърде дълго (може да е до 50 знака)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Неправилен етикет: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Грешка при обновяване записа на потребител."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Грешка при запазване етикетите."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Грешка при запазване на етикетите."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Настройките са запазени."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Създаване на нова сметка"
@@ -4474,35 +4558,43 @@ msgstr ""
msgid "Tag cloud"
msgstr "Смяна на цветовете"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Вече сте влезли!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Няма такъв код за възстановяване."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Това не е код за възстановяване."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Код за възстановяване на непознат потребител."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Грешка в кода за потвърждение."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Кодът за потвърждение е твърде стар. Започнете процеса отново."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Грешка при обновяване на потребител с потвърден email адрес."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
#, fuzzy
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
@@ -4511,67 +4603,100 @@ msgstr ""
"На е-пощата, с която сте регистрирани са изпратени инструкции за "
"възстановяване на паролата."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
msgstr ""
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Възстановяване на парола"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Псевдоним или е-поща"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "Псевдонимът ви на този сървър или е-пощата, с която сте регистрирани."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Възстановяване"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Възстановяване"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Нова парола"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Възстановяване на паролата"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Поискано е възстановяване на парола"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Непознато действие"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 или повече знака. И не ги забравяйте!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Също като паролата по-горе"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Обновяване"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Въведете псевдоним или е-поща."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "Няма потребител с такава е-поща или потребителско име."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Няма указана е-поща за този потребител."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Грешка при запазване на потвърждение за адрес"
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4579,24 +4704,35 @@ msgstr ""
"На е-пощата, с която сте регистрирани са изпратени инструкции за "
"възстановяване на паролата."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Неочаквано подновяване на паролата."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "Паролата трябва да е от поне 6 знака."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Паролата и потвърждението й не съвпадат."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Грешка при запазване на новата парола."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Грешка в настройките на потребителя."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Новата парола е запазена. Влязохте успешно."
@@ -4613,7 +4749,7 @@ msgstr "Грешка в кода за потвърждение."
msgid "Registration successful"
msgstr "Записването е успешно."
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистриране"
@@ -4639,68 +4775,59 @@ msgid ""
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"От 1 до 64 малки букви или цифри, без пунктоация и интервали. Задължително "
-"поле."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 или повече знака. Задължително поле."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Същото като паролата по-горе. Задължително поле."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 или повече знака"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Е-поща"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Използва се само за промени, обяви или възстановяване на паролата"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "По-дълго име, за предпочитане \"истинското\" ви име."
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Всички права запазени."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr " освен тези лични данни: парола, е-поща, месинджър, телефон."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4733,7 +4860,7 @@ msgstr ""
"Благодарим, че се включихте в сайта и дано ползването на услугата ви носи "
"само приятни мигове!"
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5043,7 +5170,7 @@ msgstr "Организация"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Описание"
@@ -5067,8 +5194,9 @@ msgstr "Данни за приложението"
msgid "Reset key & secret"
msgstr ""
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Изтриване"
@@ -5188,7 +5316,7 @@ msgid "Note"
msgstr "Бележка"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Псевдоними"
@@ -7738,26 +7866,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "Не е открит файл с настройки. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Изпратени са покани до следните хора:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
#, fuzzy
msgid "Go to the installer."
msgstr "Влизане в сайта"
@@ -7831,12 +7959,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Изкл."
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Обновяване"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Смяна на цветовете"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr ""
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7921,34 +8052,30 @@ msgstr ""
msgid "Grant this user the \"%s\" role"
msgstr ""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "Адрес на страница, блог или профил в друг сайт на групата"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Опишете групата или темата"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Опишете групата или темата в до %d букви"
msgstr[1] "Опишете групата или темата в до %d букви"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
"Къде се намира групата — град, община, държава и т.н. (ако е приложимо)"
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9060,14 +9187,9 @@ msgstr[1] ""
msgid "about a year ago"
msgstr "преди около година"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s не е допустим цвят!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s не е допустим цвят! Използвайте 3 или 6 шестнадесетични знака."
@@ -9108,27 +9230,30 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Няма такъв профил."
+#~ msgid "No such group"
+#~ msgstr "Няма такава група"
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Групи, в които участва %s"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "Не е открит методът в API."
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Абонирани за %s"
+#~ msgid "Reset"
+#~ msgstr "Обновяване"
-#~ msgid "Couldn't update user."
-#~ msgstr "Грешка при обновяване на потребителя."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "От 1 до 64 малки букви или цифри, без пунктоация и интервали. "
+#~ "Задължително поле."
-#~ msgid "Couldn't save profile."
-#~ msgstr "Грешка при запазване на профила."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 или повече знака. Задължително поле."
-#~ msgid "Couldn't save tags."
-#~ msgstr "Грешка при запазване етикетите."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Същото като паролата по-горе. Задължително поле."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s не е допустим цвят!"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 6cfa7f1338..c40fb0c47e 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:10+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:01+0000\n"
"Language-Team: Breton \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -78,6 +78,7 @@ msgid "Save access settings"
msgstr "Enrollañ an arventennoù moned"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -89,13 +90,13 @@ msgstr "Enrollañ an arventennoù moned"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Enrollañ"
@@ -324,7 +325,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Dibosupl eo hizivaat an implijer."
@@ -348,7 +349,7 @@ msgstr "An implijer-mañ n'eus profil ebet dezhañ."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Dibosupl eo enrollañ ar profil."
@@ -358,7 +359,7 @@ msgstr "Dibosupl eo enrollañ ar profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -537,7 +538,8 @@ msgid "That status is not a favorite."
msgstr "N'eo ket ar statud-mañ ur pennroll."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Diposupl eo dilemel ar pennroll-mañ."
@@ -585,7 +587,7 @@ msgstr "Dibosupl eo kavout an implijer pal."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
@@ -595,7 +597,7 @@ msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "N'eo ket ul lesanv mat."
@@ -607,7 +609,7 @@ msgstr "N'eo ket ul lesanv mat."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
@@ -617,7 +619,7 @@ msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -645,7 +647,7 @@ msgstr[1] "Re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -703,22 +705,26 @@ msgid "Group not found."
msgstr "N'eo ket bet kavet ar strollad."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Un ezel eus ar strollad-mañ eo dija."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Stanket oc'h bet eus ar strollad-mañ gant ur merour."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Dibosupl eo stagañ an implijer %1$s d'ar strollad %2$s."
@@ -730,9 +736,11 @@ msgstr "N'oc'h ket ezel eus ar strollad-mañ."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -792,9 +800,12 @@ msgid "Request token already authorized."
msgstr "N'oc'h ket aotreet."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -802,7 +813,7 @@ msgstr "N'oc'h ket aotreet."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -824,18 +835,20 @@ msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Kinnig ar furmskrid dic'hortoz."
@@ -883,7 +896,7 @@ msgstr "Kont"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Lesanv"
@@ -891,7 +904,7 @@ msgstr "Lesanv"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Ger-tremen"
@@ -995,10 +1008,12 @@ msgstr "Kemenn bet adkemeret dija."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1272,7 +1287,7 @@ msgstr "Izili ar strollad %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Dibosupl eo dilemel ar c'houmanant."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1308,30 +1323,51 @@ msgstr "Restr ezvezant."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Diposupl eo dilemel ar pennroll-mañ."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "N'eus ket eus ar strollad-se"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+msgstr "N'eus ket eus ar strollad-se."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "An holl izili"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "N'eo ket bet kavet an hentenn API !"
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Dibosupl eo dilemel ar c'houmanant."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1500,35 +1536,42 @@ msgstr "Ur gudenn 'zo bet e-pad hizivadenn an avatar."
msgid "Avatar deleted."
msgstr "Dilammet eo bet an Avatar."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Background"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1559,14 +1602,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Ket"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Arabat stankañ an implijer-mañ"
@@ -1578,7 +1620,7 @@ msgstr "Arabat stankañ an implijer-mañ"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ya"
@@ -1594,32 +1636,6 @@ msgstr "Stankañ an implijer-mañ"
msgid "Failed to save block information."
msgstr "Dibosupl eo enrollañ an titouroù stankañ."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "N'eus ket eus ar strollad-se."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1751,7 +1767,8 @@ msgid "Account deleted."
msgstr "Dilammet eo bet an Avatar."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Krouiñ ur gont"
@@ -1773,8 +1790,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Kadarnaat"
@@ -1846,8 +1864,10 @@ msgid "You must be logged in to delete a group."
msgstr "Ret eo deoc'h bezañ kevreet evit kuitaat ur strollad"
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Lesanv pe ID ebet."
@@ -1898,10 +1918,11 @@ msgid "Delete this group"
msgstr "Diverkañ an implijer-mañ"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1939,97 +1960,132 @@ msgstr "Arabat dilemel ar c'hemenn-mañ"
msgid "Delete this notice"
msgstr "Dilemel ar c'hemenn-mañ"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "N'hallit ket diverkañ implijerien."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Ne c'helloc'h nemet dilemel an implijerien lec'hel."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Diverkañ an implijer"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Diverkañ an implijer"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
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 ""
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Arabat dilemel ar c'hemenn-mañ"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Diverkañ an implijer-mañ"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Design"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "URL fall evit al logo."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "URL fall evit al logo."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "N'eus ket eus ar gaoz-se : %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Cheñch al logo"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo al lec'hienn"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "Logo SSL"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Lakaat un dodenn all"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Dodenn al lec'hienn"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Dodenn evit al lec'hienn."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Dodenn personelaet"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Kemmañ ar skeudenn foñs"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Background"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2037,98 +2093,108 @@ msgid ""
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "Gweredekaet"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Diweredekaet"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Gweredekaat pe diweredekaat ar skeudenn foñs."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Adober gant ar skeudenn drekleur"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Kemmañ al livioù"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Endalc'h"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Barenn kostez"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Testenn"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Liammoù"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Araokaet"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "CSS personelaet"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Implijout an talvoudoù dre ziouer"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Adlakaat an neuz dre ziouer."
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Adlakaat an arventennoù dre ziouer"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Enrollañ"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Enrollañ an design"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "N'eo ket ar c'hemenn-mañ ur pennroll !"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Ouzhpennañ d'ar pennrolloù"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "N'eo ket bet kavet ar restr \"%s\""
#. TRANS: Title for "Edit application" form.
@@ -2843,7 +2909,7 @@ msgid ""
"%%%%)"
msgstr ""
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Krouiñ ur strollad nevez"
@@ -3215,26 +3281,33 @@ msgid ""
"Sincerely, %2$s\n"
msgstr ""
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Rankout a reoc'h bezañ luget evit mont en ur strollad."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s a zo bet er strollad %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Ret eo deoc'h bezañ kevreet evit kuitaat ur strollad"
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "N'oc'h ket un ezel eus ar strollad-mañ."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s en deus kuitaet ar strollad %2$s"
@@ -3339,6 +3412,13 @@ msgstr "URL skeudenn an aotre-implijout"
msgid "URL for an image to display with the license."
msgstr "URL ur skeudenn da ziskouez gant an aotre-implijout."
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Enrollañ"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "Enrollañ arventennoù an aotre-implijout"
@@ -3365,11 +3445,11 @@ msgstr "Kevreañ"
msgid "Login to site"
msgstr "Kevreañ d'al lec'hienn"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Kaout soñj"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Digeriñ va dalc'h war-eeun ar wechoù o tont ; arabat en ober war "
@@ -3762,7 +3842,8 @@ msgstr "Cheñch ger-tremen"
msgid "Change your password."
msgstr "Cheñch ger-tremen."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Kemmañ ger-tremen"
@@ -3770,7 +3851,8 @@ msgstr "Kemmañ ger-tremen"
msgid "Old password"
msgstr "Ger-tremen kozh"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Ger-tremen nevez"
@@ -3778,7 +3860,7 @@ msgstr "Ger-tremen nevez"
msgid "6 or more characters"
msgstr "6 arouezenn pe muioc'h"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Memestra eget ar ger tremen a-us"
@@ -3802,11 +3884,12 @@ msgstr "Ger-termen kozh direizh"
msgid "Error saving user; invalid."
msgstr "Ur fazi 'zo bet e-pad enolladenn an implijer ; diwiriek."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Dibosupl eo enrollañ ar ger-tremen nevez."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Ger-tremen enrollet."
@@ -4146,23 +4229,24 @@ msgid "Profile information"
msgstr "Titouroù ar profil"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Anv klok"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Pajenn degemer"
@@ -4175,7 +4259,7 @@ msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4183,27 +4267,27 @@ msgstr[0] "Deskrivit ac'hanoc'h hag ho interestoù, gant %d arouezenn"
msgstr[1] "Deskrivit ac'hanoc'h hag ho interestoù, gant %d arouezenn"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Deskrivit hoc'h-unan hag ar pezh a zedenn ac'hanoc'h"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Buhezskrid"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Lec'hiadur"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
@@ -4258,7 +4342,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4266,49 +4350,50 @@ msgstr[0] "Re hir eo ar bio (%d arouezenn d'ar muiañ)."
msgstr[1] "Re hir eo ar bio (%d arouezenn d'ar muiañ)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "N'eo bet dibabet gwerzhid-eur ebet."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "Re hir eo ar yezh (255 arouezenn d'ar muiañ)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Balizenn direizh : \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Dibosupl eo hizivaat ar c'houmanant ez emgefre."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Dibosupl eo enrollañ an dibaboù lec'hiadur."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Dibosupl eo enrollañ ar merkoù."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Enrollet eo bet an arventennoù."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Krouiñ ur gont"
@@ -4428,35 +4513,43 @@ msgstr ""
msgid "Tag cloud"
msgstr "Koumoulenn merkoù"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Luget oc'h dija !"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Kod adtapout nann-kavet."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "N'eo ket ur c'hod adtapout an dra-mañ."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Kod adtapout evit un implijer dizanv."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Ur fazi 'zo bet gant ar c'hod kadarnaat."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Re gozh eo ar c'hod gwiriañ. Adkrogit mar plij."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Dibosupl eo hizivaat an implijer gant ar chomlec'h postel gwiriekaet."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4464,68 +4557,101 @@ msgstr ""
"M'o peus disoñjet pe kollet ho ger-tremen, e c'helloc'h kaout unan nevez hag "
"a vo kaset deoc'h d'ar chomlec'h postel termenet en ho kont."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Diskleriet oc'h bet. Lakait ur ger-tremen nevez amañ da heul. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Adtapout ar ger-tremen"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Lesanv pe chomlec'h postel"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr ""
"Ho lesanv war ar servijer-mañ, pe ar chomlec'h postel ho peus enrollet."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Adtapout"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Adtapout"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Adderaouekaat ar ger-tremen"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Adtapout ar ger-tremen"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Goulennet eo an adtapout gerioù-tremen"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Oberiadenn dianav"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 arouezenn pe muioc'h, ha n'e zisoñjit ket !"
-#: actions/recoverpassword.php:243
-msgid "Reset"
-msgstr "Adderaouekaat"
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Memestra eget ar ger tremen a-us"
-#: actions/recoverpassword.php:252
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+msgctxt "BUTTON"
+msgid "Reset"
+msgstr "Adderaouiñ"
+
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Lakait ul lesanv pe ur chomlec'h postel."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "N'eus bet kavet implijer ebet gant ar postel-se pe an anv-se."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Chomlec'h postel enrollet ebet evit an implijer-mañ."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Ur fazi 'zo bet pa voe enrollet kod kadarnaat ar postel."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4533,24 +4659,35 @@ msgstr ""
"Kaset eo bet deoc'h, d'ar chomlec'h postel termenet en ho kont, an titouroù "
"ret evit gouzout penaos adtapout o ger-tremen."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Adderaouekadur dic'hortoz ar ger-tremen."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "Rankout a ra ar ger-tremen bezañ 6 arouezenn d'an nebeutañ."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Ne glot ket ar ger-tremen gant ar c'hadarnadur."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Dibosupl eo enrollañ ar ger-tremen nevez."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Krouet eo bet ar ger-tremen nevez. Kevreet oc'h bremañ."
@@ -4568,7 +4705,7 @@ msgstr "Digarezit, kod pedadenn direizh."
msgid "Registration successful"
msgstr "Krouet eo bet ar gont."
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Krouiñ ur gont"
@@ -4596,69 +4733,61 @@ msgid ""
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:433
+#: actions/register.php:437
#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 arouezenn pe muioc'h. Rekis."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Memestra hag ar ger-tremen a-us. Rekis."
+msgid "6 or more characters."
+msgstr "6 arouezenn pe muioc'h"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Postel"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Implijet hepken evit an hizivadennoù, ar c'hemennoù, pe adtapout gerioù-"
"tremen"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Anv hiroc'h, ho anv \"gwir\" a zo gwelloc'h"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "Kompren a ran ez eo prevez danvez ha roadennoù %1$s."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Ma zestenn ha ma restroù a zo gwarezet dre copyright gant %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "Ma zestenn ha ma restroù a chom dindan ma gwirioù oberour."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Holl gwrioù miret strizh."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4677,7 +4806,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -4983,7 +5112,7 @@ msgstr "Aozadur"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Deskrivadur"
@@ -5006,8 +5135,9 @@ msgstr "Obererezhioù ar poellad"
msgid "Reset key & secret"
msgstr "Adderaouekaat an alc'hwez hag ar sekred"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Diverkañ"
@@ -5126,7 +5256,7 @@ msgid "Note"
msgstr "Notenn"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Aliasoù"
@@ -7646,26 +7776,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "N'eo bet kavet restr kefluniadur ebet. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Pedadennoù bet kaset d'an implijerien da-heul :"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Mont d'ar meziant staliañ"
@@ -7734,11 +7864,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Diweredekaet"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Adderaouiñ"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Kemmañ al livioù"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Implijout an talvoudoù dre ziouer"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7824,34 +7958,30 @@ msgstr "Mont"
msgid "Grant this user the \"%s\" role"
msgstr ""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "URL pajenn degemer ar poellad-mañ"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
#, fuzzy
msgid "Describe the group or topic"
msgstr "Deskrivit ho poellad"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Diskrivit ho poellad gant %d arouezenn"
msgstr[1] "Diskrivit ho poellad gant %d arouezenn"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8963,14 +9093,9 @@ msgstr[1] "tro %d miz zo"
msgid "about a year ago"
msgstr "bloaz zo well-wazh"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "n'eo ket %s ul liv reizh !"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "N'eo ket %s ul liv reizh ! Implijit 3 pe 6 arouezenn heksdekvedennel."
@@ -9011,27 +9136,29 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "N'eus ket eus ar profil-se."
+#~ msgid "No such group"
+#~ msgstr "N'eus ket eus ar strollad-se"
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Ezel eo %s eus ar strolladoù"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "N'eo ket bet kavet an hentenn API !"
+#~ msgid "Reset"
+#~ msgstr "Adderaouekaat"
+
#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Koumanantet da %s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
-#~ msgid "Couldn't update user."
-#~ msgstr "Dibosupl eo hizivaat an implijer."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 arouezenn pe muioc'h. Rekis."
-#~ msgid "Couldn't save profile."
-#~ msgstr "Dibosupl eo enrollañ ar profil."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Memestra hag ar ger-tremen a-us. Rekis."
-#~ msgid "Couldn't save tags."
-#~ msgstr "Dibosupl eo enrollañ ar balizennoù."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "n'eo ket %s ul liv reizh !"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index ffb9a43295..077907af09 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -16,17 +16,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:15+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:11+0000\n"
"Language-Team: Catalan \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -83,6 +83,7 @@ msgid "Save access settings"
msgstr "Desa els paràmetres d'accés"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -94,13 +95,13 @@ msgstr "Desa els paràmetres d'accés"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Desa"
@@ -335,7 +336,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "No s'ha pogut actualitzar l'usuari."
@@ -359,7 +360,7 @@ msgstr "L'usuari no té perfil."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "No s'ha pogut desar el perfil."
@@ -369,7 +370,7 @@ msgstr "No s'ha pogut desar el perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -549,7 +550,8 @@ msgid "That status is not a favorite."
msgstr "L'estat no és un preferit."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "No s'ha pogut eliminar el preferit."
@@ -595,7 +597,7 @@ msgstr "No s'ha pogut trobar l'usuari de destinació."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Aquest sobrenom ja existeix. Prova un altre. "
@@ -605,7 +607,7 @@ msgstr "Aquest sobrenom ja existeix. Prova un altre. "
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Sobrenom no vàlid."
@@ -617,7 +619,7 @@ msgstr "Sobrenom no vàlid."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "La pàgina personal no és un URL vàlid."
@@ -627,7 +629,7 @@ msgstr "La pàgina personal no és un URL vàlid."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
@@ -654,7 +656,7 @@ msgstr[1] "La descripció és massa llarga (màx. %d caràcters)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "La localització és massa llarga (màx. 255 caràcters)."
@@ -711,22 +713,26 @@ msgid "Group not found."
msgstr "No s'ha trobat el grup."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Ja sou membre del grup."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "L'administrador us ha blocat del grup."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s."
@@ -738,9 +744,11 @@ msgstr "No sou un membre del grup."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -797,9 +805,12 @@ msgid "Request token already authorized."
msgstr "El testimoni de sol·licitud ja està autoritzat."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -807,7 +818,7 @@ msgstr "El testimoni de sol·licitud ja està autoritzat."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -830,18 +841,20 @@ msgstr "Error de la base de dades en inserir l'oauth_token_association."
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Enviament de formulari inesperat."
@@ -895,7 +908,7 @@ msgstr "Compte"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Sobrenom"
@@ -903,7 +916,7 @@ msgstr "Sobrenom"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Contrasenya"
@@ -1010,10 +1023,12 @@ msgstr "Avís duplicat."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
@@ -1281,7 +1296,7 @@ msgstr "%s pertinències a grup"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "No es pot afegir la pertinència d'algú altre"
#. TRANS: Client error displayed when not using the POST verb.
@@ -1314,29 +1329,51 @@ msgstr "No existeix el preferit."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "No es pot eliminar el preferit d'algú altre"
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "No s'ha trobat el grup."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
-msgid "Not a member"
-msgstr "No és un membre"
-
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
#, fuzzy
-msgid "HTTP method not supported"
-msgstr "El mètode HTTP no està implementat."
+msgid "Not a member."
+msgstr "No és un membre"
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "No es pot eliminar la pertinència d'algú altre"
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1508,35 +1545,42 @@ msgstr "Error en actualitzar avatar."
msgid "Avatar deleted."
msgstr "S'ha eliminat l'avatar."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Només els usuaris que han iniciat una sessió poden enviar avisos."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Fons"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1570,14 +1614,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "No bloquis l'usuari"
@@ -1589,7 +1632,7 @@ msgstr "No bloquis l'usuari"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sí"
@@ -1605,32 +1648,6 @@ msgstr "Bloca aquest usuari"
msgid "Failed to save block information."
msgstr "No s'ha pogut desar la informació del bloc."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "No s'ha trobat el grup."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1760,7 +1777,8 @@ msgid "Account deleted."
msgstr "S'ha eliminat l'avatar."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Crea un compte"
@@ -1782,8 +1800,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Confirma"
@@ -1857,8 +1876,10 @@ msgid "You must be logged in to delete a group."
msgstr "Heu d'haver iniciat una sessió per eliminar un grup."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Cap sobrenom o ID."
@@ -1909,10 +1930,11 @@ msgid "Delete this group"
msgstr "Elimina aquest grup"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1952,19 +1974,30 @@ msgstr "No eliminis aquest avís"
msgid "Delete this notice"
msgstr "Elimina aquest avís"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "No podeu eliminar els usuaris."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Només podeu eliminar usuaris locals."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Elimina l'usuari"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Elimina l'usuari"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1972,78 +2005,102 @@ msgstr ""
"Esteu segur que voleu eliminar l'usuari? S'esborraran totes les dades de "
"l'usuari de la base de dades, sense cap còpia de seguretat."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "No eliminis aquest grup"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Elimina l'usuari"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Disseny"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr "Paràmetres de disseny d'aquest lloc StatusNet."
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "L'URL del logotip no és vàlid."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "L'URL SSL del logotip no és vàlid."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Tema no disponible: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Canvia el logotip"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logotip del lloc"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "Logotip SSL"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Canvia el tema"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Tema del lloc"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Tema del lloc."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Tema personalitzat"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Podeu pujar un tema personalitzat de l'StatusNet amb un arxiu ZIP."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Canvia la imatge de fons"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Fons"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2052,98 +2109,108 @@ msgstr ""
"Podeu pujar una imatge de fons per al lloc. La mida màxima de fitxer és %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "Activada"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Desactivada"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Activa o desactiva la imatge de fons."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Posa en mosaic la imatge de fons"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Canvia els colors"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Contingut"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Barra lateral"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Text"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Enllaços"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Avançat"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "CSS personalitzat"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Utilitza els paràmetres per defecte"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Restaura els dissenys per defecte"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Torna a restaurar al valor per defecte"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Desa"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Desa el disseny"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Aquesta avís no és un preferit!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Afegeix als preferits"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "No existeix el document «%s»"
#. TRANS: Title for "Edit application" form.
@@ -2869,7 +2936,7 @@ msgstr ""
"agradi? Proveu de [cercar-ne un](%%%%action.groupsearch%%%%) o [comenceu-ne "
"un de propi!](%%%%action.newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Crea un grup nou"
@@ -3276,26 +3343,33 @@ msgstr ""
"\n"
"Sincerely, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Heu d'haver iniciat una sessió per unir-vos a un grup."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s s'ha unit al grup %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Heu d'haver iniciat una sessió per deixar un grup."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "No ets membre d'aquest grup."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s ha abandonat el grup %2$s"
@@ -3402,6 +3476,13 @@ msgstr "URL de la imatge de la llicència"
msgid "URL for an image to display with the license."
msgstr "URL de la imatge que es mostrarà juntament amb la llicència."
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Desa"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "Desa els paràmetres de la llicència"
@@ -3428,11 +3509,11 @@ msgstr "Inici de sessió"
msgid "Login to site"
msgstr "Accedir al lloc"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Recorda'm"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Inicia la sessió automàticament en el futur; no ho activeu en ordinadors "
@@ -3827,7 +3908,8 @@ msgstr "Canvia la contrasenya"
msgid "Change your password."
msgstr "Canvieu la vostra contrasenya"
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Contrasenya canviada."
@@ -3835,7 +3917,8 @@ msgstr "Contrasenya canviada."
msgid "Old password"
msgstr "Antiga contrasenya"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Nova contrasenya"
@@ -3843,7 +3926,7 @@ msgstr "Nova contrasenya"
msgid "6 or more characters"
msgstr "6 o més caràcters"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Igual a la contrasenya de dalt"
@@ -3867,11 +3950,12 @@ msgstr "Contrasenya antiga incorrecta"
msgid "Error saving user; invalid."
msgstr "S'ha produït un error en desar l'usuari; no és vàlid."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "No es pot desar la nova contrasenya."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Contrasenya guardada."
@@ -4198,23 +4282,24 @@ msgid "Profile information"
msgstr "Informació del perfil"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr ""
"1-64 lletres en minúscula o nombres, sense signes de puntuació o espais."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Nom complet"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Pàgina personal"
@@ -4226,7 +4311,7 @@ msgstr "URL del vostre web, blog o perfil en un altre lloc."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4234,27 +4319,27 @@ msgstr[0] "Descriviu qui sou i els vostres interessos en %d caràcter"
msgstr[1] "Descriviu qui sou i els vostres interessos en %d caràcters"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Feu una descripció personal i interessos"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Biografia"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Ubicació"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "On us trobeu, per exemple «ciutat, comarca (o illa), país»"
@@ -4309,7 +4394,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4317,48 +4402,49 @@ msgstr[0] "La biografia és massa llarga (màx. %d caràcter)."
msgstr[1] "La biografia és massa llarga (màx. %d caràcters)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "No s'ha seleccionat el fus horari."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
msgid "Language is too long (maximum 50 characters)."
msgstr "La llengua és massa llarga (màxim 50 caràcters)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "L'etiqueta no és vàlida: «%s»"
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "No es pot actualitzar l'usuari per autosubscriure."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "No s'han pogut desar les preferències d'ubicació."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "No s'han pogut guardar les etiquetes."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "S'ha desat la configuració."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Crea un compte"
@@ -4483,35 +4569,43 @@ msgstr ""
msgid "Tag cloud"
msgstr "Núvol d'etiquetes"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Ja heu iniciat una sessió!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "No existeix aquest codi de recuperació."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "No és un codi de recuperació."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Codi de recuperació d'un usuari desconegut."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Error amb el codi de confirmació."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Aquest codi de confirmació és massa vell. Si us plau comença de nou."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat"
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4519,69 +4613,102 @@ msgstr ""
"Si heu oblidat o perdut la vostra contrasenya, podeu aconseguir-ne una de "
"nova a partir de l'adreça electrònica que s'ha associat al vostre compte."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Esteu identificat. Introduïu una contrasenya nova a continuació. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Recuperació de la contrasenya"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Sobrenom o adreça electrònica"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr ""
"El vostre nom d'usuari en aquest servidor, o la vostra adreça de correu "
"electrònic registrada."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Recupera"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Recupera"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Reinicialitza la contrasenya"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Recupera la contrasenya"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Recuperació de contrasenya sol·licitada"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Acció desconeguda"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 o més caràcters, i no te n'oblidis!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Igual a la contrasenya de dalt"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Reinicialitza"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Escriviu un sobrenom o una adreça de correu electrònic."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "No hi ha cap usuari amb aquesta direcció o usuari."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "No hi ha cap adreça de correu electrònic registrada d'aquest usuari."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "S'ha produït un error en desar la confirmació de l'adreça."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4589,23 +4716,34 @@ msgstr ""
"S'han enviat instruccions per recuperar la vostra contrasenya a l'adreça de "
"correu electrònic registrada."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Restabliment de contrasenya inesperat."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
msgid "Password must be 6 characters or more."
msgstr "La contrasenya ha de tenir 6 o més caràcters."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "La contrasenya i la confirmació no coincideixen."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "No es pot desar la nova contrasenya."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Error en configurar l'usuari."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió."
@@ -4621,7 +4759,7 @@ msgstr "El codi d'invitació no és vàlid."
msgid "Registration successful"
msgstr "Registre satisfactori"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registre"
@@ -4649,62 +4787,54 @@ msgstr ""
"Amb aquest formulari, podeu crear un compte nou. Podeu enviar avisos i "
"enllaçar a amics i col·legues. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 lletres en minúscula o números, sense puntuacions ni espais. Requerit."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 o més caràcters. Requerit."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Igual a la contrasenya de dalt. Requerit."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 o més caràcters"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Correu electrònic"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenya"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nom llarg, preferiblement el vostre nom «real»"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL del teu web, blog o perfil en un altre lloc"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"Entenc que el contingut i les dades de %1$s són privades i confidencials."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "El meu text i els meus fitxers són copyright de %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "El meu text i els meus fitxers es troben sota el meu propi copyright."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Tots els drets reservats."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4714,7 +4844,7 @@ msgstr ""
"les dades privades: contrasenya, adreça de correu electrònic, adreça de "
"missatgeria instantània i número de telèfon."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4747,7 +4877,7 @@ msgstr ""
"\n"
"Gràcies per registrar-vos-hi i esperem que en gaudiu."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5065,7 +5195,7 @@ msgstr "Organització"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Descripció"
@@ -5088,8 +5218,9 @@ msgstr "Accions d'aplicació"
msgid "Reset key & secret"
msgstr "Reinicialitza la clau i la secreta"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Elimina"
@@ -5216,7 +5347,7 @@ msgid "Note"
msgstr "Avisos"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Àlies"
@@ -7821,24 +7952,24 @@ msgstr ""
"tracking - no s'ha implementat encara.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
msgid "No configuration file found."
msgstr "No s'ha trobat cap fitxer de configuració. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
msgid "I looked for configuration files in the following places:"
msgstr "S'han cercat fitxers de configuracions en els llocs següents: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "Podeu voler executar l'instal·lador per corregir-ho."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Vés a l'instal·lador."
@@ -7905,11 +8036,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Desactivada"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Reinicialitza"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Canvia els colors"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Utilitza els paràmetres per defecte"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7993,33 +8128,28 @@ msgstr "Vés-hi"
msgid "Grant this user the \"%s\" role"
msgstr "Atorga a l'usuari el rol «%s»"
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 lletres en minúscula o números, sense signes de puntuació o espais"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
msgid "URL of the homepage or blog of the group or topic."
msgstr "URL de la pàgina o blog del grup o de la temàtica."
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Descriviu el grup o la temàtica"
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Descriviu el grup o la temàtica en %d caràcter"
msgstr[1] "Descriviu el grup o la temàtica en %d caràcters"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
"Ubicació del grup, si s'hi adiu cap, com ara «ciutat, comarca (o illa), país»."
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9224,14 +9354,9 @@ msgstr[1] "aproximadament fa %d mesos"
msgid "about a year ago"
msgstr "fa un any"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s no és un color vàlid!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s no és un color vàlid! Feu servir 3 o 6 caràcters hexadecimals."
@@ -9269,29 +9394,31 @@ msgstr "L'XML no és vàlid, hi manca l'arrel XRD."
msgid "Getting backup from file '%s'."
msgstr "Es recupera la còpia de seguretat del fitxer '%s'."
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "Enviament AtomPub amb un URI %s d'atenció desconegut"
+#~ msgid "No such group"
+#~ msgstr "No s'ha trobat el grup."
-#~ msgid "No such profile"
-#~ msgstr "No existeix el perfil"
+#, fuzzy
+#~ msgid "HTTP method not supported"
+#~ msgstr "El mètode HTTP no està implementat."
-#~ msgid "Notices %s has favorited to on %s"
-#~ msgstr "Els avisos que %s ha preferit a %s"
+#~ msgid "Reset"
+#~ msgstr "Reinicialitza"
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Els grups en què %s és membre a %s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 lletres en minúscula o números, sense puntuacions ni espais. "
+#~ "Requerit."
-#~ msgid "Method not supported"
-#~ msgstr "El mètode no està implementat"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 o més caràcters. Requerit."
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "La gent a qui %s s'ha subscrit a %s"
+#~ msgid "Same as password above. Required."
+#~ msgstr "Igual a la contrasenya de dalt. Requerit."
-#~ msgid "Couldn't update user."
-#~ msgstr "No s'ha pogut actualitzar l'usuari."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr ""
+#~ "1-64 lletres en minúscula o números, sense signes de puntuació o espais"
-#~ msgid "Couldn't save profile."
-#~ msgstr "No s'ha pogut desar el perfil."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "No s'han pogut desar les etiquetes."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s no és un color vàlid!"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 9cce57cbbb..2cf23d5bb7 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:17+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:16+0000\n"
"Language-Team: Czech \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
"2 );\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -77,6 +77,7 @@ msgid "Save access settings"
msgstr "uložit nastavení přístupu"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -88,13 +89,13 @@ msgstr "uložit nastavení přístupu"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Uložit"
@@ -328,7 +329,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Nepodařilo se aktualizovat nastavení uživatele"
@@ -352,7 +353,7 @@ msgstr "Uživatel nemá profil."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Nepodařilo se uložit profil."
@@ -362,7 +363,7 @@ msgstr "Nepodařilo se uložit profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, fuzzy, php-format
@@ -544,7 +545,8 @@ msgid "That status is not a favorite."
msgstr "Tato hláška není oblíbená."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Nelze smazat oblíbenou položku."
@@ -591,7 +593,7 @@ msgstr "Nepodařilo se najít cílového uživatele."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Přezdívku již někdo používá. Zkuste jinou."
@@ -601,7 +603,7 @@ msgstr "Přezdívku již někdo používá. Zkuste jinou."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Není platnou přezdívkou."
@@ -613,7 +615,7 @@ msgstr "Není platnou přezdívkou."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Domovská stránka není platná URL."
@@ -623,7 +625,7 @@ msgstr "Domovská stránka není platná URL."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -652,7 +654,7 @@ msgstr[2] "Popis je příliš dlouhý (maximálně %d znaků)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -711,22 +713,26 @@ msgid "Group not found."
msgstr "Skupina nebyla nalezena."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Jste již členem této skupiny."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Z této skupiny jste byl zablokován adminem."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Nemohu připojit uživatele %1$s do skupiny %2$s."
@@ -738,9 +744,11 @@ msgstr "Nejste členem této skupiny."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -800,9 +808,12 @@ msgid "Request token already authorized."
msgstr "Nejste autorizován."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -810,7 +821,7 @@ msgstr "Nejste autorizován."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -832,18 +843,20 @@ msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Nečekaný požadavek."
@@ -898,7 +911,7 @@ msgstr "Účet"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Přezdívka"
@@ -906,7 +919,7 @@ msgstr "Přezdívka"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Heslo"
@@ -1014,10 +1027,12 @@ msgstr "Již jste zopakoval toto oznámení."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1293,7 +1308,7 @@ msgstr "členové skupiny %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Nelze vložit odebírání"
#. TRANS: Client error displayed when not using the POST verb.
@@ -1329,30 +1344,51 @@ msgstr "Žádný takový soubor."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Nelze smazat oblíbenou položku."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Žádná taková skupina"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+msgstr "Žádný takový uživatel."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "Všichni členové"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr " API metoda nebyla nalezena."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Nelze smazat odebírání sebe sama"
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1524,35 +1560,42 @@ msgstr "Nahrávání obrázku selhalo."
msgid "Avatar deleted."
msgstr "Avatar smazán."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Pouze přihlášení uživatelé mohou opakovat oznámení."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Pozadí"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1586,14 +1629,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Poznámka"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Zablokovat tohoto uživatele"
@@ -1605,7 +1647,7 @@ msgstr "Zablokovat tohoto uživatele"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ano"
@@ -1621,32 +1663,6 @@ msgstr "Zablokovat tohoto uživatele"
msgid "Failed to save block information."
msgstr "Nepodařilo se uložit blokování."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Žádný takový uživatel."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1778,7 +1794,8 @@ msgid "Account deleted."
msgstr "Avatar smazán."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Zaregistrujte se"
@@ -1800,8 +1817,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Potvrdit"
@@ -1875,8 +1893,10 @@ msgid "You must be logged in to delete a group."
msgstr "Musíte být přihlášen abyste mohl opustit skupinu."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Žádná přezdívka nebo ID."
@@ -1931,10 +1951,11 @@ msgid "Delete this group"
msgstr "Odstranit tohoto uživatele"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1974,19 +1995,30 @@ msgstr "Neodstraňujte toto oznámení"
msgid "Delete this notice"
msgstr "Odstranit toto oznámení"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Nemůžete odstranit uživatele."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Můžete smazat pouze místní uživatele."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Smazat uživatele"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Smazat uživatele"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1994,80 +2026,104 @@ msgstr ""
"Jste si jisti, že chcete smazat tohoto uživatele? To odstraní všechny údaje "
"o uživateli z databáze, bez zálohy."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Neodstraňujte toto oznámení"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Odstranit tohoto uživatele"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Vzhled"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "Neplatná URL loga."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "Neplatná URL loga."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Téma není k dispozici: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Změňte logo"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo stránek"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
#, fuzzy
msgid "SSL logo"
msgstr "Logo stránek"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Změnit téma"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Téma stránek"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Téma stránek"
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Vlastní téma"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Můžete nahrát vlastní StatusNet téma jako .ZIP archiv."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Změnit obrázek na pozadí"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Pozadí"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2076,98 +2132,108 @@ msgstr ""
"Můžete nahrát obrázek na pozadí stránek. Maximální velikost souboru je %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "zap."
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "vyp."
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Zapněte nebů vypněte obrázek na pozadí."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Dlaždicovat obrázek na pozadí"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Změnit barvy"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Obsah"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Boční panel"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Text"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Odkazy"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Rozšířené"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "Vlastní CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Použít výchozí"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Obnovit výchozí vzhledy"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Reset zpět do výchozího"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Uložit"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Uložit vzhled"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Toto oznámení není oblíbeno!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Přidat do oblíbených"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Žádný dokument \"%s\" neexistuje"
#. TRANS: Title for "Edit application" form.
@@ -2891,7 +2957,7 @@ msgstr ""
"Zkuste ji [vyhledat](%%%%action.groupsearch%%%%) nebo [založit!](%%%%action."
"newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Vytvořit novou skupinu"
@@ -3298,26 +3364,33 @@ msgstr ""
"\n"
"S pozdravem, %2$s \n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Musíte být přihlášen pro vstup do skupiny."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s se připojil(a) ke skupině %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Musíte být přihlášen abyste mohl opustit skupinu."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Nejste členem této skupiny."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s opustil(a) skupinu %2$s"
@@ -3423,6 +3496,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Uložit"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr ""
@@ -3447,11 +3527,11 @@ msgstr "Přihlásit"
msgid "Login to site"
msgstr "Přihlásit se na stránky"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Zapamatuj si mě"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Příště automaticky přihlásit; ne pro počítače, které používá více lidí! "
@@ -3842,7 +3922,8 @@ msgstr "Změnit heslo"
msgid "Change your password."
msgstr "Změňte své heslo."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Změna hesla"
@@ -3850,7 +3931,8 @@ msgstr "Změna hesla"
msgid "Old password"
msgstr "Staré heslo"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Nové heslo"
@@ -3858,7 +3940,7 @@ msgstr "Nové heslo"
msgid "6 or more characters"
msgstr "6 a více znaků"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Stejné jako heslo výše"
@@ -3882,11 +3964,12 @@ msgstr "Nesprávné staré heslo"
msgid "Error saving user; invalid."
msgstr "Chyba při ukládaní uživatele; neplatný."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Nelze uložit nové heslo"
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Heslo uloženo"
@@ -4229,23 +4312,24 @@ msgid "Profile information"
msgstr "Nastavené Profilu"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Celé jméno"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Moje stránky"
@@ -4258,7 +4342,7 @@ msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4267,27 +4351,27 @@ msgstr[1] "Popište sebe a své zájmy"
msgstr[2] "Popište sebe a své zájmy"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Popište sebe a své zájmy"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "O mě"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Umístění"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Místo. Město, stát."
@@ -4340,7 +4424,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4349,49 +4433,50 @@ msgstr[1] "Umístění příliš dlouhé (maximálně %d znaků)"
msgstr[2] "Umístění příliš dlouhé (maximálně %d znaků)"
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Časové pásmo není vybráno."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "Jazyk je příliš dlouhý (max. 50 znaků)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Neplatná velikost"
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Nelze aktualizovat nastavení automatického přihlašování."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Nelze uložit nastavení umístění."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Nelze uložit nálepky"
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Nastavení uloženo"
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Zaregistrujte se"
@@ -4512,35 +4597,43 @@ msgstr ""
msgid "Tag cloud"
msgstr "Tag cloud"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Již jste přihlášen"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Žádný takový obnovující kód."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Není obnovujícím kódem"
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Obnovovací kód pro neznámého uživatele."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Chyba v ověřovacím kódu"
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Tento potvrzující kód je příliš starý Prosím zkuste znovu"
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Nemohu aktualizovat uživatele s potvrzenou e-mailovou adresu."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4548,67 +4641,101 @@ msgstr ""
"Pokud jste zapomněli nebo ztratili své heslo, můžeme zaslat nové na e-"
"mailovou adresu, kterou jste uložili ve vašem účtu."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Byl jste identifikován. Vložte níže nové heslo. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Obnovení hesla"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Zadej přezdívku nebo emailovou adresu"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "Vaše přezdívka na tomto servu, nebo váš email zadaný při registraci"
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Obnovit"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Obnovit"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Resetovat heslo"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Obnovit heslo"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Zažádáno o obnovu hesla"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Neznámá akce"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 a více znaků, a nezapomeňte ho!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Stejné jako heslo výše"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Reset"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Zadej přezdívku nebo emailovou adresu"
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "Žádný uživatel s touto e-mailovou adresu nebo uživatelským jménem."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Žádný registrovaný email pro tohoto uživatele."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Chyba při ukládání potvrzení adresy"
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4616,24 +4743,35 @@ msgstr ""
"Návod jak obnovit heslo byl odeslán na vaší emailovou adresu zaregistrovanou "
"u vašeho účtu."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Nečekané resetování hesla."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "Heslo musí být alespoň 6 znaků dlouhé"
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Heslo a potvrzení nesouhlasí"
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Nelze uložit nové heslo"
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Chyba nastavení uživatele"
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen."
@@ -4649,7 +4787,7 @@ msgstr "Litujeme, neplatný kód pozvánky."
msgid "Registration successful"
msgstr "Registrace úspěšná"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrovat"
@@ -4677,59 +4815,52 @@ msgstr ""
"Pomocí tohoto formuláře můžete vytvořit nový účet. Můžete pak posílat "
"oznámení a propojit se s přáteli a kolegy. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer. Nutné."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 a více znaků. Nutné."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Stejné jako heslo uvedeno výše. Povinné."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 a více znaků"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Email"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla."
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Delší jméno, nejlépe vaše \"skutečné\" jméno"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "Chápu, že obsah a data %1$S jsou soukromé a důvěrné."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Můj text a soubory jsou copyrightovány %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "Můj text a soubory zůstanou pod mým vlastním copyrightem."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Všechna práva vyhrazena."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4738,7 +4869,7 @@ msgstr ""
"Můj text a soubory jsou k dispozici pod %s výjimkou těchto soukromých dat: "
"heslo, e-mailová adresa, IM adresa a telefonní číslo."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4771,7 +4902,7 @@ msgstr ""
"\n"
"Díky za registraci a doufáme, že se vám používání této služby bude líbít."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5088,7 +5219,7 @@ msgstr "Organizace"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Popis"
@@ -5112,8 +5243,9 @@ msgstr "Akce aplikace"
msgid "Reset key & secret"
msgstr "Resetovat klíč a tajemství"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Odstranit"
@@ -5239,7 +5371,7 @@ msgid "Note"
msgstr "Poznámka"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Aliasy"
@@ -7832,26 +7964,26 @@ msgstr ""
"tracking - Dosud neimplementován.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "Žádný konfigurační soubor nalezen. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Díval jsem se po konfiguračních souborech na těchto místech: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "Možná budete chtít spustit instalační program abyste to vyřešili."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Jdi na instalaci."
@@ -7923,12 +8055,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "vyp."
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Reset"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Změnit barvy"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Použít výchozí"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -8012,28 +8147,24 @@ msgstr "Jdi"
msgid "Grant this user the \"%s\" role"
msgstr "Dát tomuto uživateli roli \"%s\""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "URL domovské stránky nebo blogu skupiny nebo tématu"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Popište skupinu nebo téma"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Popište skupinu nebo téma ve %d znacích"
msgstr[1] "Popište skupinu nebo téma ve %d znacích"
msgstr[2] "Popište skupinu nebo téma ve %d znacích"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8041,7 +8172,7 @@ msgstr ""
"Umístění skupiny, pokud je nějaké, ve stylu \"město, stát (nebo region), země"
"\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, fuzzy, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9253,14 +9384,9 @@ msgstr[2] ""
msgid "about a year ago"
msgstr "asi před rokem"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s není platná barva!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s není platná barva! Použijte 3 nebo 6 hex znaků."
@@ -9298,27 +9424,28 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Žádný takový profil."
+#~ msgid "No such group"
+#~ msgstr "Žádná taková skupina"
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Skupiny kterých je %s členem"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr " API metoda nebyla nalezena."
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Lidé přihlášení k %s"
+#~ msgid "Reset"
+#~ msgstr "Reset"
-#~ msgid "Couldn't update user."
-#~ msgstr "Nelze aktualizovat uživatele"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer. Nutné."
-#~ msgid "Couldn't save profile."
-#~ msgstr "Nelze uložit profil"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 a více znaků. Nutné."
-#~ msgid "Couldn't save tags."
-#~ msgstr "Nelze uložit tagy."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Stejné jako heslo uvedeno výše. Povinné."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s není platná barva!"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 6e26517b57..b814ba6076 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -19,17 +19,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:19+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:20+0000\n"
"Language-Team: German \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -85,6 +85,7 @@ msgid "Save access settings"
msgstr "Zugangs-Einstellungen speichern"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -96,13 +97,13 @@ msgstr "Zugangs-Einstellungen speichern"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Speichern"
@@ -337,7 +338,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Konnte Benutzerdaten nicht aktualisieren."
@@ -361,7 +362,7 @@ msgstr "Benutzer hat kein Profil."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Konnte Profil nicht speichern."
@@ -371,7 +372,7 @@ msgstr "Konnte Profil nicht speichern."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -553,7 +554,8 @@ msgid "That status is not a favorite."
msgstr "Diese Nachricht ist kein Favorit!"
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Konnte Favoriten nicht löschen."
@@ -601,7 +603,7 @@ msgstr "Konnte keine Statusmeldungen finden."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
@@ -611,7 +613,7 @@ msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Ungültiger Benutzername."
@@ -623,7 +625,7 @@ msgstr "Ungültiger Benutzername."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr ""
@@ -634,7 +636,7 @@ msgstr ""
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
@@ -661,7 +663,7 @@ msgstr[1] "Die Beschreibung ist zu lang (max. %d Zeichen)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
@@ -718,22 +720,26 @@ msgid "Group not found."
msgstr "Gruppe nicht gefunden!"
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Du bist bereits Mitglied dieser Gruppe"
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Der Admin dieser Gruppe hat dich blockiert."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Konnte Benutzer %1$s nicht der Gruppe %2$s hinzufügen."
@@ -745,9 +751,11 @@ msgstr "Du bist kein Mitglied dieser Gruppe."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -804,9 +812,12 @@ msgid "Request token already authorized."
msgstr "Anfrage-Token bereits autorisiert."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -814,7 +825,7 @@ msgstr "Anfrage-Token bereits autorisiert."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -835,18 +846,20 @@ msgstr "Datenbankfehler beim Einfügen von oauth_token_association."
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Unerwartete Formulareingabe."
@@ -900,7 +913,7 @@ msgstr "Profil"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Benutzername"
@@ -908,7 +921,7 @@ msgstr "Benutzername"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Passwort"
@@ -1016,10 +1029,12 @@ msgstr "Nachricht bereits wiederholt"
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
@@ -1295,7 +1310,7 @@ msgstr "%s Gruppen-Mitgliedschaften"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Konnte neues Abonnement nicht eintragen."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1329,29 +1344,51 @@ msgstr "Datei nicht gefunden."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Konnte Favoriten nicht löschen."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Keine derartige Gruppe"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+msgstr "Keine derartige Gruppe."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
-msgid "Not a member"
-msgstr "Kein Mitglied"
-
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
#, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTTP-Methode wird nicht unterstützt."
+msgid "Not a member."
+msgstr "Kein Mitglied"
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Konnte Selbst-Abonnement nicht löschen."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1522,35 +1559,42 @@ msgstr "Aktualisierung des Avatars fehlgeschlagen."
msgid "Avatar deleted."
msgstr "Avatar gelöscht."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Nur angemeldete Benutzer können Nachrichten wiederholen."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Hintergrund"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1584,14 +1628,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Nein"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Diesen Benutzer freigeben"
@@ -1603,7 +1646,7 @@ msgstr "Diesen Benutzer freigeben"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
@@ -1619,32 +1662,6 @@ msgstr "Diesen Benutzer blockieren"
msgid "Failed to save block information."
msgstr "Konnte Blockierungsdaten nicht speichern."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Keine derartige Gruppe."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1774,7 +1791,8 @@ msgid "Account deleted."
msgstr "Avatar gelöscht."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Neues Benutzerkonto erstellen"
@@ -1796,8 +1814,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Bestätigen"
@@ -1870,8 +1889,10 @@ msgid "You must be logged in to delete a group."
msgstr "Du musst angemeldet sein, um eine Gruppe zu löschen."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Kein Benutzername oder ID"
@@ -1922,10 +1943,11 @@ msgid "Delete this group"
msgstr "Diese Gruppe löschen"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1965,19 +1987,30 @@ msgstr "Diese Nachricht nicht löschen"
msgid "Delete this notice"
msgstr "Nachricht löschen"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Du kannst keine Benutzer löschen."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Du kannst nur lokale Benutzer löschen."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Benutzer löschen"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Benutzer löschen"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1985,78 +2018,102 @@ msgstr ""
"Bist du sicher, dass du den Benutzer löschen wisst? Alle Daten des Benutzers "
"werden aus der Datenbank gelöscht (ohne ein Backup)."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Diese Gruppe nicht löschen"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Diesen Benutzer löschen"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Design"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr "Design-Einstellungen dieser StatusNet-Website"
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "Ungültige URL für das Logo"
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "Ungültige URL für das SSL-Logo."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Theme nicht verfügbar: %s"
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Logo ändern"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Seitenlogo"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "SSL-Logo"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Theme ändern"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Seitentheme"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Theme dieser Seite."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Angepasster Skin"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Du kannst ein angepasstes StatusNet-Theme als .ZIP-Archiv hochladen."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Hintergrundbild ändern"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Hintergrund"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2066,98 +2123,108 @@ msgstr ""
"Dateigröße beträgt %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "An"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Aus"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Hintergrundbild ein- oder ausschalten."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Hintergrundbild kacheln"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Farben ändern"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Inhalt"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Seitenleiste"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Text"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Links"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Erweitert"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "Eigene CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Standardeinstellungen benutzen"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Standard-Design wiederherstellen"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Standard wiederherstellen"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Speichern"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Design speichern"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Diese Nachricht ist kein Favorit!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Zu Favoriten hinzufügen"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Unbekanntes Dokument „%s“"
#. TRANS: Title for "Edit application" form.
@@ -2886,7 +2953,7 @@ msgstr ""
"action.groupsearch%%%%) oder deine eigene [Gruppe aufmachen!](%%%%action."
"newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Neue Gruppe erstellen"
@@ -3298,26 +3365,33 @@ msgstr ""
"\n"
"Schöne Grüße von %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Du musst angemeldet sein, um Mitglied einer Gruppe zu werden."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s ist der Gruppe %2$s beigetreten"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Du bist kein Mitglied dieser Gruppe."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s hat die Gruppe %2$s verlassen"
@@ -3423,6 +3497,13 @@ msgstr "Lizenz-Bild-URl"
msgid "URL for an image to display with the license."
msgstr "URL eines mit der Lizenz anzuzeigenden Bildes."
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Speichern"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "Lizenz-Einstellungen speichern"
@@ -3448,11 +3529,11 @@ msgstr "Anmelden"
msgid "Login to site"
msgstr "An Seite anmelden"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Anmeldedaten merken"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
@@ -3846,7 +3927,8 @@ msgstr "Passwort ändern"
msgid "Change your password."
msgstr "Ändere dein Passwort."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Passwort geändert"
@@ -3854,7 +3936,8 @@ msgstr "Passwort geändert"
msgid "Old password"
msgstr "Altes Passwort"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Neues Passwort"
@@ -3862,7 +3945,7 @@ msgstr "Neues Passwort"
msgid "6 or more characters"
msgstr "6 oder mehr Zeichen"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Gleiches Passwort wie zuvor"
@@ -3886,11 +3969,12 @@ msgstr "Altes Passwort falsch"
msgid "Error saving user; invalid."
msgstr "Fehler beim Speichern des Benutzers, ungültig."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Konnte neues Passwort nicht speichern"
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Passwort gespeichert."
@@ -4218,22 +4302,23 @@ msgid "Profile information"
msgstr "Profilinformation"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Bürgerlicher Name"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Homepage"
@@ -4247,7 +4332,7 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4255,27 +4340,27 @@ msgstr[0] "Beschreibe dich selbst und deine Interessen in einem Zeichen"
msgstr[1] "Beschreibe dich selbst und deine Interessen in %d Zeichen"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Beschreibe dich selbst und deine Interessen"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Biografie"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Aufenthaltsort"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Wo du bist, beispielsweise „Stadt, Region, Land“"
@@ -4330,7 +4415,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4338,48 +4423,49 @@ msgstr[0] "Die Biografie ist zu lang (maximal ein Zeichen)."
msgstr[1] "Die Biografie ist zu lang (maximal %d Zeichen)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Keine Zeitzone ausgewählt."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
msgid "Language is too long (maximum 50 characters)."
msgstr "Die eingegebene Sprache ist zu lang (maximal 50 Zeichen)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Ungültiges Stichwort: „%s“"
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Autosubscribe konnte nicht aktiviert werden."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Konnte Positions-Einstellungen nicht speichern."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Konnte Tags nicht speichern."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Einstellungen gespeichert."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Neues Benutzerkonto erstellen"
@@ -4506,35 +4592,43 @@ msgstr ""
msgid "Tag cloud"
msgstr "Tag-Wolke"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Du bist bereits angemeldet!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Unbekannter Wiederherstellungscode."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Kein Wiederherstellungscode."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Wiederherstellungscode für unbekannten Benutzer."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Fehler beim Bestätigungscode."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Der Bestätigungscode ist zu alt. Bitte fange nochmal von vorne an."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4542,67 +4636,100 @@ msgstr ""
"Wenn du dein Passwort vergessen hast, kannst du dir ein neues an deine "
"hinterlegte Email schicken lassen."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Du wurdest identifiziert. Gib ein neues Passwort ein. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Passwort-Wiederherstellung"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Spitzname oder E-Mail-Adresse"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "Dein Benutzername oder E-Mail-Adresse auf diesem Server."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Wiederherstellung"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Wiederherstellung"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Passwort zurücksetzen"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Stelle Passwort wieder her"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Wiederherstellung des Passworts angefordert"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Unbekannter Befehl"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 oder mehr Zeichen, und nicht vergessen!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Gleiches Passwort wie zuvor"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Zurücksetzen"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Gib einen Spitznamen oder eine E-Mail-Adresse ein."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "Kein Benutzer mit dieser E-Mail-Adresse oder mit diesem Nutzernamen."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Der Benutzer hat keine registrierte E-Mail-Adresse."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Fehler beim Speichern der Adressbestätigung."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4610,23 +4737,34 @@ msgstr ""
"Anweisungen für die Wiederherstellung deines Passworts wurden an deine "
"hinterlegte E-Mail-Adresse geschickt."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Unerwarteter Passwortreset."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
msgid "Password must be 6 characters or more."
msgstr "Passwort muss mehr als 6 Zeichen enthalten."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Passwort und seine Bestätigung stimmen nicht überein."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Konnte neues Passwort nicht speichern"
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Fehler bei den Benutzereinstellungen."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet."
@@ -4642,7 +4780,7 @@ msgstr "Entschuldigung, ungültiger Einladungscode."
msgid "Registration successful"
msgstr "Registrierung erfolgreich"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrieren"
@@ -4671,65 +4809,57 @@ msgstr ""
"Hier kannst du einen neuen Zugang einrichten. Anschließend kannst du "
"Nachrichten und Links mit deinen Freunden und Kollegen teilen. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen. Pflicht."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 oder mehr Buchstaben. Pflicht."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 oder mehr Zeichen"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-Mail"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Wird nur für Updates, wichtige Mitteilungen und zur "
"Passwortwiederherstellung verwendet"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Längerer Name, bevorzugt dein bürgerlicher Name"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen "
"Website"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"Mir ist bewusst, dass Inhalte und Daten von %1$s privat und vertraulich sind."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Meine Texte und Dateien sind urheberrechtlich geschützt durch %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "Meine Texte und Dateien verbleiben unter meinem eigenen Urheberrecht."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Alle Rechte vorbehalten."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4738,7 +4868,7 @@ msgstr ""
"Abgesehen von den folgenden Daten: Passwort, E-Mail-Adresse, IM-Adresse und "
"Telefonnummer, sind all meine Texte und Dateien unter %s verfügbar."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4771,7 +4901,7 @@ msgstr ""
"\n"
"Danke für deine Anmeldung, wir hoffen, dass dir der Service gefällt."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5089,7 +5219,7 @@ msgstr "Organisation"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Beschreibung"
@@ -5112,8 +5242,9 @@ msgstr "Programmaktionen"
msgid "Reset key & secret"
msgstr "Schlüssel zurücksetzen"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Löschen"
@@ -5241,7 +5372,7 @@ msgid "Note"
msgstr "Nachricht"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Pseudonyme"
@@ -7842,24 +7973,24 @@ msgstr ""
"tracking - noch nicht implementiert\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
msgid "No configuration file found."
msgstr "Keine Konfigurationsdatei gefunden."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
msgid "I looked for configuration files in the following places:"
msgstr "Ich habe an folgenden Stellen nach Konfigurationsdateien gesucht:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "Bitte die Installation erneut starten, um das Problem zu beheben."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Zur Installation gehen."
@@ -7926,11 +8057,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Aus"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Zurücksetzen"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Farben ändern"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Standardeinstellungen benutzen"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -8014,31 +8149,27 @@ msgstr "Los geht's"
msgid "Grant this user the \"%s\" role"
msgstr "Teile dem Benutzer die „%s“-Rolle zu"
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
msgid "URL of the homepage or blog of the group or topic."
msgstr "Adresse der Homepage oder Blogs der Gruppe oder des Themas."
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Beschreibe die Gruppe oder das Thema"
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Beschreibe die Gruppe oder das Thema in einem Zeichen"
msgstr[1] "Beschreibe die Gruppe oder das Thema in %d Zeichen"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr "Ort der Gruppe, optional, beispielsweise „Stadt, Region, Land“."
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9247,14 +9378,9 @@ msgstr[1] "vor ca. %d Monaten"
msgid "about a year ago"
msgstr "vor ca. einem Jahr"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "„%s“ ist keine gültige Farbe!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "„%s“ ist keine gültige Farbe! Verwende 3 oder 6 Hex-Zeichen."
@@ -9294,25 +9420,29 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr "Hole Backup von der Datei „%s“."
-#~ msgid "No such profile"
-#~ msgstr "Profil nicht gefunden."
+#~ msgid "No such group"
+#~ msgstr "Keine derartige Gruppe"
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Gruppen, in denen „%s“ Mitglied ist"
+#~ msgid "HTTP method not supported"
+#~ msgstr "HTTP-Methode wird nicht unterstützt."
-#~ msgid "Method not supported"
-#~ msgstr "Methode wird nicht unterstützt"
+#~ msgid "Reset"
+#~ msgstr "Zurücksetzen"
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Leute, die „%s“ abonniert haben"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen. Pflicht."
-#~ msgid "Couldn't update user."
-#~ msgstr "Konnte Benutzerdaten nicht aktualisieren."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 oder mehr Buchstaben. Pflicht."
-#~ msgid "Couldn't save profile."
-#~ msgstr "Konnte Profil nicht speichern."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
-#~ msgid "Couldn't save tags."
-#~ msgstr "Konnte Tags nicht speichern."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "„%s“ ist keine gültige Farbe!"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 9de1abafd7..42526cb7f3 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -13,17 +13,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:21+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:25+0000\n"
"Language-Team: British English \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -78,6 +78,7 @@ msgid "Save access settings"
msgstr "Save access settings"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -89,13 +90,13 @@ msgstr "Save access settings"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Save"
@@ -329,7 +330,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Could not update user."
@@ -353,7 +354,7 @@ msgstr "User has no profile."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Could not save profile."
@@ -363,7 +364,7 @@ msgstr "Could not save profile."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, fuzzy, php-format
@@ -541,7 +542,8 @@ msgid "That status is not a favorite."
msgstr "That status is not a favourite."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Could not delete favourite."
@@ -588,7 +590,7 @@ msgstr "Could not find target user."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Nickname already in use. Try another one."
@@ -598,7 +600,7 @@ msgstr "Nickname already in use. Try another one."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Not a valid nickname."
@@ -610,7 +612,7 @@ msgstr "Not a valid nickname."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Homepage is not a valid URL."
@@ -620,7 +622,7 @@ msgstr "Homepage is not a valid URL."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -648,7 +650,7 @@ msgstr[1] "Description is too long (max %d chars)"
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -706,22 +708,26 @@ msgid "Group not found."
msgstr "Group not found."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "You are already a member of that group."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "You have been blocked from that group by the admin."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Could not join user %1$s to group %2$s."
@@ -733,9 +739,11 @@ msgstr "You are not a member of this group."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -793,9 +801,12 @@ msgid "Request token already authorized."
msgstr "You are not authorised."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -803,7 +814,7 @@ msgstr "You are not authorised."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -825,18 +836,20 @@ msgstr "Database error inserting OAuth application user."
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Unexpected form submission."
@@ -891,7 +904,7 @@ msgstr "Account"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Nickname"
@@ -899,7 +912,7 @@ msgstr "Nickname"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Password"
@@ -1005,10 +1018,12 @@ msgstr "Already repeated that notice."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1281,7 +1296,7 @@ msgstr "%s group members"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Couldn't insert new subscription."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1317,30 +1332,51 @@ msgstr "No such file."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Could not delete favourite."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "No such group."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "All members"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "API method not found."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Could not delete self-subscription."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1512,35 +1548,42 @@ msgstr "Failed updating avatar."
msgid "Avatar deleted."
msgstr "Avatar deleted."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Only logged-in users can repeat notices."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Background"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1574,14 +1617,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Do not block this user"
@@ -1593,7 +1635,7 @@ msgstr "Do not block this user"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Yes"
@@ -1609,32 +1651,6 @@ msgstr "Block this user"
msgid "Failed to save block information."
msgstr "Failed to save block information."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "No such group."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1766,7 +1782,8 @@ msgid "Account deleted."
msgstr "Avatar deleted."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Create an account"
@@ -1788,8 +1805,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Confirm"
@@ -1863,8 +1881,10 @@ msgid "You must be logged in to delete a group."
msgstr "You must be logged in to delete a group."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "No nickname or ID."
@@ -1915,10 +1935,11 @@ msgid "Delete this group"
msgstr "Delete this group"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1958,19 +1979,30 @@ msgstr "Do not delete this notice"
msgid "Delete this notice"
msgstr "Delete this notice"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "You cannot delete users."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "You can only delete local users."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Delete user"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Delete user"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1978,78 +2010,102 @@ msgstr ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Do not delete this group"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Delete this user"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Design"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "Invalid logo URL."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "Invalid SSL logo URL."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Theme not available: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Change logo"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Site logo"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "SSL logo"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Change theme"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Site theme"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Theme for the site."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Custom theme"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Change background image"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Background"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2059,98 +2115,108 @@ msgstr ""
"$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "On"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Off"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Turn background image on or off."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Tile background image"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Change colours"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Content"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Sidebar"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Text"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Links"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr ""
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Use defaults"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Restore default designs"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Reset back to default"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Save"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Save design"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "This notice is not a favourite!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Add to favourites"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "No such document \"%s\""
#. TRANS: Title for "Edit application" form.
@@ -2872,7 +2938,7 @@ msgstr ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Create a new group"
@@ -3277,26 +3343,33 @@ msgstr ""
"\n"
"Sincerely, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "You must be logged in to join a group."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s joined group %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "You must be logged in to leave a group."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "You are not a member of that group."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s left group %2$s"
@@ -3401,6 +3474,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Save"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr ""
@@ -3425,11 +3505,11 @@ msgstr "Login"
msgid "Login to site"
msgstr "Login to site"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Remember me"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "Automatically login in the future; not for shared computers!"
@@ -3817,7 +3897,8 @@ msgstr "Change password"
msgid "Change your password."
msgstr "Change your password."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Password change"
@@ -3825,7 +3906,8 @@ msgstr "Password change"
msgid "Old password"
msgstr "Old password"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "New password"
@@ -3833,7 +3915,7 @@ msgstr "New password"
msgid "6 or more characters"
msgstr "6 or more characters"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Same as password above"
@@ -3857,11 +3939,12 @@ msgstr "Incorrect old password"
msgid "Error saving user; invalid."
msgstr "Error saving user; invalid."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Can't save new password."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Password saved."
@@ -4194,23 +4277,24 @@ msgid "Profile information"
msgstr "Profile information"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Full name"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Homepage"
@@ -4223,7 +4307,7 @@ msgstr "URL of your homepage, blog, or profile on another site"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4231,27 +4315,27 @@ msgstr[0] "Describe yourself and your interests in %d chars"
msgstr[1] "Describe yourself and your interests in %d chars"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Describe yourself and your interests"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Bio"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Location"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Where you are, like \"City, State (or Region), Country\""
@@ -4304,7 +4388,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4312,49 +4396,50 @@ msgstr[0] "Bio is too long (max %d chars)."
msgstr[1] "Bio is too long (max %d chars)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Timezone not selected."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "Language is too long (max 50 chars)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Invalid tag: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Couldn't update user for autosubscribe."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Couldn't save location prefs."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Could not save tags."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Settings saved."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Create an account"
@@ -4477,35 +4562,43 @@ msgstr ""
msgid "Tag cloud"
msgstr "Tag cloud"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "You are already logged in!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "No such recovery code."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Not a recovery code."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Recovery code for unknown user."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Error with confirmation code."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "This confirmation code is too old. Please start again."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Could not update user with confirmed e-mail address."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4513,67 +4606,100 @@ msgstr ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the e-mail address you have stored in your account."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
msgstr ""
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Password recovery"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Nickname or e-mail address"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "Your nickname on this server, or your registered e-mail address."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Recover"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Recover"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Reset password"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Recover password"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Password recovery requested"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Unknown action"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 or more characters, and don't forget it!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Same as password above"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Reset"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Enter a nickname or e-mail address."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "No user with that e-mail address or username."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "No registered e-mail address for that user."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Error saving address confirmation."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4581,24 +4707,35 @@ msgstr ""
"Instructions for recovering your password have been sent to the e-mail "
"address registered to your account."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Unexpected password reset."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "Password must be 6 chars or more."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Password and confirmation do not match."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Can't save new password."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Error setting user."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "New password successfully saved. You are now logged in."
@@ -4614,7 +4751,7 @@ msgstr "Sorry, invalid invitation code."
msgid "Registration successful"
msgstr "Registration successful"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Register"
@@ -4640,59 +4777,52 @@ msgid ""
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 or more characters. Required."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Same as password above. Required."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 or more characters"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Used only for updates, announcements, and password recovery"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Longer name, preferably your \"real\" name"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL of your homepage, blog, or profile on another site"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4701,7 +4831,7 @@ msgstr ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4734,7 +4864,7 @@ msgstr ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5044,7 +5174,7 @@ msgstr "Organization"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Description"
@@ -5067,8 +5197,9 @@ msgstr "Application actions"
msgid "Reset key & secret"
msgstr ""
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Delete"
@@ -5193,7 +5324,7 @@ msgid "Note"
msgstr "Note"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr ""
@@ -7742,26 +7873,26 @@ msgstr ""
"tracking - not yet implemented.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "No configuration file found. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Invitation(s) sent to the following people:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Go to the installer."
@@ -7829,12 +7960,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Off"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Reset"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Change colours"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Use defaults"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7918,34 +8052,30 @@ msgstr "Go"
msgid "Grant this user the \"%s\" role"
msgstr ""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "URL of the homepage or blog of the group or topic"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Describe the group or topic"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Describe the group or topic in %d characters"
msgstr[1] "Describe the group or topic in %d characters"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
"Location for the group, if any, like \"City, State (or Region), Country\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9054,14 +9184,9 @@ msgstr[1] ""
msgid "about a year ago"
msgstr "about a year ago"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s is not a valid colour!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s is not a valid colour! Use 3 or 6 hex characters."
@@ -9098,27 +9223,29 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "No such profile."
+#~ msgid "No such group"
+#~ msgstr "No such group."
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Groups %s is a member of"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "API method not found."
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "People subscribed to %s"
+#~ msgid "Reset"
+#~ msgstr "Reset"
-#~ msgid "Couldn't update user."
-#~ msgstr "Couldn't update user."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgid "Couldn't save profile."
-#~ msgstr "Couldn't save profile."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 or more characters. Required."
-#~ msgid "Couldn't save tags."
-#~ msgstr "Couldn't save tags."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Same as password above. Required."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s is not a valid colour!"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index ae848abf18..d4b72d3e9b 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -17,17 +17,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:22+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:29+0000\n"
"Language-Team: Esperanto \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: eo\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -82,6 +82,7 @@ msgid "Save access settings"
msgstr "Konservu atingan agordon"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -93,13 +94,13 @@ msgstr "Konservu atingan agordon"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Konservu"
@@ -333,7 +334,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Malsukcesis ĝisdatigi uzanton"
@@ -357,7 +358,7 @@ msgstr "La uzanto ne havas profilon."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Malsukcesis konservi la profilon."
@@ -367,7 +368,7 @@ msgstr "Malsukcesis konservi la profilon."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -545,7 +546,8 @@ msgid "That status is not a favorite."
msgstr "La stato ne estas ŝatata."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Malsukcesis forigi ŝataton."
@@ -591,7 +593,7 @@ msgstr "Malsukcesis trovi celan uzanton."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "La uzantnomo jam uziĝis. Provu ion alian."
@@ -601,7 +603,7 @@ msgstr "La uzantnomo jam uziĝis. Provu ion alian."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Ne valida kromnomo."
@@ -613,7 +615,7 @@ msgstr "Ne valida kromnomo."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Ĉefpaĝo ne estas valida URL."
@@ -623,7 +625,7 @@ msgstr "Ĉefpaĝo ne estas valida URL."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Kompleta nomo tro longas (maksimume 255 signoj)"
@@ -650,7 +652,7 @@ msgstr[1] "Priskribo estas tro longa (maksimume %d signoj)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Lokonomo tro longas (maksimume 255 signoj)"
@@ -707,22 +709,26 @@ msgid "Group not found."
msgstr "Grupo ne troviĝas."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Vi estas jam grupano."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "La administranto blokis vin de tiu grupo."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "La uzanto %1$*s ne povas aliĝi al la grupo %2$*s."
@@ -734,9 +740,11 @@ msgstr "Vi ne estas grupano."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -793,9 +801,12 @@ msgid "Request token already authorized."
msgstr ""
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -803,7 +814,7 @@ msgstr ""
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -825,18 +836,20 @@ msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Neatendita formo-sendo."
@@ -890,7 +903,7 @@ msgstr "Konto"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Kromnomo"
@@ -898,7 +911,7 @@ msgstr "Kromnomo"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Pasvorto"
@@ -1006,10 +1019,12 @@ msgstr "La avizo jam ripetiĝis."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1285,7 +1300,7 @@ msgstr "%s grupanoj"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Eraris enmeti novan abonon."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1321,31 +1336,51 @@ msgstr "Ne ekzistas tia dosiero."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Malsukcesis forigi ŝataton."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-#, fuzzy
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "Ne estas tiu grupo."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "Ĉiuj grupanoj"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Metodo de API ne troviĝas."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Ne eblas forigi abonon al vi mem."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1517,35 +1552,42 @@ msgstr "Eraris ĝisdatigi vizaĝbildon."
msgid "Avatar deleted."
msgstr "Vizaĝbildo forigita."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Nur ensalutinto rajtas ripeti avizon."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Fono"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1578,14 +1620,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Ne"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Ne bloki la uzanton"
@@ -1597,7 +1638,7 @@ msgstr "Ne bloki la uzanton"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Jes"
@@ -1613,32 +1654,6 @@ msgstr "Bloki la uzanton"
msgid "Failed to save block information."
msgstr "Eraris konservi blokado-informon."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Ne estas tiu grupo."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1770,7 +1785,8 @@ msgid "Account deleted."
msgstr "Vizaĝbildo forigita."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Krei konton"
@@ -1792,8 +1808,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Konfirmi"
@@ -1867,8 +1884,10 @@ msgid "You must be logged in to delete a group."
msgstr "Ensalutu por eksaniĝi."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Ne estas alinomo aŭ ID."
@@ -1923,10 +1942,11 @@ msgid "Delete this group"
msgstr "Forigi la uzanton"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1965,19 +1985,30 @@ msgstr "Ne forigi la avizon"
msgid "Delete this notice"
msgstr "Forigi la avizon"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Vi ne povas forigi uzantojn."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Vi povas forigi nur lokan uzanton."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Forigi uzanton"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Forigi uzanton"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1985,80 +2016,104 @@ msgstr ""
"Ĉu vi certe volas forigi la uzanton? Ĉiu datumo pri la uzanto viŝiĝos de la "
"datumbazo sen sekurkopio."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Ne forigi la avizon"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Forigi la uzanton"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Aspekto"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr "Desegna agordo por ĉi tiu StatusNet-retejo"
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "URL por la emblemo nevalida."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "URL por la emblemo nevalida."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Desegno ne havebla: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Ŝanĝi emblemon"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Reteja emblemo"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
#, fuzzy
msgid "SSL logo"
msgstr "Reteja emblemo"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Ŝanĝi desegnon"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Reteja desegno"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Desegno por la retejo"
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Propra desegno"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Vi povas alŝuti propran StatusNet-desegnon kiel .zip-dosiero"
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Ŝanĝi fonbildon"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Fono"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2066,98 +2121,108 @@ msgid ""
msgstr "Vi povas alŝuti fonbildon por la retejo. Dosiero-grandlimo estas %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "En"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "For"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Aktivigi aŭ senaktivigi fonbildon"
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Ripeti la fonbildon"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Ŝanĝi kolorojn"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Enhavo"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Flanka strio"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Teksto"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Ligiloj"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Speciala"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "Propra CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Uzu defaŭlton"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Restaŭri defaŭltajn desegnojn"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Redefaŭltiĝi"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Konservi"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Savi desegnon"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Ĉi tiu avizo ne estas preferita"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Aldoni al ŝatolisto"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Ne estas tia dokumento \"%s\""
#. TRANS: Title for "Edit application" form.
@@ -2875,7 +2940,7 @@ msgstr ""
"(%%%%action.groupsearch%%%%) aŭ [kreu vian propran grupon!](%%%%action."
"newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Krei novan grupon"
@@ -3277,26 +3342,33 @@ msgstr ""
"\n"
"via sincere, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Ensalutu por aniĝi al grupo."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s aniĝis al grupo %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Ensalutu por eksaniĝi."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Vi ne estas grupano."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s eksaniĝis de grupo %2$s"
@@ -3401,6 +3473,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Konservi"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr ""
@@ -3425,11 +3504,11 @@ msgstr "Ensaluti"
msgid "Login to site"
msgstr "Ensaluti al la retejo"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Memoru min"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "Aŭtomate ensaluti estonte; ne taŭge por komuna komputilo!"
@@ -3816,7 +3895,8 @@ msgstr "Ŝanĝi pasvorton"
msgid "Change your password."
msgstr "Ŝanĝi vian pasvorton."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Pasvorta ŝanĝo"
@@ -3824,7 +3904,8 @@ msgstr "Pasvorta ŝanĝo"
msgid "Old password"
msgstr "Malnova pasvorto"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Nova pasvorto"
@@ -3832,7 +3913,7 @@ msgstr "Nova pasvorto"
msgid "6 or more characters"
msgstr "6 aŭ pli da literoj"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Same kiel pasvorto supra"
@@ -3856,11 +3937,12 @@ msgstr "Neĝusta malnova pasvorto"
msgid "Error saving user; invalid."
msgstr "Eraris konservi uzanton: nevalida."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Malsukcesis konservi novan pasvorton."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Pasvorto konservitas."
@@ -4186,23 +4268,24 @@ msgid "Profile information"
msgstr "Profila informo"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Plena nomo"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Hejmpaĝo"
@@ -4215,7 +4298,7 @@ msgstr "URL de via hejmpaĝo, blogo aŭ profilo ĉe alia retejo"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4223,27 +4306,27 @@ msgstr[0] "Priskribu vin mem kaj viajn ŝatokupojn per ne pli ol %d signoj"
msgstr[1] "Priskribu vin mem kaj viajn ŝatokupojn per ne pli ol %d signoj"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Priskribu vin mem kaj viajn ŝatokupojn"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Biografio"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Loko"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Kie vi estas, ekzemple \"Urbo, Ŝtato (aŭ Regiono), Lando\""
@@ -4296,7 +4379,7 @@ msgstr "Aŭtomate aboni iun ajn, kiu abonas min (prefereble por ne-homoj)"
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4304,49 +4387,50 @@ msgstr[0] "Biografio tro longas (maksimume %d literoj)"
msgstr[1] "Biografio tro longas (maksimume %d literoj)"
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Horzono ne elektita"
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "Lingvo tro longas (maksimume 50 literoj)"
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Nevalida markilo: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Malsukcesis ĝisdatigi uzanton por aŭtomatabonado."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Malsukcesis konservi lokan preferon."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Malsukcesis konservi etikedojn."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Agordo konservitas."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Krei konton"
@@ -4466,35 +4550,43 @@ msgstr "Kial ne [krei konton](%%action.register%%) kaj esti la unua afiŝanto!"
msgid "Tag cloud"
msgstr "Entikedo-nubo"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Vi jam ensalutis."
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Ne estas tia rehava kodo."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Ne rehava kodo."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Rehava kodo por nekonata uzanto."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Eraras pro komfirma kodo."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Tiu komfirmnumero tro malnovas. Bonvolu rekomenci."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Malsukcesas ĝisdatigi uzanton per komfirmita retpoŝtadreso."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4502,67 +4594,101 @@ msgstr ""
"Se vi forgesas aŭ perdas vian pasvorton, ni povas sendi novan pasvorton al "
"la retpoŝtadreso konservita je via konto."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Vi estis identigita. Enigu sube novan pasvorton."
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Pasvorton rehavi."
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Alinomo aŭ retpoŝtadreso."
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "Via alinomo ĉe tiu ĉi servilo, aŭ via registrita retpoŝadreso."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Rehavi"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Rehavi"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Refari pasvorton"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Refari pasvorton"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Petiĝas pasvorton rehavado"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Nekonata ago"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "Almenaŭ 6 signoj, kaj ne forgesu ĝin!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Same kiel pasvorto supra"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Restarigi"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Alinomo aŭ retpoŝtadreso."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "Ne estas uzanto kun tiu retpoŝtadreso aŭ uzantnomo."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Neniu registrita retpoŝtadreso apartenas al la uzanto."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Eraras pro komfirma kodo."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4570,24 +4696,35 @@ msgstr ""
"Gvidoj rehavi vian pasvorton jam sendiĝas al la retpoŝtadreso registrita je "
"via konto."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Neatendita pasvorto-rekomencigo."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "Pasvorto devas enhavi 6 signojn aŭ pli."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Pasvorto kaj komfirmo ne kongruas."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Malsukcesis konservi novan pasvorton."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Eraris agordi uzanton."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Nova pasvorto sukcese konserviĝas. Vi nun estas ensalutinta."
@@ -4603,7 +4740,7 @@ msgstr "Pardonon, nevalida invitkodo."
msgid "Registration successful"
msgstr "Registriĝo sukcesa"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registri"
@@ -4631,61 +4768,53 @@ msgstr ""
"Per tiu ĉi formularo vi povas krei novan konton. Poste povos vi afiŝi avizon "
"kaj komuniki kun amikoj kaj kolegoj. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco. Bezonate."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 aŭ pli da literoj. Bezonate."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Same kiel supra pasvorto. Bezonate."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 aŭ pli da literoj"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Retpoŝto"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Uzu nur por ĝisdatigo, anonco, kaj rehavi pasvorton."
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Pli longa nomo, prefere via \"vera\" nomo."
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL de via hejmpaĝo, blogo aŭ profilo ĉe alia retejo"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"Mi komprenas ke enhavo kaj datumo de %1$s estas privataj kaj sekretigita."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Mia teksto kaj dosiero estas aŭtorrajtigita de %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "Mia teksto kaj dosiero restu en mia propra aŭtorrajto."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Ĉiuj rajtoj rezervitaj."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4694,7 +4823,7 @@ msgstr ""
"Mia teksto kaj dosiero estas atingebla per %s krom jene: pasvorto, "
"retpoŝtadreso, tujmesaĝilo-adreso, kaj telefonnumero."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4726,7 +4855,7 @@ msgstr ""
"\n"
"Dankon pro registriĝo, kaj ni esperas al vi ĝuon de uzi ĉi servon."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5042,7 +5171,7 @@ msgstr "Organizaĵo"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Priskribo"
@@ -5065,8 +5194,9 @@ msgstr "Aplikaĵa ago"
msgid "Reset key & secret"
msgstr "Rekomencigi ŝlosilon & sekreton"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Forigi"
@@ -5191,7 +5321,7 @@ msgid "Note"
msgstr "Noto"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Alnomo"
@@ -7760,26 +7890,26 @@ msgstr ""
"tracking -ankoraŭ ne realigita.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "Ne troviĝas agorda dosiero. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Mi serĉis agordan dosieron je jenaj lokoj: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "Vi eble volas uzi instalilon por ripari tiun ĉi."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Al la instalilo."
@@ -7850,12 +7980,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "For"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Restarigi"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Ŝanĝi kolorojn"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Uzu defaŭlton"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7939,34 +8072,30 @@ msgstr "Iri"
msgid "Grant this user the \"%s\" role"
msgstr "Donu al la uzanto rolon \"%s\""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "URL de la hejmpaĝo aŭ blogo de la grupo aŭ temo"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Priskribo de grupo aŭ temo"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Priskribo de grupo aŭ temo, apenaŭ je %d literoj"
msgstr[1] "Priskribo de grupo aŭ temo, apenaŭ je %d literoj"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
"Loko de la grupo, se iu ajn, ekzemple \"Urbo, Stato (aŭ Regiono), Lando\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, fuzzy, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9171,14 +9300,9 @@ msgstr[1] "antaŭ ĉirkaŭ %d monatoj"
msgid "about a year ago"
msgstr "antaŭ ĉirkaŭ unu jaro"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s ne estas valida koloro!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s ne estas valida koloro! Uzu 3 aŭ 6 deksesumaĵojn."
@@ -9216,26 +9340,29 @@ msgid "Getting backup from file '%s'."
msgstr ""
#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Ne ekzistas tia profilo."
+#~ msgid "No such group"
+#~ msgstr "Ne estas tiu grupo."
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Grupoj de %s"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "Metodo de API ne troviĝas."
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Abonantoj de %s"
+#~ msgid "Reset"
+#~ msgstr "Restarigi"
-#~ msgid "Couldn't update user."
-#~ msgstr "Ne povus ĝisdatigi uzanton."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco. Bezonate."
-#~ msgid "Couldn't save profile."
-#~ msgstr "Malsukcesis konservi la profilon."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 aŭ pli da literoj. Bezonate."
-#~ msgid "Couldn't save tags."
-#~ msgstr "Malsukcesis konservi markilojn."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Same kiel supra pasvorto. Bezonate."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s ne estas valida koloro!"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 02b882b20d..155932d023 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -17,17 +17,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:23+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:33+0000\n"
"Language-Team: Spanish \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -82,6 +82,7 @@ msgid "Save access settings"
msgstr "Guardar la configuración de acceso"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -93,13 +94,13 @@ msgstr "Guardar la configuración de acceso"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Guardar"
@@ -334,7 +335,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "No se pudo actualizar el usuario."
@@ -358,7 +359,7 @@ msgstr "El usuario no tiene un perfil."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "No se pudo guardar el perfil."
@@ -368,7 +369,7 @@ msgstr "No se pudo guardar el perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, fuzzy, php-format
@@ -546,7 +547,8 @@ msgid "That status is not a favorite."
msgstr "Este status no es un favorito."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "No se pudo borrar favorito."
@@ -593,7 +595,7 @@ msgstr "No se pudo encontrar ningún usuario de destino."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "El usuario ya existe. Prueba con otro."
@@ -603,7 +605,7 @@ msgstr "El usuario ya existe. Prueba con otro."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Usuario inválido"
@@ -615,7 +617,7 @@ msgstr "Usuario inválido"
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "La página de inicio no es un URL válido."
@@ -625,7 +627,7 @@ msgstr "La página de inicio no es un URL válido."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -653,7 +655,7 @@ msgstr[1] "La descripción es demasiado larga (máx. %d caracteres)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -711,22 +713,26 @@ msgid "Group not found."
msgstr "Grupo no encontrado."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Ya eres miembro de ese grupo"
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Has sido bloqueado de ese grupo por el administrador."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "No se pudo unir el usuario %s al grupo %s"
@@ -738,9 +744,11 @@ msgstr "No eres miembro de este grupo."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -800,9 +808,12 @@ msgid "Request token already authorized."
msgstr "No estás autorizado."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -810,7 +821,7 @@ msgstr "No estás autorizado."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -833,18 +844,20 @@ msgstr "Error de base de datos al insertar usuario de la aplicación OAuth."
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Envío de formulario inesperado."
@@ -898,7 +911,7 @@ msgstr "Cuenta"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Usuario"
@@ -906,7 +919,7 @@ msgstr "Usuario"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Contraseña"
@@ -1014,10 +1027,12 @@ msgstr "Este mensaje ya se ha repetido."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1292,7 +1307,7 @@ msgstr "Miembros del grupo %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "No se pudo insertar una nueva suscripción."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1328,30 +1343,51 @@ msgstr "No existe tal archivo."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "No se pudo borrar favorito."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "No existe ese grupo"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+msgstr "No existe ese grupo."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "Todos los miembros"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Método de API no encontrado."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "No se pudo eliminar la auto-suscripción."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1521,35 +1557,42 @@ msgstr "Error al actualizar la imagen."
msgid "Avatar deleted."
msgstr "Imagen borrada."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Sólo los usuarios que hayan accedido pueden repetir mensajes."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Fondo"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1583,14 +1626,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "No bloquear a este usuario"
@@ -1602,7 +1644,7 @@ msgstr "No bloquear a este usuario"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sí"
@@ -1618,32 +1660,6 @@ msgstr "Bloquear este usuario."
msgid "Failed to save block information."
msgstr "No se guardó información de bloqueo."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "No existe ese grupo."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1776,7 +1792,8 @@ msgid "Account deleted."
msgstr "Imagen borrada."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Crear una cuenta"
@@ -1798,8 +1815,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -1874,8 +1892,10 @@ msgid "You must be logged in to delete a group."
msgstr "Debes estar conectado para dejar un grupo."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Ningún nombre de usuario o ID."
@@ -1927,10 +1947,11 @@ msgid "Delete this group"
msgstr "Borrar este grupo"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1970,19 +1991,30 @@ msgstr "No eliminar este mensaje"
msgid "Delete this notice"
msgstr "Borrar este mensaje"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "No puedes borrar usuarios."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Sólo puedes eliminar usuarios locales."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Borrar usuario"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Borrar usuario"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1990,80 +2022,104 @@ msgstr ""
"¿Realmente deseas eliminar este usuario? Esto borrará de la base de datos "
"todos los datos sobre el usuario, sin dejar una copia de seguridad."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "No eliminar este grupo"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Borrar este usuario"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Diseño"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "URL de logotipo inválido."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "URL de logotipo inválido."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Tema no disponible: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Cambiar logo"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo del sitio"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
#, fuzzy
msgid "SSL logo"
msgstr "Logo del sitio"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Cambiar el tema"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Tema del sitio"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Tema para el sitio."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Personalizar tema"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Puedes subir un tema personalizado StatusNet como un archivo .ZIP."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Cambiar la imagen de fondo"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Fondo"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2073,98 +2129,108 @@ msgstr ""
"es %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "Activar"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Desactivar"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Activar o desactivar la imagen de fondo."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Imagen de fondo en mosaico"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Cambiar colores"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Contenido"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Barra lateral"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Texto"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Vínculos"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Avanzado"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "Personalizar CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Utilizar los valores predeterminados"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Restaurar los diseños predeterminados"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Volver a los valores predeterminados"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Guardar"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Guardar el diseño"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Este mensaje no es un favorito!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Agregar a favoritos"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "No existe tal documento \"%s\""
#. TRANS: Title for "Edit application" form.
@@ -2894,7 +2960,7 @@ msgstr ""
"encuentras un grupo que te guste? ¡Intenta [buscar otro](%%%%action."
"groupsearch%%%%) o [crea tú uno!](%%%%action.newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Crear un nuevo grupo"
@@ -3303,26 +3369,33 @@ msgstr ""
"\n"
"Saludos cordiales, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Debes estar conectado para unirte a un grupo."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s se ha unido al grupo %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Debes estar conectado para dejar un grupo."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "No eres miembro de este grupo."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s ha dejado el grupo %2$s"
@@ -3427,6 +3500,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Guardar"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr ""
@@ -3451,11 +3531,11 @@ msgstr "Inicio de sesión"
msgid "Login to site"
msgstr "Ingresar a sitio"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Recordarme"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores "
@@ -3849,7 +3929,8 @@ msgstr "Cambiar contraseña"
msgid "Change your password."
msgstr "Cambia tu contraseña"
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Cambio de contraseña"
@@ -3857,7 +3938,8 @@ msgstr "Cambio de contraseña"
msgid "Old password"
msgstr "Antigua contraseña"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Nueva contraseña"
@@ -3865,7 +3947,7 @@ msgstr "Nueva contraseña"
msgid "6 or more characters"
msgstr "6 o más caracteres"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Igual a la contraseña de arriba"
@@ -3889,11 +3971,12 @@ msgstr "Contraseña antigua incorrecta."
msgid "Error saving user; invalid."
msgstr "Error al guardar el usuario; inválido."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "No se puede guardar la nueva contraseña."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Se guardó la contraseña."
@@ -4238,7 +4321,8 @@ msgid "Profile information"
msgstr "Información del perfil"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr ""
@@ -4246,16 +4330,16 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Nombre completo"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Página de inicio"
@@ -4268,7 +4352,7 @@ msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4276,27 +4360,27 @@ msgstr[0] "Descríbete y cuéntanos tus intereses en %d caracteres"
msgstr[1] "Descríbete y cuéntanos tus intereses en %d caracteres"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Descríbete y cuéntanos acerca de tus intereses"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Biografía"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Ubicación"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
@@ -4351,7 +4435,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4359,49 +4443,50 @@ msgstr[0] "La biografía es muy larga (máx. %d caracteres)."
msgstr[1] "La biografía es muy larga (máx. %d caracteres)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Zona horaria no seleccionada"
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "Idioma es muy largo ( max 50 car.)"
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Etiqueta inválida: \"% s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "No se pudo actualizar el usuario para autosuscribirse."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "No se han podido guardar las preferencias de ubicación."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "No se han podido guardar las etiquetas."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Se guardó configuración."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Crear una cuenta"
@@ -4527,37 +4612,45 @@ msgstr ""
msgid "Tag cloud"
msgstr "Nube de etiquetas"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "¡Ya te has conectado!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "No existe ese código de recuperación."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "No es un código de recuperación."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Código de recuperación para usuario desconocido."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Error con el código de confirmación."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr ""
"Este código de confirmación es demasiado viejo. Por favor empieza de nuevo."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr ""
"No se pudo actualizar el usuario con la dirección de correo confirmada."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4565,71 +4658,105 @@ msgstr ""
"Si has olvidado tu contraseña, podemos enviarte una nueva a la dirección de "
"correo electrónico que has registrado en tu cuenta."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr ""
"Se te ha identificado. Por favor, escribe una nueva contraseña a "
"continuación. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Recuperación de contraseña"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Nombre de usuario o dirección de correo electrónico"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr ""
"Tu nombre de usuario en este servidor, o la dirección de correo electrónico "
"registrada."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Recuperar"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Recuperar"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Restablecer contraseña"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Recuperar contraseña"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Recuperación de contraseña solicitada"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Acción desconocida"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 o más caracteres, ¡no te olvides!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Igual a la contraseña de arriba"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Restablecer"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Ingresa un nombre de usuario o correo electronico"
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "No hay ningún usuario con esa dirección de correo o nombre de usuario."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Ninguna dirección de correo electrónico registrada por este usuario."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Error al guardar confirmación de la dirección."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4637,24 +4764,35 @@ msgstr ""
"Se enviaron instrucciones para recuperar tu contraseña a la dirección de "
"correo registrada."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Restablecimiento de contraseña inesperado."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "La contraseña debe tener 6 o más caracteres."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "La contraseña y la confirmación no coinciden."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "No se puede guardar la nueva contraseña."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Error al configurar el usuario."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
@@ -4670,7 +4808,7 @@ msgstr "El código de invitación no es válido."
msgid "Registration successful"
msgstr "Registro exitoso."
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrarse"
@@ -4698,64 +4836,55 @@ msgstr ""
"Con este formulario puedes crear una nueva cuenta. Después podrás publicar "
"avisos y enviar vínculos de ellos a tus amigos y colegas. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 letras en minúscula o números, sin signos de puntuación o espacios. "
-"Requerido."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 o más caracters. Requerido."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Igual a la contraseña de arriba. Requerida"
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 o más caracteres"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Correo electrónico"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Se usa sólo para actualizaciones, anuncios y recuperación de contraseñas"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nombre más largo, preferiblemente tu nombre \"real\""
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"Entiendo que el contenido y los datos de %1$s son privados y confidenciales."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
"Mi texto y archivos est'an protegidos por los derecho de autor de %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "Mi texto y archivos permanecen bajo mi propio derecho de autor."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Todos los derechos reservados."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4765,7 +4894,7 @@ msgstr ""
"información privada: contraseña, dirección de correo electrónico, dirección "
"de mensajería instantánea y número de teléfono."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4798,7 +4927,7 @@ msgstr ""
"\n"
"¡Gracias por apuntarte! Esperamos que disfrutes usando este servicio."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5116,7 +5245,7 @@ msgstr "Organización"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Descripción"
@@ -5139,8 +5268,9 @@ msgstr "Acciones de la aplicación"
msgid "Reset key & secret"
msgstr "Reiniciar clave y secreto"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Borrar"
@@ -5267,7 +5397,7 @@ msgid "Note"
msgstr "Nota"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Alias"
@@ -7878,26 +8008,26 @@ msgstr ""
"tracking - aún sin implementar.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "Ningún archivo de configuración encontrado. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "He buscado archivos de configuración en los siguientes lugares: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "Quizá desees ejecutar el instalador para solucionar este problema."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Ir al instalador."
@@ -7969,12 +8099,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Desactivar"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Restablecer"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Cambiar colores"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Utilizar los valores predeterminados"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -8058,28 +8191,23 @@ msgstr "Ir"
msgid "Grant this user the \"%s\" role"
msgstr "Otorgar al usuario el papel de \"%$\""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 letras en minúscula o números, sin signos de puntuación o espacios"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "URL de página de inicio o blog del grupo o tema"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Describir al grupo o tema"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Describir al grupo o tema en %d caracteres"
msgstr[1] "Describir al grupo o tema en %d caracteres"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8087,7 +8215,7 @@ msgstr ""
"Ubicación del grupo, si existe, por ejemplo \"Ciudad, Estado (o Región), País"
"\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, fuzzy, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9300,14 +9428,9 @@ msgstr[1] "hace aproximadamente %d meses"
msgid "about a year ago"
msgstr "hace un año"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "¡%s no es un color válido!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s no es un color válido! Usar 3 o 6 caracteres hexagesimales"
@@ -9344,27 +9467,31 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "No existe tal perfil."
+#~ msgid "No such group"
+#~ msgstr "No existe ese grupo"
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "%s es miembro de los grupos"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "Método de API no encontrado."
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Personas suscritas a %s"
+#~ msgid "Reset"
+#~ msgstr "Restablecer"
-#~ msgid "Couldn't update user."
-#~ msgstr "No se pudo actualizar el usuario."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 letras en minúscula o números, sin signos de puntuación o espacios. "
+#~ "Requerido."
-#~ msgid "Couldn't save profile."
-#~ msgstr "No se pudo guardar el perfil."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 o más caracters. Requerido."
-#~ msgid "Couldn't save tags."
-#~ msgstr "No se pudo guardar las etiquetas."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Igual a la contraseña de arriba. Requerida"
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr ""
+#~ "1-64 letras en minúscula o números, sin signos de puntuación o espacios"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "¡%s no es un color válido!"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 4a1e51eac9..cb0a6fee8c 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:24+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:39+0000\n"
"Last-Translator: Ahmad Sufi Mahmudi\n"
"Language-Team: Persian \n"
"MIME-Version: 1.0\n"
@@ -25,9 +25,9 @@ msgstr ""
"X-Language-Code: fa\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -82,6 +82,7 @@ msgid "Save access settings"
msgstr "ذخیرهٔ تنظیمات دسترسی"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -93,13 +94,13 @@ msgstr "ذخیرهٔ تنظیمات دسترسی"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "ذخیره"
@@ -331,7 +332,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "نمیتوان کاربر را بههنگامسازی کرد."
@@ -355,7 +356,7 @@ msgstr "کاربر هیچ نمایهای ندارد."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "نمیتوان نمایه را ذخیره کرد."
@@ -365,7 +366,7 @@ msgstr "نمیتوان نمایه را ذخیره کرد."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, fuzzy, php-format
@@ -539,7 +540,8 @@ msgid "That status is not a favorite."
msgstr "این پیام یک پیام برگزیده نیست."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "نمیتوان پیام برگزیده را حذف کرد."
@@ -586,7 +588,7 @@ msgstr "نمیتوان کاربر هدف را پیدا کرد."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی دیگر انتخاب کنید."
@@ -596,7 +598,7 @@ msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "لقب نا معتبر."
@@ -608,7 +610,7 @@ msgstr "لقب نا معتبر."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
@@ -618,7 +620,7 @@ msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -645,7 +647,7 @@ msgstr[0] "توصیف خیلی طولانی است (حداکثر %d نویسه)"
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -702,22 +704,26 @@ msgid "Group not found."
msgstr "گروه یافت نشد."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "شما از پیش یک عضو این گروه هستید."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "دسترسی شما به گروه توسط مدیر آن محدود شده است."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "نمیتوان کاربر %1$s را عضو گروه %2$s کرد."
@@ -729,9 +735,11 @@ msgstr "شما یک عضو این گروه نیستید."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -791,9 +799,12 @@ msgid "Request token already authorized."
msgstr "شما شناسایی نشده اید."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -801,7 +812,7 @@ msgstr "شما شناسایی نشده اید."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -823,18 +834,20 @@ msgstr "هنگام افزودن کاربر برنامهٔ OAuth در پایگا
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "ارسال غیر قابل انتظار فرم."
@@ -891,7 +904,7 @@ msgstr "حساب کاربری"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "نام کاربری"
@@ -899,7 +912,7 @@ msgstr "نام کاربری"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "گذرواژه"
@@ -1007,10 +1020,12 @@ msgstr "قبلا آن پیام تکرار شده است."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1282,7 +1297,7 @@ msgstr "اعضای گروه %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "نمیتوان اشتراک تازهای افزود."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1318,30 +1333,51 @@ msgstr "چنین پروندهای وجود ندارد."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "نمیتوان پیام برگزیده را حذف کرد."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "چنین گروهی وجود ندارد."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "همهٔ اعضا"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "رابط مورد نظر پیدا نشد."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "نمیتوان اشتراک را ذخیره کرد."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1515,35 +1551,42 @@ msgstr "به روز رسانی چهره موفقیت آمیر نبود."
msgid "Avatar deleted."
msgstr "چهره پاک شد."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "تنها کاربران وارد شده می توانند پیامها را تکرار کنند."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "پیشزمینه"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1578,14 +1621,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "خیر"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "کاربر را مسدود نکن"
@@ -1597,7 +1639,7 @@ msgstr "کاربر را مسدود نکن"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "بله"
@@ -1613,32 +1655,6 @@ msgstr "کاربر را مسدود کن"
msgid "Failed to save block information."
msgstr "ذخیرهٔ ردیف اطلاعات شکست خورد."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "چنین گروهی وجود ندارد."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1770,7 +1786,8 @@ msgid "Account deleted."
msgstr "چهره پاک شد."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "ساختن یک جسابکاربری"
@@ -1792,8 +1809,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "تایید"
@@ -1868,8 +1886,10 @@ msgid "You must be logged in to delete a group."
msgstr "برای ترک یک گروه، شما باید وارد شده باشید."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "ناممستعار یا شناسهای وجود ندارد."
@@ -1924,10 +1944,11 @@ msgid "Delete this group"
msgstr "حذف این کاربر"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1967,19 +1988,30 @@ msgstr "این پیام را پاک نکن"
msgid "Delete this notice"
msgstr "این پیام را پاک کن"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "شما نمیتوانید کاربران را پاک کنید."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "شما فقط میتوانید کاربران محلی را پاک کنید."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "حذف کاربر"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "حذف کاربر"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1987,82 +2019,106 @@ msgstr ""
"آیا مطمئن هستید که میخواهید این کاربر را پاک کنید؟ با این کار تمام اطلاعات "
"پاک و بدون برگشت خواهند بود."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "این پیام را پاک نکن"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "حذف این کاربر"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "طرح"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "نشانی اینترنتی نشان نامعتبر است."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "نشانی اینترنتی نشان نامعتبر است."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "پوسته در دسترس نیست: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "تغییر نشان"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "نشان وبگاه"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
#, fuzzy
msgid "SSL logo"
msgstr "نشان وبگاه"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "تغییر پوسته"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "پوستهٔ وبگاه"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "پوسته برای وبگاه"
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "پوستهٔ اختصاصی"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
"شما میتوانید یک پوستهٔ اختصاصی StatusNet را بهعنوان یک آرشیو .ZIP بارگذاری "
"کنید."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "تغییر تصویر پیشزمینه"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "پیشزمینه"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2072,98 +2128,108 @@ msgstr ""
"پرونده %1 $s است."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "روشن"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "خاموش"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "تصویر پیشزمینه را فعال یا غیرفعال کنید."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "تصویر پیشزمینهٔ موزاییکی"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "تغییر رنگها"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "محتوا"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "ستون کناری"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "متن"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "پیوندها"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "پیشرفته"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "CSS اختصاصی"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "استفادهکردن از پیشفرضها"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "بازگرداندن طرحهای پیشفرض"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "برگشت به حالت پیش گزیده"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "ذخیرهکردن"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "ذخیرهکردن طرح"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "این پیام یک پیام برگزیده نیست!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "افزودن به برگزیدهها"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "چنین پیوستی وجود ندارد."
#. TRANS: Title for "Edit application" form.
@@ -2888,7 +2954,7 @@ msgstr ""
"نمیبینید؟ میتوانید برای یافتن آن [بگردید](%%%action.groupsearch%%%) !یا [آن "
"را خودتان بسازید](%%%%action.newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "یک گروه جدید بساز"
@@ -3288,26 +3354,33 @@ msgstr ""
"\n"
"با تشکر، %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "برای پیوستن به یک گروه، باید وارد شده باشید."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s به گروه %2$s پیوست"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "برای ترک یک گروه، شما باید وارد شده باشید."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "شما یک کاربر این گروه نیستید."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s گروه %2$s را ترک کرد"
@@ -3412,6 +3485,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "ذخیرهکردن"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr ""
@@ -3436,11 +3516,11 @@ msgstr "ورود"
msgid "Login to site"
msgstr "ورود به وبگاه"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "مرا به یاد بسپار"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "وارد شدن خودکار. نه برای کامپیوترهای مشترک!"
@@ -3829,7 +3909,8 @@ msgstr "تغییر گذرواژه"
msgid "Change your password."
msgstr "تغییر گذرواژهٔ شما"
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "تغییر گذرواژه"
@@ -3837,7 +3918,8 @@ msgstr "تغییر گذرواژه"
msgid "Old password"
msgstr "گذرواژهٔ پیشین"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "گذرواژهٔ تازه"
@@ -3845,7 +3927,7 @@ msgstr "گذرواژهٔ تازه"
msgid "6 or more characters"
msgstr "۶ نویسه یا بیشتر"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "مانند گذرواژهٔ بالا"
@@ -3869,11 +3951,12 @@ msgstr "گذرواژه پیشین اشتباه است"
msgid "Error saving user; invalid."
msgstr "هنگام ذخیرهٔ کاربر خطا رخ داد؛ نامعتبر است."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "نمیتوان گذرواژهٔ جدید را ذخیره کرد."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "گذرواژه ذخیره شد."
@@ -4216,23 +4299,24 @@ msgid "Profile information"
msgstr "اطلاعات نمایه"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "نامکامل"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "صفحهٔ خانگی"
@@ -4245,34 +4329,34 @@ msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نم
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
msgstr[0] "خودتان و علاقهمندیهایتان را در %d نویسه توصیف کنید"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "خودتان و علاقهمندیهایتان را توصیف کنید"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "شرححال"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "موقعیت"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "مکانی که شما در آن هستید، مانند «شهر، ایالت (یا استان)، کشور»"
@@ -4325,56 +4409,57 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
msgstr[0] "شرححال خیلی طولانی است (بیشینه %d نویسه)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "منطقهٔ زمانی انتخاب نشده است."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "زبان بسیار طولانی است ( حداکثر ۵۰ نویسه)"
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "نشان نادرست »%s«"
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "نمیتوان کاربر را برای اشتراک خودکار بههنگامسازی کرد."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "نمیتوان تنظیمات مکانی را تنظیم کرد."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "نمیتوان برچسبها را ذخیره کرد."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "تنظیمات ذخیره شد."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "ساختن یک جسابکاربری"
@@ -4496,35 +4581,43 @@ msgstr ""
msgid "Tag cloud"
msgstr "ابر برچسب"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "شما قبلا وارد شدید"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "چنین کد بازیابی شده ای نیست"
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "کد بازیابی شده ای نیست."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "بازیابی کد برای کاربر ناشناخته"
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "خطا در تایید کد"
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "این کد تایید شده بسیار قدیمی است . لطفا دباره شروع کنید ."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "را به روز کرد user نمیتوان با ایمیلی که تایید شده"
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4533,67 +4626,101 @@ msgstr ""
"که به نشانی پست الکترونیکیتان که در حسابتان ذخیره کردهاید فرستاده شده است، "
"بگیرید."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "هویت شما شناسایی شد. یک گذرواژه تازه را در زیر وارد کنید. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "بازیابی گذرواژه"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "نام کاربری یا نشانی پست الکترونیکی"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "نام کاربری شما بر روی این سرور، یا نشانی پست الکترونیکی ثبت شدهٔ شما."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "بازیابی"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "بازیابی"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "بازنشانی گذرواژه"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "بازیابی گذرواژه"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "بازیابی گذرواژه درخواست شد"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "عمل نامعلوم"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "۶ نویسه یا بیشتر، و این را فراموش نکنید!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "مانند گذرواژهٔ بالا"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "بازنشاندن"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "یک نام کاربری یا نشانی پست الکترونیکی وارد کنید."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "هیچ کاربری با آن نشانی پست الکترونیکی یا نام کاربری وجود ندارد."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "برای آن کاربر نشانی پست الکترونیکی ثبت شده وجود ندارد."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "هنگام ذخیرهٔ تایید نشانی خطا رخ داد."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4601,24 +4728,35 @@ msgstr ""
"راهنمای چگونگی بازیابی گذرواژه به نشانی پست الکترونیکی ثبت شده در حساب شما "
"فرستاده شده است."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "گذرواژه به طور غیر منتظره ریست شد."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "گذرواژه باید ۶ نویسه یا بیشتر باشد."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "گذرواژه و تاییدیهٔ آن با هم تطابق ندارند."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "نمیتوان گذرواژهٔ جدید را ذخیره کرد."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "هنگام گذاشتن کاربر خطا روی داد."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "گذرواژه تازه با موفقیت ذخیره شد. شما اکنون وارد شدهاید."
@@ -4634,7 +4772,7 @@ msgstr "با عرض تاسف، کد دعوت نا معتبر است."
msgid "Registration successful"
msgstr "ثبت نام با موفقیت انجام شد."
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "ثبت نام"
@@ -4662,59 +4800,52 @@ msgstr ""
"با این فرم شما میتوانید یک حساب تازه بسازید. سپس شما میتوانید پیام بفرستید و "
"به دوستان و همکارانتان بپیوندید. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "۱-۶۴ حرف کوچک یا اعداد، بدون نشانه گذاری یا فاصله نیاز است."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "۶ نویسه یا بیشتر مورد نیاز است."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "با گذرواژهٔ بالا یکسان باشد. مورد نیاز است."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "۶ نویسه یا بیشتر"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "پست الکترونیکی"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "تنها برای بههنگامسازیها، اعلامیهها و بازیابی گذرواژه به کار میرود"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "نام بلند تر، به طور بهتر نام واقعیتان"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نمایهتان در یک وبگاه دیگر"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "من متوجه هستم که محتوا و دادههای %1$s خصوصی و محرمانه هستند."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "متن و پروندههای من دارای حق تکثیر %1$s هستند."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "متن و پروندههای من زیر حق تکثیر خودم میمانند."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "تمام حقوق محفوظ است."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4723,7 +4854,7 @@ msgstr ""
"نوشتهها و پروندههای من به جز دادههای خصوصی گذرواژه، نشانی پست الکترونیک، "
"نشانی پیامرسان فوری و شماره تلفن زیر مجوز %s هستند."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4757,7 +4888,7 @@ msgstr ""
"از اینکه نامنویسی کردهاید، تشکر میکنیم و امیدواریم که از استفاده از این "
"سرویس لذت ببرید."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5072,7 +5203,7 @@ msgstr "سازمان"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "توصیف"
@@ -5095,8 +5226,9 @@ msgstr "اعمال برنامه"
msgid "Reset key & secret"
msgstr ""
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "حذف"
@@ -5223,7 +5355,7 @@ msgid "Note"
msgstr "یادداشت"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "نام های مستعار"
@@ -7805,26 +7937,26 @@ msgstr ""
"tracking - هنوز پیاده نشده است.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "بدون کد تصدیق."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "من به دنبال پروندههای پیکربندی در مکانهای زیر بودم: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "شما ممکن است بخواهید نصاب را اجرا کنید تا این را تعمیر کند."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "برو به نصاب."
@@ -7896,12 +8028,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "خاموش"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "بازنشاندن"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "تغییر رنگها"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "استفادهکردن از پیشفرضها"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7986,32 +8121,28 @@ msgstr "برو"
msgid "Grant this user the \"%s\" role"
msgstr ""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "نشانی اینترنتی صفحهٔخانگی یا وبلاگ گروه یا موضوع"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "گروه یا موضوع را توصیف کنید"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "گروه یا موضوع را در %d نویسه توصیف کنید"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr "مکان گروه، در صورت وجود داشتن، مانند «شهر، ایالت (یا استان)، کشور»"
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, fuzzy, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9205,14 +9336,9 @@ msgstr[0] ""
msgid "about a year ago"
msgstr "حدود یک سال پیش"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s یک رنگ صحیح نیست!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s یک رنگ صحیح نیست! از ۳ یا ۶ نویسه مبنای شانزده استفاده کنید"
@@ -9250,27 +9376,28 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "چنین نمایهای وجود ندارد."
+#~ msgid "No such group"
+#~ msgstr "چنین گروهی وجود ندارد."
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "هست عضو %s گروه"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "رابط مورد نظر پیدا نشد."
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "افراد مشترک %s"
+#~ msgid "Reset"
+#~ msgstr "بازنشاندن"
-#~ msgid "Couldn't update user."
-#~ msgstr "نمیتوان کاربر را به روز کرد."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr "۱-۶۴ حرف کوچک یا اعداد، بدون نشانه گذاری یا فاصله نیاز است."
-#~ msgid "Couldn't save profile."
-#~ msgstr "نمیتوان نمایه را ذخیره کرد."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "۶ نویسه یا بیشتر مورد نیاز است."
-#~ msgid "Couldn't save tags."
-#~ msgstr "نمیتوان نشان را ذخیره کرد."
+#~ msgid "Same as password above. Required."
+#~ msgstr "با گذرواژهٔ بالا یکسان باشد. مورد نیاز است."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s یک رنگ صحیح نیست!"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 2da695ebd5..676b7b8f79 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:26+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:45+0000\n"
"Language-Team: Finnish \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -85,6 +85,7 @@ msgid "Save access settings"
msgstr "Profiilikuva-asetukset"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -96,13 +97,13 @@ msgstr "Profiilikuva-asetukset"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Tallenna"
@@ -333,7 +334,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Käyttäjän päivitys epäonnistui."
@@ -357,7 +358,7 @@ msgstr "Käyttäjällä ei ole profiilia."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Profiilin tallennus epäonnistui."
@@ -367,7 +368,7 @@ msgstr "Profiilin tallennus epäonnistui."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -546,7 +547,8 @@ msgid "That status is not a favorite."
msgstr "Tämä päivitys ei ole suosikki!"
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Ei voitu poistaa suosikkia."
@@ -593,7 +595,7 @@ msgstr "Ei voitu päivittää käyttäjää."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
@@ -603,7 +605,7 @@ msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Tuo ei ole kelvollinen tunnus."
@@ -615,7 +617,7 @@ msgstr "Tuo ei ole kelvollinen tunnus."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Kotisivun verkko-osoite ei ole toimiva."
@@ -625,7 +627,7 @@ msgstr "Kotisivun verkko-osoite ei ole toimiva."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -653,7 +655,7 @@ msgstr[1] "kuvaus on liian pitkä (max %d merkkiä)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -711,22 +713,26 @@ msgid "Group not found."
msgstr "Ei löytynyt."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Sinä kuulut jo tähän ryhmään."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimesta."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s."
@@ -738,9 +744,11 @@ msgstr "Sinä et kuulu tähän ryhmään."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -800,9 +808,12 @@ msgid "Request token already authorized."
msgstr "Sinulla ei ole valtuutusta tähän."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -810,7 +821,7 @@ msgstr "Sinulla ei ole valtuutusta tähän."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -835,18 +846,20 @@ msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Odottamaton lomakkeen lähetys."
@@ -895,7 +908,7 @@ msgstr "Käyttäjätili"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Tunnus"
@@ -903,7 +916,7 @@ msgstr "Tunnus"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Salasana"
@@ -1011,10 +1024,12 @@ msgstr "Tätä päivitystä ei voi poistaa."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1289,7 +1304,7 @@ msgstr "Ryhmän %s jäsenet"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Ei voitu lisätä uutta tilausta."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1325,30 +1340,51 @@ msgstr "Tiedostoa ei ole."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Ei voitu poistaa suosikkia."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "Tuota ryhmää ei ole."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "Kaikki jäsenet"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "API-metodia ei löytynyt."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Tilausta ei onnistuttu tallentamaan."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1520,35 +1556,42 @@ msgstr "Profiilikuvan päivittäminen epäonnistui."
msgid "Avatar deleted."
msgstr "Kuva poistettu."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Tausta"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1579,14 +1622,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Ei"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Älä estä tätä käyttäjää"
@@ -1598,7 +1640,7 @@ msgstr "Älä estä tätä käyttäjää"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Kyllä"
@@ -1614,32 +1656,6 @@ msgstr "Estä tämä käyttäjä"
msgid "Failed to save block information."
msgstr "Käyttäjän estotiedon tallennus epäonnistui."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Tuota ryhmää ei ole."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1771,7 +1787,8 @@ msgid "Account deleted."
msgstr "Kuva poistettu."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Luo uusi ryhmä"
@@ -1793,8 +1810,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Vahvista"
@@ -1870,8 +1888,10 @@ msgid "You must be logged in to delete a group."
msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
#, fuzzy
msgid "No nickname or ID."
msgstr "Tunnusta ei ole."
@@ -1924,10 +1944,11 @@ msgid "Delete this group"
msgstr "Poista käyttäjä"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1967,103 +1988,138 @@ msgstr "Älä poista tätä päivitystä"
msgid "Delete this notice"
msgstr "Poista tämä päivitys"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Sinä et voi poistaa käyttäjiä."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Sinä et voi poistaa käyttäjiä."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Poista käyttäjä"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Poista käyttäjä"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
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 ""
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Älä poista tätä päivitystä"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Poista käyttäjä"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Ulkoasu"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
#, fuzzy
msgid "Invalid logo URL."
msgstr "Koko ei kelpaa."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "Koko ei kelpaa."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Pikaviestin ei ole käytettävissä."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Vaihda väriä"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Palvelun ilmoitus"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
#, fuzzy
msgid "SSL logo"
msgstr "Palvelun ilmoitus"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
#, fuzzy
msgid "Change theme"
msgstr "Vaihda"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
#, fuzzy
msgid "Site theme"
msgstr "Palvelun ilmoitus"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
#, fuzzy
msgid "Theme for the site."
msgstr "Kirjaudu ulos palvelusta"
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
#, fuzzy
msgid "Custom theme"
msgstr "Palvelun ilmoitus"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Vaihda tautakuva"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Tausta"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2071,104 +2127,114 @@ msgid ""
msgstr "Voit ladata ryhmälle logokuvan. Maksimikoko on %s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "On"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Off"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
#, fuzzy
msgid "Turn background image on or off."
msgstr "Vaihda tautakuva"
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
#, fuzzy
msgid "Tile background image"
msgstr "Vaihda tautakuva"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Vaihda väriä"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Sisältö"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
#, fuzzy
msgid "Sidebar"
msgstr "Haku"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Teksti"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Linkit"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr ""
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Käytä oletusasetuksia"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
#, fuzzy
msgid "Restore default designs"
msgstr "Käytä oletusasetuksia"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
#, fuzzy
msgid "Reset back to default"
msgstr "Käytä oletusasetuksia"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Tallenna"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
#, fuzzy
msgid "Save design"
msgstr "Ryhmän ulkoasu"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Tämä päivitys ei ole suosikki!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Lisää suosikkeihin"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Liitettä ei ole."
#. TRANS: Title for "Edit application" form.
@@ -2900,7 +2966,7 @@ msgid ""
"%%%%)"
msgstr ""
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Luo uusi ryhmä"
@@ -3309,26 +3375,33 @@ msgstr ""
"\n"
"Terveisin, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Sinun pitää olla kirjautunut sisään, jos haluat liittyä ryhmään."
-#: actions/joingroup.php:141
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%s liittyi ryhmään %s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Sinä et kuulu tähän ryhmään."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "Käyttäjän %1$s päivitys %2$s"
@@ -3434,6 +3507,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Tallenna"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr ""
@@ -3459,11 +3539,11 @@ msgstr "Kirjaudu sisään"
msgid "Login to site"
msgstr "Kirjaudu sisään"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Muista minut"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla "
@@ -3865,7 +3945,8 @@ msgstr "Vaihda salasana"
msgid "Change your password."
msgstr "Vaihda salasanasi."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Salasanan vaihto"
@@ -3873,7 +3954,8 @@ msgstr "Salasanan vaihto"
msgid "Old password"
msgstr "Vanha salasana"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Uusi salasana"
@@ -3881,7 +3963,7 @@ msgstr "Uusi salasana"
msgid "6 or more characters"
msgstr "6 tai useampia merkkejä"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Sama kuin ylläoleva salasana"
@@ -3905,11 +3987,12 @@ msgstr "Väärä vanha salasana"
msgid "Error saving user; invalid."
msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Uutta salasanaa ei voida tallentaa."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Salasana tallennettu."
@@ -4258,7 +4341,8 @@ msgid "Profile information"
msgstr "Profiilitieto"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr ""
@@ -4267,16 +4351,16 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Koko nimi"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Kotisivu"
@@ -4289,7 +4373,7 @@ msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4297,27 +4381,27 @@ msgstr[0] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
msgstr[1] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Tietoja"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Kotipaikka"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
#, fuzzy
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
@@ -4373,7 +4457,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4381,49 +4465,50 @@ msgstr[0] "kuvaus on liian pitkä (max %d merkkiä)."
msgstr[1] "kuvaus on liian pitkä (max %d merkkiä)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Aikavyöhykettä ei ole valittu."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "Kieli on liian pitkä (enintään 50 merkkiä)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Virheellinen tagi: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Ei voitu asettaa käyttäjälle automaattista tilausta."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Tageja ei voitu tallentaa."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Tagien tallennus epäonnistui."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Asetukset tallennettu."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Luo uusi ryhmä"
@@ -4540,35 +4625,43 @@ msgstr ""
msgid "Tag cloud"
msgstr "Tagipilvi"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Olet jo kirjautunut sisään!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Palautuskoodia ei ole."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Tuo ei ole palautuskoodi."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Tuntemattoman käyttäjän palautuskoodi"
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Virhe vahvistuskoodin kanssa."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Vahvistuskoodi on liian vanha. Aloita uudelleen."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
#, fuzzy
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
@@ -4577,69 +4670,102 @@ msgstr ""
"Ohjeet salasanan palauttamiseksi on lähetetty sähköpostiisiosoitteeseen, "
"joka on rekisteröity käyttäjätunnuksellesi."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Sinut on tunnistettu. Syötä uusi salasana alapuolelle. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Salasanan palautus"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Käyttäjätunnus tai sähköpostiosoite"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr ""
"Käyttäjätunnuksesi tässä palvelussa tai rekisteröity sähköpostiosoitteesi."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Palauta"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Palauta"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Vaihda salasana"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Salasanan palautus"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Salasanan palautuspyyntö lähetetty."
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Tuntematon toiminto"
-#: actions/recoverpassword.php:236
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
#, fuzzy
-msgid "6 or more characters, and don't forget it!"
+msgid "6 or more characters, and do not forget it!"
msgstr "6 tai useampia merkkejä äläkä unohda mitä kirjoitit!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Sama kuin ylläoleva salasana"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Vaihda"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Syötä käyttäjätunnus tai sähköpostiosoite"
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "Käyttäjää tuolla sähköpostilla tai käyttäjätunnuksella ei ole."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Rekisteröityä sähköpostiosoitetta ei ole tälle käyttäjälle."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Virhe tapahtui osoitevahvistuksen tallentamisessa"
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4647,24 +4773,35 @@ msgstr ""
"Ohjeet salasanan palauttamiseksi on lähetetty sähköpostiisiosoitteeseen, "
"joka on rekisteröity käyttäjätunnuksellesi."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Odottamaton salasanan uudelleenasetus."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Salasana ja salasanan vahvistus eivät täsmää."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Uutta salasanaa ei voida tallentaa."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Virhe tapahtui käyttäjän asettamisessa."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr ""
"Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään."
@@ -4681,7 +4818,7 @@ msgstr "Virheellinen kutsukoodin."
msgid "Registration successful"
msgstr "Rekisteröityminen onnistui"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Rekisteröidy"
@@ -4707,63 +4844,54 @@ msgid ""
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
-"välilyöntejä. Pakollinen."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 tai useampia merkkejä. Pakollinen."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Sama kuin ylläoleva salasana. Pakollinen."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 tai useampia merkkejä"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Sähköposti"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Käytetään ainoastaan päivityksien lähettämiseen, ilmoitusasioihin ja "
"salasanan uudelleen käyttöönottoon."
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Pitempi nimi, mieluiten oikea nimesi"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4772,7 +4900,7 @@ msgstr ""
"poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, "
"puhelinnumero."
-#: actions/register.php:589
+#: actions/register.php:588
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4805,7 +4933,7 @@ msgstr ""
"\n"
"Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5133,7 +5261,7 @@ msgstr "Sivutus"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Kuvaus"
@@ -5156,8 +5284,9 @@ msgstr ""
msgid "Reset key & secret"
msgstr ""
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Poista"
@@ -5276,7 +5405,7 @@ msgid "Note"
msgstr "Huomaa"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Aliakset"
@@ -7860,26 +7989,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "Varmistuskoodia ei ole annettu."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Kutsu(t) lähetettiin seuraaville henkilöille:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
#, fuzzy
msgid "Go to the installer."
msgstr "Kirjaudu sisään palveluun"
@@ -7952,12 +8081,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Off"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Vaihda"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Vaihda väriä"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Käytä oletusasetuksia"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -8043,30 +8175,24 @@ msgstr "Mene"
msgid "Grant this user the \"%s\" role"
msgstr ""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
-"välilyöntejä"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
#, fuzzy
msgid "Describe the group or topic"
msgstr "Kuvaile ryhmää tai aihetta 140 merkillä"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
msgstr[1] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8074,7 +8200,7 @@ msgstr ""
"Ryhmän paikka, jos sellainen on, kuten \"Kaupunki, Maakunta (tai Lääni), Maa"
"\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9210,14 +9336,9 @@ msgstr[1] ""
msgid "about a year ago"
msgstr "noin vuosi sitten"
-#: lib/webcolor.php:80
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "Kotisivun verkko-osoite ei ole toimiva."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "Kotisivun verkko-osoite ei ole toimiva."
@@ -9254,27 +9375,33 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Tiedostoa ei ole."
+#~ msgid "No such group"
+#~ msgstr "Tuota ryhmää ei ole."
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Ryhmät, joiden jäsen %s on"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "API-metodia ei löytynyt."
+#~ msgid "Reset"
+#~ msgstr "Vaihda"
+
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
+#~ "välilyöntejä. Pakollinen."
+
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 tai useampia merkkejä. Pakollinen."
+
+#~ msgid "Same as password above. Required."
+#~ msgstr "Sama kuin ylläoleva salasana. Pakollinen."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr ""
+#~ "1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
+#~ "välilyöntejä"
+
#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
-
-#~ msgid "Couldn't update user."
-#~ msgstr "Ei voitu päivittää käyttäjää."
-
-#~ msgid "Couldn't save profile."
-#~ msgstr "Ei voitu tallentaa profiilia."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "Tageja ei voitu tallentaa."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "Kotisivun verkko-osoite ei ole toimiva."
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 34823b0cb7..66127d1518 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -21,17 +21,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:27+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:49+0000\n"
"Language-Team: French \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -86,6 +86,7 @@ msgid "Save access settings"
msgstr "Sauvegarder les paramètres d’accès"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -97,13 +98,13 @@ msgstr "Sauvegarder les paramètres d’accès"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Enregistrer"
@@ -339,7 +340,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Impossible de mettre à jour l’utilisateur."
@@ -363,7 +364,7 @@ msgstr "Aucun profil ne correspond à cet utilisateur."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Impossible d’enregistrer le profil."
@@ -373,7 +374,7 @@ msgstr "Impossible d’enregistrer le profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -555,7 +556,8 @@ msgid "That status is not a favorite."
msgstr "Cet avis n’est pas un favori."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Impossible de supprimer le favori."
@@ -601,7 +603,7 @@ msgstr "Impossible de trouver l’utilisateur cible."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Pseudo déjà utilisé. Essayez-en un autre."
@@ -611,7 +613,7 @@ msgstr "Pseudo déjà utilisé. Essayez-en un autre."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Pseudo invalide."
@@ -623,7 +625,7 @@ msgstr "Pseudo invalide."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "L’adresse du site personnel n’est pas un URL valide. "
@@ -633,7 +635,7 @@ msgstr "L’adresse du site personnel n’est pas un URL valide. "
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Le nom complet est trop long (limité à 255 caractères maximum)."
@@ -660,7 +662,7 @@ msgstr[1] "La description est trop longue (limitée à %d caractères maximum)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
@@ -717,22 +719,26 @@ msgid "Group not found."
msgstr "Groupe non trouvé."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Vous êtes déjà membre de ce groupe."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Vous avez été bloqué de ce groupe par l’administrateur."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Impossible d’inscrire l’utilisateur %1$s au groupe %2$s."
@@ -744,9 +750,11 @@ msgstr "Vous n’êtes pas membre de ce groupe."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -803,9 +811,12 @@ msgid "Request token already authorized."
msgstr "Le jeton de requête a déjà été autorisé."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -813,7 +824,7 @@ msgstr "Le jeton de requête a déjà été autorisé."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -838,18 +849,20 @@ msgstr ""
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Soumission de formulaire inattendue."
@@ -905,7 +918,7 @@ msgstr "Compte"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Pseudo"
@@ -913,7 +926,7 @@ msgstr "Pseudo"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Mot de passe"
@@ -1021,10 +1034,12 @@ msgstr "Vous avez déjà repris cet avis."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
@@ -1303,7 +1318,7 @@ msgstr "Membres du groupe %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Impossible d’insérer un nouvel abonnement."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1339,30 +1354,51 @@ msgstr "Fichier non trouvé."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Impossible de supprimer le favori."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "Aucun groupe trouvé."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "Tous les membres"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Méthode HTTP non trouvée !"
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Impossible de supprimer l’abonnement à soi-même."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1534,35 +1570,42 @@ msgstr "La mise à jour de l’avatar a échoué."
msgid "Avatar deleted."
msgstr "Avatar supprimé."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Seuls les utilisateurs identifiés peuvent reprendre des avis."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Arrière plan"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1596,14 +1639,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Non"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Ne pas bloquer cet utilisateur"
@@ -1615,7 +1657,7 @@ msgstr "Ne pas bloquer cet utilisateur"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Oui"
@@ -1631,32 +1673,6 @@ msgstr "Bloquer cet utilisateur"
msgid "Failed to save block information."
msgstr "Impossible d’enregistrer les informations de blocage."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Aucun groupe trouvé."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1786,7 +1802,8 @@ msgid "Account deleted."
msgstr "Avatar supprimé."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Créer un compte"
@@ -1808,8 +1825,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Confirmer"
@@ -1883,8 +1901,10 @@ msgid "You must be logged in to delete a group."
msgstr "Vous devez ouvrir une session pour supprimer un groupe."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Aucun pseudo ou ID."
@@ -1936,10 +1956,11 @@ msgid "Delete this group"
msgstr "Supprimer ce groupe"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1979,19 +2000,30 @@ msgstr "Ne pas supprimer cet avis"
msgid "Delete this notice"
msgstr "Supprimer cet avis"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Vous ne pouvez pas supprimer des utilisateurs."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Vous pouvez seulement supprimer les utilisateurs locaux."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Supprimer l’utilisateur"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Supprimer l’utilisateur"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1999,79 +2031,103 @@ msgstr ""
"Voulez-vous vraiment supprimer cet utilisateur ? Ceci effacera toutes les "
"données à son propos de la base de données, sans sauvegarde."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Ne pas supprimer ce groupe"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Supprimer cet utilisateur"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Conception"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr "Paramètres de conception pour ce site StatusNet"
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "URL du logo invalide."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "Adresse URL du logo SSL invalide."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Le thème n’est pas disponible : %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Modifier le logo"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo du site"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "Logo SSL"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Modifier le thème"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Thème du site"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Thème pour le site."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Thème personnalisé"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
"Vous pouvez importer un thème StatusNet personnalisé dans une archive .ZIP."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Changer l’image d’arrière plan"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Arrière plan"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2081,98 +2137,108 @@ msgstr ""
"maximale du fichier est de %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "Activé"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Désactivé"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Activer ou désactiver l’image d’arrière plan."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Répéter l’image d’arrière plan"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Modifier les couleurs"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Contenu"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Barre latérale"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Texte"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Liens"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Avancé"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "CSS personnalisé"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Utiliser les valeurs par défaut"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Restaurer les conceptions par défaut"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Revenir aux valeurs par défaut"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Enregistrer"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Sauvegarder la conception"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Cet avis n’est pas un favori !"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Ajouter aux favoris"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Document « %s » non trouvé."
#. TRANS: Title for "Edit application" form.
@@ -2898,7 +2964,7 @@ msgstr ""
"intéresse ? Essayez d’en [rechercher un](%%%%action.groupsearch%%%%) ou de "
"[créer le vôtre !](%%%%action.newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Créer un nouveau groupe"
@@ -3314,26 +3380,33 @@ msgstr ""
"\n"
"Cordialement, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Vous devez ouvrir une session pour rejoindre un groupe."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s a rejoint le groupe %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Vous devez ouvrir une session pour quitter un groupe."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Vous n’êtes pas membre de ce groupe."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s a quitté le groupe %2$s"
@@ -3439,6 +3512,13 @@ msgstr "URL de l’image de la licence"
msgid "URL for an image to display with the license."
msgstr "URL d’une image à afficher avec la licence."
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Enregistrer"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "Enregistrer les paramètres de licence"
@@ -3465,11 +3545,11 @@ msgstr "Ouvrir une session"
msgid "Login to site"
msgstr "Ouverture de session"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Se souvenir de moi"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Ouvrir automatiquement ma session à l’avenir (déconseillé pour les "
@@ -3867,7 +3947,8 @@ msgstr "Changer de mot de passe"
msgid "Change your password."
msgstr "Modifier votre mot de passe."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Modification du mot de passe"
@@ -3875,7 +3956,8 @@ msgstr "Modification du mot de passe"
msgid "Old password"
msgstr "Ancien mot de passe"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Nouveau mot de passe"
@@ -3883,7 +3965,7 @@ msgstr "Nouveau mot de passe"
msgid "6 or more characters"
msgstr "6 caractères ou plus"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Identique au mot de passe ci-dessus"
@@ -3907,11 +3989,12 @@ msgstr "Ancien mot de passe incorrect"
msgid "Error saving user; invalid."
msgstr "Erreur lors de l’enregistrement de l’utilisateur ; invalide."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Impossible de sauvegarder le nouveau mot de passe."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Mot de passe enregistré."
@@ -4239,22 +4322,23 @@ msgid "Profile information"
msgstr "Information de profil"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Nom complet"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Site personnel"
@@ -4267,7 +4351,7 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4275,27 +4359,27 @@ msgstr[0] "Décrivez-vous avec vos intérêts en %d caractère"
msgstr[1] "Décrivez-vous avec vos intérêts en %d caractères"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Décrivez vous et vos interêts"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Bio"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Emplacement"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
@@ -4350,7 +4434,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4358,48 +4442,49 @@ msgstr[0] "La biographie est trop longue (limitée à %d caractère maximum)."
msgstr[1] "La biographie est trop longue (limitée à %d caractères maximum)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Aucun fuseau horaire n’a été choisi."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
msgid "Language is too long (maximum 50 characters)."
msgstr "La langue est trop longue (limitée à 50 caractères maximum)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Marque invalide : « %s »"
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Impossible de mettre à jour l’auto-abonnement."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Impossible d’enregistrer les préférences de localisation."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Impossible d’enregistrer les marques."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Préférences enregistrées."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Créer un compte"
@@ -4524,36 +4609,44 @@ msgstr ""
msgid "Tag cloud"
msgstr "Nuage de marques"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Votre session est déjà ouverte !"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Code de récupération non trouvé."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Ceci n’est pas un code de récupération."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Code de récupération d’un utilisateur inconnu."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Erreur dans le code de confirmation."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Ce code de validation est périmé. Veuillez recommencer."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr ""
"Impossible de mettre l’utilisateur à jour avec l’adresse courriel confirmée."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4562,68 +4655,101 @@ msgstr ""
"nouveau qui sera envoyé à votre adresse de courriel définie dans votre "
"compte."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Vous avez été identifié. Entrez un nouveau mot de passe ci-dessous. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Récupération de mot de passe"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Pseudo ou adresse de courriel"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr ""
"Votre pseudo sur ce serveur, ou l’adresse courriel que vous avez enregistrée."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Récupérer"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Récupérer"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Réinitialiser le mot de passe"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Récupérer le mot de passe"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Récupération de mot de passe demandée"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Action inconnue"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 caractères ou plus, et ne l’oubliez pas !"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Identique au mot de passe ci-dessus"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Réinitialiser"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Entrez un pseudo ou une adresse courriel."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "Aucun utilisateur trouvé avec ce courriel ou ce nom."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Aucune adresse courriel enregistrée pour cet utilisateur."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Erreur lors de l’enregistrement de la confirmation du courriel."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4631,23 +4757,34 @@ msgstr ""
"Les instructions pour récupérer votre mot de passe ont été envoyées à "
"l’adresse courriel indiquée dans votre compte."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Réinitialisation inattendue du mot de passe."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
msgid "Password must be 6 characters or more."
msgstr "Le mot de passe doit contenir au moins 6 caractères."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Le mot de passe et sa confirmation ne correspondent pas."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Impossible de sauvegarder le nouveau mot de passe."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Erreur lors de la configuration de l’utilisateur."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr ""
"Nouveau mot de passe créé avec succès. Votre session est maintenant ouverte."
@@ -4664,7 +4801,7 @@ msgstr "Désolé, code d’invitation invalide."
msgid "Registration successful"
msgstr "Compte créé avec succès"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Créer un compte"
@@ -4692,41 +4829,33 @@ msgstr ""
"Avec ce formulaire vous pouvez créer un nouveau compte. Vous pourrez ensuite "
"poster des avis and et vous relier à des amis et collègues. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces. Requis."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 caractères ou plus. Requis."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Identique au mot de passe ci-dessus. Requis."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 caractères ou plus"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Courriel"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Utilisé uniquement pour les mises à jour, les notifications, et la "
"récupération de mot de passe"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nom plus long, votre \"vrai\" nom de préférence"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
"Adresse URL de votre page personnelle, blogue ou profil sur un autre site"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
@@ -4734,23 +4863,23 @@ msgstr ""
"Je comprends que le contenu et les données de %1$s sont privés et "
"confidentiels."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Mon texte et les fichiers sont protégés par copyright par %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "Mon texte et les fichiers restent sous mon propre droit d'auteur."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Tous droits réservés."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4760,7 +4889,7 @@ msgstr ""
"données personnelles : mot de passe, adresse électronique, adresse de "
"messagerie instantanée, numéro de téléphone."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4794,7 +4923,7 @@ msgstr ""
"Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre "
"service."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5113,7 +5242,7 @@ msgstr "Organisation"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Description"
@@ -5136,8 +5265,9 @@ msgstr "Actions de l’application"
msgid "Reset key & secret"
msgstr "Réinitialiser la clé et le secret"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Supprimer"
@@ -5265,7 +5395,7 @@ msgid "Note"
msgstr "Note"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Alias"
@@ -7889,25 +8019,25 @@ msgstr ""
"tracking - pas encore implémenté.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
msgid "No configuration file found."
msgstr "Aucun fichier de configuration n’a été trouvé."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
msgid "I looked for configuration files in the following places:"
msgstr ""
"Les fichiers de configuration ont été cherchés aux emplacements suivants :"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
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."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Aller au programme d’installation"
@@ -7974,11 +8104,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Désactivé"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Réinitialiser"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Modifier les couleurs"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Utiliser les valeurs par défaut"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -8062,33 +8196,29 @@ msgstr "Aller"
msgid "Grant this user the \"%s\" role"
msgstr "Accorder le rôle « %s » à cet utilisateur"
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
msgid "URL of the homepage or blog of the group or topic."
msgstr "Adresse URL du site web ou blogue pour le groupe ou sujet."
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Description du groupe ou du sujet"
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Description du groupe ou du sujet, en %d caractère ou moins"
msgstr[1] "Description du groupe ou du sujet, en %d caractères ou moins"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
"Emplacement du groupe, s’il y a lieu, de la forme « Ville, État (ou région), "
"pays »"
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9304,14 +9434,9 @@ msgstr[1] "il y a environ %d mois"
msgid "about a year ago"
msgstr "il y a environ 1 an"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "&s n’est pas une couleur valide !"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr ""
@@ -9353,30 +9478,30 @@ msgstr "XML invalide, racine XRD manquante."
msgid "Getting backup from file '%s'."
msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "Publication AtomPost avec l’URI d’attention inconnu %s"
+#~ msgid "No such group"
+#~ msgstr "Aucun groupe trouvé."
#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Profil non-trouvé."
-
-#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Groupes de %s"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "Méthode HTTP non trouvée !"
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Abonnés de %s"
+#~ msgid "Reset"
+#~ msgstr "Réinitialiser"
-#~ msgid "Couldn't update user."
-#~ msgstr "Impossible de mettre à jour l’utilisateur."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces. "
+#~ "Requis."
-#~ msgid "Couldn't save profile."
-#~ msgstr "Impossible d’enregistrer le profil."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 caractères ou plus. Requis."
-#~ msgid "Couldn't save tags."
-#~ msgstr "Impossible d’enregistrer les marques."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Identique au mot de passe ci-dessus. Requis."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "&s n’est pas une couleur valide !"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index f77179b069..75d26bc21c 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:28+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:53+0000\n"
"Language-Team: Galician \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: gl\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -76,6 +76,7 @@ msgid "Save access settings"
msgstr "Gardar a configuración de acceso"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -87,13 +88,13 @@ msgstr "Gardar a configuración de acceso"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Gardar"
@@ -328,7 +329,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Non se puido actualizar o usuario."
@@ -352,7 +353,7 @@ msgstr "O usuario non ten perfil."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Non se puido gardar o perfil."
@@ -362,7 +363,7 @@ msgstr "Non se puido gardar o perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, fuzzy, php-format
@@ -543,7 +544,8 @@ msgid "That status is not a favorite."
msgstr "Ese estado non é un dos favoritos."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Non se puido eliminar o favorito."
@@ -590,7 +592,7 @@ msgstr "Non se puido atopar o usuario de destino."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Ese alcume xa está en uso. Probe con outro."
@@ -600,7 +602,7 @@ msgstr "Ese alcume xa está en uso. Probe con outro."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "O formato do alcume non é correcto."
@@ -612,7 +614,7 @@ msgstr "O formato do alcume non é correcto."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "O URL da páxina persoal non é correcto."
@@ -622,7 +624,7 @@ msgstr "O URL da páxina persoal non é correcto."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -650,7 +652,7 @@ msgstr[1] "A descrición é longa de máis (o máximo son %d caracteres)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -708,22 +710,26 @@ msgid "Group not found."
msgstr "Non se atopou o grupo."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Xa forma parte dese grupo."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "O administrador bloqueouno nese grupo."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "O usuario %1$s non se puido engadir ao grupo %2$s."
@@ -735,9 +741,11 @@ msgstr "Vostede non pertence a este grupo."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -796,9 +804,12 @@ msgid "Request token already authorized."
msgstr "Non está autorizado."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -806,7 +817,7 @@ msgstr "Non está autorizado."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -830,18 +841,20 @@ msgstr ""
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Envío de formulario inesperado."
@@ -895,7 +908,7 @@ msgstr "Conta"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Alcume"
@@ -903,7 +916,7 @@ msgstr "Alcume"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Contrasinal"
@@ -1008,10 +1021,12 @@ msgstr "Xa repetiu esa nota."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1289,7 +1304,7 @@ msgstr "Membros do grupo %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Non se puido inserir unha subscrición nova."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1325,31 +1340,51 @@ msgstr "Non existe tal ficheiro."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Non se puido eliminar o favorito."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-#, fuzzy
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "Non existe tal grupo."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "Todos os membros"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Non se atopou o método da API."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Non se puido borrar a subscrición a si mesmo."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1520,35 +1555,42 @@ msgstr "Non se puido actualizar o avatar."
msgid "Avatar deleted."
msgstr "Borrouse o avatar."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Só os usuarios identificados poden repetir notas."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Fondo"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1582,14 +1624,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Non"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Non bloquear este usuario"
@@ -1601,7 +1642,7 @@ msgstr "Non bloquear este usuario"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Si"
@@ -1617,32 +1658,6 @@ msgstr "Bloquear este usuario"
msgid "Failed to save block information."
msgstr "Non se puido gardar a información do bloqueo."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Non existe tal grupo."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1773,7 +1788,8 @@ msgid "Account deleted."
msgstr "Borrouse o avatar."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Crear unha conta"
@@ -1795,8 +1811,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -1871,8 +1888,10 @@ msgid "You must be logged in to delete a group."
msgstr "Ten que identificarse para deixar un grupo."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Nin alcume nin ID."
@@ -1926,10 +1945,11 @@ msgid "Delete this group"
msgstr "Borrar o usuario"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1969,19 +1989,30 @@ msgstr "Non borrar esta nota"
msgid "Delete this notice"
msgstr "Borrar esta nota"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Non pode borrar usuarios."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Só pode borrar usuarios locais."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Borrar o usuario"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Borrar o usuario"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1989,81 +2020,105 @@ msgstr ""
"Está seguro de querer borrar este usuario? Isto borrará todos os datos do "
"usuario da base de datos, sen posibilidade de recuperalos."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Non borrar esta nota"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Borrar o usuario"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Deseño"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr "Configuración de deseño para este sitio StatusNet"
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "URL do logo incorrecto."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "URL do logo incorrecto."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "O tema visual non está dispoñible: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Cambiar o logo"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo do sitio"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
#, fuzzy
msgid "SSL logo"
msgstr "Logo do sitio"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Cambiar o tema visual"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Tema visual do sitio"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Tema visual para o sitio."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Tema visual personalizado"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
"Pode cargar como arquivo .ZIP un tema visual personalizado para StatusNet"
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Cambiar a imaxe de fondo"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Fondo"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2073,98 +2128,108 @@ msgstr ""
"ficheiro é de %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "Activado"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Desactivado"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Activar ou desactivar a imaxe de fondo."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Imaxe de fondo en mosaico"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Cambiar as cores"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Contido"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Barra lateral"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Texto"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Ligazóns"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Avanzado"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "CSS personalizado"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Utilizar os valores por defecto"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Restaurar o deseño por defecto"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Volver ao deseño por defecto"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Gardar"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Gardar o deseño"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Esta nota non é unha das favoritas!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Engadir aos favoritos"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Non hai ningún documento \"%s\""
#. TRANS: Title for "Edit application" form.
@@ -2894,7 +2959,7 @@ msgstr ""
"un grupo que lle guste? Probe a [buscar un](%%%%action.groupsearch%%%%) ou "
"[crear un pola súa conta!](%%%%action.newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Crear un grupo novo"
@@ -3302,26 +3367,33 @@ msgstr ""
"\n"
"Cordialmente, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Ten que identificarse para unirse a un grupo."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s uniuse ao grupo %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Ten que identificarse para deixar un grupo."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Non pertence a ese grupo."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
@@ -3428,6 +3500,13 @@ msgstr "URL da imaxe da licenza"
msgid "URL for an image to display with the license."
msgstr "URL dunha imaxe a mostrar coa licenza."
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Gardar"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "Gardar a configuración de licenza"
@@ -3454,11 +3533,11 @@ msgstr "Identificarse"
msgid "Login to site"
msgstr "Identificarse no sitio"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Lembrádeme"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Identificarse automaticamente no futuro. Non se aconsella en computadoras "
@@ -3853,7 +3932,8 @@ msgstr "Cambiar o contrasinal"
msgid "Change your password."
msgstr "Cambiar o seu contrasinal."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Cambio de contrasinal"
@@ -3861,7 +3941,8 @@ msgstr "Cambio de contrasinal"
msgid "Old password"
msgstr "Contrasinal anterior"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Novo contrasinal"
@@ -3869,7 +3950,7 @@ msgstr "Novo contrasinal"
msgid "6 or more characters"
msgstr "Seis ou máis caracteres"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Igual ao contrasinal anterior"
@@ -3893,11 +3974,12 @@ msgstr "O contrasinal anterior non é correcto"
msgid "Error saving user; invalid."
msgstr "Houbo un erro ao gardar o usuario. Incorrecto."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Non se puido gardar o novo contrasinal."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Gardouse o contrasinal."
@@ -4236,7 +4318,8 @@ msgid "Profile information"
msgstr "Información do perfil"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr ""
@@ -4245,16 +4328,16 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Nome completo"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Páxina persoal"
@@ -4267,7 +4350,7 @@ msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4275,27 +4358,27 @@ msgstr[0] "Descríbase a vostede e mailos seus intereses en %d caracteres"
msgstr[1] "Descríbase a vostede e mailos seus intereses en %d caracteres"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Descríbase a vostede e mailos seus intereses"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Biografía"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Lugar"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Onde está a vivir, coma “localidade, provincia (ou comunidade), país”"
@@ -4350,7 +4433,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4358,49 +4441,50 @@ msgstr[0] "A biografía é longa de máis (o límite son %d caracteres)."
msgstr[1] "A biografía é longa de máis (o límite son %d caracteres)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Non se escolleu ningún fuso horario."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "A lingua é longa de máis (o límite é de 50 caracteres)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Etiqueta incorrecta: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Non se puido actualizar o usuario para subscribirse automaticamente."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Non se puideron gardar as preferencias de lugar."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Non se puideron gardar as etiquetas."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Gardouse a configuración."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Crear unha conta"
@@ -4525,37 +4609,45 @@ msgstr ""
msgid "Tag cloud"
msgstr "Nube de etiquetas"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Xa está identificado!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Ese código de recuperación non existe."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Iso non é un código de recuperación."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Código de recuperación para un usuario descoñecido."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Houbo un erro co código de confirmación."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Este código de confirmación é vello de máis. Volva empezar."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr ""
"Non se puido actualizar o usuario co enderezo de correo electrónico "
"confirmado."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4563,71 +4655,105 @@ msgstr ""
"Se esqueceu ou perdeu o seu contrasinal, pode solicitar que se lle envíe un "
"novo ao enderezo de correo electrónico da conta."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Acaba de identificarse. Introduza un contrasinal novo a continuación. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Recuperación do contrasinal"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Alcume ou enderezo de correo electrónico"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr ""
"O seu alcume neste servidor, ou o enderezo de correo electrónico co que se "
"rexistrou."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Recuperar"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Recuperar"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Restablecer o contrasinal"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Recuperar o contrasinal"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Solicitouse a recuperación do contrasinal"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Non se coñece esa acción"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "Seis ou máis caracteres, e non o esqueza!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Igual ao contrasinal anterior"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Restablecer"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Introduza un alcume ou enderezo de correo electrónico."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr ""
"Non hai ningún usuario con ese enderezo de correo electrónico ou alcume."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr ""
"Non se rexistrou ningún enderezo de correo electrónico para ese usuario."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Houbo un erro ao gardar a confirmación do enderezo."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4635,24 +4761,35 @@ msgstr ""
"Enviáronse instrucións para a recuperación do seu contrasinal ao enderezo de "
"correo electrónico rexistrado para a súa conta."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Restablecemento de contrasinal inesperado."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "O contrasinal debe ter seis ou máis caracteres."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "O contrasinal e a confirmación non coinciden."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Non se puido gardar o novo contrasinal."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Houbo un erro ao configurar o usuario."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "O novo contrasinal gardouse correctamente. Agora está identificado."
@@ -4668,7 +4805,7 @@ msgstr "O código da invitación é incorrecto."
msgid "Registration successful"
msgstr "Rexistrouse correctamente"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Rexistrarse"
@@ -4696,65 +4833,56 @@ msgstr ""
"Con este formulario pode crear unha conta nova. Entón poderá publicar notas "
"e porse en contacto con amigos e compañeiros. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
-"espazos, tiles ou eñes. Obrigatorio."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 ou máis caracteres. Obrigatorio."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "O mesmo contrasinal que o anterior. Obrigatorio."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "Seis ou máis caracteres"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Correo electrónico"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Só se utiliza para actualizacións, anuncios e recuperación de contrasinais"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome longo, preferiblemente o seu nome \"real\""
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "Entendo que o contido e os datos de %1$s son privados e confidenciais."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
"Os meus textos e ficheiros están protexidos polos dereitos de autor de %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
"Os meus textos e ficheiros están protexidos polos meus propios dereitos de "
"autor."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Todos os dereitos reservados."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4764,7 +4892,7 @@ msgstr ""
"datos privados: contrasinais, enderezos de correo electrónico e mensaxería "
"instantánea e números de teléfono."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4796,7 +4924,7 @@ msgstr ""
"\n"
"Grazas por rexistrarse. Esperamos que goce deste servizo."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5114,7 +5242,7 @@ msgstr "Organización"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Descrición"
@@ -5137,8 +5265,9 @@ msgstr "Accións da aplicación"
msgid "Reset key & secret"
msgstr "Restablecer o contrasinal ou a pregunta secreta"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Borrar"
@@ -5267,7 +5396,7 @@ msgid "Note"
msgstr "Nota"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Pseudónimos"
@@ -7882,26 +8011,26 @@ msgstr ""
"tracking - aínda non se integrou\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "Non se atopou ningún ficheiro de configuración. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Buscáronse ficheiros de configuración nos seguintes lugares: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "Pode que queira executar o instalador para arranxalo."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Ir ao instalador."
@@ -7973,12 +8102,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Desactivado"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Restablecer"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Cambiar as cores"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Utilizar os valores por defecto"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -8062,29 +8194,23 @@ msgstr "Continuar"
msgid "Grant this user the \"%s\" role"
msgstr "Outorgarlle a este usuario o rol \"%s\""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
-"espazos, tiles ou eñes"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "URL do sitio web persoal ou blogue do grupo ou tema"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Describa o grupo ou o tema"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Describa o grupo ou o tema en %d caracteres"
msgstr[1] "Describa o grupo ou o tema en %d caracteres"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8092,7 +8218,7 @@ msgstr ""
"Localidade do grupo, se a ten, como por exemplo \"Cidade, Provincia, "
"Comunidade, País\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, fuzzy, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9306,14 +9432,9 @@ msgstr[1] "hai %d meses"
msgid "about a year ago"
msgstr "hai como un ano"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s non é unha cor correcta!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s non é unha cor correcta! Use 3 ou 6 caracteres hexadecimais."
@@ -9353,26 +9474,32 @@ msgid "Getting backup from file '%s'."
msgstr ""
#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Non existe ese perfil."
+#~ msgid "No such group"
+#~ msgstr "Non existe tal grupo."
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Grupos aos que pertence %s"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "Non se atopou o método da API."
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Persoas subscritas a %s"
+#~ msgid "Reset"
+#~ msgstr "Restablecer"
-#~ msgid "Couldn't update user."
-#~ msgstr "Non se puido actualizar o usuario."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
+#~ "espazos, tiles ou eñes. Obrigatorio."
-#~ msgid "Couldn't save profile."
-#~ msgstr "Non se puido gardar o perfil."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 ou máis caracteres. Obrigatorio."
-#~ msgid "Couldn't save tags."
-#~ msgstr "Non se puideron gardar as etiquetas."
+#~ msgid "Same as password above. Required."
+#~ msgstr "O mesmo contrasinal que o anterior. Obrigatorio."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr ""
+#~ "Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
+#~ "espazos, tiles ou eñes"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s non é unha cor correcta!"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 4ab4b4fd02..949f9f40d5 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:30+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:58+0000\n"
"Language-Team: Upper Sorbian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: hsb\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
"n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -77,6 +77,7 @@ msgid "Save access settings"
msgstr "Přistupne nastajenja składować"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -88,13 +89,13 @@ msgstr "Přistupne nastajenja składować"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Składować"
@@ -321,7 +322,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Wužiwar njeje so dał aktualizować."
@@ -345,7 +346,7 @@ msgstr "Wužiwar nima profil."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Profil njeje so składować dał."
@@ -355,7 +356,7 @@ msgstr "Profil njeje so składować dał."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -394,7 +395,6 @@ msgstr "Design njeda so aktualizować."
#. TRANS: Title for Atom feed.
#: actions/apiatomservice.php:85
-#, fuzzy
msgctxt "ATOM"
msgid "Main"
msgstr "Hłowny"
@@ -535,7 +535,8 @@ msgid "That status is not a favorite."
msgstr "Tón status faworit njeje."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Faworit njeda so zhašeć."
@@ -581,7 +582,7 @@ msgstr "Cilowy wužiwar njeda so namakać."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
@@ -591,7 +592,7 @@ msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Žane płaćiwe přimjeno."
@@ -603,7 +604,7 @@ msgstr "Žane płaćiwe přimjeno."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Startowa strona njeje płaćiwy URL."
@@ -613,7 +614,7 @@ msgstr "Startowa strona njeje płaćiwy URL."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
@@ -642,7 +643,7 @@ msgstr[3] "Wopisanje je předołho (maks. %d znamješkow)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Městno je předołho (maks. 255 znamješkow)."
@@ -701,22 +702,26 @@ msgid "Group not found."
msgstr "Skupina njenamakana."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Sy hižo čłon teje skupiny."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Administratora tuteje skupiny je će zablokował."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
@@ -728,9 +733,11 @@ msgstr "Njejsy čłon tuteje skupiny."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -787,9 +794,12 @@ msgid "Request token already authorized."
msgstr "Naprašowanski token hižo awtorizowany."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -797,7 +807,7 @@ msgstr "Naprašowanski token hižo awtorizowany."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -818,18 +828,20 @@ msgstr "Zmylk datoweje banki při zasunjenju oauth_token_association."
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Njewočakowane wotpósłanje formulara."
@@ -877,7 +889,7 @@ msgstr "Konto"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Přimjeno"
@@ -885,7 +897,7 @@ msgstr "Přimjeno"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Hesło"
@@ -989,10 +1001,12 @@ msgstr "Tuta zdźělenka bu hižo wospjetowana."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
@@ -1023,9 +1037,8 @@ msgstr "Zhašenje je jenož z Atomowym formatom móžno."
#. TRANS: Client error displayed when a user has no rights to delete notices of other users.
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
-#, fuzzy
msgid "Cannot delete this notice."
-msgstr "Tuta zdźělenka njeda so zničić."
+msgstr "Tuta zdźělenka njeda so zhašeć."
#. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
#: actions/apistatusesshow.php:249
@@ -1227,15 +1240,13 @@ msgstr "Profil njeeksistuje."
#. TRANS: Client exception thrown when trying to set a favorite for another user.
#. TRANS: Client exception thrown when trying to subscribe another user.
#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
-#, fuzzy
msgid "Cannot add someone else's subscription."
-msgstr "Nowy abonement njeda so přidać"
+msgstr "Abonement druheho njeda so zhašeć"
#. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
#: actions/atompubfavoritefeed.php:240
-#, fuzzy
msgid "Can only handle favorite activities."
-msgstr "Jenož zdźělenki dadźa so jako fawority składować."
+msgstr "Jenož faworitowe aktiwity hodźa so wobdźěłać."
#. TRANS: Client exception thrown when trying favorite an object that is not a notice.
#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
@@ -1262,15 +1273,14 @@ msgstr "%s skupisnkich čłonstwow"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
-msgstr "Nowy abonement njeda so přidać"
+msgid "Cannot add someone else's membership."
+msgstr "Čłonstwo druheho njeda so přidać"
#. TRANS: Client error displayed when not using the POST verb.
#. TRANS: Do not translate POST.
#: actions/atompubmembershipfeed.php:242
-#, fuzzy
msgid "Can only handle join activities."
-msgstr "Jenož zdźělenki dadźa so jako fawority składować."
+msgstr "Jenož aktiwity zastupjenja hodźa so wobdźěłać."
#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
#: actions/atompubmembershipfeed.php:259
@@ -1295,52 +1305,73 @@ msgstr "Faworit njeeksistuje."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Faworit druheho njeda so zhašeć"
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Skupina njeeksistuje"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+msgstr "Skupina njeeksistuje."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
-msgid "Not a member"
-msgstr "Njeje čłon"
-
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
#, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTTP-metoda so njepodpěruje."
+msgid "Not a member."
+msgstr "Njeje čłon"
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
-msgstr "Abonement druheho njeda so zhašeć"
+msgid "Cannot delete someone else's membership."
+msgstr "Čłonstwo druheho njeda so zhašeć"
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
#. TRANS: %d is the non-existing profile ID number.
#: actions/atompubshowsubscription.php:72
#: actions/atompubshowsubscription.php:83
#: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
msgid "No such profile id: %d."
-msgstr "Profilowy ID njeeksistuje: %d"
+msgstr "Profilowy ID njeeksistuje: %d."
#. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
#. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
#: actions/atompubshowsubscription.php:94
-#, fuzzy, php-format
+#, php-format
msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "Profil %1$d njeje profil %2$d abonował"
+msgstr "Profil %1$d njeje profil %2$d abonował."
#. TRANS: Client exception thrown when trying to delete a subscription of another user.
#: actions/atompubshowsubscription.php:157
-#, fuzzy
msgid "Cannot delete someone else's subscription."
-msgstr "Abonement druheho njeda so zhašeć"
+msgstr "Abonement druheho njeda so zhašeć."
#. TRANS: Client error displayed when not using the POST verb.
#. TRANS: Do not translate POST.
@@ -1355,9 +1386,9 @@ msgstr ""
#. TRANS: Client exception thrown when subscribing to a non-existing profile.
#: actions/atompubsubscriptionfeed.php:267
-#, fuzzy, php-format
+#, php-format
msgid "Unknown profile %s."
-msgstr "Njeznaty profil %s"
+msgstr "Njeznaty profil %s."
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
@@ -1487,33 +1518,40 @@ msgstr "Aktualizowanje awatara je so njeporadźiło."
msgid "Avatar deleted."
msgstr "Awatar zničeny."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr "Konto zawěsćić"
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
msgid "Only logged-in users can backup their account."
msgstr "Jenož přizjewjeni wužiwarjo móža swoje konto zawěsćić."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr "Njesměš swoje konto zawěsćić."
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
msgctxt "BUTTON"
msgid "Backup"
msgstr "Zawěsćenje"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr "Twoje konto zawěsćić"
@@ -1544,14 +1582,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Ně"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Tutoho wužiwarja njeblokować"
@@ -1563,7 +1600,7 @@ msgstr "Tutoho wužiwarja njeblokować"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Haj"
@@ -1579,32 +1616,6 @@ msgstr "Tutoho wužiwarja blokować"
msgid "Failed to save block information."
msgstr "Njebě móžno blokěrowanske informacije składować."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Skupina njeeksistuje."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1731,7 +1742,8 @@ msgid "Account deleted."
msgstr "Konto zhašene."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
msgid "Delete account"
msgstr "Konto zhašeć"
@@ -1752,8 +1764,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Wobkrućić"
@@ -1823,8 +1836,10 @@ msgid "You must be logged in to delete a group."
msgstr "Dyrbiš přizjewjeny być, zo by skupinu zhašał."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Žane přimjeno abo žadyn ID."
@@ -1872,10 +1887,11 @@ msgid "Delete this group"
msgstr "Tutu skupinu zhašeć"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1913,96 +1929,131 @@ msgstr "Tutu zdźělenku njewušmórnyć"
msgid "Delete this notice"
msgstr "Tutu zdźělenku wušmórnyć"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Njemóžeš wužiwarjow wušmórnyć."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Móžeš jenož lokalnych wužiwarjow wušmórnyć."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Wužiwarja wušmórnyć"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Wužiwarja wušmórnyć"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
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 ""
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Tuitu skupinu njezhašeć"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Tutoho wužiwarja wušmórnyć"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Design"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr "Designowe nastajenja za tute sydło StatusNet"
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "Njepłaćiwy logowy URL."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "Njepłaćiwy SSL-URL loga."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Šat njesteji k dispoziciji: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Logo změnić"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo sydła"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "SSL-logo"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Šat změnić"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Šat sydła"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Šat za sydło."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Swójski šat"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Móžeš swójski šat StatusNet jako .ZIP-archiw nahrać."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Pozadkowy wobraz změnić"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Pozadk"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2011,98 +2062,108 @@ msgstr ""
"Móžeš pozadkowy wobraz za sydło nahrać. Maksimalna datajowa wulkosć je %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "Zapinjeny"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Wupinjeny"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Pozadkowy wobraz zmóžnić abo znjemóžnić."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Pozadkowy wobraz kachlicować"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Barby změnić"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Wobsah"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Bóčnica"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Tekst"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Wotkazy"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Rozšěrjeny"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "Swójski CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Standardne hódnoty wužiwać"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Standardne designy wobnowić"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Na standard wróćo stajić"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Składować"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Design składować"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Tuta zdźělenka faworit njeje!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "K faworitam přidać"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Dokument \"%s\" njeeksistuje"
#. TRANS: Title for "Edit application" form.
@@ -2400,7 +2461,6 @@ msgstr "Ta e-mejlowa adresa hižo słuša k druhemu wužiwarjej."
#. TRANS: Server error thrown on database error adding SMS confirmation code.
#: actions/emailsettings.php:426 actions/imsettings.php:343
#: actions/smssettings.php:365
-#, fuzzy
msgid "Could not insert confirmation code."
msgstr "Wobkrućenski kod njehodźi so zasunyć."
@@ -2427,7 +2487,6 @@ msgstr "To je wopačna e-mejlowa adresa."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
#: actions/emailsettings.php:468 actions/smssettings.php:413
-#, fuzzy
msgid "Could not delete email confirmation."
msgstr "E-mejlowe wobkrućenje njeda so zhašeć."
@@ -2455,7 +2514,6 @@ msgstr "Žana adresa za dochadźace e-mejle."
#. TRANS: Server error thrown on database error adding incoming e-mail address.
#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:564 actions/smssettings.php:587
-#, fuzzy
msgid "Could not update user record."
msgstr "Datowa sadźba wužiwarja njeda so aktualizować."
@@ -2804,7 +2862,7 @@ msgid ""
"%%%%)"
msgstr ""
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Nowu skupinu wutworić"
@@ -2977,7 +3035,6 @@ msgstr "to je wopačna IM-adresa."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:391
-#, fuzzy
msgid "Could not delete IM confirmation."
msgstr "IM-wobkrućenje njeda so zhašeć."
@@ -3173,26 +3230,33 @@ msgid ""
"Sincerely, %2$s\n"
msgstr ""
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Dyrbiš přizjewjeny być, zo by do skupiny zastupił."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s je do %2$s zastupił"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Dyrbiš přizjewjeny być, zo by skupinu wopušćił."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Njejsy čłon teje skupiny."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s je skupinu %2$s wopušćił"
@@ -3296,6 +3360,13 @@ msgstr "URL wobraza licency"
msgid "URL for an image to display with the license."
msgstr "URL za wobraz, kotryž ma so z licencu zwobraznić."
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Składować"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "Licencne nastajenja składować"
@@ -3320,11 +3391,11 @@ msgstr "Přizjewić"
msgid "Login to site"
msgstr "Při sydle přizjewić"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Składować"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
@@ -3701,7 +3772,8 @@ msgstr "Hesło změnić"
msgid "Change your password."
msgstr "Změń swoje hesło."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Hesło změnjene"
@@ -3709,7 +3781,8 @@ msgstr "Hesło změnjene"
msgid "Old password"
msgstr "Stare hesło"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Nowe hesło"
@@ -3717,7 +3790,7 @@ msgstr "Nowe hesło"
msgid "6 or more characters"
msgstr "6 abo wjace znamješkow"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Samsne hesło kaž horjeka"
@@ -3741,11 +3814,12 @@ msgstr "Wopačne stare hesło"
msgid "Error saving user; invalid."
msgstr "Zmylk při składowanju wužiwarja; njepłaćiwy."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Nowe hesło njeda so składować."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Hesło składowane."
@@ -4068,7 +4142,8 @@ msgid "Profile information"
msgstr "Profilowe informacije"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr ""
"1-64 małopisanych pismikow abo ličbow, žane interpunkciske znamješka abo "
@@ -4076,16 +4151,16 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Dospołne mjeno"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Startowa strona"
@@ -4097,7 +4172,7 @@ msgstr "URL twojeje startoweje strony, bloga abo profila na druhim sydle."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4107,27 +4182,27 @@ msgstr[2] "Wopisaj sebje a swoje zajimy z %d znamješkami"
msgstr[3] "Wopisaj sebje a swoje zajimy z %d znamješkami"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Wopisaj sebje a swoje zajimy"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Biografija"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Městno"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Hdźež sy, na př. \"město, zwjazkowy kraj (abo region) , kraj\""
@@ -4178,7 +4253,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4188,48 +4263,47 @@ msgstr[2] "Biografija je předołha (maks. %d znamješka)."
msgstr[3] "Biografija je předołha (maks. %d znamješkow)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Časowe pasmo njeje wubrane."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
msgid "Language is too long (maximum 50 characters)."
msgstr "Mjeno rěče je předołhe (maks. 50 znamješkow)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Njepłaćiwa taflička: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
-#, fuzzy
+#: actions/profilesettings.php:347
msgid "Could not update user for autosubscribe."
msgstr "Wužiwar njeda so za awtomatiske abonowanje aktualizować."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
-#, fuzzy
+#: actions/profilesettings.php:405
msgid "Could not save location prefs."
msgstr "Nastajenja městna njedachu so składować."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Taflički njedadźa so składować."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Nastajenja składowane."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
msgid "Restore account"
msgstr "Konto wobnowić"
@@ -4339,125 +4413,177 @@ msgstr ""
msgid "Tag cloud"
msgstr "Mróčel tafličkow"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Sy hižo přizjewjeny!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Njeznaty wobnowjenski kod."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Žadyn wobnowjenski kod."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr ""
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Zmylk z wobkrućenskim kodom."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Tutón wobkrućenski kod je přestary. Prošu započń hišće raz."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Wužiwar njeda so z wobkrućenej e-mejlowej adresu aktualizować."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr ""
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Sy so identifikował. Zapodaj deleka nowe hesło. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Wobnowjenje hesła"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Přimjeno abo e-mejlowa adresa"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr ""
"Twoje přimjeno na tutym serwerje abo twoje zregistrowana e-mejlowa adresa."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Wobnowić"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Wobnowić"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Hesło wróćo stajić"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Hesło wobnowić"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Wobnowjenje hesła požadane"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Njeznata akcija"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 abo wjace znamješkow, a njezabudź jo!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Samsne hesło kaž horjeka"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Wróćo stajić"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Zapodaj přimjeno abo e-mejlowu adresu."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr ""
"Wužiwar z tej e-mejlowej adresu abo tym wužiwarskim mjenom njeeksistuje."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Wužiwar nima žanu zregistrowanu e-mejlowu adresu."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Zmylk při składowanju adresoweho wobkrućenja."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr ""
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Njewočakowane hesło wróćo stajene."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
msgid "Password must be 6 characters or more."
msgstr "Hesło dyrbi 6 znamješkow abo wjace měć."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Hesło a jeho wobkrućenje so njekryjetej."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Nowe hesło njeda so składować."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Zmylk při nastajenju wužiwarja."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Nowe hesło bu wuspěšnje składowane. Sy nětko přizjewjeny."
@@ -4473,7 +4599,7 @@ msgstr "Wodaj, njepłaćiwy přeprošenski kod."
msgid "Registration successful"
msgstr "Registrowanje wuspěšne"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrować"
@@ -4499,68 +4625,59 @@ msgid ""
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 małopisanych pismikow abo ličbow, žane interpunkciske znamješka abo "
-"mjezery. Trěbne."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 abo wjace znamješkow. Trěbne."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Jenake kaž hesło horjeka. Trěbne."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 abo wjace znamješkow"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-mejl"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Wšě prawa wuměnjenjene."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4579,7 +4696,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -4631,14 +4748,12 @@ msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
#: actions/remotesubscribe.php:175
-#, fuzzy
msgid "That is a local profile! Login to subscribe."
msgstr "To je lokalny profil! Přizjew so, zo by abonował."
#: actions/remotesubscribe.php:182
-#, fuzzy
msgid "Could not get a request token."
-msgstr "Přistupny token njeda so wudać."
+msgstr "Přistupny token njeda so wobstarać."
#: actions/repeat.php:56
msgid "Only logged-in users can repeat notices."
@@ -4649,7 +4764,6 @@ msgid "No notice specified."
msgstr "Žana zdźělenka podata."
#: actions/repeat.php:75
-#, fuzzy
msgid "You cannot repeat your own notice."
msgstr "Njemóžeš swójsku zdźělenku wospjetować."
@@ -4875,7 +4989,7 @@ msgstr "Organizacija"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Wopisanje"
@@ -4898,8 +5012,9 @@ msgstr "Aplikaciske akcije"
msgid "Reset key & secret"
msgstr ""
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Zničić"
@@ -5017,7 +5132,7 @@ msgid "Note"
msgstr "Přispomnjenka"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Aliasy"
@@ -6919,7 +7034,7 @@ msgstr ""
#. TRANS: Client error thrown when authentication fails.
#: lib/apiauth.php:266 lib/apiauth.php:293
msgid "Could not authenticate you."
-msgstr ""
+msgstr "Njebě móžno će awtentifikować."
#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
#: lib/apioauthstore.php:45
@@ -6947,9 +7062,8 @@ msgid "Database error inserting OAuth application user."
msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije."
#: lib/apioauthstore.php:345
-#, fuzzy
msgid "Database error updating OAuth application user."
-msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije."
+msgstr "Zmylk datoweje banki při aktualizowanju wužiwarja OAuth-aplikacije."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
#: lib/apioauthstore.php:371
@@ -7155,14 +7269,14 @@ msgstr "Wužiwar nima poslednju powěsć."
#: lib/command.php:128
#, php-format
msgid "Could not find a user with nickname %s."
-msgstr ""
+msgstr "Wužiwar z přimjenom %s njeda so namakać."
#. TRANS: Message given getting a non-existing user.
#. TRANS: %s is the nickname of the user that could not be found.
#: lib/command.php:148
#, php-format
msgid "Could not find a local user with nickname %s."
-msgstr ""
+msgstr "Lokalny wužiwar z přimjenom %s njeda so namakać."
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:183
@@ -7494,24 +7608,24 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
msgid "No configuration file found."
msgstr "Žana konfiguraciska dataja namakana."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
msgid "I looked for configuration files in the following places:"
msgstr "Sym na slědowacych městnach konfiguraciske dataje pytał:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "Móže być, zo chceš instalaciski program startować, zo by to porjedźił."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "K instalaciji"
@@ -7578,11 +7692,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Wupinjeny"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Wróćo stajić"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Barby změnić"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Standardne hódnoty wužiwać"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7665,37 +7783,31 @@ msgstr "Start"
msgid "Grant this user the \"%s\" role"
msgstr "Tutomu wužiwarjej rólu \"%s\" dać"
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 małopisanych pismikow abo ličbow, žane interpunkciske znamješka abo "
-"mjezery."
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
msgid "URL of the homepage or blog of the group or topic."
msgstr "URL startoweje strony abo bloga skupiny abo temy."
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Skupinu abo temu wopisać"
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Skupinu abo temu w %d znamješce wopisać"
msgstr[1] "Skupinu abo temu w %d znamješkomaj wopisać"
msgstr[2] "Skupinu abo temu w %d znamješkach wopisać"
msgstr[3] "Skupinu abo temu w %d znamješkach wopisać"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
"Městno za skupinu, jeli eksistuje, na př. \"město, zwjazkowy kraj (abo "
"region), kraj\"."
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8811,14 +8923,9 @@ msgstr[3] "před něhdźe %d měacami"
msgid "about a year ago"
msgstr "před něhdźe jednym lětom"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s płaćiwa barba njeje!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr ""
@@ -8862,23 +8969,31 @@ msgstr "Njepłaćiwy XML, korjeń XRD faluje."
msgid "Getting backup from file '%s'."
msgstr "Wobstaruje so zawěsćenje z dataje \"%s\"-"
-#~ msgid "No such profile"
-#~ msgstr "Profil njeeksistuje"
+#~ msgid "No such group"
+#~ msgstr "Skupina njeeksistuje"
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Skupiny, w kotrychž %s je čłon na %s"
+#~ msgid "HTTP method not supported"
+#~ msgstr "HTTP-metoda so njepodpěruje"
-#~ msgid "Method not supported"
-#~ msgstr "Metoda so njepodpěruje."
+#~ msgid "Reset"
+#~ msgstr "Wróćo stajić"
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Ludźo, kotřiž su %s na %s abonowali"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 małopisanych pismikow abo ličbow, žane interpunkciske znamješka abo "
+#~ "mjezery. Trěbne."
-#~ msgid "Couldn't update user."
-#~ msgstr "Wužiwar njeda aktualizować."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 abo wjace znamješkow. Trěbne."
-#~ msgid "Couldn't save profile."
-#~ msgstr "Profil njeda so składować."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Jenake kaž hesło horjeka. Trěbne."
-#~ msgid "Couldn't save tags."
-#~ msgstr "Taflički njedadźa so składować."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr ""
+#~ "1-64 małopisanych pismikow abo ličbow, žane interpunkciske znamješka abo "
+#~ "mjezery."
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s płaćiwa barba njeje!"
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index 2debe428e9..fac32f4770 100644
--- a/locale/hu/LC_MESSAGES/statusnet.po
+++ b/locale/hu/LC_MESSAGES/statusnet.po
@@ -12,13 +12,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:31+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:01+0000\n"
"Language-Team: Hungarian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: hu\n"
"X-Message-Group: #out-statusnet-core\n"
@@ -79,6 +79,7 @@ msgid "Save access settings"
msgstr "Hozzáférések beállításainak mentése"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -90,13 +91,13 @@ msgstr "Hozzáférések beállításainak mentése"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Mentés"
@@ -325,7 +326,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Nem sikerült frissíteni a felhasználót."
@@ -349,7 +350,7 @@ msgstr "A felhasználónak nincs profilja."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Nem sikerült menteni a profilt."
@@ -359,7 +360,7 @@ msgstr "Nem sikerült menteni a profilt."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, fuzzy, php-format
@@ -538,7 +539,8 @@ msgid "That status is not a favorite."
msgstr "Az az állapotjelentés nincs a kedvenceid között."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Nem sikerült törölni a kedvencet."
@@ -584,7 +586,7 @@ msgstr "A cél felhasználó nem található."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "A becenév már foglalt. Próbálj meg egy másikat."
@@ -594,7 +596,7 @@ msgstr "A becenév már foglalt. Próbálj meg egy másikat."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Nem érvényes becenév."
@@ -606,7 +608,7 @@ msgstr "Nem érvényes becenév."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "A honlap érvénytelen URL-cím."
@@ -616,7 +618,7 @@ msgstr "A honlap érvénytelen URL-cím."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -644,7 +646,7 @@ msgstr[1] "A leírás túl hosszú (legfeljebb %d karakter lehet)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -702,22 +704,26 @@ msgid "Group not found."
msgstr "A csoport nem található."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Már tagja vagy ennek a csoportnak."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Az adminisztrátor blokkolt ebből a csoportból."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Nem sikerült %1$s felhasználót hozzáadni a %2$s csoporthoz."
@@ -729,9 +735,11 @@ msgstr "Nem vagy tagja ennek a csoportnak."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -790,9 +798,12 @@ msgid "Request token already authorized."
msgstr "Nincs jogosultságod."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -800,7 +811,7 @@ msgstr "Nincs jogosultságod."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -821,18 +832,20 @@ msgstr ""
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Váratlan űrlapbeküldés."
@@ -881,7 +894,7 @@ msgstr "Kontó"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Becenév"
@@ -889,7 +902,7 @@ msgstr "Becenév"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Jelszó"
@@ -996,10 +1009,12 @@ msgstr "Már megismételted azt a hírt."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1274,7 +1289,7 @@ msgstr "%s csoport tagjai"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Nem sikerült törölni a kedvencet."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1310,30 +1325,51 @@ msgstr "Nincs ilyen fájl."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Nem sikerült törölni a kedvencet."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Nincs ilyen csoport"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+msgstr "Nincs ilyen csoport."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "Összes tag"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Az API-metódus nem található."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Nem sikerült törölni a kedvencet."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1505,35 +1541,42 @@ msgstr "Nem sikerült felölteni az avatart."
msgid "Avatar deleted."
msgstr "Avatar törölve."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Csak a felhasználó láthatja a saját postaládáját."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Háttér"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1564,14 +1607,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Nem"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Ne blokkoljuk ezt a felhasználót"
@@ -1583,7 +1625,7 @@ msgstr "Ne blokkoljuk ezt a felhasználót"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Igen"
@@ -1599,32 +1641,6 @@ msgstr "Felhasználó blokkolása"
msgid "Failed to save block information."
msgstr "Nem sikerült elmenteni a blokkolási információkat."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Nincs ilyen csoport."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1756,7 +1772,8 @@ msgid "Account deleted."
msgstr "Avatar törölve."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Felhasználó törlése"
@@ -1778,8 +1795,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Megerősítés"
@@ -1851,8 +1869,10 @@ msgid "You must be logged in to delete a group."
msgstr "Be kell jelentkezned hogy elhagyhass egy csoportot."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Nincs nicknév vagy azonosító."
@@ -1907,10 +1927,11 @@ msgid "Delete this group"
msgstr "Töröljük ezt a felhasználót"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1948,19 +1969,30 @@ msgstr "Ne töröljük ezt a hírt"
msgid "Delete this notice"
msgstr "Töröljük ezt a hírt"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Nem törölhetsz felhasználókat."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Csak helyi felhasználókat tudsz törölni."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Felhasználó törlése"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Felhasználó törlése"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1968,80 +2000,104 @@ msgstr ""
"Biztosan törölni szeretnéd ezt a felhasználót? Ezzel minden róla szóló "
"adatot törlünk az adatbázisból, biztonsági mentés nélkül."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Ne töröljük ezt a hírt"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Töröljük ezt a felhasználót"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Megjelenés"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "Érvénytelen logó URL."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "Érvénytelen logó URL."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr ""
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Logó megváltoztatása"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Oldal logója"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
#, fuzzy
msgid "SSL logo"
msgstr "Oldal logója"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Téma megváltoztatása"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Webhely-téma"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "A webhely témája."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr ""
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Háttérkép megváltoztatása"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Háttér"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2049,98 +2105,108 @@ msgid ""
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "Be"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Ki"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Háttérkép be- vagy kikapcsolása."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Háttérkép csempézése"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Színek megváltoztatása"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Tartalom"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Oldalsáv"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Szöveg"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Hivatkozások"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr ""
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Alapértelmezések használata"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr ""
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Visszaállítás az alapértelmezettre"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Mentés"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Design mentése"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Ez a hír nincs a kedvenceid között!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Hozzáadás a kedvencekhez"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Nincs ilyen dokumentum: „%s”"
#. TRANS: Title for "Edit application" form.
@@ -2856,7 +2922,7 @@ msgid ""
"%%%%)"
msgstr ""
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Új csoport létrehozása"
@@ -3224,28 +3290,35 @@ msgid ""
"Sincerely, %2$s\n"
msgstr ""
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Be kell jelentkezned, ha csatlakozni szeretnél a csoporthoz."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s csatlakozott a(z) %2$s csoporthoz"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Be kell jelentkezned hogy elhagyhass egy csoportot."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Nem vagy tagja annak a csoportnak."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
-msgstr ""
+msgstr "%1$s csatlakozott a(z) %2$s csoporthoz"
#. TRANS: User admin panel title
#: actions/licenseadminpanel.php:55
@@ -3348,6 +3421,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Mentés"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr ""
@@ -3372,11 +3452,11 @@ msgstr "Bejelentkezés"
msgid "Login to site"
msgstr "Bejelentkezés az oldalra"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Emlékezz rám"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"A jövőben legyen automatikus a bejelentkezés; csak ha egyedül használod a "
@@ -3753,7 +3833,8 @@ msgstr "Jelszó megváltoztatása"
msgid "Change your password."
msgstr "Változtasd meg a jelszavadat."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Jelszó megváltoztatása"
@@ -3761,7 +3842,8 @@ msgstr "Jelszó megváltoztatása"
msgid "Old password"
msgstr "Régi jelszó"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Új jelszó"
@@ -3769,7 +3851,7 @@ msgstr "Új jelszó"
msgid "6 or more characters"
msgstr "6 vagy több karakter"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Ugyanaz mint a fenti jelszó"
@@ -3793,11 +3875,12 @@ msgstr "Érvénytelen a régi jelszó"
msgid "Error saving user; invalid."
msgstr "Hiba a felhasználó mentésekor; érvénytelen."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Az új jelszót nem sikerült elmenteni."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Jelszó elmentve."
@@ -4140,23 +4223,24 @@ msgid "Profile information"
msgstr "Személyes profil"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64 kisbetű vagy számjegy, nem lehet benne írásjel vagy szóköz"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Teljes név"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Honlap"
@@ -4171,7 +4255,7 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4179,27 +4263,27 @@ msgstr[0] "Jellemezd önmagad és az érdeklődési köröd %d karakterben"
msgstr[1] "Jellemezd önmagad és az érdeklődési köröd %d karakterben"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Jellemezd önmagad és az érdeklődési köröd"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Életrajz"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Helyszín"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Merre vagy, mint pl. \"Város, Megye, Ország\""
@@ -4254,7 +4338,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4262,49 +4346,50 @@ msgstr[0] "Az bemutatkozás túl hosszú (max %d karakter)."
msgstr[1] "Az bemutatkozás túl hosszú (max %d karakter)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Nem választottál időzónát."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "A nyelv túl hosszú (legfeljebb 50 karakter lehet)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Érvénytelen címke: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Nem sikerült a felhasználónak automatikus feliratkozást beállítani."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Nem sikerült a helyszín beállításait elmenteni."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr ""
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "A beállításokat elmentettük."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
msgid "Restore account"
msgstr ""
@@ -4419,124 +4504,176 @@ msgstr ""
msgid "Tag cloud"
msgstr "Címkefelhő"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Már be vagy jelentkezve!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Nincs ilyen visszaállítási kód."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Nem visszaállítási kód."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr ""
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr ""
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr ""
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Nem sikerült a felhasználó frissítése a megerősített e-mail címmel."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr ""
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
msgstr ""
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Jelszó visszaállítása"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Becenév vagy email cím"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr ""
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Alaphelyzetbe állítás"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Alaphelyzetbe állítás"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Jelszó alaphelyzetbe állítása"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Elfelejtett jelszó"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Jelszó visszaállítás kérvényezve"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Ismeretlen művelet"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 vagy több karakter, és ne felejtsd el!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Ugyanaz mint a fenti jelszó"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Alaphelyzet"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Adj meg egy nicknevet vagy email címet."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr ""
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr ""
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr ""
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr ""
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr ""
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "A jelszónak legalább 6 karakterből kell állnia."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "A jelszó és a megerősítése nem egyeznek meg."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Az új jelszót nem sikerült elmenteni."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Hiba a felhasználó beállításakor."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -4552,7 +4689,7 @@ msgstr ""
msgid "Registration successful"
msgstr "A regisztráció sikeres"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Regisztráció"
@@ -4578,71 +4715,63 @@ msgid ""
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 kisbetű vagy számjegy, nem lehet írásjel vagy szóköz benne. Szükséges."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 vagy több karakter. Kötelező."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Ugyanaz mint a jelszó fentebb. Szükséges."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 vagy több karakter"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Csak frissítéskor, fontos közlemények esetén és jelszóproblémák orvoslására "
"használjuk"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Hosszabb név, célszerűen a \"valódi\" neved"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
"A honlapodhoz, blogodhoz, vagy egy másik webhelyen lévő profilodhoz tartozó "
"URL"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4661,7 +4790,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -4964,7 +5093,7 @@ msgstr "Szervezet"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Leírás"
@@ -4987,8 +5116,9 @@ msgstr ""
msgid "Reset key & secret"
msgstr ""
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Törlés"
@@ -5106,7 +5236,7 @@ msgid "Note"
msgstr "Megjegyzés"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Álnevek"
@@ -7575,26 +7705,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "Nem találtunk konfigurációs fájlt. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "A következő helyeken kerestem konfigurációs fájlokat: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "A telepítő futtatása kijavíthatja ezt."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Menj a telepítőhöz."
@@ -7663,12 +7793,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Ki"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Alaphelyzet"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Színek megváltoztatása"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Alapértelmezések használata"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7752,27 +7885,23 @@ msgstr "Menjünk"
msgid "Grant this user the \"%s\" role"
msgstr ""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 kisbetű vagy számjegy, nem lehet benne írásjel vagy szóköz"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "A csoporthoz vagy témához tartozó honlap illetve blog URL-je"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Jellemezd a csoportot vagy a témát"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Jellemezd a csoportot vagy a témát %d karakterben"
msgstr[1] "Jellemezd a csoportot vagy a témát %d karakterben"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -7780,7 +7909,7 @@ msgstr ""
"A csoport földrajzi elhelyezkedése, ha van ilyen, pl. \"Város, Megye, Ország"
"\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, fuzzy, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8943,14 +9072,9 @@ msgstr[1] ""
msgid "about a year ago"
msgstr "körülbelül egy éve"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr ""
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr ""
@@ -8987,27 +9111,27 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Nincs ilyen profil."
+#~ msgid "No such group"
+#~ msgstr "Nincs ilyen csoport"
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "A legtöbb tagból álló csoportok"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "Az API-metódus nem található."
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Senki sem követ figyelemmel."
+#~ msgid "Reset"
+#~ msgstr "Alaphelyzet"
-#~ msgid "Couldn't update user."
-#~ msgstr "Nem sikerült frissíteni a felhasználót."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 kisbetű vagy számjegy, nem lehet írásjel vagy szóköz benne. "
+#~ "Szükséges."
-#~ msgid "Couldn't save profile."
-#~ msgstr "Nem sikerült elmenteni a profilt."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 vagy több karakter. Kötelező."
-#~ msgid "Couldn't save tags."
-#~ msgstr "Nem sikerült a címkéket elmenteni."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Ugyanaz mint a jelszó fentebb. Szükséges."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 kisbetű vagy számjegy, nem lehet benne írásjel vagy szóköz"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 635f29d291..3c99af5802 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:33+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:06+0000\n"
"Language-Team: Interlingua \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -74,6 +74,7 @@ msgid "Save access settings"
msgstr "Salveguardar configurationes de accesso"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -85,13 +86,13 @@ msgstr "Salveguardar configurationes de accesso"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Salveguardar"
@@ -326,7 +327,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Non poteva actualisar le usator."
@@ -350,7 +351,7 @@ msgstr "Le usator non ha un profilo."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Non poteva salveguardar le profilo."
@@ -360,7 +361,7 @@ msgstr "Non poteva salveguardar le profilo."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -401,7 +402,6 @@ msgstr "Non poteva actualisar le apparentia."
#. TRANS: Title for Atom feed.
#: actions/apiatomservice.php:85
-#, fuzzy
msgctxt "ATOM"
msgid "Main"
msgstr "Principal"
@@ -540,7 +540,8 @@ msgid "That status is not a favorite."
msgstr "Iste stato non es favorite."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Non poteva deler le favorite."
@@ -586,7 +587,7 @@ msgstr "Non poteva trovar le usator de destination."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Pseudonymo ja in uso. Proba un altere."
@@ -596,7 +597,7 @@ msgstr "Pseudonymo ja in uso. Proba un altere."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Non un pseudonymo valide."
@@ -608,7 +609,7 @@ msgstr "Non un pseudonymo valide."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Le pagina personal non es un URL valide."
@@ -618,7 +619,7 @@ msgstr "Le pagina personal non es un URL valide."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
@@ -645,7 +646,7 @@ msgstr[1] "Description es troppo longe (maximo %d characteres)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Loco es troppo longe (maximo 255 characteres)."
@@ -702,22 +703,26 @@ msgid "Group not found."
msgstr "Gruppo non trovate."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Tu es ja membro de iste gruppo."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Le administrator te ha blocate de iste gruppo."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s."
@@ -729,9 +734,11 @@ msgstr "Tu non es membro de iste gruppo."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -788,9 +795,12 @@ msgid "Request token already authorized."
msgstr "Indicio de requesta jam autorisate."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -798,7 +808,7 @@ msgstr "Indicio de requesta jam autorisate."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -820,18 +830,20 @@ msgstr ""
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Submission de formulario inexpectate."
@@ -885,7 +897,7 @@ msgstr "Conto"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Pseudonymo"
@@ -893,7 +905,7 @@ msgstr "Pseudonymo"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Contrasigno"
@@ -1001,10 +1013,12 @@ msgstr "Iste nota ha ja essite repetite."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
@@ -1035,7 +1049,6 @@ msgstr "Le deletion es solmente possibile con le formato Atom."
#. TRANS: Client error displayed when a user has no rights to delete notices of other users.
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
-#, fuzzy
msgid "Cannot delete this notice."
msgstr "Non pote deler iste nota."
@@ -1240,15 +1253,13 @@ msgstr "Profilo non existe."
#. TRANS: Client exception thrown when trying to set a favorite for another user.
#. TRANS: Client exception thrown when trying to subscribe another user.
#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
-#, fuzzy
msgid "Cannot add someone else's subscription."
msgstr "Non es possibile adder le subscription de un altere persona."
#. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
#: actions/atompubfavoritefeed.php:240
-#, fuzzy
msgid "Can only handle favorite activities."
-msgstr "Solmente le activitates Favorite es possibile."
+msgstr "Solmente le activitates favorite es possibile."
#. TRANS: Client exception thrown when trying favorite an object that is not a notice.
#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
@@ -1275,15 +1286,14 @@ msgstr "Membratos del gruppo %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
-msgstr "Non pote adder le membrato de un altere persona"
+msgid "Cannot add someone else's membership."
+msgstr "Non es possibile adder le membrato de un altere persona"
#. TRANS: Client error displayed when not using the POST verb.
#. TRANS: Do not translate POST.
#: actions/atompubmembershipfeed.php:242
-#, fuzzy
msgid "Can only handle join activities."
-msgstr "Solmente le activitates \"Join\" es possibile."
+msgstr "Solmente le activitates de adhesion es possibile."
#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
#: actions/atompubmembershipfeed.php:259
@@ -1308,29 +1318,51 @@ msgstr "Iste favorite non existe."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Non pote deler le favorite de un altere persona."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Gruppo non existe"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+msgstr "Gruppo non existe."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
-msgid "Not a member"
-msgstr "Non es membro"
-
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Methodo HTTP non supportate."
+msgid "Not a member."
+msgstr "Non es membro"
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Non pote deler le membrato de un altere persona"
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1338,22 +1370,21 @@ msgstr "Non pote deler le membrato de un altere persona"
#: actions/atompubshowsubscription.php:72
#: actions/atompubshowsubscription.php:83
#: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
msgid "No such profile id: %d."
msgstr "Iste ID de profilo non existe: %d"
#. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
#. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
#: actions/atompubshowsubscription.php:94
-#, fuzzy, php-format
+#, php-format
msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "Le profilo %1$d non es subscribite al profilo %2$d"
+msgstr "Le profilo %1$d non es subscribite al profilo %2$d."
#. TRANS: Client exception thrown when trying to delete a subscription of another user.
#: actions/atompubshowsubscription.php:157
-#, fuzzy
msgid "Cannot delete someone else's subscription."
-msgstr "Non pote deler le subscription de un altere persona"
+msgstr "Non pote deler le subscription de un altere persona."
#. TRANS: Client error displayed when not using the POST verb.
#. TRANS: Do not translate POST.
@@ -1368,9 +1399,9 @@ msgstr "Pote solmente sequer personas."
#. TRANS: Client exception thrown when subscribing to a non-existing profile.
#: actions/atompubsubscriptionfeed.php:267
-#, fuzzy, php-format
+#, php-format
msgid "Unknown profile %s."
-msgstr "Profilo incognite: %s"
+msgstr "Profilo %s incognite."
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
@@ -1500,24 +1531,30 @@ msgstr "Actualisation del avatar fallite."
msgid "Avatar deleted."
msgstr "Avatar delite."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr "Facer un copia de reserva del conto"
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
msgid "Only logged-in users can backup their account."
msgstr ""
"Solmente usatores authenticate pote facer un copia de reserva de lor conto."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr "Tu non pote facer un copia de reserva de tu conto."
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
+#, fuzzy
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
@@ -1527,12 +1564,14 @@ msgstr ""
"como adresses de e-mail e de messageria instantanee non es copiate. In "
"addition, le files incargate e le messages directe non es copiate."
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
msgctxt "BUTTON"
msgid "Backup"
msgstr "Copia de reserva"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr "Facer un copia de reserva de tu conto"
@@ -1566,14 +1605,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Non blocar iste usator"
@@ -1585,7 +1623,7 @@ msgstr "Non blocar iste usator"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Si"
@@ -1601,32 +1639,6 @@ msgstr "Blocar iste usator"
msgid "Failed to save block information."
msgstr "Falleva de salveguardar le information del blocada."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Gruppo non existe."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1753,7 +1765,8 @@ msgid "Account deleted."
msgstr "Conto delite."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
msgid "Delete account"
msgstr "Deler conto"
@@ -1778,8 +1791,9 @@ msgstr ""
"datos ante le deletion."
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -1852,8 +1866,10 @@ msgid "You must be logged in to delete a group."
msgstr "Tu debe aperir un session pro deler un gruppo."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Nulle pseudonymo o ID."
@@ -1904,10 +1920,11 @@ msgid "Delete this group"
msgstr "Deler iste gruppo"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1947,19 +1964,30 @@ msgstr "Non deler iste nota"
msgid "Delete this notice"
msgstr "Deler iste nota"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Tu non pote deler usatores."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Tu pote solmente deler usatores local."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Deler usator"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Deler usator"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1967,80 +1995,104 @@ msgstr ""
"Es tu secur de voler deler iste usator? Isto radera tote le datos super le "
"usator del base de datos, sin copia de reserva."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Non deler iste gruppo"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Deler iste usator"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Apparentia"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr "Configuration del apparentia de iste sito StatusNet"
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "URL de logotypo invalide."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "URL de logotypo SSL invalide."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Thema non disponibile: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Cambiar logotypo"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logotypo del sito"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "Logotypo SSL"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Cambiar thema"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Thema del sito"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Le thema de apparentia pro le sito."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Apparentia personalisate"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
"Es possibile incargar un apparentia personalisate de StatusNet in un "
"archivo .ZIP."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Cambiar imagine de fundo"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Fundo"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2050,98 +2102,108 @@ msgstr ""
"file es %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "Active"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Non active"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Activar o disactivar le imagine de fundo."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Tegular le imagine de fundo"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Cambiar colores"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Contento"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Barra lateral"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Texto"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Ligamines"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Avantiate"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "CSS personalisate"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Usar predefinitiones"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Restaurar apparentias predefinite"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Revenir al predefinitiones"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Salveguardar"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Salveguardar apparentia"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Iste nota non es favorite!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Adder al favorites"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Le documento \"%s\" non existe."
#. TRANS: Title for "Edit application" form.
@@ -2444,7 +2506,6 @@ msgstr "Iste adresse de e-mail pertine ja a un altere usator."
#. TRANS: Server error thrown on database error adding SMS confirmation code.
#: actions/emailsettings.php:426 actions/imsettings.php:343
#: actions/smssettings.php:365
-#, fuzzy
msgid "Could not insert confirmation code."
msgstr "Non poteva inserer le codice de confirmation."
@@ -2474,7 +2535,6 @@ msgstr "Iste adresse de e-mail es erronee."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
#: actions/emailsettings.php:468 actions/smssettings.php:413
-#, fuzzy
msgid "Could not delete email confirmation."
msgstr "Non poteva deler confirmation de e-mail."
@@ -2502,7 +2562,6 @@ msgstr "Nulle adresse de e-mail entrante."
#. TRANS: Server error thrown on database error adding incoming e-mail address.
#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:564 actions/smssettings.php:587
-#, fuzzy
msgid "Could not update user record."
msgstr "Non poteva actualisar le datos del usator."
@@ -2866,7 +2925,7 @@ msgstr ""
"vide un gruppo que te place? Tenta [cercar un](%%%%action.groupsearch%%%%) o "
"[crear le tue!](%%%%action.newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Crear un nove gruppo"
@@ -3054,7 +3113,6 @@ msgstr "Iste adresse de messageria instantanee es erronee."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:391
-#, fuzzy
msgid "Could not delete IM confirmation."
msgstr "Non poteva deler confirmation de messageria instantanee."
@@ -3272,26 +3330,33 @@ msgstr ""
"\n"
"Sincermente, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Tu debe aperir un session pro facer te membro de un gruppo."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s se jungeva al gruppo %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Tu debe aperir un session pro quitar un gruppo."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Tu non es membro de iste gruppo."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s quitava le gruppo %2$s"
@@ -3397,6 +3462,13 @@ msgstr "URL del imagine del licentia"
msgid "URL for an image to display with the license."
msgstr "Le URL de un imagine a monstrar con le licentia."
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Salveguardar"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "Salveguardar configurationes de licentia"
@@ -3422,11 +3494,11 @@ msgstr "Aperir session"
msgid "Login to site"
msgstr "Authenticar te a iste sito"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Memorar me"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Aperir session automaticamente in le futuro; non pro computatores usate in "
@@ -3818,7 +3890,8 @@ msgstr "Cambiar contrasigno"
msgid "Change your password."
msgstr "Cambiar tu contrasigno."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Cambio del contrasigno"
@@ -3826,7 +3899,8 @@ msgstr "Cambio del contrasigno"
msgid "Old password"
msgstr "Ancian contrasigno"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Nove contrasigno"
@@ -3834,7 +3908,7 @@ msgstr "Nove contrasigno"
msgid "6 or more characters"
msgstr "6 o plus characteres"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Identic al contrasigno hic supra"
@@ -3858,11 +3932,12 @@ msgstr "Ancian contrasigno incorrecte"
msgid "Error saving user; invalid."
msgstr "Error de salveguardar le usator; invalide."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Non pote salveguardar le nove contrasigno."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Contrasigno salveguardate."
@@ -4189,22 +4264,23 @@ msgid "Profile information"
msgstr "Information de profilo"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64 minusculas o numeros, sin punctuation o spatios."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Nomine complete"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Pagina personal"
@@ -4216,7 +4292,7 @@ msgstr "URL de tu pagina personal, blog o profilo in un altere sito."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4224,27 +4300,27 @@ msgstr[0] "Describe te e tu interesses in %d character"
msgstr[1] "Describe te e tu interesses in %d characteres"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Describe te e tu interesses"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Bio"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Loco"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\""
@@ -4298,7 +4374,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4306,48 +4382,47 @@ msgstr[0] "Bio es troppo longe (maximo %d character)."
msgstr[1] "Bio es troppo longe (maximo %d characteres)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Fuso horari non seligite."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
msgid "Language is too long (maximum 50 characters)."
msgstr "Lingua es troppo longe (maximo 50 characteres)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Etiquetta invalide: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
-#, fuzzy
+#: actions/profilesettings.php:347
msgid "Could not update user for autosubscribe."
-msgstr "Non poteva actualisar usator pro autosubscription."
+msgstr "Non poteva actualisar le usator pro autosubscription."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
-#, fuzzy
+#: actions/profilesettings.php:405
msgid "Could not save location prefs."
msgstr "Non poteva salveguardar le preferentias de loco."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Non poteva salveguardar etiquettas."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Preferentias confirmate."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
msgid "Restore account"
msgstr "Restaurar conto"
@@ -4470,35 +4545,43 @@ msgstr ""
msgid "Tag cloud"
msgstr "Etiquettario"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Tu es jam authenticate!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Iste codice de recuperation non existe."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Non es un codice de recuperation."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Codice de recuperation pro un usator incognite."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Error con le codice de confirmation."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Iste codice de confirmation ha expirate. Per favor recomencia."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Non poteva actualisar le usator con le adresse de e-mail confirmate."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4506,67 +4589,100 @@ msgstr ""
"Si tu ha oblidate o perdite tu contrasigno, tu pote facer inviar un nove al "
"adresse de e-mail specificate in tu conto."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Tu ha essite identificate. Entra un nove contrasigno hic infra. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Recuperation de contrasigno"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Pseudonymo o adresse de e-mail"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "Tu pseudonymo in iste servitor, o tu adresse de e-mail registrate."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Recuperar"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Recuperar"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Reinitialisar contrasigno"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Recuperar contrasigno"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Recuperation de contrasigno requestate"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Action incognite"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 o plus characteres, e non oblida lo!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Identic al contrasigno hic supra"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Reinitialisar"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Entra un pseudonymo o adresse de e-mail."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "Nulle usator existe con iste adresse de e-mail o nomine de usator."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Nulle adresse de e-mail registrate pro iste usator."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Error al salveguardar le confirmation del adresse."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4574,23 +4690,34 @@ msgstr ""
"Instructiones pro recuperar tu contrasigno ha essite inviate al adresse de e-"
"mail registrate in tu conto."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Reinitialisation inexpectate del contrasigno."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
msgid "Password must be 6 characters or more."
msgstr "Le contrasigno debe haber 6 characteres o plus."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Contrasigno e confirmation non corresponde."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Non pote salveguardar le nove contrasigno."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Error durante le configuration del usator."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Nove contrasigno salveguardate con successo. Tu session es ora aperte."
@@ -4606,7 +4733,7 @@ msgstr "Pardono, le codice de invitation es invalide."
msgid "Registration successful"
msgstr "Registration succedite"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Crear conto"
@@ -4634,62 +4761,55 @@ msgstr ""
"Con iste formulario tu pote crear un nove conto. Postea, tu pote publicar "
"notas e mitter te in contacto con amicos e collegas. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 minusculas o numeros, sin punctuation o spatios. Requirite."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 o plus characteres. Requirite."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Identic al contrasigno hic supra. Requirite."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 o plus characteres"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Usate solmente pro actualisationes, notificationes e recuperation de "
"contrasigno"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nomine plus longe, preferibilemente tu nomine \"real\""
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL de tu pagina personal, blog o profilo in un altere sito"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"io comprende que le contento e datos de %1$s es private e confidential."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Le derecto de autor pro mi texto e files es in possession de %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "Le derecto de autor pro mi texto e files resta in mi possession."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Tote le derectos reservate."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4699,7 +4819,7 @@ msgstr ""
"contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de "
"telephono."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4731,7 +4851,7 @@ msgstr ""
"\n"
"Gratias pro inscriber te, e nos spera que iste servicio te place."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -4791,12 +4911,10 @@ msgstr ""
"invalide)."
#: actions/remotesubscribe.php:175
-#, fuzzy
msgid "That is a local profile! Login to subscribe."
-msgstr "Isto es un profilo local! Aperi un session pro subscriber."
+msgstr "Isto es un profilo local! Aperi session pro subscriber."
#: actions/remotesubscribe.php:182
-#, fuzzy
msgid "Could not get a request token."
msgstr "Non poteva obtener un indicio de requesta."
@@ -4809,7 +4927,6 @@ msgid "No notice specified."
msgstr "Nulle nota specificate."
#: actions/repeat.php:75
-#, fuzzy
msgid "You cannot repeat your own notice."
msgstr "Tu non pote repeter tu proprie nota."
@@ -5047,7 +5164,7 @@ msgstr "Organisation"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Description"
@@ -5070,8 +5187,9 @@ msgstr "Actiones de application"
msgid "Reset key & secret"
msgstr "Reinitialisar clave e secreto"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Deler"
@@ -5199,7 +5317,7 @@ msgid "Note"
msgstr "Nota"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Aliases"
@@ -7220,10 +7338,9 @@ msgstr ""
"OAuth."
#: lib/apioauthstore.php:345
-#, fuzzy
msgid "Database error updating OAuth application user."
msgstr ""
-"Error del base de datos durante le insertion del usator del application "
+"Error del base de datos durante le actualisation del usator del application "
"OAuth."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
@@ -7787,24 +7904,24 @@ msgstr ""
"tracking - non ancora implementate.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
msgid "No configuration file found."
msgstr "Nulle file de configuration trovate."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
msgid "I looked for configuration files in the following places:"
msgstr "Io cercava files de configuration in le sequente locos:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "Considera executar le installator pro reparar isto."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Ir al installator."
@@ -7871,11 +7988,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Non active"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Reinitialisar"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Cambiar colores"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Usar predefinitiones"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7958,32 +8079,28 @@ msgstr "Ir"
msgid "Grant this user the \"%s\" role"
msgstr "Conceder le rolo \"%s\" a iste usator"
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 minusculas o numeros, sin punctuation o spatios"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
msgid "URL of the homepage or blog of the group or topic."
msgstr "URL del pagina initial o blog del gruppo o topico."
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Describe le gruppo o topico"
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Describe le gruppo o topico in %d character o minus"
msgstr[1] "Describe le gruppo o topico in %d characteres o minus"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
"Loco del gruppo, si existe, como \"Citate, Provincia (o Region), Pais\"."
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9191,14 +9308,9 @@ msgstr[1] "circa %d menses retro"
msgid "about a year ago"
msgstr "circa un anno retro"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s non es un color valide!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s non es un color valide! Usa 3 o 6 characteres hexadecimal."
@@ -9234,29 +9346,27 @@ msgstr "XML invalide, radice XRD mancante."
msgid "Getting backup from file '%s'."
msgstr "Obtene copia de reserva ex file '%s'."
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "Message AtomPub con URI de attention incognite %s"
+#~ msgid "No such group"
+#~ msgstr "Gruppo non existe"
-#~ msgid "No such profile"
-#~ msgstr "Profilo non existe"
+#~ msgid "HTTP method not supported"
+#~ msgstr "Methodo HTTP non supportate"
-#~ msgid "Notices %s has favorited to on %s"
-#~ msgstr "Notas que %s ha addite al favorites in %s"
+#~ msgid "Reset"
+#~ msgstr "Reinitialisar"
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Gruppos del quales %s es membro in %s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr "1-64 minusculas o numeros, sin punctuation o spatios. Requirite."
-#~ msgid "Method not supported"
-#~ msgstr "Methodo non supportate"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 o plus characteres. Requirite."
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Personas al quales %s ha subscribite in %s"
+#~ msgid "Same as password above. Required."
+#~ msgstr "Identic al contrasigno hic supra. Requirite."
-#~ msgid "Couldn't update user."
-#~ msgstr "Non poteva actualisar usator."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 minusculas o numeros, sin punctuation o spatios"
-#~ msgid "Couldn't save profile."
-#~ msgstr "Non poteva salveguardar profilo."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "Non poteva salveguardar etiquettas."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s non es un color valide!"
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index f9cbcf30a2..1b8b209700 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:34+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:10+0000\n"
"Language-Team: Icelandic \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -80,6 +80,7 @@ msgid "Save access settings"
msgstr "Stillingar fyrir mynd"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -91,13 +92,13 @@ msgstr "Stillingar fyrir mynd"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
#, fuzzy
msgctxt "BUTTON"
msgid "Save"
@@ -326,7 +327,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
#, fuzzy
msgid "Could not update user."
@@ -351,7 +352,7 @@ msgstr "Notandi hefur enga persónulega síðu."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
#, fuzzy
msgid "Could not save profile."
msgstr "Gat ekki vistað persónulega síðu."
@@ -362,7 +363,7 @@ msgstr "Gat ekki vistað persónulega síðu."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -542,7 +543,8 @@ msgid "That status is not a favorite."
msgstr "Þetta babl er ekki í uppáhaldi!"
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Gat ekki eytt uppáhaldi."
@@ -595,7 +597,7 @@ msgstr "Gat ekki uppfært notanda."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
@@ -605,7 +607,7 @@ msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Ekki tækt stuttnefni."
@@ -617,7 +619,7 @@ msgstr "Ekki tækt stuttnefni."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Heimasíða er ekki gild vefslóð."
@@ -627,7 +629,7 @@ msgstr "Heimasíða er ekki gild vefslóð."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -655,7 +657,7 @@ msgstr[1] "Staðsetning er of löng (í mesta lagi %d stafir)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -713,23 +715,27 @@ msgid "Group not found."
msgstr "Fannst ekki."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
#, fuzzy
msgid "You are already a member of that group."
msgstr "Þú ert nú þegar meðlimur í þessum hópi"
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr ""
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Gat ekki skráð hópmeðlimi."
@@ -742,9 +748,11 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -805,9 +813,12 @@ msgid "Request token already authorized."
msgstr "Þú ert ekki áskrifandi."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -815,7 +826,7 @@ msgstr "Þú ert ekki áskrifandi."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -838,18 +849,20 @@ msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Bjóst ekki við innsendingu eyðublaðs."
@@ -898,7 +911,7 @@ msgstr "Aðgangur"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Stuttnefni"
@@ -906,7 +919,7 @@ msgstr "Stuttnefni"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Lykilorð"
@@ -1015,10 +1028,12 @@ msgstr "Get ekki eytt þessu babli."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1293,7 +1308,7 @@ msgstr "Hópmeðlimir %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Gat ekki sett inn nýja áskrift."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1329,30 +1344,51 @@ msgstr "Ekkert svoleiðis babl."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Gat ekki eytt uppáhaldi."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "Enginn þannig hópur."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "Allir meðlimir"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Aðferð í forritsskilum fannst ekki!"
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Gat ekki vistað áskrift."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1528,34 +1564,41 @@ msgstr "Mistókst að uppfæra mynd"
msgid "Avatar deleted."
msgstr "Mynd hefur verið uppfærð."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Aðeins notandinn getur lesið hans eigin pósthólf."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
msgctxt "BUTTON"
msgid "Backup"
msgstr ""
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1586,14 +1629,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Athugasemd"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
#, fuzzy
msgid "Do not block this user"
msgstr "Opna á þennan notanda"
@@ -1606,7 +1648,7 @@ msgstr "Opna á þennan notanda"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
@@ -1623,32 +1665,6 @@ msgstr "Loka á þennan notanda"
msgid "Failed to save block information."
msgstr "Mistókst að vista upplýsingar um notendalokun"
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Enginn þannig hópur."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1784,7 +1800,8 @@ msgid "Account deleted."
msgstr "Mynd hefur verið uppfærð."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Búa til nýjan hóp"
@@ -1806,8 +1823,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Staðfesta"
@@ -1882,8 +1900,10 @@ msgid "You must be logged in to delete a group."
msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
#, fuzzy
msgid "No nickname or ID."
msgstr "Ekkert stuttnefni."
@@ -1936,10 +1956,11 @@ msgid "Delete this group"
msgstr "Eyða þessu babli"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1978,108 +1999,143 @@ msgstr "Get ekki eytt þessu babli."
msgid "Delete this notice"
msgstr "Eyða þessu babli"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
#, fuzzy
msgid "You cannot delete users."
msgstr "Gat ekki uppfært notanda."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: 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
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
+msgid "Delete user"
+msgstr "Eyða"
+
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
#, fuzzy
msgid "Delete user"
msgstr "Eyða"
-#: actions/deleteuser.php:136
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
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 ""
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Get ekki eytt þessu babli."
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
#, fuzzy
msgid "Delete this user"
msgstr "Eyða þessu babli"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr ""
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
#, fuzzy
msgid "Invalid logo URL."
msgstr "Ótæk stærð."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "Ótæk stærð."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Þessi síða er ekki aðgengileg í "
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
#, fuzzy
msgid "Change logo"
msgstr "Breyta"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Babl vefsíðunnar"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
#, fuzzy
msgid "SSL logo"
msgstr "Babl vefsíðunnar"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
#, fuzzy
msgid "Change theme"
msgstr "Breyta"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
#, fuzzy
msgid "Site theme"
msgstr "Babl vefsíðunnar"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
#, fuzzy
msgid "Theme for the site."
msgstr "Skrá þig út af síðunni"
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
#, fuzzy
msgid "Custom theme"
msgstr "Babl vefsíðunnar"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr ""
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2087,102 +2143,110 @@ msgid ""
msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr ""
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr ""
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr ""
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
#, fuzzy
-msgid "Change colours"
+msgid "Change colors"
msgstr "Breyta lykilorðinu þínu"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
#, fuzzy
msgid "Content"
msgstr "Tengjast"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
#, fuzzy
msgid "Sidebar"
msgstr "Leita"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Texti"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
#, fuzzy
msgid "Links"
msgstr "Innskráning"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr ""
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr ""
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr ""
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr ""
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Vista"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr ""
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Þetta babl er ekki í uppáhaldi!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Bæta við sem uppáhaldsbabli"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Ekkert svoleiðis babl."
#. TRANS: Title for "Edit application" form.
@@ -2926,7 +2990,7 @@ msgid ""
"%%%%)"
msgstr ""
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Búa til nýjan hóp"
@@ -3336,26 +3400,33 @@ msgstr ""
"\n"
"Með bestu kveðju, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Þú verður að hafa skráð þig inn til að bæta þér í hóp."
-#: actions/joingroup.php:141
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%s bætti sér í hópinn %s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Þú ert ekki meðlimur í þessum hópi."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "Staða %1$s á %2$s"
@@ -3461,6 +3532,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Vista"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr ""
@@ -3486,11 +3564,11 @@ msgstr "Innskráning"
msgid "Login to site"
msgstr "Skrá þig inn á síðuna"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Muna eftir mér"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Sjálfvirk innskráning í framtíðinni. Ekki nota þetta á tölvu sem aðrir deila "
@@ -3895,7 +3973,8 @@ msgstr "Breyta lykilorði"
msgid "Change your password."
msgstr "Breyta lykilorðinu þínu."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Lykilorðabreyting"
@@ -3903,7 +3982,8 @@ msgstr "Lykilorðabreyting"
msgid "Old password"
msgstr "Eldra lykilorð"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Nýtt lykilorð"
@@ -3911,7 +3991,7 @@ msgstr "Nýtt lykilorð"
msgid "6 or more characters"
msgstr "6 eða fleiri tákn"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Sama og lykilorðið hér fyrir ofan"
@@ -3935,11 +4015,12 @@ msgstr "Rangt eldra lykilorð"
msgid "Error saving user; invalid."
msgstr "Villa kom upp í vistun notanda: ótækt."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Get ekki vistað nýja lykilorðið."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Lykilorð vistað."
@@ -4284,23 +4365,24 @@ msgid "Profile information"
msgstr "Upplýsingar á persónulegri síðu"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Fullt nafn"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Heimasíða"
@@ -4315,7 +4397,7 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4323,28 +4405,28 @@ msgstr[0] "Lýstu þér og áhugamálum þínum í 140 táknum"
msgstr[1] "Lýstu þér og áhugamálum þínum í 140 táknum"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Lýstu þér og þínum "
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Lýsing"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Staðsetning"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Staðsetning þín, eins og \"borg, sýsla, land\""
@@ -4399,7 +4481,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4407,49 +4489,50 @@ msgstr[0] "Staðsetning er of löng (í mesta lagi %d stafir)."
msgstr[1] "Staðsetning er of löng (í mesta lagi %d stafir)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Tímabelti ekki valið."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "Tungumál er of langt (í mesta lagi 50 stafir)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Ógilt merki: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Gat ekki uppfært notanda í sjálfvirka áskrift."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Gat ekki vistað merki."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Gat ekki vistað merki."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Stillingar vistaðar."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Búa til nýjan hóp"
@@ -4560,37 +4643,45 @@ msgstr ""
msgid "Tag cloud"
msgstr "Merkjaský"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Þú ert nú þegar innskráð(ur)!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Enginn svoleiðis staðfestingarlykill."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Þetta er ekki staðfestingarlykill."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Lykill fyrir endurheimtingu óþekkts notanda."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Villa kom upp varðandi staðfestingarlykilinn."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr ""
"Þessi staðfestingarlykill er of gamall. Vinsamlegast byrjaðu aftur upp á "
"nýtt."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
#, fuzzy
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
@@ -4599,69 +4690,102 @@ msgstr ""
"Leiðbeiningar um það hvernig þú getur endurheimt lykilorðið þitt hafa verið "
"sendar á tölvupóstfangið sem er tengt notendaaðganginum þínum."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
msgstr ""
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
#, fuzzy
msgid "Password recovery"
msgstr "Beiðni um að endurheimta lykilorð hefur verið send inn"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
#, fuzzy
msgid "Nickname or email address"
msgstr "Sláðu inn stuttnefni eða tölvupóstfang."
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "Stuttnefnið þitt á þessum vefþjóni eða skráða tölvupóstfangið."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Endurheimta"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Endurheimta"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Endurstilla lykilorð"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Endurheimta lykilorð"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Beiðni um að endurheimta lykilorð hefur verið send inn"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Óþekkt aðgerð"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 eða fleiri tákn og ekki gleyma því!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Sama og lykilorðið hér fyrir ofan"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Endurstilla"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Sláðu inn stuttnefni eða tölvupóstfang."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "Enginn notandi með þetta tölvupóstfang eða notendanafn"
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Ekkert tölvupóstfang á skrá fyrir þennan notanda."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Villa kom upp í vistun netfangsstaðfestingar."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4669,24 +4793,35 @@ msgstr ""
"Leiðbeiningar um það hvernig þú getur endurheimt lykilorðið þitt hafa verið "
"sendar á tölvupóstfangið sem er tengt notendaaðganginum þínum."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Bjóst ekki við endurstillingu lykilorðs."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "Lykilorð verður að vera 6 tákn eða fleiri."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Lykilorð og staðfesting passa ekki saman."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Get ekki vistað nýja lykilorðið."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Villa kom upp í stillingu notanda."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)"
@@ -4703,7 +4838,7 @@ msgstr "Villa kom upp varðandi staðfestingarlykilinn."
msgid "Registration successful"
msgstr "Nýskráning tókst"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Nýskrá"
@@ -4729,70 +4864,62 @@ msgid ""
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 lágstafir eða tölustafir, engin greinarmerki eða bil. Nauðsynlegt."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 eða fleiri tákn. Nauðsynlegt"
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 eða fleiri tákn"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Tölvupóstur"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Aðeins notað fyrir uppfærslur, tilkynningar og endurheimtingu lykilorða."
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Lengra nafn, ákjósalegast að það sé \"rétta\" nafnið þitt"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
"Veffang heimasíðunnar þinnar, bloggsins þíns eða persónulegrar síðu á öðru "
"vefsvæði"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:589
+#: actions/register.php:588
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4825,7 +4952,7 @@ msgstr ""
"\n"
"Takk fyrir að skrá þig og við vonum að þú njótir þjónustunnar."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5148,7 +5275,7 @@ msgstr "Uppröðun"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Lýsing"
@@ -5171,8 +5298,9 @@ msgstr ""
msgid "Reset key & secret"
msgstr ""
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Eyða"
@@ -5291,7 +5419,7 @@ msgid "Note"
msgstr "Athugasemd"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr ""
@@ -7871,26 +7999,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "Enginn staðfestingarlykill."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Boðskort sent á eftirfarandi aðila:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
#, fuzzy
msgid "Go to the installer."
msgstr "Skrá þig inn á síðuna"
@@ -7961,12 +8089,16 @@ msgctxt "RADIO"
msgid "Off"
msgstr ""
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Endurstilla"
+msgid "Change colours"
+msgstr "Breyta lykilorðinu þínu"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr ""
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -8052,34 +8184,30 @@ msgstr "Áfram"
msgid "Grant this user the \"%s\" role"
msgstr ""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "Vefslóð vefsíðu hópsins eða umfjöllunarefnisins"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
#, fuzzy
msgid "Describe the group or topic"
msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
msgstr[1] "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr "Staðsetning hópsins, ef einhver, eins og \"Borg, landshluti, land\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9205,14 +9333,9 @@ msgstr[1] ""
msgid "about a year ago"
msgstr "fyrir um einu ári síðan"
-#: lib/webcolor.php:80
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "Heimasíða er ekki gild vefslóð."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "Heimasíða er ekki gild vefslóð."
@@ -9251,27 +9374,30 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Ekkert svoleiðis babl."
+#~ msgid "No such group"
+#~ msgstr "Enginn þannig hópur."
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Hópar sem %s er meðlimur í"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "Aðferð í forritsskilum fannst ekki!"
+#~ msgid "Reset"
+#~ msgstr "Endurstilla"
+
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil. Nauðsynlegt."
+
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 eða fleiri tákn. Nauðsynlegt"
+
+#~ msgid "Same as password above. Required."
+#~ msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
+
#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Fólk sem eru áskrifendur að %s"
-
-#~ msgid "Couldn't update user."
-#~ msgstr "Gat ekki uppfært notanda."
-
-#~ msgid "Couldn't save profile."
-#~ msgstr "Gat ekki vistað persónulega síðu."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "Gat ekki vistað merki."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "Heimasíða er ekki gild vefslóð."
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 223452403d..510b1d11e7 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:35+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:13+0000\n"
"Language-Team: Italian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -78,6 +78,7 @@ msgid "Save access settings"
msgstr "Salva impostazioni di accesso"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -89,13 +90,13 @@ msgstr "Salva impostazioni di accesso"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Salva"
@@ -328,7 +329,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Impossibile aggiornare l'utente."
@@ -352,7 +353,7 @@ msgstr "L'utente non ha un profilo."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Impossibile salvare il profilo."
@@ -362,7 +363,7 @@ msgstr "Impossibile salvare il profilo."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, fuzzy, php-format
@@ -542,7 +543,8 @@ msgid "That status is not a favorite."
msgstr "Questo messaggio non è un preferito."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Impossibile eliminare un preferito."
@@ -589,7 +591,7 @@ msgstr "Impossibile trovare l'utente destinazione."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Soprannome già in uso. Prova con un altro."
@@ -599,7 +601,7 @@ msgstr "Soprannome già in uso. Prova con un altro."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Non è un soprannome valido."
@@ -611,7 +613,7 @@ msgstr "Non è un soprannome valido."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "L'indirizzo della pagina web non è valido."
@@ -621,7 +623,7 @@ msgstr "L'indirizzo della pagina web non è valido."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -649,7 +651,7 @@ msgstr[1] "La descrizione è troppo lunga (max %d caratteri)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -707,22 +709,26 @@ msgid "Group not found."
msgstr "Gruppo non trovato."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Fai già parte di quel gruppo."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
@@ -734,9 +740,11 @@ msgstr "Non fai parte di questo gruppo."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -796,9 +804,12 @@ msgid "Request token already authorized."
msgstr "Autorizzazione non presente."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -806,7 +817,7 @@ msgstr "Autorizzazione non presente."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -829,18 +840,20 @@ msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Invio del modulo inaspettato."
@@ -895,7 +908,7 @@ msgstr "Account"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Soprannome"
@@ -903,7 +916,7 @@ msgstr "Soprannome"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Password"
@@ -1011,10 +1024,12 @@ msgstr "Hai già ripetuto quel messaggio."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1289,7 +1304,7 @@ msgstr "Membri del gruppo %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Impossibile inserire un nuovo abbonamento."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1325,30 +1340,51 @@ msgstr "Nessun file."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Impossibile eliminare un preferito."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Nessun gruppo"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+msgstr "Nessuna gruppo."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "Tutti i membri"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Metodo delle API non trovato."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Impossibile salvare l'abbonamento."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1521,35 +1557,42 @@ msgstr "Aggiornamento dell'immagine non riuscito."
msgid "Avatar deleted."
msgstr "Immagine eliminata."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Solo gli utenti collegati possono ripetere i messaggi."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Sfondo"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1583,14 +1626,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Non bloccare questo utente"
@@ -1602,7 +1644,7 @@ msgstr "Non bloccare questo utente"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sì"
@@ -1618,32 +1660,6 @@ msgstr "Blocca questo utente"
msgid "Failed to save block information."
msgstr "Salvataggio delle informazioni per il blocco non riuscito."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Nessuna gruppo."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1775,7 +1791,8 @@ msgid "Account deleted."
msgstr "Immagine eliminata."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Crea un account"
@@ -1797,8 +1814,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Conferma"
@@ -1872,8 +1890,10 @@ msgid "You must be logged in to delete a group."
msgstr "Devi eseguire l'accesso per lasciare un gruppo."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Nessun soprannome o ID."
@@ -1928,10 +1948,11 @@ msgid "Delete this group"
msgstr "Elimina questo utente"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1971,19 +1992,30 @@ msgstr "Non eliminare il messaggio"
msgid "Delete this notice"
msgstr "Elimina questo messaggio"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Non puoi eliminare utenti."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Puoi eliminare solo gli utenti locali."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Elimina utente"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Elimina utente"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1991,80 +2023,104 @@ msgstr ""
"Vuoi eliminare questo utente? Questa azione eliminerà tutti i dati "
"dell'utente dal database, senza una copia di sicurezza."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Non eliminare il messaggio"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Elimina questo utente"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Aspetto"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr "Impostazioni dell'aspetto per questo sito StatusNet"
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "URL del logo non valido."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "URL del logo non valido."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Tema non disponibile: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Modifica logo"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo del sito"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
#, fuzzy
msgid "SSL logo"
msgstr "Logo del sito"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Modifica tema"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Tema del sito"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Tema per questo sito."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Tema personalizzato"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Puoi caricare un tema per StatusNet personalizzato come un file ZIP."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Modifica l'immagine di sfondo"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Sfondo"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2074,98 +2130,108 @@ msgstr ""
"file è di %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "On"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Off"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Abilita o disabilita l'immagine di sfondo."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Affianca l'immagine di sfondo"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Modifica colori"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Contenuto"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Barra laterale"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Testo"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Collegamenti"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Avanzate"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "CSS personalizzato"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Usa predefiniti"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Ripristina i valori predefiniti"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Reimposta i valori predefiniti"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Salva"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Salva aspetto"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Questo messaggio non è un preferito!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Aggiungi ai preferiti"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Nessun documento \"%s\""
#. TRANS: Title for "Edit application" form.
@@ -2894,7 +2960,7 @@ msgstr ""
"nomegruppo\". Non trovi un gruppo che ti piace? Prova a [cercarne uno](%%%%"
"action.groupsearch%%%%) o [crea il tuo!](%%%%action.newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Crea un nuovo gruppo"
@@ -3304,26 +3370,33 @@ msgstr ""
"\n"
"Cordiali saluti, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Devi eseguire l'accesso per iscriverti a un gruppo."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s fa ora parte del gruppo %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Devi eseguire l'accesso per lasciare un gruppo."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Non fai parte di quel gruppo."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s ha lasciato il gruppo %2$s"
@@ -3430,6 +3503,13 @@ msgstr "Indirizzo immagine licenza"
msgid "URL for an image to display with the license."
msgstr "Indirizzo di un'immagine da visualizzare con la licenza."
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Salva"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "Salva impostazioni licenza"
@@ -3454,11 +3534,11 @@ msgstr "Accedi"
msgid "Login to site"
msgstr "Accedi al sito"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Ricordami"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
@@ -3849,7 +3929,8 @@ msgstr "Modifica password"
msgid "Change your password."
msgstr "Modifica la tua password."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Modifica password"
@@ -3857,7 +3938,8 @@ msgstr "Modifica password"
msgid "Old password"
msgstr "Vecchia password"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Nuova password"
@@ -3865,7 +3947,7 @@ msgstr "Nuova password"
msgid "6 or more characters"
msgstr "6 o più caratteri"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Stessa password di sopra"
@@ -3889,11 +3971,12 @@ msgstr "Vecchia password non corretta"
msgid "Error saving user; invalid."
msgstr "Errore nel salvare l'utente; non valido."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Impossibile salvare la nuova password."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Password salvata."
@@ -4238,7 +4321,8 @@ msgid "Profile information"
msgstr "Informazioni sul profilo"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr ""
@@ -4246,16 +4330,16 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Nome"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Pagina web"
@@ -4268,7 +4352,7 @@ msgstr "URL della tua pagina web, blog o profilo su un altro sito"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4276,27 +4360,27 @@ msgstr[0] "Descriviti assieme ai tuoi interessi in %d caratteri"
msgstr[1] "Descriviti assieme ai tuoi interessi in %d caratteri"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Descrivi te e i tuoi interessi"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Biografia"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Ubicazione"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Dove ti trovi, tipo \"città, regione, stato\""
@@ -4350,7 +4434,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4358,49 +4442,50 @@ msgstr[0] "La biografia è troppo lunga (max %d caratteri)."
msgstr[1] "La biografia è troppo lunga (max %d caratteri)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Fuso orario non selezionato"
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "La lingua è troppo lunga (max 50 caratteri)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Etichetta non valida: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Impossibile aggiornare l'utente per auto-abbonarsi."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Impossibile salvare le preferenze della posizione."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Impossibile salvare le etichette."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Impostazioni salvate."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Crea un account"
@@ -4521,35 +4606,43 @@ msgstr "Perché non [crei un accout](%%action.register%%) e ne scrivi uno tu!"
msgid "Tag cloud"
msgstr "Insieme delle etichette"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Hai già effettuato l'accesso!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Nessun codice di ripristino."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Non è un codice di ripristino."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Codice di recupero per utente sconosciuto."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Errore con il codice di conferma."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Questo codice di conferma è scaduto. Ricomincia da capo."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Impossibile aggiornare l'utente con l'indirizzo email confermato."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4557,68 +4650,102 @@ msgstr ""
"Se hai dimenticato o perso la tua password, puoi fartene inviare una nuova "
"all'indirizzo email che hai inserito nel tuo account."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Identificazione avvenuta. Inserisci la nuova password. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Recupero password"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Soprannome o indirizzo email"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr ""
"Il tuo soprannome su questo server o il tuo indirizzo email registrato."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Recupera"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Recupera"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Reimposta la password"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Recupera la password"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Richiesta password di ripristino"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Azione sconosciuta"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 o più caratteri, e non dimenticarla!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Stessa password di sopra"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Reimposta"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Inserisci un soprannome o un indirizzo email."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "Nessun utente con quell'email o nome utente."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Nessun indirizzo email registrato per quell'utente."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Errore nel salvare la conferma dell'indirizzo."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4626,24 +4753,35 @@ msgstr ""
"Le istruzioni per recuperare la tua password sono state inviate "
"all'indirizzo email registrato nel tuo account."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Ripristino della password inaspettato."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "La password deve essere lunga almeno 6 caratteri."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "La password e la conferma non corrispondono."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Impossibile salvare la nuova password."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Errore nell'impostare l'utente."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
@@ -4659,7 +4797,7 @@ msgstr "Codice di invito non valido."
msgid "Registration successful"
msgstr "Registrazione riuscita"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrati"
@@ -4688,61 +4826,53 @@ msgstr ""
"successivamente inviare messaggi e metterti in contatto con i tuoi amici e "
"colleghi. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 lettere minuscole o numeri, niente punteggiatura o spazi; richiesto"
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 o più caratteri; richiesta"
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Stessa password di sopra; richiesta"
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 o più caratteri"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Email"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Usata solo per aggiornamenti, annunci e recupero password"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL della tua pagina web, blog o profilo su un altro sito"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"Comprendo che i contenuti e i dati di %1$s sono privati e confidenziali."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "I miei testi e i miei file sono copyright di %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "I miei testi e file restano sotto il mio diretto copyright."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Tutti i diritti riservati."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4752,7 +4882,7 @@ msgstr ""
"dati personali: password, indirizzo email, indirizzo messaggistica "
"istantanea e numero di telefono."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4786,7 +4916,7 @@ msgstr ""
"Grazie per la tua iscrizione e speriamo tu possa divertiti usando questo "
"servizio."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5101,7 +5231,7 @@ msgstr "Organizzazione"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Descrizione"
@@ -5124,8 +5254,9 @@ msgstr "Azioni applicazione"
msgid "Reset key & secret"
msgstr "Reimposta chiave e segreto"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Elimina"
@@ -5251,7 +5382,7 @@ msgid "Note"
msgstr "Nota"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Alias"
@@ -7857,20 +7988,20 @@ msgstr ""
"tracking - non ancora implementato\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "Non è stato trovato alcun file di configurazione. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "I file di configurazione sono stati cercati in questi posti: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr ""
"Potrebbe essere necessario lanciare il programma d'installazione per "
@@ -7878,7 +8009,7 @@ msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Vai al programma d'installazione."
@@ -7950,12 +8081,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Off"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Reimposta"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Modifica colori"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Usa predefiniti"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -8039,34 +8173,29 @@ msgstr "Vai"
msgid "Grant this user the \"%s\" role"
msgstr "Concedi a questo utente il ruolo \"%s\""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "URL della pagina web, blog del gruppo o l'argomento"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Descrivi il gruppo o l'argomento"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Descrivi il gruppo o l'argomento in %d caratteri"
msgstr[1] "Descrivi il gruppo o l'argomento in %d caratteri"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr "Dove è situato il gruppo, tipo \"città, regione, stato\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, fuzzy, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9278,14 +9407,9 @@ msgstr[1] "circa %d mesi fa"
msgid "about a year ago"
msgstr "circa un anno fa"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s non è un colore valido."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s non è un colore valido. Usa 3 o 6 caratteri esadecimali."
@@ -9322,27 +9446,30 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Nessun profilo."
+#~ msgid "No such group"
+#~ msgstr "Nessun gruppo"
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Gruppi di cui %s fa parte"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "Metodo delle API non trovato."
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Persone abbonate a %s"
+#~ msgid "Reset"
+#~ msgstr "Reimposta"
-#~ msgid "Couldn't update user."
-#~ msgstr "Impossibile aggiornare l'utente."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 lettere minuscole o numeri, niente punteggiatura o spazi; richiesto"
-#~ msgid "Couldn't save profile."
-#~ msgstr "Impossibile salvare il profilo."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 o più caratteri; richiesta"
-#~ msgid "Couldn't save tags."
-#~ msgstr "Impossibile salvare le etichette."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Stessa password di sopra; richiesta"
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr ""
+#~ "1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s non è un colore valido."
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index ef1f2708cc..4e13fa0e9d 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:36+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:16+0000\n"
"Language-Team: Japanese \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -80,6 +80,7 @@ msgid "Save access settings"
msgstr "アクセス設定の保存"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -91,13 +92,13 @@ msgstr "アクセス設定の保存"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "保存"
@@ -331,7 +332,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "ユーザを更新できませんでした。"
@@ -355,7 +356,7 @@ msgstr "ユーザはプロフィールをもっていません。"
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "プロフィールを保存できませんでした。"
@@ -365,7 +366,7 @@ msgstr "プロフィールを保存できませんでした。"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, fuzzy, php-format
@@ -540,7 +541,8 @@ msgid "That status is not a favorite."
msgstr "そのステータスはお気に入りではありません。"
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "お気に入りを取り消すことができません。"
@@ -588,7 +590,7 @@ msgstr "ターゲットユーザーを見つけられません。"
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
@@ -598,7 +600,7 @@ msgstr "そのニックネームは既に使用されています。他のもの
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "有効なニックネームではありません。"
@@ -610,7 +612,7 @@ msgstr "有効なニックネームではありません。"
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "ホームページのURLが不適切です。"
@@ -620,7 +622,7 @@ msgstr "ホームページのURLが不適切です。"
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -647,7 +649,7 @@ msgstr[0] "記述が長すぎます。(最長%d字)"
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -704,22 +706,26 @@ msgid "Group not found."
msgstr "見つかりません。"
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "すでにこのグループのメンバーです。"
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "管理者によってこのグループからブロックされています。"
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "ユーザ %1$s はグループ %2$s に参加できません。"
@@ -731,9 +737,11 @@ msgstr "このグループのメンバーではありません。"
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -794,9 +802,12 @@ msgid "Request token already authorized."
msgstr "認証されていません。"
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -804,7 +815,7 @@ msgstr "認証されていません。"
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -826,18 +837,20 @@ msgstr "OAuth アプリケーションユーザの追加時DBエラー。"
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "予期せぬフォーム送信です。"
@@ -886,7 +899,7 @@ msgstr "アカウント"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "ニックネーム"
@@ -894,7 +907,7 @@ msgstr "ニックネーム"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "パスワード"
@@ -1003,10 +1016,12 @@ msgstr "すでにつぶやきを繰り返しています。"
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1279,7 +1294,7 @@ msgstr "%s グループメンバー"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "サブスクリプションを追加できません"
#. TRANS: Client error displayed when not using the POST verb.
@@ -1315,30 +1330,51 @@ msgstr "そのようなファイルはありません。"
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "お気に入りを取り消すことができません。"
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "そのようなグループはありません。"
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "全てのメンバー"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "API メソッドが見つかりません。"
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "フォローを保存できません。"
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1511,35 +1547,42 @@ msgstr "アバターの更新に失敗しました。"
msgid "Avatar deleted."
msgstr "アバターが削除されました。"
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "ログインユーザだけがつぶやきを繰り返せます。"
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "バックグラウンド"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1574,14 +1617,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "ノート"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "このユーザをアンブロックする"
@@ -1593,7 +1635,7 @@ msgstr "このユーザをアンブロックする"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "はい"
@@ -1609,32 +1651,6 @@ msgstr "このユーザをブロックする"
msgid "Failed to save block information."
msgstr "ブロック情報の保存に失敗しました。"
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "そのようなグループはありません。"
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1766,7 +1782,8 @@ msgid "Account deleted."
msgstr "アバターが削除されました。"
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "新しいグループを作成"
@@ -1788,8 +1805,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "パスワード確認"
@@ -1864,8 +1882,10 @@ msgid "You must be logged in to delete a group."
msgstr "グループから離れるにはログインしていなければなりません。"
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
#, fuzzy
msgid "No nickname or ID."
msgstr "ニックネームがありません。"
@@ -1921,10 +1941,11 @@ msgid "Delete this group"
msgstr "このユーザを削除"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1964,19 +1985,30 @@ msgstr "このつぶやきを削除できません。"
msgid "Delete this notice"
msgstr "このつぶやきを削除"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "ユーザを削除できません"
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "ローカルユーザのみ削除できます。"
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "ユーザ削除"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "ユーザ削除"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1984,81 +2016,105 @@ msgstr ""
"あなたは本当にこのユーザを削除したいですか? これはバックアップなしでデータ"
"ベースからユーザに関するすべてのデータをクリアします。"
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "このつぶやきを削除できません。"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "このユーザを削除"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "デザイン"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "不正なロゴ URL"
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "不正なロゴ URL"
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "IM が利用不可。"
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "ロゴの変更"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "サイトロゴ"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
#, fuzzy
msgid "SSL logo"
msgstr "サイトロゴ"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "テーマ変更"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "サイトテーマ"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "サイトのテーマ"
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
#, fuzzy
msgid "Custom theme"
msgstr "サイトテーマ"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "バックグラウンドイメージの変更"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "バックグラウンド"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2068,98 +2124,108 @@ msgstr ""
"イズは %1$s。"
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "オン"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "オフ"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "バックグラウンドイメージのオンまたはオフ。"
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "タイルバックグラウンドイメージ"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "色の変更"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "内容"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "サイドバー"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "テキスト"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "リンク"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr ""
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "デフォルトを使用"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "デフォルトデザインに戻す。"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "デフォルトへリセットする"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "保存"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "デザインの保存"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "このつぶやきはお気に入りではありません!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "お気に入りに加える"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "そのようなドキュメントはありません。\"%s\""
#. TRANS: Title for "Edit application" form.
@@ -2895,7 +2961,7 @@ msgstr ""
"うか[探してみる](%%%%action.groupsearch%%%%)か、あなた自身で[始めてください!]"
"(%%%%action.newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "新しいグループを作成"
@@ -3300,26 +3366,33 @@ msgstr ""
"\n"
"%2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "グループに入るためにはログインしなければなりません。"
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s はグループ %2$s に参加しました"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "グループから離れるにはログインしていなければなりません。"
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "あなたはそのグループのメンバーではありません。"
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s はグループ %2$s に残りました。"
@@ -3424,6 +3497,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "保存"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr ""
@@ -3448,11 +3528,11 @@ msgstr "ログイン"
msgid "Login to site"
msgstr "サイトへログイン"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "ログイン状態を保持"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう!"
@@ -3844,7 +3924,8 @@ msgstr "パスワードの変更"
msgid "Change your password."
msgstr "パスワードを変更します。"
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "パスワード変更"
@@ -3852,7 +3933,8 @@ msgstr "パスワード変更"
msgid "Old password"
msgstr "古いパスワード"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "新しいパスワード"
@@ -3860,7 +3942,7 @@ msgstr "新しいパスワード"
msgid "6 or more characters"
msgstr "6文字以上"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "上と同じパスワード"
@@ -3884,11 +3966,12 @@ msgstr "古いパスワードが間違っています。"
msgid "Error saving user; invalid."
msgstr "ユーザ保存エラー; 不正なユーザ"
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "新しいパスワードを保存できません。"
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "パスワードが保存されました。"
@@ -4232,23 +4315,24 @@ msgid "Profile information"
msgstr "プロファイル情報"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "フルネーム"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "ホームページ"
@@ -4261,34 +4345,34 @@ msgstr "ホームページ、ブログ、プロファイル、その他サイト
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
msgstr[0] "%d字以内で自分自身と自分の興味について書いてください"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "自分自身と自分の興味について書いてください"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "自己紹介"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "場所"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "自分のいる場所。例:「都市, 都道府県 (または地域), 国」"
@@ -4341,56 +4425,57 @@ msgstr "自分をフォローしている者を自動的にフォローする (B
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
msgstr[0] "自己紹介が長すぎます (最長%d文字)。"
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "タイムゾーンが選ばれていません。"
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "言語が長すぎます。(最大50字)"
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "不正なタグ: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "自動フォローのためのユーザを更新できませんでした。"
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "場所情報を保存できません。"
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "タグをを保存できません。"
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "設定が保存されました。"
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "新しいグループを作成"
@@ -4516,35 +4601,43 @@ msgstr ""
msgid "Tag cloud"
msgstr "タグクラウド"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "既にログイン済みです。"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "そのような回復コードはありません。"
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "回復コードではありません。"
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "不明なユーザのための回復コード。"
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "確認コードにエラーがあります。"
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "確認コードが古すぎます。もう一度やり直してください。"
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "確認されたメールアドレスでユーザを更新できません。"
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4552,90 +4645,135 @@ msgstr ""
"あなたのパスワードを忘れるか紛失したなら、あなたはアカウントに格納したメール"
"アドレスに新しいものを送らせることができます。"
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "あなたは特定されました。 以下の新しいパスワードを入力してください。 "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "パスワード回復"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "ニックネームまたはメールアドレス"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "このサーバでのニックネーム、または登録したメールアドレス。"
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "回復"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "回復"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "パスワードをリセット"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "パスワードを回復"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "パスワード回復がリクエストされました"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "不明なアクション"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6文字以上。忘れないでください!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "上と同じパスワード"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "リセット"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "ニックネームかメールアドレスを入力してください。"
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "そのメールアドレスかユーザ名をもっているユーザがありません。"
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "そのユーザにはメールアドレスの登録がありません。"
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "アドレス確認保存エラー"
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr "登録されたメールアドレスにパスワードの回復方法をお送りしました。"
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "予期せぬパスワードのリセットです。"
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "パスワードは6字以上でなければいけません。"
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "パスワードと確認が一致しません。"
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "新しいパスワードを保存できません。"
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "ユーザ設定エラー"
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "新しいパスワードの保存に成功しました。ログインしています。"
@@ -4651,7 +4789,7 @@ msgstr "すみません、不正な招待コード。"
msgid "Registration successful"
msgstr "登録成功"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "登録"
@@ -4680,67 +4818,59 @@ msgstr ""
"このフォームで新しいアカウントを作成できます。 次につぶやきを投稿して、友人や"
"同僚にリンクできます。 "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く。必須です。"
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6文字以上。必須です。"
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "上のパスワードと同じです。 必須。"
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6文字以上"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "メール"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "長い名前"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr "個人情報を除く: パスワード、メールアドレス、IMアドレス、電話番号"
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4773,7 +4903,7 @@ msgstr ""
"参加してくださってありがとうございます。私たちはあなたがこのサービスを楽しん"
"で使ってくれることを願っています。"
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5093,7 +5223,7 @@ msgstr "組織"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "概要"
@@ -5116,8 +5246,9 @@ msgstr "アプリケーションアクション"
msgid "Reset key & secret"
msgstr "key と secret のリセット"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "削除"
@@ -5245,7 +5376,7 @@ msgid "Note"
msgstr "ノート"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "別名"
@@ -7812,20 +7943,20 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "コンフィギュレーションファイルがありません。 "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "私は以下の場所でコンフィギュレーションファイルを探しました: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr ""
"あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ"
@@ -7833,7 +7964,7 @@ msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "インストーラへ。"
@@ -7905,12 +8036,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "オフ"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "リセット"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "色の変更"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "デフォルトを使用"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7994,32 +8128,28 @@ msgstr "移動"
msgid "Grant this user the \"%s\" role"
msgstr ""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "グループやトピックのホームページやブログの URL"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "グループやトピックを記述"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "グループやトピックを %d 字以内記述"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr "グループの場所, 例えば \"都市, 都道府県 (または 地域), 国\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, fuzzy, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9192,14 +9322,9 @@ msgstr[0] ""
msgid "about a year ago"
msgstr "約 1 年前"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%sは有効な色ではありません!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s は有効な色ではありません! 3か6の16進数を使ってください。"
@@ -9235,27 +9360,30 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "そのようなファイルはありません。"
+#~ msgid "No such group"
+#~ msgstr "そのようなグループはありません。"
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "グループ %s はメンバー"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "API メソッドが見つかりません。"
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "人々は %s をフォローしました。"
+#~ msgid "Reset"
+#~ msgstr "リセット"
-#~ msgid "Couldn't update user."
-#~ msgstr "ユーザを更新できません"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く。必須で"
+#~ "す。"
-#~ msgid "Couldn't save profile."
-#~ msgstr "プロファイルを保存できません"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6文字以上。必須です。"
-#~ msgid "Couldn't save tags."
-#~ msgstr "タグを保存できません。"
+#~ msgid "Same as password above. Required."
+#~ msgstr "上のパスワードと同じです。 必須。"
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%sは有効な色ではありません!"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index d5dcbd0f7a..efccf498bc 100644
--- a/locale/ka/LC_MESSAGES/statusnet.po
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:37+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:20+0000\n"
"Language-Team: Georgian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ka\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -74,6 +74,7 @@ msgid "Save access settings"
msgstr "შეინახე შესვლის პარამეტრები"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -85,13 +86,13 @@ msgstr "შეინახე შესვლის პარამეტრე
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "შეინახე"
@@ -324,7 +325,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "მომხმარებლის განახლება ვერ მოხერხდა."
@@ -348,7 +349,7 @@ msgstr "მომხმარებელს პროფილი არ გა
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "პროფილის შენახვა ვერ მოხერხდა."
@@ -358,7 +359,7 @@ msgstr "პროფილის შენახვა ვერ მოხერ
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, fuzzy, php-format
@@ -532,7 +533,8 @@ msgid "That status is not a favorite."
msgstr "ეს სტატუსი არა არის ფავორიტი."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "ფავორიტის წაშლა ვერ მოხერხდა."
@@ -579,7 +581,7 @@ msgstr "სასურველი მომხმარებელი ვე
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "მეტსახელი უკვე გამოყენებულია. სცადე სხვა."
@@ -589,7 +591,7 @@ msgstr "მეტსახელი უკვე გამოყენებუ
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "მეტსახელი არასწორია."
@@ -601,7 +603,7 @@ msgstr "მეტსახელი არასწორია."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "სასტარტო გვერდი არასწორი URL-ია."
@@ -611,7 +613,7 @@ msgstr "სასტარტო გვერდი არასწორი URL
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -638,7 +640,7 @@ msgstr[0] "აღწერა ძალიან გრძელია (არ
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -695,22 +697,26 @@ msgid "Group not found."
msgstr "ჯგუფი ვერ მოიძებნა."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "თქვენ უკვე ხართ ამ ჯგუფის წევრი."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "თქვენ დაბლოკილი ხართ ამ ჯგუფიდან ადმინისტრატორის მიერ."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "ვერ მოხერხდა მომხმარებელ %1$s-სთან ერთად ჯგუფ %2$s-ში გაერთიანება."
@@ -722,9 +728,11 @@ msgstr "თვენ არ ხართ ამ ჯგუფის წევრ
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -783,9 +791,12 @@ msgid "Request token already authorized."
msgstr "თქვენ არ ხართ ავტორიზირებული."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -793,7 +804,7 @@ msgstr "თქვენ არ ხართ ავტორიზირებუ
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -815,18 +826,20 @@ msgstr "ბაზამ დაუშვა შეცდომა OAuth აპლ
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr ""
@@ -875,7 +888,7 @@ msgstr "ანგარიში"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "მეტსახელი"
@@ -883,7 +896,7 @@ msgstr "მეტსახელი"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "პაროლი"
@@ -991,10 +1004,12 @@ msgstr "ეს შეტყობინება უკვე გამეორ
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1266,7 +1281,7 @@ msgstr "%s ჯგუფის წევრი"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "ახალი გამოწერის ჩასმა ვერ მოხერხდა."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1301,30 +1316,51 @@ msgstr "ასეთი ფაილი არ არსებობს."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "ფავორიტის წაშლა ვერ მოხერხდა."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-#, fuzzy
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "ასეთი ჯგუფი ვერ მოიძებნა."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
-msgid "Not a member"
-msgstr ""
-
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
#, fuzzy
-msgid "HTTP method not supported"
-msgstr "API მეთოდი ვერ მოიძებნა."
+msgid "Not a member."
+msgstr "ტელეფონის ნომერი არ არის."
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "საკუთარი გამოწერის წაშლა ვერ ხერხდება."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1497,35 +1533,42 @@ msgstr "ავატარის განახლება ვერ მოხ
msgid "Avatar deleted."
msgstr "ავატარი წაიშალა."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "მხოლოდ ავტორიზირებულ მომხმარებლებს შეუძლიათ შეტყობინებების გამეორება."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "ფონი"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1556,14 +1599,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "არა"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "არ დაბლოკო ეს მომხმარებელი"
@@ -1575,7 +1617,7 @@ msgstr "არ დაბლოკო ეს მომხმარებელი
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "დიახ"
@@ -1591,32 +1633,6 @@ msgstr "დაბლოკე ეს მომხმარებელი"
msgid "Failed to save block information."
msgstr "დაბლოკვის შესახებ ინფორმაციის შენახვა ვერ მოხერხდა."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "ასეთი ჯგუფი ვერ მოიძებნა."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1748,7 +1764,8 @@ msgid "Account deleted."
msgstr "ავატარი წაიშალა."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "გახსენი ანგარიში"
@@ -1770,8 +1787,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "ვადასტურებ"
@@ -1845,8 +1863,10 @@ msgid "You must be logged in to delete a group."
msgstr "გჯუფის დატოვებისათვის საჭიროა ავტორიზაცია."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "მეტსახელი ან ID უცნობია."
@@ -1901,10 +1921,11 @@ msgid "Delete this group"
msgstr "ამ მომხმარებლის წაშლა"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1942,19 +1963,30 @@ msgstr "არ წაშალო ეს შეტყობინება"
msgid "Delete this notice"
msgstr "შეტყობინების წაშლა"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "თქვენ ვერ შეძლებთ მომხმარებლების წაშლას."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "თქვენ მხოლოდ ადგილობრივი მომხმარებლების წაშლა გძალუძთ."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "მომხმარებლის წაშლა"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "მომხმარებლის წაშლა"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1962,81 +1994,105 @@ msgstr ""
"ნამდვილად გნებავთ ამ მომხმარებლის წაშლა? ეს მოქმედება წაშლის ყველა მონაცემს "
"მომხმარებლის შესახებ სარეზერვო ასლის გარეშე."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "არ წაშალო ეს შეტყობინება"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "ამ მომხმარებლის წაშლა"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "ამ მომხმარებლის წაშლა"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "ლოგოს არასწორი URL-ი"
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "ლოგოს არასწორი URL-ი"
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "იერსახე არ არის ხელმისაწვდომი %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "შეცვალე ლოგო"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "საიტის ლოგო"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
#, fuzzy
msgid "SSL logo"
msgstr "საიტის ლოგო"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "შეცვალე იერსახე"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "საიტის იერსახე"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "იერსახე ამ საიტისთვის"
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "საკუთარი იერსახე"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
"თქვენ შეგიძლიათ ატვირთოთ საკუთარი StatusNet–იერსახე .ZIP არქივის სახით."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "შეცვალე ფონური სურათი"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "ფონი"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2046,98 +2102,108 @@ msgstr ""
"ზომაა %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "ჩართვა"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "გამორთვა"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "ჩართე ან გამორთე ფონური სურათის ფუნქცია."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "გაამრავლე ფონური სურათი"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "შეცვალე ფერები"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "შიგთავსი"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "გვერდითი პანელი"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "ტექსტი"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "ბმულები"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "მეტი პარამეტრები"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "საკუთარი CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "გამოიყენე პირვანდელი მდგომარეობა"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "დააბრუნე პირვანდელი დიზაინი"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "პირვანდელის პარამეტრების დაბრუნება"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "შენახვა"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "შეინახე დიზაინი"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "ეს შეტყობინება არ არის რჩეული!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "რჩეულებში დამატება"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "ასეთი დოკუმენტი არ არის \"%s\""
#. TRANS: Title for "Edit application" form.
@@ -2862,7 +2928,7 @@ msgstr ""
"ხედავთ მოსაწონ ჯგუფს? სცადეთ [ძიება](%%%%action.groupsearch%%%%) ან "
"[შექმენით საკუთარი!](%%%%action.newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "შექმენი ახალი ჯგუფი"
@@ -3268,26 +3334,33 @@ msgstr ""
"\n"
"პატივისცემით, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "გჯუფში გაწევრიანებისათვის საჭიროა ავტორიზაცია."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s გაწევრიანდა ჯგუფში %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "გჯუფის დატოვებისათვის საჭიროა ავტორიზაცია."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "თვენ არ ხართ ამ ჯგუფის წევრი."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s-მა დატოვა ჯგუფი %2$s"
@@ -3392,6 +3465,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "შენახვა"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr ""
@@ -3416,11 +3496,11 @@ msgstr "შესვლა"
msgid "Login to site"
msgstr "საიტზე შესვლა"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "დამიმახსოვრე"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "მომავალში ავტომატურად შემიყვანე; არა საზიარო კომპიუტერებისათვის!"
@@ -3807,7 +3887,8 @@ msgstr "შეცვალეთ პაროლი"
msgid "Change your password."
msgstr "შეცვალეთ თქვენი პაროლი."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "პაროლის შეცვლა"
@@ -3815,7 +3896,8 @@ msgstr "პაროლის შეცვლა"
msgid "Old password"
msgstr "ძველი პაროლი"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "ახალი პაროლი"
@@ -3823,7 +3905,7 @@ msgstr "ახალი პაროლი"
msgid "6 or more characters"
msgstr "6 ან მეტი სიმბოლო"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "იგივე რაც ზედა პაროლი"
@@ -3847,11 +3929,12 @@ msgstr "არასწორი ძველი პაროლი"
msgid "Error saving user; invalid."
msgstr "შეცდომა მომხმარებლის შენახვისას; არასწორი."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "ვერ ვინახავ ახალ პაროლს."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "პაროლი შენახულია."
@@ -4191,23 +4274,24 @@ msgid "Profile information"
msgstr "ინფორმაცია პროფილზე"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "სრული სახელი"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "ვებ. გვერსი"
@@ -4220,34 +4304,34 @@ msgstr "თქვენი ვებ. გვერდის URL, ბლოგი
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
msgstr[0] "აღწერეთ საკუთარი თავი და თქვენი ინტერესები %d სიმბოლოთი"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "აღწერეთ საკუთარი თავი და თქვენი ინტერესები"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "ბიოგრაფია"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "მდებარეობა"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "რომელ ქალაქში, რეგიონში, ქვეყანაში ხართ?"
@@ -4301,56 +4385,57 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
msgstr[0] "ბიოგრაფია ძალიან გრძელია (არაუმეტეს %d სიმბოლო)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "დროის სარტყელი არ არის არჩეული."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "ენა ძალიან გრძელია (არაუმეტეს 50 სიმბოლო)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "არასწორი სანიშნე: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "მომხმარებლის განახლება ავტოგამოწერისათვის ვერ მოხერხდა."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "მდებარეობის პარამეტრების შენახვა ვერ მოხერხდა."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "სანიშნეების შენახვა ვერ მოხერხდა."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "პარამეტრები შენახულია."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "გახსენი ანგარიში"
@@ -4468,36 +4553,44 @@ msgstr "[დარეგისტრირდი](%%action.register%%) და
msgid "Tag cloud"
msgstr "სანიშნეების ღრუბელი"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "თქვენ უკვე ავტორიზირებული ხართ!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "ასეთი აღსადგენი კოდი არ არსებობს."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "ეს არ არის აღსადგენი კოდი."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "აღსადგენი კოდი უცნობი მომხმარებლისთვის."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "სადასტურე კოდს შეცდომა აქვს."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "სადასტურე კოდი ძალიან გრძელია. გთხოვთ ხელახლა დაიწყოთ."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr ""
"მომხმარებლის განახლება დადასტურებული ელ. ფოსტის მისამართით ვერ მოხერხდა."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4505,67 +4598,101 @@ msgstr ""
"თუ დაგავიწყდათ, ან დაკარგეთ თქვენი პაროლი, შეგიძლიათ მიიღოთ ახალი, თქვენს "
"ანგარიშში მითითებულ ელ. ფოსტის მისამართზე."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "თქვენ იდენტიფიცირებული ხართ, შეიყვანეთ ახალი პაროლი ქვევით. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "პაროლის აღდგენა"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "მეტსახელი ან ელ. ფოსტის მისამართი"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "თქვენი მეტსახელი ამ სერვერზე, ან რეგისტრირებული ელ. ფოსტის მისამართი."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "აღდგენა"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "აღდგენა"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "პაროლის გადაყენება"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "პაროლის აღდგენა"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "პაროლის აღდგენა მოთხოვნილია"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "უცნობი მოქმედება"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 ან მეტი სიმბოლო, და არ დაგავიწყდეთ!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "იგივე რაც ზედა პაროლი"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "გადაყენება"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "შეიყვანეთ მეტსახელი ან ელ. ფოსტის მისამართი."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "ასეთი ელ. ფოსტის მისამართით ან სახელით არ არსებობს."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "ამ მომხმარებლისთვის ვერ მოიძებნა რეგისტრირებული ელ. ფოსტის მისამართი."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "მისამართის დადასტურების სენახვისას მოხდა შეცდომა."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4573,24 +4700,35 @@ msgstr ""
"პაროლის აღსადგენი ინსტრუქციები გამოიგზავნა თქვენს ანგარიშთან ასოცირებულ ელ. "
"ფოსტაზე."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "პაროლის მოულოდნელი გადაყენება."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "პაროლი უნდა შედგებოდეს 6 ან მეტი სიმბოლოსგან."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "პაროლი და დასტური არ ემთხვევა."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "ვერ ვინახავ ახალ პაროლს."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "მომხმარებელის დაყენებისას მოხდა შეცდომა."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "ახალი პაროლი წარმატებით იქნა შენახული. თქვენ ახლა ავტორიზირებული ხართ."
@@ -4606,7 +4744,7 @@ msgstr "ბოდიშს გიხდით, მოსაწვევი კ
msgid "Registration successful"
msgstr "რეგისტრაცია წარმატებით დასრულდა"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "რეგისტრაცია"
@@ -4634,40 +4772,31 @@ msgstr ""
"ამ ფორმით შეგიძლიათ შექმნათ ახალი ანგარიში. შემდგომ შეძლებთ შეტყობინებების "
"დაპოსტვას და მეგობრებთან და კოლეგებთან ურთიერთობას. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია. "
-"სავალდებულო."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 ან მეტი სიმბოლო. სავალდებულო."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "იგივე, რაც პაროლი ზევით. სავალდებულო."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 ან მეტი სიმბოლო"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "ელ. ფოსტა"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"გამოიყენება მხოლოდ განახლებებისთვის, განცხადებებისთვის და პაროლის აღსადგენად"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "გრძელი სახელი, სასურველია თქვენი ნამდვილი სახელი"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "თქვენი ვებ. გვერდის URL, ბლოგი, ან პროფილი სხვა საიტზე"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
@@ -4675,23 +4804,23 @@ msgstr ""
"მე ვაცნობიერებ, რომ %1$s–ის შიგთავსი და მონაცემები არის პირადული და "
"კონციდენციალური."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "ჩემი ტექსტის და ფაილების საავტორო უფლება ეკუტვნის %1$s–ს."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "ჩემი ტექსტი და ფაილები ჩემივე საკუთრებაა."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "ყველა უფლება დაცულია."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4700,7 +4829,7 @@ msgstr ""
"ჩემი ტექსტი და ფაილები ხელმისაწვდომია %s–ით, გარდა ამ პირადი ინფორმაციისა: "
"პაროლი, ელ. ფოსტის მისამართი, IM მისამართი და ტელეფონის ნომერი."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4733,7 +4862,7 @@ msgstr ""
"\n"
"გმადლობთ რომ დარეგისტრირდით. იმედი გვაქვს ისიამოვნებთ ამ სერვისით."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5049,7 +5178,7 @@ msgstr "ორგანიზაცია"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "აღწერა"
@@ -5072,8 +5201,9 @@ msgstr "აპლიკაციის მოქმედებები"
msgid "Reset key & secret"
msgstr "გასაღების და საიდუმლოს გადაყენება"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "წაშლა"
@@ -5197,7 +5327,7 @@ msgid "Note"
msgstr "შენიშვნა"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr ""
@@ -7731,26 +7861,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "კონფიგურაციის ფაილი ვერ მოიძებნა. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "კონფიგურაციის ფაილები შემდეგ ადგილებში ვეძებე: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "თუ გინდათ ინსტალატორი გაუშვით ამის გასასწორებლად."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "გადადი ამ ინსტალატორზე."
@@ -7822,12 +7952,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "გამორთვა"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "გადაყენება"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "შეცვალე ფერები"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "გამოიყენე პირვანდელი მდგომარეობა"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7910,26 +8043,22 @@ msgstr "წინ"
msgid "Grant this user the \"%s\" role"
msgstr "მიანიჭე ამ მომხმარებელს \"%s\" როლი"
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "საწყისი გვერდის URL, ან ჯგუფის/თემის ბლოგი"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "აღწერე ჯგუფი ან თემა"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "არწერე ჯგუფი ან თემა %d სიმბოლოთი"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -7937,7 +8066,7 @@ msgstr ""
"ჯგუფის მდებარეობა არსებობის შემთხვევაში. მაგ.: \"ქალაქი, ქვეყანა (ან რეგიონი)"
"\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, fuzzy, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9110,14 +9239,9 @@ msgstr[0] ""
msgid "about a year ago"
msgstr "დაახლოებით 1 წლის წინ"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s არ არის სწორი ფერი!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr ""
@@ -9157,26 +9281,31 @@ msgid "Getting backup from file '%s'."
msgstr ""
#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "ასეთი პროფილი არ არსებობს."
+#~ msgid "No such group"
+#~ msgstr "ასეთი ჯგუფი ვერ მოიძებნა."
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "%1$s-ს ის ჯგუფები რომლებშიც გაერთიანებულია %2$s."
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "API მეთოდი ვერ მოიძებნა."
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "%s-ს გამოწერა დასრულდა წარმატებით."
+#~ msgid "Reset"
+#~ msgstr "გადაყენება"
-#~ msgid "Couldn't update user."
-#~ msgstr "მომხმარებლის განახლება ვერ მოხერხდა."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია. "
+#~ "სავალდებულო."
-#~ msgid "Couldn't save profile."
-#~ msgstr "პროფილის შენახვა ვერ მოხერხდა."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 ან მეტი სიმბოლო. სავალდებულო."
-#~ msgid "Couldn't save tags."
-#~ msgstr "სანიშნეების შენახვა ვერ მოხერხდა."
+#~ msgid "Same as password above. Required."
+#~ msgstr "იგივე, რაც პაროლი ზევით. სავალდებულო."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr ""
+#~ "1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s არ არის სწორი ფერი!"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 5b2e992bb7..b34e7ec6a8 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:39+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:23+0000\n"
"Language-Team: Korean \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -76,6 +76,7 @@ msgid "Save access settings"
msgstr "접근 설정을 저장"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -87,13 +88,13 @@ msgstr "접근 설정을 저장"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "저장"
@@ -320,7 +321,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "이용자를 업데이트 할 수 없습니다."
@@ -344,7 +345,7 @@ msgstr "이용자가 프로필을 가지고 있지 않습니다."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "프로필을 저장 할 수 없습니다."
@@ -354,7 +355,7 @@ msgstr "프로필을 저장 할 수 없습니다."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, fuzzy, php-format
@@ -529,7 +530,8 @@ msgid "That status is not a favorite."
msgstr "이 소식은 관심소식이 아닙니다."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "관심소식을 삭제할 수 없습니다."
@@ -576,7 +578,7 @@ msgstr "타겟 이용자를 찾을 수 없습니다."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
@@ -586,7 +588,7 @@ msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "유효한 별명이 아닙니다"
@@ -598,7 +600,7 @@ msgstr "유효한 별명이 아닙니다"
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "홈페이지 주소형식이 올바르지 않습니다."
@@ -608,7 +610,7 @@ msgstr "홈페이지 주소형식이 올바르지 않습니다."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -635,7 +637,7 @@ msgstr[0] "설명이 너무 깁니다. (최대 %d 글자)"
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -692,22 +694,26 @@ msgid "Group not found."
msgstr "찾을 수가 없습니다."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "당신은 이미 이 그룹의 멤버입니다."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "이미 차단된 이용자입니다."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
@@ -719,9 +725,11 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -781,9 +789,12 @@ msgid "Request token already authorized."
msgstr "당신은 이 프로필에 구독되지 않고있습니다."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -791,7 +802,7 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -813,18 +824,20 @@ msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "잘못된 폼 제출"
@@ -879,7 +892,7 @@ msgstr "계정"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "별명"
@@ -887,7 +900,7 @@ msgstr "별명"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "비밀 번호"
@@ -995,10 +1008,12 @@ msgstr "이미 재전송된 소식입니다."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1269,7 +1284,7 @@ msgstr "%s 그룹 회원"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "예약 구독을 추가 할 수 없습니다."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1305,30 +1320,51 @@ msgstr "해당하는 파일이 없습니다."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "관심소식을 삭제할 수 없습니다."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "그러한 그룹이 없습니다."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "모든 회원"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "API 메서드 발견 안 됨."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "구독을 저장할 수 없습니다."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1500,35 +1536,42 @@ msgstr "아바타 업데이트 실패"
msgid "Avatar deleted."
msgstr "아바타가 삭제되었습니다."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "배경"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1561,14 +1604,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "아니오"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "이용자를 차단하지 않는다."
@@ -1580,7 +1622,7 @@ msgstr "이용자를 차단하지 않는다."
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "예"
@@ -1596,32 +1638,6 @@ msgstr "이 사용자 차단하기"
msgid "Failed to save block information."
msgstr "정보차단을 저장하는데 실패했습니다."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "그러한 그룹이 없습니다."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1754,7 +1770,8 @@ msgid "Account deleted."
msgstr "아바타가 삭제되었습니다."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "새 계정 만들기"
@@ -1776,8 +1793,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "인증"
@@ -1849,8 +1867,10 @@ msgid "You must be logged in to delete a group."
msgstr "그룹을 떠나기 위해서는 로그인해야 합니다."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
#, fuzzy
msgid "No nickname or ID."
msgstr "별명이 없습니다."
@@ -1903,10 +1923,11 @@ msgid "Delete this group"
msgstr "이 사용자 삭제"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1947,98 +1968,133 @@ msgstr "이 통지를 지울 수 없습니다."
msgid "Delete this notice"
msgstr "이 게시글 삭제하기"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "이용자를 업데이트 할 수 없습니다."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "이용자를 업데이트 할 수 없습니다."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "이용자 삭제"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "이용자 삭제"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
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 ""
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "이 통지를 지울 수 없습니다."
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "이 사용자 삭제"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "디자인"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "잘못된 로고 URL 입니다."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "잘못된 로고 URL 입니다."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "인스턴트 메신저를 사용할 수 없습니다."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "로고 변경"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "사이트 로고"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
#, fuzzy
msgid "SSL logo"
msgstr "사이트 로고"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "테마 바꾸기"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "사이트 테마"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "사이트에 대한 테마"
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "사용자 지정 테마"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "배경 이미지 바꾸기"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "배경"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2047,98 +2103,108 @@ msgstr ""
"사이트의 배경 이미지를 업로드할 수 있습니다. 최대 파일 크기는 %1$s 입니다."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "켜기"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "끄기"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "배경 이미지를 켜거나 끈다."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "배경 이미지를 반복 나열"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "색상 변경"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "만족하는"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "가장자리 창"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "문자"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "링크"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "고급 검색"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "사용자 정의 CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "기본값 사용"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr ""
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr ""
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "저장"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "디자인 저장"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "이 메시지는 favorite이 아닙니다."
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "좋아하는 게시글로 추가하기"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "해당하는 첨부파일이 없습니다."
#. TRANS: Title for "Edit application" form.
@@ -2858,7 +2924,7 @@ msgid ""
"%%%%)"
msgstr ""
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "새 그룹을 만듭니다."
@@ -3248,26 +3314,33 @@ msgstr ""
"\n"
"%2$s 보냄\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "그룹가입을 위해서는 로그인이 필요합니다."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s의 상태 (%2$s에서)"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "그룹을 떠나기 위해서는 로그인해야 합니다."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "당신은 해당 그룹의 멤버가 아닙니다."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s의 상태 (%2$s에서)"
@@ -3373,6 +3446,13 @@ msgstr "라이선스 이미지 URL"
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "저장"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr ""
@@ -3397,11 +3477,11 @@ msgstr "로그인"
msgid "Login to site"
msgstr "사이트에 로그인하세요."
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "자동 로그인"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!"
@@ -3790,7 +3870,8 @@ msgstr "비밀번호 바꾸기"
msgid "Change your password."
msgstr "비밀번호를 변경하세요."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "비밀번호 변경"
@@ -3798,7 +3879,8 @@ msgstr "비밀번호 변경"
msgid "Old password"
msgstr "기존 비밀 번호"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "새로운 비밀 번호"
@@ -3806,7 +3888,7 @@ msgstr "새로운 비밀 번호"
msgid "6 or more characters"
msgstr "6글자 이상"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "위와 같은 비밀 번호"
@@ -3830,11 +3912,12 @@ msgstr "기존 비밀 번호가 틀렸습니다"
msgid "Error saving user; invalid."
msgstr "사용자 저장 오류; 무효한 사용자"
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "새 비밀번호를 저장 할 수 없습니다."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "비밀 번호 저장"
@@ -4171,23 +4254,24 @@ msgid "Profile information"
msgstr "프로필 정보"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "실명"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "홈페이지"
@@ -4200,34 +4284,34 @@ msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
msgstr[0] "%d자 이내에서 자기 소개 및 자기 관심사"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "자기 소개 및 자기 관심사"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "자기소개"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "위치"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라\""
@@ -4278,56 +4362,57 @@ msgstr "나에게 구독하는 사람에게 자동 구독 신청"
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
msgstr[0] "설명이 너무 깁니다. (최대 %d 글자)"
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "타임존이 설정 되지 않았습니다."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "언어가 너무 깁니다. (최대 50글자)"
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "올바르지 않은 태그: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "자동구독에 사용자를 업데이트 할 수 없습니다."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "태그를 저장할 수 없습니다."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "태그를 저장할 수 없습니다."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "설정 저장"
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "새 계정 만들기"
@@ -4443,126 +4528,178 @@ msgstr ""
msgid "Tag cloud"
msgstr "태그 클라우드"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "당신은 이미 로그인되어 있습니다."
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "그러한 복구 코드는 없습니다."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "복구 코드가 아닙니다."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "알 수 없는 취소를 위한 리커버리 코드"
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "확인 코드 오류"
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "이 인증 코드는 오래됐습니다. 다시 발급 받아 주십시오."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "이 이메일 주소로 사용자를 업데이트 할 수 없습니다."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
#, fuzzy
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr "가입하신 이메일로 비밀 번호 재발급에 관한 안내를 보냈습니다."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
msgstr ""
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "비밀 번호 복구"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
#, fuzzy
msgid "Nickname or email address"
msgstr "별명이나 이메일 계정을 입력하십시오."
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "이 서버에서 당신의 닉네임 혹은 당신의 등록된 이메일주소"
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "복구"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "복구"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "비밀 번호 초기화"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "비밀 번호 복구"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "비밀 번호 복구가 요청되었습니다."
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "알려지지 않은 행동"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6글자 이상, 잊어 버리지 마십시오!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "위와 같은 비밀 번호"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "초기화"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "별명이나 이메일 계정을 입력하십시오."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "그러한 이메일 주소나 계정을 가진 사용자는 없습니다."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "그 사용자는 등록된 메일주소가 없습니다."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "주소 확인 저장 에러"
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr "가입하신 이메일로 비밀 번호 재발급에 관한 안내를 보냈습니다."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "잘못된 비밀 번호 지정"
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "비밀 번호는 6자 이상이어야 합니다."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "비밀 번호가 일치하지 않습니다."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "새 비밀번호를 저장 할 수 없습니다."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "사용자 세팅 오류"
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr ""
"새로운 비밀 번호를 성공적으로 저장했습니다. 귀하는 이제 로그인 되었습니다."
@@ -4580,7 +4717,7 @@ msgstr "확인 코드 오류"
msgid "Registration successful"
msgstr "회원 가입이 성공적입니다."
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "등록"
@@ -4606,68 +4743,59 @@ msgid ""
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다. 필수 "
-"입력."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6글자 이상이 필요합니다."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "위와 같은 비밀 번호. 필수 사항."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6글자 이상"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "메일"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "업데이트나 공지, 비밀번호 찾기에 사용하세요."
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "더욱 긴 이름을 요구합니다."
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
-#: actions/register.php:524
+#: actions/register.php:523
#, fuzzy, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "%1$s의 컨텐츠와 데이터는 외부 유출을 금지합니다."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "글과 파일의 저작권은 %1$s의 소유입니다"
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr "다음 개인정보 제외: 비밀 번호, 메일 주소, 메신저 주소, 전화 번호"
-#: actions/register.php:589
+#: actions/register.php:588
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4700,7 +4828,7 @@ msgstr ""
"\n"
"다시 한번 가입하신 것을 환영하면서 즐거운 서비스가 되셨으면 합니다."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5010,7 +5138,7 @@ msgstr "기관 이름이 필요합니다."
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "설명"
@@ -5033,8 +5161,9 @@ msgstr "인증 코드가 없습니다."
msgid "Reset key & secret"
msgstr ""
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "삭제"
@@ -5154,7 +5283,7 @@ msgid "Note"
msgstr "설명"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr ""
@@ -7686,26 +7815,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "확인 코드가 없습니다."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "다음 사람들에게 초대권을 보냈습니다:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "이 사이트에 로그인"
@@ -7775,12 +7904,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "끄기"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "초기화"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "색상 변경"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "기본값 사용"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7866,32 +7998,28 @@ msgstr "이동"
msgid "Grant this user the \"%s\" role"
msgstr ""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "그룹 혹은 토픽의 홈페이지나 블로그 URL"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "응용프로그램 삭제"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "140글자로 그룹이나 토픽 설명하기"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr "그룹의 위치, \"시/군/구, 도, 국가\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8990,14 +9118,9 @@ msgstr[0] ""
msgid "about a year ago"
msgstr "1년 전"
-#: lib/webcolor.php:80
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "홈페이지 주소형식이 올바르지 않습니다."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "홈페이지 주소형식이 올바르지 않습니다."
@@ -9033,27 +9156,32 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "해당하는 파일이 없습니다."
+#~ msgid "No such group"
+#~ msgstr "그러한 그룹이 없습니다."
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "%s 사용자가 멤버인 그룹"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "API 메서드 발견 안 됨."
+#~ msgid "Reset"
+#~ msgstr "초기화"
+
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다. 필"
+#~ "수 입력."
+
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6글자 이상이 필요합니다."
+
+#~ msgid "Same as password above. Required."
+#~ msgstr "위와 같은 비밀 번호. 필수 사항."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr ""
+#~ "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
+
#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "%s에 의해 구독되는 사람들"
-
-#~ msgid "Couldn't update user."
-#~ msgstr "사용자를 업데이트 할 수 없습니다."
-
-#~ msgid "Couldn't save profile."
-#~ msgstr "프로필을 저장 할 수 없습니다."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "태그를 저장할 수 없습니다."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "홈페이지 주소형식이 올바르지 않습니다."
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 6a7aa4d753..61c475668d 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:40+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:25+0000\n"
"Language-Team: Macedonian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -77,6 +77,7 @@ msgid "Save access settings"
msgstr "Зачувај нагодувања на пристап"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -88,13 +89,13 @@ msgstr "Зачувај нагодувања на пристап"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Зачувај"
@@ -328,7 +329,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Не можев да го подновам корисникот."
@@ -352,7 +353,7 @@ msgstr "Корисникот нема профил."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Не може да се зачува профил."
@@ -362,7 +363,7 @@ msgstr "Не може да се зачува профил."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -403,7 +404,6 @@ msgstr "Не може да се поднови Вашиот изглед."
#. TRANS: Title for Atom feed.
#: actions/apiatomservice.php:85
-#, fuzzy
msgctxt "ATOM"
msgid "Main"
msgstr "Главна"
@@ -543,7 +543,8 @@ msgid "That status is not a favorite."
msgstr "Тој статус не Ви е бендисан."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Не можам да ја избришам бендисаната забелешка."
@@ -590,7 +591,7 @@ msgstr "Не можев да го пронајдам целниот корисн
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Тој прекар е во употреба. Одберете друг."
@@ -600,7 +601,7 @@ msgstr "Тој прекар е во употреба. Одберете друг.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Неправилен прекар."
@@ -612,7 +613,7 @@ msgstr "Неправилен прекар."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Главната страница не е важечка URL-адреса."
@@ -622,7 +623,7 @@ msgstr "Главната страница не е важечка URL-адрес
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Полното име е предолго (највеќе 255 знаци)."
@@ -649,7 +650,7 @@ msgstr[1] "Описот е предолг (дозволено е највеќе
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Местоположбата е предолга (највеќе 255 знаци)."
@@ -706,22 +707,26 @@ msgid "Group not found."
msgstr "Групата не е пронајдена."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Веќе членувате во таа група."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Блокирани сте од таа група од администраторот."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Не можам да го зачленам корисникот %1$s во групата 2$s."
@@ -733,9 +738,11 @@ msgstr "Не членувате во оваа група."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -792,9 +799,12 @@ msgid "Request token already authorized."
msgstr "Жетонот за барање е веќе овластен."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -802,7 +812,7 @@ msgstr "Жетонот за барање е веќе овластен."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -823,18 +833,20 @@ msgstr "Грешка во базата при вметнувањето на auth
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Неочекувано поднесување на образец."
@@ -888,7 +900,7 @@ msgstr "Сметка"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Прекар"
@@ -896,7 +908,7 @@ msgstr "Прекар"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Лозинка"
@@ -1004,10 +1016,12 @@ msgstr "Забелешката е веќе повторена."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
@@ -1038,9 +1052,8 @@ msgstr "Може да се избрише само користејќи го ф
#. TRANS: Client error displayed when a user has no rights to delete notices of other users.
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
-#, fuzzy
msgid "Cannot delete this notice."
-msgstr "Не може да се избрише оваа забелешка."
+msgstr "Не можам да ја избришам оваа забелешка."
#. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
#: actions/apistatusesshow.php:249
@@ -1242,15 +1255,13 @@ msgstr "Нема таков профил."
#. TRANS: Client exception thrown when trying to set a favorite for another user.
#. TRANS: Client exception thrown when trying to subscribe another user.
#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
-#, fuzzy
msgid "Cannot add someone else's subscription."
-msgstr "Не можам да додадам туѓа претплата"
+msgstr "Не можам да додадам туѓа претплата."
#. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
#: actions/atompubfavoritefeed.php:240
-#, fuzzy
msgid "Can only handle favorite activities."
-msgstr "Може да работи само со активности за бендисување."
+msgstr "Може да работи само со бендисани активности."
#. TRANS: Client exception thrown when trying favorite an object that is not a notice.
#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
@@ -1277,13 +1288,12 @@ msgstr "Членства на групата %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
-msgstr "Не можам да додадам туѓо членство"
+msgid "Cannot add someone else's membership."
+msgstr "Не можам да додадам туѓо членство."
#. TRANS: Client error displayed when not using the POST verb.
#. TRANS: Do not translate POST.
#: actions/atompubmembershipfeed.php:242
-#, fuzzy
msgid "Can only handle join activities."
msgstr "Може да работи само со активности за зачленување."
@@ -1310,52 +1320,73 @@ msgstr "Нема таква бендисана ставка."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
-msgstr "Не можам да избришам туѓа бендисана ставка."
+msgid "Cannot delete someone else's favorite."
+msgstr "Не можам да избришам туѓo бендисанo."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Нема такваа група"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+msgstr "Нема таква група."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
-msgid "Not a member"
-msgstr "Не членувате"
-
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
#, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTML-методот не е поддржан."
+msgid "Not a member."
+msgstr "Не членувате"
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
-msgstr "Не можам да избришам туѓо членство"
+msgid "Cannot delete someone else's membership."
+msgstr "Не можам да избришам туѓо членство."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
#. TRANS: %d is the non-existing profile ID number.
#: actions/atompubshowsubscription.php:72
#: actions/atompubshowsubscription.php:83
#: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
msgid "No such profile id: %d."
-msgstr "Нема таква назнака на профил: %d"
+msgstr "Нема таква назнака на профил: %d."
#. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
#. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
#: actions/atompubshowsubscription.php:94
-#, fuzzy, php-format
+#, php-format
msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "Профилот %1$d не е претплатен на профилот %2$d"
+msgstr "Профилот %1$d не е претплатен на профилот %2$d."
#. TRANS: Client exception thrown when trying to delete a subscription of another user.
#: actions/atompubshowsubscription.php:157
-#, fuzzy
msgid "Cannot delete someone else's subscription."
-msgstr "Не можам да избришам туѓа претплата"
+msgstr "Не можам да избришам туѓа претплата."
#. TRANS: Client error displayed when not using the POST verb.
#. TRANS: Do not translate POST.
@@ -1370,9 +1401,9 @@ msgstr "Може само да следи луѓе."
#. TRANS: Client exception thrown when subscribing to a non-existing profile.
#: actions/atompubsubscriptionfeed.php:267
-#, fuzzy, php-format
+#, php-format
msgid "Unknown profile %s."
-msgstr "Непознат профил %s"
+msgstr "Непознат профил %s."
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
@@ -1503,23 +1534,29 @@ msgstr "Подновата на аватарот не успеа."
msgid "Avatar deleted."
msgstr "Аватарот е избришан."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr "Резервна сметка"
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
msgid "Only logged-in users can backup their account."
msgstr "Само одјавени корисници можат да прават резервна верзија на сметката."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr "Не можете да направите резрвна верзија на Вашата сметка."
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
+#, fuzzy
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
@@ -1529,12 +1566,14 @@ msgstr ""
"се зачуваат лични податоци како е-пошта и адреса за НП. Покрај ова, во "
"резервата не се зачувуваат и подигнатите податотеки и непосредните пораки."
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
msgctxt "BUTTON"
msgid "Backup"
msgstr "Резерва"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr "Направете резервна верзија на сметката"
@@ -1569,14 +1608,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Не"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Не го блокирај корисников"
@@ -1588,7 +1626,7 @@ msgstr "Не го блокирај корисников"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Да"
@@ -1604,32 +1642,6 @@ msgstr "Блокирај го корисников"
msgid "Failed to save block information."
msgstr "Не можев да ги снимам инофрмациите за блокот."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Нема таква група."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1756,7 +1768,8 @@ msgid "Account deleted."
msgstr "Сметката е избришана."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
msgid "Delete account"
msgstr "Избриши сметка"
@@ -1780,8 +1793,9 @@ msgstr ""
"\">резервна верзија на податоците."
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Потврди"
@@ -1854,8 +1868,10 @@ msgid "You must be logged in to delete a group."
msgstr "Мора да сте најавени за да избришете група."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Нема прекар или ID."
@@ -1906,10 +1922,11 @@ msgid "Delete this group"
msgstr "Избриши ја групава"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1932,7 +1949,7 @@ msgstr ""
#. TRANS: Fieldset legend for the delete notice form.
#: actions/deletenotice.php:117 actions/deletenotice.php:148
msgid "Delete notice"
-msgstr "Бриши забелешка"
+msgstr "Избриши забелешка"
#. TRANS: Message for the delete notice form.
#: actions/deletenotice.php:152
@@ -1947,21 +1964,32 @@ msgstr "Не ја бриши оваа забелешка"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
#: actions/deletenotice.php:166 lib/noticelist.php:673
msgid "Delete this notice"
-msgstr "Бриши ја оваа забелешка"
+msgstr "Избриши ја оваа забелешка"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Не можете да бришете корисници."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Може да бришете само локални корисници."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
-msgstr "Бриши корисник"
+msgstr "Избриши корисник"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Избриши корисник"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1969,78 +1997,102 @@ msgstr ""
"Дали се сигурни дека сакате да го избришете овој корисник? Ова воедно ќе ги "
"избрише сите податоци за корисникот од базата, без да може да се вратат."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Не ја бриши групава"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Избриши овој корисник"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Изглед"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr "Нагодувања на изгледот на ова StatusNet-мрежно место."
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "Погрешен URL на лого."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "Неважечка URL-адреса на SSL-логото."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Темата е недостапна: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Промени лого"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Лого на мрежното место"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "SSL-лого"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Промени изглед"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Изглед на мрежното место"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Изглед за мрежното место."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Прилагоден мотив"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Можете да подигнете свој изглед за StatusNet како .ZIP архив."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
-msgstr "Промена на слика на позадина"
+msgstr "Промена на слика за позадина"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Позадина"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2050,98 +2102,108 @@ msgstr ""
"големина на податотеката е %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "Вкл."
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Искл."
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Вклучи или исклучи позадинска слика."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Позадината во квадрати"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Промена на бои"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Содржина"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Странична лента"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Текст"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Врски"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Напредно"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "Прилагодено CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Користи по основно"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Врати основно-зададени нагодувања"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Врати по основно"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Зачувај"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Зачувај изглед"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Оваа забелешка не Ви е бендисана!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Додај во бендисани"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Нема документ со наслов „%s“"
#. TRANS: Title for "Edit application" form.
@@ -2446,9 +2508,8 @@ msgstr "Таа е-поштенска адреса е веќе зафатена
#. TRANS: Server error thrown on database error adding SMS confirmation code.
#: actions/emailsettings.php:426 actions/imsettings.php:343
#: actions/smssettings.php:365
-#, fuzzy
msgid "Could not insert confirmation code."
-msgstr "Потврдниот код не може да се внесе."
+msgstr "Не можев да го внесам потврдниот код."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
#: actions/emailsettings.php:433
@@ -2476,7 +2537,6 @@ msgstr "Ова е погрешна е-поштенска адреса."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
#: actions/emailsettings.php:468 actions/smssettings.php:413
-#, fuzzy
msgid "Could not delete email confirmation."
msgstr "Не можев да ја избришам потврдата по е-пошта."
@@ -2504,7 +2564,6 @@ msgstr "Нема приемна е-поштенска адреса."
#. TRANS: Server error thrown on database error adding incoming e-mail address.
#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:564 actions/smssettings.php:587
-#, fuzzy
msgid "Could not update user record."
msgstr "Не можев да ја подновам корисничката евиденција."
@@ -2872,7 +2931,7 @@ msgstr ""
"[ја пронајдете](%%%%action.groupsearch%%%%) или [започнете своја!](%%%%"
"action.newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Создај нова група"
@@ -3059,7 +3118,6 @@ msgstr "Ова е погрешната IM адреса."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:391
-#, fuzzy
msgid "Could not delete IM confirmation."
msgstr "Не можев да ја избришам потврдата на IM."
@@ -3205,7 +3263,7 @@ msgstr "Можете да додадете и лична порака во по
#: actions/invite.php:231
msgctxt "BUTTON"
msgid "Send"
-msgstr "Прати"
+msgstr "Испрати"
#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
#. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
@@ -3277,26 +3335,33 @@ msgstr ""
"\n"
"Со почит, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Мора да сте најавени за да можете да се зачлените во група."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s се зачлени во групата %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Мора да сте најавени за да можете да ја напуштите групата."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Не членувате во таа група."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s ја напушти групата %2$s"
@@ -3406,6 +3471,13 @@ msgstr "URL-адреса за сликата на лиценцата"
msgid "URL for an image to display with the license."
msgstr "URL-адреса за слика што ќе се прикажува со лиценцата."
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Зачувај"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "Зачувај нагодувања на лиценцата"
@@ -3430,11 +3502,11 @@ msgstr "Најава"
msgid "Login to site"
msgstr "Најавете се"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Запамети ме"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Отсега врши автоматска најава. Не треба да се користи за јавни сметачи!"
@@ -3775,7 +3847,7 @@ msgstr "Види изгледи на профилот"
#. TRANS: Tooltip for checkbox.
#: actions/othersettings.php:130
msgid "Show or hide profile designs."
-msgstr "Прикажи или сокриј профилни изгледи."
+msgstr "Прикажи или скриј изгледи на профилот."
#. TRANS: Form validation error for form "Other settings" in user profile.
#: actions/othersettings.php:162
@@ -3826,7 +3898,8 @@ msgstr "Промени ја лозинката"
msgid "Change your password."
msgstr "Променете си ја лозинката."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Промена на лозинка"
@@ -3834,7 +3907,8 @@ msgstr "Промена на лозинка"
msgid "Old password"
msgstr "Стара лозинка"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Нова лозинка"
@@ -3842,7 +3916,7 @@ msgstr "Нова лозинка"
msgid "6 or more characters"
msgstr "6 или повеќе знаци"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Исто како лозинката погоре"
@@ -3866,11 +3940,12 @@ msgstr "Неточна стара лозинка"
msgid "Error saving user; invalid."
msgstr "Грешка во зачувувањето на корисникот; неправилен."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Не можам да ја зачувам новата лозинка."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Лозинката е зачувана."
@@ -4198,22 +4273,23 @@ msgid "Profile information"
msgstr "Информации за профил"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64 мали букви или бројки, без интерпукциски знаци и празни места."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Цело име"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Домашна страница"
@@ -4226,7 +4302,7 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4234,27 +4310,27 @@ msgstr[0] "Опишете се себеси и своите интереси с
msgstr[1] "Опишете се себеси и своите интереси со %d знаци."
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Опишете се себеси и Вашите интереси"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Биографија"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Местоположба"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Каде се наоѓате, на пр. „Град, Област, Земја“."
@@ -4310,7 +4386,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4318,48 +4394,47 @@ msgstr[0] "Биографијата е предолга (највеќе до %d
msgstr[1] "Биографијата е предолга (највеќе до %d знаци)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Не е избрана часовна зона."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
msgid "Language is too long (maximum 50 characters)."
msgstr "Јазикот е предолг (највеќе до 50 знаци)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Неважечка ознака: „%s“"
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
-#, fuzzy
+#: actions/profilesettings.php:347
msgid "Could not update user for autosubscribe."
msgstr "Не можев да го подновам корисникот за автопретплата."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
-#, fuzzy
+#: actions/profilesettings.php:405
msgid "Could not save location prefs."
-msgstr "Не можев да ги зачувам нагодувањата за местоположба"
+msgstr "Не можев да ги зачувам нагодувањата за местоположба."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Не можев да ги зачувам ознаките."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Нагодувањата се зачувани"
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
msgid "Restore account"
msgstr "Врати сметка"
@@ -4483,35 +4558,43 @@ msgstr ""
msgid "Tag cloud"
msgstr "Облак од ознаки"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Веќе сте најавени!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Нема таков код за спасување."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Ова не е код за спасување."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Код за пронаоѓање за непознат корисник."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Грешка со кодот за потврдување."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Овој код потврден код е престар. Почнете од почеток."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Не можев да го подновам корисникот со потврдена е-поштенска адреса."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4519,69 +4602,102 @@ msgstr ""
"Ако ја имате заборавено или загубено лозинката, можете да побарате да Ви се "
"испрати нова по е-поштата која сте ја назначиле за сметката."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Препознаени сте. Внесете нова лозинка подполу. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Враќање на лозинката"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Прекар или е-поштенска адреса"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr ""
"Вашиот прекар на овој опслужувач или адресата за е-пошта со која се "
"регистриравте."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Пронајди"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Пронајди"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Рестетирај ја лозинката"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Пронаоѓање на лозинка"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Побарано е пронаоѓање на лозинката"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Непознато дејство"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 или повеќе знаци и не заборавајте!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Исто како лозинката погоре"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Врати одново"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Внесете прекар или е-пошта"
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "Нема корисник со таа е-поштенска адреса или корисничко име."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Нема регистрирана адреса за е-пошта за тој корисник."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Грешка при зачувувањето на потврдата за адреса."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4589,23 +4705,34 @@ msgstr ""
"Упатството за пронаоѓање на Вашата лозинка е испратено до адресата за е-"
"пошта што е регистрирана со Вашата сметка."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Неочекувано подновување на лозинката."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
msgid "Password must be 6 characters or more."
msgstr "Лозинката мора да има барем 6 знаци."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Двете лозинки не се совпаѓаат."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Не можам да ја зачувам новата лозинка."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Грешка во поставувањето на корисникот."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Новата лозинка е успешно зачувана. Сега сте најавени."
@@ -4621,7 +4748,7 @@ msgstr "Жалиме, неважечки код за поканата."
msgid "Registration successful"
msgstr "Регистрацијата е успешна"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистрирај се"
@@ -4649,63 +4776,54 @@ msgstr ""
"Со овој образец можете да создадете нова сметка. Потоа ќе можете да "
"објавувате забелешки и да се поврзувате со пријатели и колеги. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 мали букви или бројки, без интерпункциски знаци и празни места. "
-"Задолжително поле."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "Барем 6 знаци. Задолжително поле."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Исто што и лозинката погоре. Задолжително поле."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 или повеќе знаци"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Е-пошта"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Се користи само за подновувања, објави и повраќање на лозинка."
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Подолго име, по можност Вашето вистинско име и презиме"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL на Вашата домашна страница, блог или профил на друго мрежно место."
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "Сфаќам дека содржината и податоците на %1$s се лични и доверливи."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Авторското правво на мојот текст и податотеки го има %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
"Јас ја задржувам сопственоста на авторското право врз мојот текст и "
"податотеки."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Сите права задржани."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4714,7 +4832,7 @@ msgstr ""
"Мојот текст и податотеки се достапни под %s, освен следниве приватни "
"податоци: лозинка, е-пошта, IM-адреса и телефонски број."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4748,7 +4866,7 @@ msgstr ""
"Ви благодариме што се зачленивте и Ви пожелуваме пријатни мигови со оваа "
"служба."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -4808,12 +4926,10 @@ msgstr ""
"неважечки XRDS)."
#: actions/remotesubscribe.php:175
-#, fuzzy
msgid "That is a local profile! Login to subscribe."
-msgstr "Тоа е локален профил! најавете се за да се претплатите."
+msgstr "Тоа е локален профил! Најавете се за да се претплатите."
#: actions/remotesubscribe.php:182
-#, fuzzy
msgid "Could not get a request token."
msgstr "Не можев да добијам жетон за барање."
@@ -4826,7 +4942,6 @@ msgid "No notice specified."
msgstr "Нема назначено забелешка."
#: actions/repeat.php:75
-#, fuzzy
msgid "You cannot repeat your own notice."
msgstr "Не можете да повторувате сопствена забелешка."
@@ -5067,7 +5182,7 @@ msgstr "Организација"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Опис"
@@ -5090,10 +5205,11 @@ msgstr "Дејства на програмот"
msgid "Reset key & secret"
msgstr "Клуч за промена и тајна"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
-msgstr "Бриши"
+msgstr "Избриши"
#: actions/showapplication.php:261
msgid "Application info"
@@ -5220,7 +5336,7 @@ msgid "Note"
msgstr "Забелешка"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Алијаси"
@@ -6912,7 +7028,7 @@ msgstr "Помош"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
#: lib/action.php:867
msgid "About"
-msgstr "За"
+msgstr "За нас"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
#: lib/action.php:870
@@ -7249,11 +7365,9 @@ msgstr ""
"програмот."
#: lib/apioauthstore.php:345
-#, fuzzy
msgid "Database error updating OAuth application user."
msgstr ""
-"Грешка во базата на податоци при вметнувањето на корисникот на OAuth-"
-"програмот."
+"Грешка во базата на податоци при подновата на корисникот на OAuth-програмот."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
#: lib/apioauthstore.php:371
@@ -7818,24 +7932,24 @@ msgstr ""
"tracking - сè уште не е имплементирано.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
msgid "No configuration file found."
msgstr "Нема пронајдено податотека со поставки."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
msgid "I looked for configuration files in the following places:"
msgstr "Пребарав податотеки со поставки на следниве места:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "Препорачуваме да го пуштите инсталатерот за да го поправите ова."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Оди на инсталаторот."
@@ -7902,11 +8016,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Искл."
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Врати одново"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Промена на бои"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Користи по основно"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7989,32 +8107,28 @@ msgstr "Оди"
msgid "Grant this user the \"%s\" role"
msgstr "Додели улога „%s“ на корисников"
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 мали букви или бројки. Без интерпукциски знаци и празни места."
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
msgid "URL of the homepage or blog of the group or topic."
msgstr "URL на страницата или блогот на групата или темата"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Опишете ја групата или темата"
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Опишете ја групата или темата со највеќе %d знак"
msgstr[1] "Опишете ја групата или темата со највеќе %d знаци"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
"Местоположба на групата (ако има). На пр. „Град, Сој. држава/област, Земја“"
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8652,7 +8766,7 @@ msgstr "Расположиви знаци"
#: lib/messageform.php:185 lib/noticeform.php:237
msgctxt "Send button for sending notice"
msgid "Send"
-msgstr "Прати"
+msgstr "Испрати"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
#: lib/nickname.php:165
@@ -9220,14 +9334,9 @@ msgstr[1] "пред околу %d месеци"
msgid "about a year ago"
msgstr "пред една година"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s не е важечка боја!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr ""
@@ -9266,29 +9375,29 @@ msgstr "Неважечки XML. Нема XRD-корен."
msgid "Getting backup from file '%s'."
msgstr "Земам резерва на податотеката „%s“."
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "AtomPub-објава со непознат URI за внимание %s"
+#~ msgid "No such group"
+#~ msgstr "Нема такваа група"
-#~ msgid "No such profile"
-#~ msgstr "Нема таков профил"
+#~ msgid "HTTP method not supported"
+#~ msgstr "HTML-методот не е поддржан"
-#~ msgid "Notices %s has favorited to on %s"
-#~ msgstr "Забелешки на %s што ги бендисува %s"
+#~ msgid "Reset"
+#~ msgstr "Врати одново"
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Групи на %s кадешто членува %s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 мали букви или бројки, без интерпункциски знаци и празни места. "
+#~ "Задолжително поле."
-#~ msgid "Method not supported"
-#~ msgstr "Методот не е поддржан"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "Барем 6 знаци. Задолжително поле."
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Луѓе на %s на коишто се претплатил %s"
+#~ msgid "Same as password above. Required."
+#~ msgstr "Исто што и лозинката погоре. Задолжително поле."
-#~ msgid "Couldn't update user."
-#~ msgstr "Не можев да го подновам корисникот."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 мали букви или бројки. Без интерпукциски знаци и празни места."
-#~ msgid "Couldn't save profile."
-#~ msgstr "Не можам да го зачувам профилот."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "Не можев да ги зачувам ознаките."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s не е важечка боја!"
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index ed13e9423b..af2c804132 100644
--- a/locale/ml/LC_MESSAGES/statusnet.po
+++ b/locale/ml/LC_MESSAGES/statusnet.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:41+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:30+0000\n"
"Language-Team: Malayalam \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ml\n"
"X-Message-Group: #out-statusnet-core\n"
@@ -74,6 +74,7 @@ msgid "Save access settings"
msgstr "അഭിഗമ്യതാ സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -85,13 +86,13 @@ msgstr "അഭിഗമ്യതാ സജ്ജീകരണങ്ങൾ സേ
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "സേവ് ചെയ്യുക"
@@ -316,7 +317,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
@@ -340,7 +341,7 @@ msgstr ""
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr ""
@@ -350,7 +351,7 @@ msgstr ""
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -387,7 +388,6 @@ msgstr "താങ്കളുടെ രൂപകല്പന പുതുക്
#. TRANS: Title for Atom feed.
#: actions/apiatomservice.php:85
-#, fuzzy
msgctxt "ATOM"
msgid "Main"
msgstr "മുഖ്യം"
@@ -524,7 +524,8 @@ msgid "That status is not a favorite."
msgstr ""
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr ""
@@ -570,7 +571,7 @@ msgstr "ലക്ഷ്യമിട്ട ഉപയോക്താവിനെ
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "വിളിപ്പേര് മുമ്പേ ഉപയോഗത്തിലുണ്ട്. മറ്റൊരെണ്ണം ശ്രമിക്കുക."
@@ -580,7 +581,7 @@ msgstr "വിളിപ്പേര് മുമ്പേ ഉപയോഗത്
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
@@ -592,7 +593,7 @@ msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "ഹോംപേജിന്റെ യൂ.ആർ.എൽ. സാധുവല്ല."
@@ -602,7 +603,7 @@ msgstr "ഹോംപേജിന്റെ യൂ.ആർ.എൽ. സാധുവ
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "പൂർണ്ണ നാമത്തിന്റെ നീളം വളരെ കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
@@ -629,7 +630,7 @@ msgstr[1] ""
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr ""
@@ -686,22 +687,26 @@ msgid "Group not found."
msgstr "സംഘത്തെ കണ്ടെത്താനായില്ല."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "താങ്കൾ ആ സംഘത്തിൽ മുമ്പേ തന്നെ അംഗമാണ്."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "ആ സംഘത്തിൽ നിന്നും കാര്യനിർവ്വാഹകൻ താങ്കളെ തടഞ്ഞിരിക്കുന്നു."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "%2$s എന്ന സംഘത്തിൽ %1$s എന്ന ഉപയോക്താവിനെ ചേർക്കാൻ കഴിഞ്ഞില്ല."
@@ -713,9 +718,11 @@ msgstr "താങ്കൾ ഈ സംഘത്തിൽ അംഗമല്ല."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -772,9 +779,12 @@ msgid "Request token already authorized."
msgstr "അഭ്യർത്ഥനാ ചീട്ട് മുമ്പേ തന്നെ അംഗീകരിക്കപ്പെട്ടതാണ്."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -782,7 +792,7 @@ msgstr "അഭ്യർത്ഥനാ ചീട്ട് മുമ്പേ ത
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -803,18 +813,20 @@ msgstr ""
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "അപ്രതീക്ഷിത ഫോം സമർപ്പിക്കൽ."
@@ -862,7 +874,7 @@ msgstr "അംഗത്വം"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "വിളിപ്പേര്"
@@ -870,7 +882,7 @@ msgstr "വിളിപ്പേര്"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "രഹസ്യവാക്ക്"
@@ -974,10 +986,12 @@ msgstr "ആ അറിയിപ്പ് മുമ്പേ തന്നെ ആ
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
@@ -1008,9 +1022,8 @@ msgstr "ആറ്റം ഫോർമാറ്റ് ഉപയോഗിച്ച
#. TRANS: Client error displayed when a user has no rights to delete notices of other users.
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
-#, fuzzy
msgid "Cannot delete this notice."
-msgstr "ഈ അറിയിപ്പ് മായ്ക്കാൻ കഴിഞ്ഞില്ല."
+msgstr "ഈ അറിയിപ്പ് മായ്ക്കാൻ കഴിയില്ല."
#. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
#: actions/apistatusesshow.php:249
@@ -1096,7 +1109,7 @@ msgstr ""
#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
-msgstr "%s പൊതു സമയരേഖ"
+msgstr "%s സാർവ്വജനിക സമയരേഖ"
#. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
@@ -1179,9 +1192,9 @@ msgstr ""
#. TRANS: Client error displayed when posting a notice without content through the API.
#. TRANS: %d is the notice ID (number).
#: actions/apitimelineuser.php:381
-#, fuzzy, php-format
+#, php-format
msgid "No content for notice %d."
-msgstr "ഉള്ളടക്കമൊന്നും %s എന്ന അറിയിപ്പിനു നൽകിയിട്ടില്ല."
+msgstr "%d എന്ന അറിയിപ്പിനു ഉള്ളടക്കമില്ല"
#. TRANS: Client error displayed when using another format than AtomPub.
#: actions/apitimelineuser.php:409
@@ -1245,13 +1258,12 @@ msgstr "%s സംഘ അംഗത്വങ്ങൾ"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
-msgstr "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
+msgid "Cannot add someone else's membership."
+msgstr "മറ്റൊരാളുടെ അംഗത്വം കൂട്ടിച്ചേർക്കാനാവില്ല."
#. TRANS: Client error displayed when not using the POST verb.
#. TRANS: Do not translate POST.
#: actions/atompubmembershipfeed.php:242
-#, fuzzy
msgid "Can only handle join activities."
msgstr "പങ്ക് ചേരൽ പ്രക്രിയകൾ മാത്രം കൈകാര്യം ചെയ്യാനേ കഴിയൂ."
@@ -1278,29 +1290,51 @@ msgstr ""
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "അത്തരത്തിൽ ഒരു സംഘം ഇല്ല"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+msgstr "അങ്ങനെ ഒരു സംഘം ഇല്ല."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
-msgid "Not a member"
-msgstr "അംഗം അല്ല"
-
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
#, fuzzy
-msgid "HTTP method not supported"
-msgstr "എച്ച്.റ്റി.റ്റി.പി. രീതി പിന്തുണയ്ക്കുന്നില്ല."
+msgid "Not a member."
+msgstr "അംഗം അല്ല"
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1469,35 +1503,42 @@ msgstr "അവതാരം അപ്ലോഡ് ചെയ്യുന്ന
msgid "Avatar deleted."
msgstr ""
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "ഉപയോക്താവിനു മാത്രമേ അദ്ദേഹത്തിന്റെ സ്വന്തം സമയരേഖ ചേർക്കാൻ കഴിയൂ."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "പശ്ചാത്തലം"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1528,14 +1569,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "അല്ല"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "ഈ ഉപയോക്താവിനെ തടയരുത്"
@@ -1547,7 +1587,7 @@ msgstr "ഈ ഉപയോക്താവിനെ തടയരുത്"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "അതെ"
@@ -1563,32 +1603,6 @@ msgstr "ഈ ഉപയോക്താവിനെ തടയുക"
msgid "Failed to save block information."
msgstr "തടയലിന്റെ വിവരങ്ങൾ സേവ് ചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "അങ്ങനെ ഒരു സംഘം ഇല്ല."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1715,7 +1729,8 @@ msgid "Account deleted."
msgstr "അംഗത്വം മായ്ച്ചിരിക്കുന്നു."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
msgid "Delete account"
msgstr "അംഗത്വം മായ്ക്കുക"
@@ -1737,8 +1752,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "സ്ഥിരീകരിക്കുക"
@@ -1808,8 +1824,10 @@ msgid "You must be logged in to delete a group."
msgstr ""
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "വിളിപ്പേരോ ഐ.ഡി.യോ ഇല്ല."
@@ -1857,10 +1875,11 @@ msgid "Delete this group"
msgstr "ഈ സംഘത്തെ മായ്ക്കുക"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1900,19 +1919,30 @@ msgstr "ഈ അറിയിപ്പ് മായ്ക്കരുത്"
msgid "Delete this notice"
msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "താങ്കൾക്ക് ഉപയോക്താക്കളെ നീക്കം ചെയ്യാൻ കഴിയില്ല."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "താങ്കൾക്ക് പ്രാദേശിക ഉപയോക്താക്കളെ മാത്രമേ നീക്കം ചെയ്യാൻ കഴിയൂ."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "ഉപയോക്താവിനെ നീക്കം ചെയ്യുക"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "ഉപയോക്താവിനെ നീക്കം ചെയ്യുക"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1920,78 +1950,102 @@ msgstr ""
"ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യണമെന്ന് താങ്കൾക്ക് തീർച്ചയാണോ? ഇത് ഡേറ്റാബേസിൽ നിന്നും ബാക്ക്അപ് "
"ഇല്ലാതെ ഉപയോക്താവിനെ കുറിച്ചുള്ള എല്ലാ വിവരങ്ങളും നീക്കം ചെയ്യും."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "ഈ സംഘത്തെ മായ്ക്കരുത്"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യുക"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "രൂപകല്പന"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr "ഈ സ്റ്റാറ്റസ്നെറ്റ് സൈറ്റിന്റെ രൂപകല്പനാ സജ്ജീകരണങ്ങൾ"
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "ലോഗോ യൂ.ആർ.എൽ. അസാധുവാണ്."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "അസാധുവായ എസ്.എസ്.എൽ. ലോഗോ യൂ.ആർ.എൽ."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "ദൃശ്യരൂപം ലഭ്യമല്ല: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "ലോഗോ മാറ്റുക"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "സൈറ്റിന്റെ ലോഗോ"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "എസ്.എസ്.എൽ. ലോഗോ"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "ദൃശ്യരൂപം മാറ്റുക"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "സൈറ്റിന്റെ ദൃശ്യരൂപം"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "ഈ സൈറ്റിന്റെ ദൃശ്യരൂപം."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "ഐച്ഛിക ദൃശ്യരൂപം"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
-msgstr "പശ്ചാത്തല ചിത്രം മാറ്റുക"
+msgstr "പശ്ചാത്തലചിത്രം മാറ്റുക"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "പശ്ചാത്തലം"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2001,98 +2055,108 @@ msgstr ""
"വലിപ്പം %1$s ആയിരിക്കണം."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "സജ്ജം"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "രഹിതം"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "പശ്ചാത്തലചിത്രം പ്രവർത്തന സജ്ജമാക്കുക അല്ലെങ്കിൽ രഹിതമാക്കുക."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
-msgstr ""
+msgstr "പശ്ചാത്തലചിത്രം ആവർത്തിച്ചു ചേർക്കുക"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "നിറങ്ങൾ മാറ്റുക"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "ഉള്ളടക്കം"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "പാർശ്വഭിത്തി"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "എഴുത്ത്"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "കണ്ണികൾ"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "വിപുലം"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "സ്വന്തം സി.എസ്.എസ്."
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "സ്വതേയുള്ളവ ഉപയോഗിക്കുക"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "സ്വതേയുള്ള രൂപകല്പനകൾ പുനഃസ്ഥാപിക്കുക"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "മുമ്പ് സ്വതേയുണ്ടായിരുന്നതിലേയ്ക്ക് പുനഃസ്ഥാപിക്കുക"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "സേവ് ചെയ്യുക"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "രൂപകല്പന സേവ് ചെയ്യുക"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr ""
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr ""
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "\"%s\" എന്നൊരു രേഖ ഇല്ല"
#. TRANS: Title for "Edit application" form.
@@ -2394,7 +2458,6 @@ msgstr "ആ ഇമെയിൽ വിലാസം മറ്റൊരു ഉപ
#. TRANS: Server error thrown on database error adding SMS confirmation code.
#: actions/emailsettings.php:426 actions/imsettings.php:343
#: actions/smssettings.php:365
-#, fuzzy
msgid "Could not insert confirmation code."
msgstr "സ്ഥിരീകരണ കോഡ് ഉൾപ്പെടുത്താൻ കഴിഞ്ഞില്ല."
@@ -2424,7 +2487,6 @@ msgstr "അത് തെറ്റായ ഇമെയിൽ വിലാസമാ
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
#: actions/emailsettings.php:468 actions/smssettings.php:413
-#, fuzzy
msgid "Could not delete email confirmation."
msgstr "ഇമെയിൽ സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
@@ -2533,11 +2595,11 @@ msgstr ""
#: actions/file.php:34
msgid "No notice ID."
-msgstr ""
+msgstr "അറിയിപ്പിന്റെ ഐ.ഡി. ഇല്ല."
#: actions/file.php:38
msgid "No notice."
-msgstr ""
+msgstr "അറിയിപ്പ് ഇല്ല."
#: actions/file.php:42
msgid "No attachments."
@@ -2800,8 +2862,13 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
+"സമാന താത്പര്യങ്ങളുള്ള ആൾക്കാരെ കണ്ടെത്താൻ %%%%site.name%%%% സംഘങ്ങൾ സഹായമാവുന്നു. ഒരു "
+"സംഘത്തിൽ ചേർന്നു കഴിഞ്ഞാൽ \"!groupname\" എന്ന് ഉപയോഗിച്ച് സംഘത്തിലെ എല്ലാവർക്കുമായി "
+"സന്ദേശമയയ്ക്കാൻ സാധിക്കും. താങ്കൾക്ക് താത്പര്യമുള്ള സംഘം കണ്ടെത്താനായില്ലേ? [തിരഞ്ഞു നോക്കുക](%%"
+"%%action.groupsearch%%%%) അല്ലെങ്കിൽ [താങ്കൾ തന്നെ ഒരെണ്ണം തുടങ്ങുക!](%%%%action."
+"newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "പുതിയൊരു സംഘം സൃഷ്ടിക്കുക"
@@ -2811,6 +2878,9 @@ msgid ""
"Search for groups on %%site.name%% by their name, location, or description. "
"Separate the terms by spaces; they must be 3 characters or more."
msgstr ""
+"%%site.name%% സൈറ്റിൽ അവയുടെ പേരിനേയോ, പ്രദേശത്തിനേയോ, വിവരണത്തിനേയോ അടിസ്ഥാനമാക്കി "
+"സംഘങ്ങൾ തിരയുക. ഒന്നിലധികം പദങ്ങൾ ഉണ്ടെങ്കിൽ അവയ്ക്കിടയിൽ ഇട നൽകുക; ഓരോ പദത്തിലും മൂന്നോ "
+"അതിലധികമോ അക്ഷരങ്ങൾ ഉണ്ടായിരിക്കണം."
#: actions/groupsearch.php:58
msgid "Group search"
@@ -2909,6 +2979,8 @@ msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
+"ജാബ്ബർ അല്ലെങ്കിൽ ജിറ്റോക് വിലാസം, \"UserName@example.org\" എന്ന രീതിയിൽ. ആദ്യം %s "
+"താങ്കളുടെ ഐ.എം. ക്ലയന്റിലോ ജിറ്റോക്കിലോ സുഹൃത്തുക്കളുടെ പട്ടികയിലുണ്ടെന്നുറപ്പാക്കുക."
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:154
@@ -2983,9 +3055,8 @@ msgstr "ഇത് തെറ്റായ ഐ.എം. വിലാസമാണ്.
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:391
-#, fuzzy
msgid "Could not delete IM confirmation."
-msgstr "ഇമെയിൽ സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
+msgstr "ഐ.എം. സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:396
@@ -3015,7 +3086,7 @@ msgstr ""
#: actions/inbox.php:115
msgid "This is your inbox, which lists your incoming private messages."
-msgstr ""
+msgstr "ഇതാണ് താങ്കളുടെ ഇൻബോക്സ്, താങ്കൾക്ക് വരുന്ന സ്വകാര്യസന്ദേശങ്ങൾ ഇവിടെയാണെത്തുക."
#. TRANS: Client error displayed when trying to sent invites while they have been disabled.
#: actions/invite.php:40
@@ -3027,7 +3098,7 @@ msgstr "ക്ഷണം പ്രവർത്തന രഹിതമാക്ക
#: actions/invite.php:44
#, php-format
msgid "You must be logged in to invite other users to use %s."
-msgstr ""
+msgstr "%s ഉപയോഗിക്കാൻ മറ്റുപയോക്താക്കളെ ക്ഷണിക്കാൻ താങ്കൾ ലോഗിൻ ചെയ്തിരിക്കണം."
#. TRANS: Form validation message when providing an e-mail address that does not validate.
#. TRANS: %s is an invalid e-mail address.
@@ -3170,26 +3241,33 @@ msgid ""
"Sincerely, %2$s\n"
msgstr ""
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "ഒരു സംഘത്തിൽ ചേരാൻ താങ്കൾ ലോഗിൻ ചെയ്തിരിക്കേണ്ടതാണ്."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s %2$s എന്ന സംഘത്തിൽ ചേർന്നു"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "ഒരു സംഘത്തിൽ നിന്നും പുറത്തുപോകാൻ താങ്കൾ ലോഗിൻ ചെയ്തിരിക്കേണ്ടതാണ്."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "താങ്കൾ ആ സംഘത്തിൽ അംഗമല്ല."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s %2$s എന്ന സംഘത്തിൽ നിന്നും ഒഴിവായി"
@@ -3294,6 +3372,13 @@ msgstr "അനുമതി ചിത്ര യൂ.ആർ.എൽ."
msgid "URL for an image to display with the license."
msgstr "അനുമതിയോടൊപ്പം പ്രദർശിപ്പിക്കേണ്ട ചിത്രത്തിന്റെ യൂ.ആർ.എൽ.."
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "സേവ് ചെയ്യുക"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "അനുമതി സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക"
@@ -3318,11 +3403,11 @@ msgstr "പ്രവേശിക്കുക"
msgid "Login to site"
msgstr "സൈറ്റിലേക്ക് പ്രവേശിക്കുക"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "എന്നെ ഓർത്തുവെയ്ക്കുക"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "ഭാവിയിൽ സ്വയം ലോഗിൻ ചെയ്യുക; പങ്ക് വെച്ച് ഉപയോഗിക്കുന്ന കമ്പ്യൂട്ടറുകളിൽ പാടില്ല!"
@@ -3696,7 +3781,8 @@ msgstr "രഹസ്യവാക്ക് മാറ്റുക"
msgid "Change your password."
msgstr "താങ്കളുടെ രഹസ്യവാക്ക് മാറ്റുക."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "രഹസ്യവാക്ക് മാറ്റൽ"
@@ -3704,7 +3790,8 @@ msgstr "രഹസ്യവാക്ക് മാറ്റൽ"
msgid "Old password"
msgstr "പഴയ രഹസ്യവാക്ക്"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "പുതിയ രഹസ്യവാക്ക്"
@@ -3712,7 +3799,7 @@ msgstr "പുതിയ രഹസ്യവാക്ക്"
msgid "6 or more characters"
msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "മുകളിലുള്ള രഹസ്യവാക്ക് തന്നെ"
@@ -3736,11 +3823,12 @@ msgstr "പഴയ രഹസ്യവാക്ക് തെറ്റാണ്"
msgid "Error saving user; invalid."
msgstr ""
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "പുതിയ രഹസ്യവാക്ക് സേവ് ചെയ്യാനായില്ല."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "രഹസ്യവാക്ക് സേവ് ചെയ്തിരിക്കുന്നു."
@@ -4061,22 +4149,23 @@ msgid "Profile information"
msgstr ""
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "പൂർണ്ണനാമം"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "ഹോംപേജ്"
@@ -4088,7 +4177,7 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4096,27 +4185,27 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "താങ്കളെക്കുറിച്ചും താങ്കളുടെ ഇഷ്ടങ്ങളെക്കുറിച്ചും വിവരിക്കുക"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "സ്ഥലം"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "താങ്കളെവിടെയാണ്, അതായത് \"നഗരം, സംസ്ഥാനം (അഥവ പ്രദേശം), രാജ്യം\" എന്ന്"
@@ -4167,7 +4256,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4175,55 +4264,56 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "സമയമേഖല തിരഞ്ഞെടുത്തിട്ടില്ല."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
msgid "Language is too long (maximum 50 characters)."
msgstr "ഭാഷയുടെ നീളം വളരെ കൂടുതലാണ് (പരമാവധി 50 അക്ഷരങ്ങൾ)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "അസാധുവായ റ്റാഗ്: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "എന്റെ സ്ഥാനം പങ്ക് വെയ്ക്കരുത്"
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
-msgstr ""
+msgstr "റ്റാഗുകൾ സേവ് ചെയ്യാൻ കഴിഞ്ഞില്ല."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "സജ്ജീകരണങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
msgid "Restore account"
msgstr "അംഗത്വം പുനഃക്രമീകരിക്കുക"
#: actions/public.php:83
#, php-format
msgid "Beyond the page limit (%s)."
-msgstr ""
+msgstr "താളിന്റെ പരിധിയ്ക്ക് (%s) പുറത്താണ്."
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -4232,11 +4322,11 @@ msgstr ""
#: actions/public.php:130
#, php-format
msgid "Public timeline, page %d"
-msgstr ""
+msgstr "സാർവ്വജനിക സമയരേഖ, താൾ %d"
#: actions/public.php:132 lib/publicgroupnav.php:79
msgid "Public timeline"
-msgstr ""
+msgstr "സാർവ്വജനിക സമയരേഖ"
#: actions/public.php:160
msgid "Public Stream Feed (RSS 1.0)"
@@ -4326,35 +4416,43 @@ msgstr ""
msgid "Tag cloud"
msgstr ""
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "താങ്കൾ മുമ്പേതന്നെ ലോഗിൻ ചെയ്തിട്ടുണ്ട്!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr ""
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr ""
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr ""
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "സ്ഥിരീകരണ കോഡിൽ പിഴവുണ്ട്."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "ഈ സ്ഥിരീകരണ കോഡ് വളരെ പഴക്കമേറിയതാണ്. ദയവായി ആദ്യം മുതൽ വീണ്ടും ശ്രമിക്കുക."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr ""
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4362,68 +4460,101 @@ msgstr ""
"താങ്കളുടെ രഹസ്യവാക്ക് നഷ്ടപ്പെടുകയോ മറക്കുകയോ ചെയ്താൽ, താങ്കളുടെ അംഗത്വത്തിനൊപ്പം "
"സൂക്ഷിച്ചിട്ടുള്ള ഇമെയിൽ വിലാസത്തിലേക്ക് പുതിയ ഒരെണ്ണം അയച്ചു വാങ്ങാനാകുന്നതാണ്."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "താങ്കൾ തിരിച്ചറിയപ്പെട്ടിരിക്കുന്നു. താഴെ പുതിയ രഹസ്യവാക്ക് നൽകുക. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "വിളിപ്പേര് അല്ലെങ്കിൽ ഇമെയിൽ വിലാസം"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr ""
"ഈ സെർവറിലെ താങ്കളുടെ വിളിപ്പേര്, അഥവാ താങ്കൾ രജിസ്റ്റർ ചെയ്തിട്ടുള്ള ഇമെയിൽ വിലാസം."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "വീണ്ടെടുക്കുക"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "വീണ്ടെടുക്കുക"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "രഹസ്യവാക്ക് പുനഃക്രമീകരിക്കുക"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "രഹസ്യവാക്ക് വീണ്ടെടുക്കുക"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ ആവശ്യപ്പെട്ടിരിക്കുന്നു"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "അജ്ഞാതമായ പ്രവൃത്തി"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ, അത് മറക്കരുത്!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "മുകളിലുള്ള രഹസ്യവാക്ക് തന്നെ"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+msgctxt "BUTTON"
msgid "Reset"
msgstr "പുനഃക്രമീകരിക്കുക"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "ഒരു വിളിപ്പേരോ ഇമെയിൽ വിലാസമോ നൽകുക."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "ആ ഇമെയിൽ വിലാസമോ ഉപയോക്തൃനാമമോ ഉപയോഗിക്കുന്ന ഒരു ഉപയോക്താവും ഇല്ല."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "ആ ഉപയോക്താവ് ഇമെയിൽ വിലാസമൊന്നും നൽകിയിട്ടില്ല."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "വിലാസത്തിന്റെ സ്ഥിരീകരണം സേവ് ചെയ്യുമ്പോൾ പിഴവുണ്ടായി."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4431,23 +4562,34 @@ msgstr ""
"താങ്കളുടെ രഹസ്യവാക്ക് പുനഃസ്ഥാപിക്കാനുള്ള നിർദ്ദേശങ്ങൾ താങ്കളുടെ അംഗതത്തോടൊപ്പം നൽകിയിട്ടുള്ള "
"ഇമെയിൽ വിലാസത്തിലേയ്ക്ക് അയച്ചിട്ടുണ്ട്."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "അപ്രതീക്ഷിത രഹസ്യവാക്ക് പുനഃക്രമീകരണം."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
msgid "Password must be 6 characters or more."
msgstr "രഹസ്യവാക്കിന് ആറോ അതിലധികമോ അക്ഷരങ്ങളുണ്ടായിരിക്കണം."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "രഹസ്യവാക്കും സ്ഥിരീകരണവും യോജിക്കുന്നില്ല."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "പുതിയ രഹസ്യവാക്ക് സേവ് ചെയ്യാനായില്ല."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "ഉപയോക്താവിനെ സജ്ജീകരിക്കുന്നതിൽ പിഴവുണ്ടായി."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "പുതിയ രഹസ്യവാക്ക് വിജയകരമായി സേവ് ചെയ്തു. താങ്കൾക്ക് ലോഗിൻ ചെയ്യാവുന്നതാണ്."
@@ -4463,7 +4605,7 @@ msgstr "ക്ഷമിക്കുക, ക്ഷണത്തിന്റെ ക
msgid "Registration successful"
msgstr "അംഗത്വമെടുക്കൽ വിജയകരം"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "അംഗത്വമെടുക്കുക"
@@ -4489,66 +4631,63 @@ msgid ""
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ. ആവശ്യമാണ്."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "മുകളിൽ നിലകിയിരിക്കുന്ന രഹസ്യവാക്കിനു തുല്യമായത്. നിർബന്ധമാണ്."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "ഇമെയിൽ"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
+"പുതുക്കൽ വിവരങ്ങൾക്കും, അറിയിപ്പുകൾക്കും, രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ പ്രവർത്തനത്തിനും മാത്രം "
+"ഉപയോഗിച്ചത്"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "വലിയ പേര്, താങ്കളുടെ \"യഥാർത്ഥ\" പേര് നൽകാൻ താത്പര്യപ്പെടുന്നു"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
+"താങ്കളുടെ ഹോംപേജിന്റെ, ബ്ലോഗിന്റെ അല്ലെങ്കിൽ മറ്റൊരു സൈറ്റിലെ താങ്കളെക്കുറിച്ചുള്ള "
+"താളിലേയ്ക്കുള്ള യൂ.ആർ.എൽ."
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "എന്റെ എഴുത്തുകളും പ്രമാണങ്ങളും എന്റെ സ്വന്തം പകർപ്പവകാശത്തിലായിരിക്കും."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "എല്ലാ അവകാശങ്ങളും സംരക്ഷിതം."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4567,7 +4706,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -4624,9 +4763,8 @@ msgid "That is a local profile! Login to subscribe."
msgstr "വരിക്കാരനാകുന്നതിൽ നിന്നും ആ ഉപയോക്താവ് താങ്കളെ തടഞ്ഞിരിക്കുന്നു."
#: actions/remotesubscribe.php:182
-#, fuzzy
msgid "Could not get a request token."
-msgstr "അസാധുവായ അഭ്യർത്ഥനാ ചീട്ട്."
+msgstr "അഭ്യർത്ഥനാ ചീട്ട് ലഭ്യമാക്കാനായില്ല."
#: actions/repeat.php:56
msgid "Only logged-in users can repeat notices."
@@ -4637,7 +4775,6 @@ msgid "No notice specified."
msgstr "അറിയിപ്പുകളൊന്നും വ്യക്തമാക്കിയിട്ടില്ല."
#: actions/repeat.php:75
-#, fuzzy
msgid "You cannot repeat your own notice."
msgstr "താങ്കൾക്ക് താങ്കളുടെ തന്നെ അറിയിപ്പ് ആവർത്തിക്കാനാവില്ല."
@@ -4741,7 +4878,7 @@ msgstr ""
#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
#: actions/restoreaccount.php:150 lib/mediafile.php:214
msgid "Missing a temporary folder."
-msgstr ""
+msgstr "താത്കാലിക ഫോൾഡർ കാണുന്നില്ല."
#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
#: actions/restoreaccount.php:154 lib/mediafile.php:218
@@ -4756,7 +4893,7 @@ msgstr ""
#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
msgid "System error uploading file."
-msgstr ""
+msgstr "പ്രമാണം അപ്ലോഡ് ചെയ്തുകൊണ്ടിരിക്കെ സിസ്റ്റം പിഴവുണ്ടായി."
#. TRANS: Client exception thrown when a feed is not an Atom feed.
#: actions/restoreaccount.php:207
@@ -4835,7 +4972,7 @@ msgstr ""
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
msgid "Save site settings"
-msgstr ""
+msgstr "സൈറ്റ് സജ്ജീകരണങ്ങൾ ചേവ് ചെയ്യുക"
#: actions/showapplication.php:82
msgid "You must be logged in to view an application."
@@ -4863,7 +5000,7 @@ msgstr "സംഘടന"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "വിവരണം"
@@ -4886,8 +5023,9 @@ msgstr ""
msgid "Reset key & secret"
msgstr ""
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "മായ്ക്കുക"
@@ -4920,6 +5058,8 @@ msgid ""
"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
"signature method."
msgstr ""
+"ശ്രദ്ധിക്കുക: HMAC-SHA1 ഒപ്പുകളാണ് ഞങ്ങൾ പിന്തുണയ്ക്കുന്നത്. പ്ലെയിൻ-ടെക്സ്റ്റ് ഒപ്പ് രീതി ഞങ്ങൾ "
+"പിന്തുണയ്ക്കുന്നില്ല."
#: actions/showapplication.php:309
msgid "Are you sure you want to reset your consumer key and secret?"
@@ -5005,7 +5145,7 @@ msgid "Note"
msgstr "കുറിപ്പ്"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr ""
@@ -5065,7 +5205,7 @@ msgstr "സൃഷ്ടിച്ചിരിക്കുന്നു"
#: actions/showgroup.php:461
msgctxt "LABEL"
msgid "Members"
-msgstr ""
+msgstr "അംഗങ്ങൾ"
#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
@@ -5242,11 +5382,11 @@ msgstr "ഈ സ്റ്റാറ്റസ്നെറ്റ് സൈറ്
#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "സൈറ്റിന്റെ പേര് ശൂന്യമായിരിക്കരുത്."
#: actions/siteadminpanel.php:141
msgid "You must have a valid contact email address."
-msgstr ""
+msgstr "താങ്കളെ ബന്ധപ്പെടാനായി സാധുവായ ഇമെയിൽ വിലാസമുണ്ടായിരിക്കണം."
#: actions/siteadminpanel.php:159
#, php-format
@@ -5255,7 +5395,7 @@ msgstr "അപരിചിതമായ ഭാഷ \"%s\"."
#: actions/siteadminpanel.php:165
msgid "Minimum text limit is 0 (unlimited)."
-msgstr ""
+msgstr "എഴുത്തുകളുടെ ഏറ്റവും ചെറിയ പരിധി 0 ആണ് (പരിധിയില്ല)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must be one or more seconds."
@@ -5319,11 +5459,11 @@ msgstr "പരിധികൾ"
#: actions/siteadminpanel.php:274
msgid "Text limit"
-msgstr ""
+msgstr "എഴുത്തിന്റെ പരിധി"
#: actions/siteadminpanel.php:274
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "അറിയിപ്പുകളിലെ അക്ഷരങ്ങളുടെ പരമാവധി പരിധി."
#: actions/siteadminpanel.php:278
msgid "Dupe limit"
@@ -5346,7 +5486,7 @@ msgstr ""
#. TRANS: Server error displayed when saving a site-wide notice was impossible.
#: actions/sitenoticeadminpanel.php:101
msgid "Unable to save site notice."
-msgstr ""
+msgstr "സൈറ്റ് അറിയിപ്പ് സേവ് ചെയ്യാനായില്ല."
#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
#: actions/sitenoticeadminpanel.php:112
@@ -5366,12 +5506,12 @@ msgstr ""
#. TRANS: Title for button to save site notice in admin panel.
#: actions/sitenoticeadminpanel.php:201
msgid "Save site notice"
-msgstr ""
+msgstr "സൈറ്റ് അറിയിപ്പ് സേവ് ചെയ്യുക"
#. TRANS: Title for SMS settings.
#: actions/smssettings.php:57
msgid "SMS settings"
-msgstr ""
+msgstr "എസ്.എം.എസ്. സജ്ജീകരണങ്ങൾ"
#. TRANS: SMS settings page instructions.
#. TRANS: %%site.name%% is the name of the site.
@@ -5379,6 +5519,8 @@ msgstr ""
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
+"%%site.name%% സൈറ്റിൽ നിന്നും ഇമെയിൽ വഴി താങ്കൾക്ക് എസ്.എം.എസ്. സന്ദേശങ്ങൾ "
+"സ്വീകരിക്കാവുന്നതാണ്."
#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
#: actions/smssettings.php:93
@@ -5393,12 +5535,12 @@ msgstr "എസ്.എം.എസ്. വിലാസം"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:116
msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
+msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിച്ച എസ്.എം.എസ്. സജ്ജമായ ഫോൺ നമ്പർ."
#. TRANS: Form guide in IM settings form.
#: actions/smssettings.php:129
msgid "Awaiting confirmation on this phone number."
-msgstr ""
+msgstr "ഈ ഫോൺ നമ്പരിൽ നിന്നുള്ള സ്ഥിരീകരണത്തിനായി കാക്കുന്നു."
#. TRANS: Field label for SMS address input in SMS settings form.
#: actions/smssettings.php:138
@@ -5408,7 +5550,7 @@ msgstr "സ്ഥിരീകരണ കോഡ്"
#. TRANS: Form field instructions in SMS settings form.
#: actions/smssettings.php:140
msgid "Enter the code you received on your phone."
-msgstr ""
+msgstr "താങ്കളുടെ ഫോണിൽ ലഭിച്ച കോഡ് നൽകുക."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:144
@@ -5419,7 +5561,7 @@ msgstr "സ്ഥിരീകരിക്കുക"
#. TRANS: Field label for SMS phone number input in SMS settings form.
#: actions/smssettings.php:149
msgid "SMS phone number"
-msgstr ""
+msgstr "എസ്.എം.എസ്. ഫോൺ നമ്പർ."
#. TRANS: SMS phone number input field instructions in SMS settings form.
#: actions/smssettings.php:152
@@ -5429,7 +5571,7 @@ msgstr ""
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:191
msgid "SMS preferences"
-msgstr ""
+msgstr "എസ്.എം.എസ്. ക്രമീകരണങ്ങൾ"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:197
@@ -5441,7 +5583,7 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:308
msgid "SMS preferences saved."
-msgstr ""
+msgstr "എസ്.എം.എസ്. ക്രമീകരണങ്ങൾ സേവ് ചെയ്യപ്പെട്ടിട്ടുണ്ട്."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:330
@@ -5456,12 +5598,12 @@ msgstr ""
#. TRANS: Message given saving SMS phone number that is already set.
#: actions/smssettings.php:344
msgid "That is already your phone number."
-msgstr ""
+msgstr "അതാണ് താങ്കളുടെ ഫോൺ നമ്പരായി മുമ്പേ ഉള്ളത്."
#. TRANS: Message given saving SMS phone number that is already set for another user.
#: actions/smssettings.php:348
msgid "That phone number already belongs to another user."
-msgstr ""
+msgstr "ആ ഫോൺ നമ്പർ മുമ്പേ തന്നെ മറ്റൊരു ഉപയോക്താവിന് അവകാശപ്പെട്ടതാണ്."
#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
#: actions/smssettings.php:376
@@ -5469,27 +5611,29 @@ 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 ""
+"താങ്കൾ നൽകിയ ഫോൺ നമ്പരിൽ ഒരു സ്ഥിരീകരണ കോഡ് അയച്ചിട്ടുണ്ട്. കോഡിനും അതെപ്രകാരം "
+"ഉപയോഗിക്കാമെന്ന മാർഗ്ഗനിർദ്ദേശങ്ങൾക്കും താങ്കളുടെ ഫോൺ പരിശോധിക്കുക."
#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
#: actions/smssettings.php:404
msgid "That is the wrong confirmation number."
-msgstr ""
+msgstr "അത് തെറ്റായ സ്ഥിരീകരണ സംഖ്യയാണ്."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:418
msgid "SMS confirmation cancelled."
-msgstr ""
+msgstr "എസ്.എം.എസ്. സ്ഥിരീകരണം റദ്ദാക്കി."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
#: actions/smssettings.php:438
msgid "That is not your phone number."
-msgstr ""
+msgstr "അത് താങ്കളുടെ ഫോൺ നമ്പരല്ല."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:460
msgid "The SMS phone number was removed."
-msgstr ""
+msgstr "എസ്.എം.എസ്. ഫോൺ നമ്പർ നീക്കം ചെയ്തിരിക്കുന്നു."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:499
@@ -5513,7 +5657,7 @@ msgstr ""
#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
#: actions/smssettings.php:535
msgid "No code entered"
-msgstr ""
+msgstr "യാതൊരു കോഡും ചേർത്തിട്ടില്ല"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
@@ -5563,7 +5707,7 @@ msgstr ""
#: actions/snapshotadminpanel.php:226
msgid "Report URL"
-msgstr ""
+msgstr "യൂ.ആർ.എൽ. അറിയിക്കുക"
#: actions/snapshotadminpanel.php:227
msgid "Snapshots will be sent to this URL"
@@ -5734,7 +5878,7 @@ msgstr ""
#: actions/tagother.php:65
#, php-format
msgid "Tag %s"
-msgstr ""
+msgstr "റ്റാഗ് %s"
#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
@@ -5766,7 +5910,7 @@ msgstr ""
#: actions/tagrss.php:35
msgid "No such tag."
-msgstr ""
+msgstr "അത്തരത്തിൽ ഒരു റ്റാഗില്ല."
#: actions/unblock.php:59
msgid "You haven't blocked that user."
@@ -6140,12 +6284,12 @@ msgstr "പ്രമാണത്തിന്റെ പേര് അസാധു
#. TRANS: Exception thrown when joining a group fails.
#: classes/Group_member.php:51
msgid "Group join failed."
-msgstr ""
+msgstr "സംഘത്തിൽ ചേരൽ പരാജയപ്പെട്ടു."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
#: classes/Group_member.php:64
msgid "Not part of group."
-msgstr ""
+msgstr "സംഘത്തിന്റെ ഭാഗമല്ല."
#. TRANS: Exception thrown when trying to leave a group fails.
#: classes/Group_member.php:72
@@ -6577,7 +6721,7 @@ msgstr "തിരയുക"
#. TRANS: Menu item for site administration
#: lib/action.php:620 lib/adminpanelaction.php:387
msgid "Site notice"
-msgstr ""
+msgstr "സൈറ്റ് അറിയിപ്പ്"
#. TRANS: DT element for local views block. String is hidden in default CSS.
#: lib/action.php:687
@@ -6587,7 +6731,7 @@ msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
#: lib/action.php:757
msgid "Page notice"
-msgstr ""
+msgstr "താളിലെ അറിയിപ്പ്"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
#: lib/action.php:858
@@ -7444,24 +7588,24 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
msgid "No configuration file found."
msgstr "ക്രമീകരണ പ്രമാണം കണ്ടെത്താനായില്ല."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
msgid "I looked for configuration files in the following places:"
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr ""
@@ -7491,7 +7635,7 @@ msgstr ""
#: lib/connectsettingsaction.php:120
msgctxt "MENU"
msgid "Connections"
-msgstr ""
+msgstr "ബന്ധങ്ങൾ"
#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
@@ -7526,11 +7670,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "രഹിതം"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "പുനഃക്രമീകരിക്കുക"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "നിറങ്ങൾ മാറ്റുക"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "സ്വതേയുള്ളവ ഉപയോഗിക്കുക"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7613,31 +7761,27 @@ msgstr "പോകൂ"
msgid "Grant this user the \"%s\" role"
msgstr ""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
msgid "URL of the homepage or blog of the group or topic."
msgstr ""
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "സംഘത്തെക്കുറിച്ചോ വിഷയത്തെക്കുറിച്ചോ വിവരിക്കുക"
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
-msgstr[0] ""
-msgstr[1] ""
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
+msgstr[0] "സംഘത്തെക്കുറിച്ചോ വിഷയത്തെക്കുറിച്ചോ വിവരിക്കുക"
+msgstr[1] "സംഘത്തെക്കുറിച്ചോ വിഷയത്തെക്കുറിച്ചോ വിവരിക്കുക"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7755,7 +7899,7 @@ msgstr ""
#: lib/imagefile.php:95
msgid "Partial upload."
-msgstr ""
+msgstr "ഭാഗിക അപ്ലോഡ്."
#: lib/imagefile.php:111
msgid "Not an image or corrupt file."
@@ -8031,7 +8175,7 @@ msgstr ""
#: lib/mail.php:680
#, php-format
msgid "%1$s (@%2$s) sent a notice to your attention"
-msgstr ""
+msgstr "%1$s (@%2$s) താങ്കളുടെ ശ്രദ്ധയ്ക്കായി ഒരു അറിയിപ്പ് അയച്ചിരിക്കുന്നു"
#. TRANS: Body of @-reply notification e-mail.
#. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
@@ -8102,7 +8246,7 @@ msgstr "ക്ഷമിക്കുക, ഇങ്ങോട്ട് ഇമെയ
#: lib/mailhandler.php:229
#, php-format
msgid "Unsupported message type: %s"
-msgstr ""
+msgstr "പിന്തുണയില്ലാത്ത തരം സന്ദേശം: %s"
#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
#: lib/mediafile.php:102 lib/mediafile.php:174
@@ -8145,7 +8289,7 @@ msgstr ""
#: lib/messageform.php:120
msgid "Send a direct notice"
-msgstr ""
+msgstr "അറിയിപ്പ് നേരിട്ട് അയയ്ക്കുക"
#. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
#: lib/messageform.php:137
@@ -8258,7 +8402,7 @@ msgstr ""
#: lib/noticelist.php:619
msgid "Repeated by"
-msgstr ""
+msgstr "ആവർത്തിച്ചത്"
#: lib/noticelist.php:646
msgid "Reply to this notice"
@@ -8270,7 +8414,7 @@ msgstr "മറുപടി"
#: lib/noticelist.php:691
msgid "Notice repeated"
-msgstr ""
+msgstr "അറിയിപ്പ് ആവർത്തിച്ചിരിക്കുന്നു"
#: lib/nudgeform.php:116
msgid "Nudge this user"
@@ -8299,7 +8443,7 @@ msgstr ""
#. TRANS: Exception thrown when a notice is denied because it has been sent before.
#: lib/oauthstore.php:362
msgid "Duplicate notice."
-msgstr ""
+msgstr "അറിയിപ്പിന്റെ പകർപ്പ്."
#: lib/oauthstore.php:507
msgid "Couldn't insert new subscription."
@@ -8627,7 +8771,7 @@ msgstr ""
#: lib/userprofile.php:236 lib/userprofile.php:250
msgid "User actions"
-msgstr ""
+msgstr "ഉപയോക്തൃ പ്രവൃത്തികൾ"
#: lib/userprofile.php:239
msgid "User deletion in progress..."
@@ -8651,7 +8795,7 @@ msgstr "സന്ദേശം"
#: lib/userprofile.php:331
msgid "Moderate"
-msgstr ""
+msgstr "മാധ്യസ്ഥം വഹിക്കുക"
#: lib/userprofile.php:369
msgid "User role"
@@ -8729,14 +8873,9 @@ msgstr[1] "ഏകദേശം %d മാസം മുമ്പ്"
msgid "about a year ago"
msgstr "ഏകദേശം ഒരു വർഷം മുമ്പ്"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s ഒരു സാധുവായ നിറമല്ല!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr ""
@@ -8772,8 +8911,20 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#~ msgid "Method not supported"
-#~ msgstr "പിന്തുണയില്ലാത്ത മാർഗ്ഗമാണ്"
+#~ msgid "No such group"
+#~ msgstr "അത്തരത്തിൽ ഒരു സംഘം ഇല്ല"
-#~ msgid "Couldn't update user."
-#~ msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
+#~ msgid "HTTP method not supported"
+#~ msgstr "എച്ച്.റ്റി.റ്റി.പി. രീതി പിന്തുണയ്ക്കുന്നില്ല."
+
+#~ msgid "Reset"
+#~ msgstr "പുനഃക്രമീകരിക്കുക"
+
+#~ msgid "6 or more characters. Required."
+#~ msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ. ആവശ്യമാണ്."
+
+#~ msgid "Same as password above. Required."
+#~ msgstr "മുകളിൽ നിലകിയിരിക്കുന്ന രഹസ്യവാക്കിനു തുല്യമായത്. നിർബന്ധമാണ്."
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s ഒരു സാധുവായ നിറമല്ല!"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index d3a99f627d..76c7252f28 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:51+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:39+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.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -76,6 +76,7 @@ msgid "Save access settings"
msgstr "Lagre tilgangsinnstillinger"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -87,13 +88,13 @@ msgstr "Lagre tilgangsinnstillinger"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Lagre"
@@ -324,7 +325,7 @@ msgstr "Du må angi en verdi for parameteren 'device' med en av: sms, im, none."
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Kunne ikke oppdatere bruker."
@@ -348,7 +349,7 @@ msgstr "Brukeren har ingen profil."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Kunne ikke lagre profil."
@@ -358,7 +359,7 @@ msgstr "Kunne ikke lagre profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -537,7 +538,8 @@ msgid "That status is not a favorite."
msgstr "Den statusen er ikke en favoritt."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Kunne ikke slette favoritt."
@@ -583,7 +585,7 @@ msgstr "Kunne ikke finne målbruker."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Det nicket er allerede i bruk. Prøv et annet."
@@ -593,7 +595,7 @@ msgstr "Det nicket er allerede i bruk. Prøv et annet."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Ugyldig nick."
@@ -605,7 +607,7 @@ msgstr "Ugyldig nick."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Hjemmesiden er ikke en gyldig URL."
@@ -615,7 +617,7 @@ msgstr "Hjemmesiden er ikke en gyldig URL."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Fullt navn er for langt (maks 255 tegn)."
@@ -642,7 +644,7 @@ msgstr[1] "Beskrivelsen er for lang (maks %d tegn)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Plasseringen er for lang (maks 255 tegn)."
@@ -699,22 +701,26 @@ msgid "Group not found."
msgstr "Gruppe ikke funnet."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Du er allerede medlem av den gruppen."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Du har blitt blokkert fra den gruppen av administratoren."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s."
@@ -726,9 +732,11 @@ msgstr "Du er ikke et medlem av denne gruppen."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -788,9 +796,12 @@ msgid "Request token already authorized."
msgstr "Du er ikke autorisert."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -798,7 +809,7 @@ msgstr "Du er ikke autorisert."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -819,18 +830,20 @@ msgstr "Databasefeil ved innsetting av oauth_token_association."
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Uventet skjemainnsending."
@@ -884,7 +897,7 @@ msgstr "Konto"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Nick"
@@ -892,7 +905,7 @@ msgstr "Nick"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Passord"
@@ -1000,10 +1013,12 @@ msgstr "Allerede gjentatt den notisen."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
@@ -1271,7 +1286,7 @@ msgstr "%s gruppemedlemmer"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Kan ikke legge til noen andres abonnement"
#. TRANS: Client error displayed when not using the POST verb.
@@ -1307,30 +1322,51 @@ msgstr "Ingen slik fil."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Kunne ikke slette favoritt."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "Ingen slik gruppe."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "Alle medlemmer"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTTP-metoden støttes ikke."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Kunne ikke slette favoritt."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1499,35 +1535,42 @@ msgstr "Oppdatering av avatar mislyktes."
msgid "Avatar deleted."
msgstr "Avatar slettet."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Bare innloggede brukere kan repetere notiser."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Bakgrunn"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1561,14 +1604,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Nei"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Ikke blokker denne brukeren"
@@ -1580,7 +1622,7 @@ msgstr "Ikke blokker denne brukeren"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
@@ -1596,32 +1638,6 @@ msgstr "Blokker denne brukeren"
msgid "Failed to save block information."
msgstr "Kunne ikke lagre blokkeringsinformasjon."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Ingen slik gruppe."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1751,7 +1767,8 @@ msgid "Account deleted."
msgstr "Avatar slettet."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Opprett en konto"
@@ -1773,8 +1790,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Bekreft"
@@ -1849,8 +1867,10 @@ msgid "You must be logged in to delete a group."
msgstr "Du må være innlogget for å slette en gruppe."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "ngen kallenavn eller ID."
@@ -1901,10 +1921,11 @@ msgid "Delete this group"
msgstr "Slett denne gruppen"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1944,19 +1965,30 @@ msgstr "Ikke slett denne notisen"
msgid "Delete this notice"
msgstr "Slett denne notisen"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Du kan ikke slette brukere."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Du kan bare slette lokale brukere."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Slett bruker"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Slett bruker"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1964,78 +1996,102 @@ msgstr ""
"Er du sikker på at du vil slette denne brukeren? Dette vil slette alle data "
"om brukeren fra databasen, uten sikkerhetskopi."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Ikke slett denne gruppen"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Slett denne brukeren"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Utseende"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "Ugyldig logo-URL."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "Ugyldig SSL-logo-URL."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Tema ikke tilgjengelig: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Endre logo"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Nettstedslogo"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "SSL-logo"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Endre tema"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Nettstedstema"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Tema for nettstedet."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Egendefinert tema"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Du kan laste opp et egendefinert StatusNet-tema som et .ZIP-arkiv."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Endre bakgrunnsbilde"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Bakgrunn"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2044,98 +2100,108 @@ msgstr ""
"Du kan laste opp et bakgrunnsbilde for nettstedet. Maks filstørrelse er %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "På"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Av"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Slå på eller av bakgrunnsbilde."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Gjenta bakgrunnsbildet"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Endre farger"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Innhold"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Sidelinje"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Tekst"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Lenker"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Avansert"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "Egendefinert CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Bruk standard"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Gjenopprett standardutseende"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Tilbakestill til standardverdier"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Lagre"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Lagre utseende"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Denne notisen er ikke en favoritt!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Legg til i favoritter"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Inget slikt dokument «%s»"
#. TRANS: Title for "Edit application" form.
@@ -2855,7 +2921,7 @@ msgstr ""
"Prøv å [søke etter en](%%%%action.groupsearch%%%%) eller [start din egen.](%%"
"%%action.newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Opprett en ny gruppe"
@@ -3253,26 +3319,33 @@ msgstr ""
"\n"
"Vennlig hilsen, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Du må være innlogget for å bli med i en gruppe."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s ble med i gruppen %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Du må være innlogget for å forlate en gruppe."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Du er ikke et medlem av den gruppen."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s forlot gruppe %2$s"
@@ -3376,6 +3449,13 @@ msgstr "Lisensbildeadresse"
msgid "URL for an image to display with the license."
msgstr "Adresse til et bilde som vises med lisensen."
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Lagre"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "Lagre lisensinnstillinger"
@@ -3400,11 +3480,11 @@ msgstr "Logg inn"
msgid "Login to site"
msgstr "Logg inn på nettstedet"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Husk meg"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
@@ -3793,7 +3873,8 @@ msgstr "Endre passord"
msgid "Change your password."
msgstr "Endre passordet ditt."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Endre passord"
@@ -3801,7 +3882,8 @@ msgstr "Endre passord"
msgid "Old password"
msgstr "Gammelt passord"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Nytt passord"
@@ -3809,7 +3891,7 @@ msgstr "Nytt passord"
msgid "6 or more characters"
msgstr "6 eller flere tegn"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Samme som passord ovenfor"
@@ -3833,11 +3915,12 @@ msgstr "Feil gammelt passord"
msgid "Error saving user; invalid."
msgstr "Feil ved lagring av bruker; ugyldig."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Klarer ikke å lagre nytt passord."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Passordet ble lagret"
@@ -4164,22 +4247,23 @@ msgid "Profile information"
msgstr "Profilinformasjon"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1‒64 små bokstaver eller tall, ingen tegnsetting eller mellomrom."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Fullt navn"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Hjemmesiden"
@@ -4191,7 +4275,7 @@ msgstr "Adressen til din hjemmeside, blogg eller profil på et annet nettsted."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4199,27 +4283,27 @@ msgstr[0] "Beskriv deg selv og dine interesser på %d tegn"
msgstr[1] "Beskriv deg selv og dine interesser på %d tegn"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Beskriv degselv og dine interesser"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Om meg"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Plassering"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
@@ -4273,7 +4357,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4281,48 +4365,49 @@ msgstr[0] "Biografien er for lang (maks %d tegn)."
msgstr[1] "Biografien er for lang (maks %d tegn)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Tidssone ikke valgt."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
msgid "Language is too long (maximum 50 characters)."
msgstr "Språknavnet er for langt (maks 50 tegn)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Ugyldig merkelapp: «%s»"
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Kunne ikke oppdatere bruker for autoabonnering."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Kunne ikke lagre plasseringsinnstillinger."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Kunne ikke lagre merkelapper."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Innstillinger lagret."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Opprett en konto"
@@ -4446,35 +4531,43 @@ msgstr ""
msgid "Tag cloud"
msgstr "Merkelappsky"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Du er allerede logget inn!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Ingen slik gjenopprettingskode."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Ikke en gjenopprettingskode."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Gjenopprettingskode for ukjent bruker."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Bekreftelseskodefeil."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Denne bekreftelseskoden er for gammel. Start på nytt."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Klarte ikke å oppdatere bruker med bekreftet e-post."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4482,67 +4575,101 @@ msgstr ""
"Om du har glemt eller mistet passordet ditt kan du få et nytt tilsendt på e-"
"postadressen du har lagret på kontoen din."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Du har blitt identifisert. Skriv inn et nytt passord nedenfor. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Passordgjenoppretting"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Kallenavn eller e-postadresse"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "Ditt kallenavn på denne tjeneren eller din registrerte e-postadresse."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Gjenopprett"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Gjenopprett"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Tilbakestill passord"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Gjenopprett passord"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Passordgjenoppretting forespurt"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Ukjent handling"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 eller flere tegn. Og ikke glem det!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Samme som passord ovenfor"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Nullstill"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Skriv inn et kallenavn eller en e-postadresse."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "Ingen bruker med den e-postadressen eller det kallenavnet."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Ingen registrert e-postadresse for den brukeren."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Feil ved lagring av adressebekreftelse."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4550,23 +4677,34 @@ msgstr ""
"Instruksjoner om hvordan du kan gjenopprette ditt passord har blitt sendt "
"til din registrerte e-postadresse."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Uventet tilbakestilling av passord."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
msgid "Password must be 6 characters or more."
msgstr "Passordet må bestå av 6 eller flere tegn."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Passord og bekreftelse samsvarer ikke."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Klarer ikke å lagre nytt passord."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Feil ved innstilling av bruker."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Nytt passord ble lagret. Du er nå logget inn."
@@ -4582,7 +4720,7 @@ msgstr "Beklager, ugyldig invitasjonskode."
msgid "Registration successful"
msgstr "Registrering vellykket"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrer"
@@ -4610,59 +4748,52 @@ msgstr ""
"Med dette skjemaet kan du opprette en ny konto. Du kan så poste notiser og "
"knytte deg til venner og kollegaer. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 små bokstaver eller tall, ingen punktum eller mellomrom. Påkrevd."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 eller flere tegn. Påkrevd."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Samme som passord over. Kreves."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 eller flere tegn"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-post"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Kun brukt for oppdateringer, kunngjøringer og passordgjenoppretting"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Lengre navn, helst ditt \"ekte\" navn"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Alle rettigheter reservert."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4671,7 +4802,7 @@ msgstr ""
"Mine tekster og filer er tilgjengelig under %s med unntak av disse private "
"dataene: passord, e-postadresse, direktemeldingsadresse og telefonnummer."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4704,7 +4835,7 @@ msgstr ""
"\n"
"Takk for at du registrerte deg og vi håper du kommer til å like tjenesten."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5018,7 +5149,7 @@ msgstr "Organisasjon"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Beskrivelse"
@@ -5041,8 +5172,9 @@ msgstr "Programhandlinger"
msgid "Reset key & secret"
msgstr "Tilbakestill nøkkel & hemmelighet"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Slett"
@@ -5171,7 +5303,7 @@ msgid "Note"
msgstr "Merk"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Alias"
@@ -7712,26 +7844,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "Ingen konfigurasjonsfil funnet. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Jeg så etter konfigurasjonfiler på følgende seter: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
#, fuzzy
msgid "Go to the installer."
msgstr "Log inn på nettstedet"
@@ -7803,12 +7935,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Av"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Nullstill"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Endre farger"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Bruk standard"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7898,33 +8033,29 @@ msgstr "Gå"
msgid "Grant this user the \"%s\" role"
msgstr "Innvilg denne brukeren rollen «%s»"
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 små bokstaver eller tall, ingen punktum eller mellomrom"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "Nettadresse til hjemmesiden for dette programmet"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Beskriv programmet ditt"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Beskriv programmet ditt med %d tegn"
msgstr[1] "Beskriv programmet ditt med %d tegn"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9134,14 +9265,9 @@ msgstr[1] ""
msgid "about a year ago"
msgstr "omtrent ett år siden"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s er ikke en gyldig farge."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s er ikke en gyldig farge. Bruk 3 eller 6 heksadesimale tegn."
@@ -9178,32 +9304,29 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "AtomPub-innlegg med ukjent oppmerksomhets-URI %s"
-
-#~ msgid "No such profile"
-#~ msgstr "Ingen slik profil"
-
-#~ msgid "Notices %s has favorited to on %s"
-#~ msgstr "Notiser som %s har lagt til som favoritt på %s"
+#~ msgid "No such group"
+#~ msgstr "Ingen slik gruppe."
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "%1$s grupper %2$s er et medlem av."
+#~ msgid "HTTP method not supported"
+#~ msgstr "HTTP-metoden støttes ikke."
-#, fuzzy
-#~ msgid "Method not supported"
-#~ msgstr "API-metode ikke funnet!"
+#~ msgid "Reset"
+#~ msgstr "Nullstill"
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Fjernabonner"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 små bokstaver eller tall, ingen punktum eller mellomrom. Påkrevd."
-#~ msgid "Couldn't update user."
-#~ msgstr "Klarte ikke å oppdatere bruker."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 eller flere tegn. Påkrevd."
-#~ msgid "Couldn't save profile."
-#~ msgstr "Klarte ikke å lagre profil."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Samme som passord over. Kreves."
-#~ msgid "Couldn't save tags."
-#~ msgstr "Kunne ikke lagre merkelapper."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 små bokstaver eller tall, ingen punktum eller mellomrom"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s er ikke en gyldig farge."
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 9ae3a24e62..b511008396 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:43+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:32+0000\n"
"Language-Team: Dutch \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -77,6 +77,7 @@ msgid "Save access settings"
msgstr "Toegangsinstellingen opslaan"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -88,13 +89,13 @@ msgstr "Toegangsinstellingen opslaan"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Opslaan"
@@ -330,7 +331,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Het was niet mogelijk de gebruiker bij te werken."
@@ -354,7 +355,7 @@ msgstr "Deze gebruiker heeft geen profiel."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Het was niet mogelijk het profiel op te slaan."
@@ -364,7 +365,7 @@ msgstr "Het was niet mogelijk het profiel op te slaan."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -405,10 +406,9 @@ msgstr "Het was niet mogelijk uw ontwerp bij te werken."
#. TRANS: Title for Atom feed.
#: actions/apiatomservice.php:85
-#, fuzzy
msgctxt "ATOM"
msgid "Main"
-msgstr "Hoofdmenu"
+msgstr "Overzicht"
#. TRANS: Title for Atom feed. %s is a user nickname.
#. TRANS: Message is used as link title. %s is a user nickname.
@@ -544,7 +544,8 @@ msgid "That status is not a favorite."
msgstr "Deze mededeling staat niet in uw favorietenlijst."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr ""
"Het was niet mogelijk deze mededeling van uw favorietenlijst te verwijderen."
@@ -593,7 +594,7 @@ msgstr "Het was niet mogelijk de doelgebruiker te vinden."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr ""
@@ -604,7 +605,7 @@ msgstr ""
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Ongeldige gebruikersnaam!"
@@ -616,7 +617,7 @@ msgstr "Ongeldige gebruikersnaam!"
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "De thuispagina is geen geldige URL."
@@ -626,7 +627,7 @@ msgstr "De thuispagina is geen geldige URL."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "De volledige naam is te lang (maximaal 255 tekens)."
@@ -653,7 +654,7 @@ msgstr[1] "De beschrijving is te lang (maximaal %d tekens)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "De locatie is te lang (maximaal 255 tekens)."
@@ -710,22 +711,26 @@ msgid "Group not found."
msgstr "De groep is niet aangetroffen."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "U bent al lid van die groep."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s."
@@ -737,9 +742,11 @@ msgstr "U bent geen lid van deze groep."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -796,9 +803,12 @@ msgid "Request token already authorized."
msgstr "Het verzoektoken is al geautoriseerd."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -806,7 +816,7 @@ msgstr "Het verzoektoken is al geautoriseerd."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -831,18 +841,20 @@ msgstr ""
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Het formulier is onverwacht ingezonden."
@@ -896,7 +908,7 @@ msgstr "Gebruikersgegevens"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Gebruikersnaam"
@@ -904,7 +916,7 @@ msgstr "Gebruikersnaam"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Wachtwoord"
@@ -1012,10 +1024,12 @@ msgstr "U hebt die mededeling al herhaald."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
@@ -1046,7 +1060,6 @@ msgstr "Het is alleen mogelijk te verwijderen via de Atomopmaak."
#. TRANS: Client error displayed when a user has no rights to delete notices of other users.
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
-#, fuzzy
msgid "Cannot delete this notice."
msgstr "Deze mededeling kan niet verwijderd worden."
@@ -1251,13 +1264,11 @@ msgstr "Het profiel bestaat niet."
#. TRANS: Client exception thrown when trying to set a favorite for another user.
#. TRANS: Client exception thrown when trying to subscribe another user.
#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
-#, fuzzy
msgid "Cannot add someone else's subscription."
msgstr "Het is niet mogelijk het abonnement voor iemand anders toe te voegen"
#. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
#: actions/atompubfavoritefeed.php:240
-#, fuzzy
msgid "Can only handle favorite activities."
msgstr ""
"Het is alleen mogelijk om activiteiten met betrekking tot favorieten af te "
@@ -1288,13 +1299,12 @@ msgstr "groepslidmaatschappen van %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
-msgstr "Het is niet mogelijk om een lidmaatschap van een ander toe te voegen"
+msgid "Cannot add someone else's membership."
+msgstr "Het is niet mogelijk om een lidmaatschap van een ander toe te voegen."
#. TRANS: Client error displayed when not using the POST verb.
#. TRANS: Do not translate POST.
#: actions/atompubmembershipfeed.php:242
-#, fuzzy
msgid "Can only handle join activities."
msgstr ""
"Het is alleen mogelijk om activiteiten met betrekking tot lidmaatschap af te "
@@ -1323,50 +1333,71 @@ msgstr "De favoriet bestaat niet."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
-msgstr "Het is niet mogelijk om een favoriet van een ander te verwijderen"
+msgid "Cannot delete someone else's favorite."
+msgstr "Het is niet mogelijk om een favoriet van een ander te verwijderen."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Deze groep bestaat niet"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+msgstr "De opgegeven groep bestaat niet."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
-msgid "Not a member"
-msgstr "Geen lid"
-
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
#, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTTP-methode wordt niet ondersteund."
+msgid "Not a member."
+msgstr "Geen lid"
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
-msgstr "Het is niet mogelijk om een lidmaatschap van een ander te verwijderen"
+msgid "Cannot delete someone else's membership."
+msgstr "Het is niet mogelijk om een lidmaatschap van een ander te verwijderen."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
#. TRANS: %d is the non-existing profile ID number.
#: actions/atompubshowsubscription.php:72
#: actions/atompubshowsubscription.php:83
#: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
msgid "No such profile id: %d."
msgstr "Het profielnummer bestaat niet: %d."
#. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
#. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
#: actions/atompubshowsubscription.php:94
-#, fuzzy, php-format
+#, php-format
msgid "Profile %1$d not subscribed to profile %2$d."
msgstr "Profiel %1$d is niet geabonneerd op profiel %2$d."
#. TRANS: Client exception thrown when trying to delete a subscription of another user.
#: actions/atompubshowsubscription.php:157
-#, fuzzy
msgid "Cannot delete someone else's subscription."
msgstr ""
"Het is niet mogelijk het abonnement van een andere gebruiker op te zeggen."
@@ -1386,9 +1417,9 @@ msgstr "Het is alleen mogelijk om mensen te volgen."
#. TRANS: Client exception thrown when subscribing to a non-existing profile.
#: actions/atompubsubscriptionfeed.php:267
-#, fuzzy, php-format
+#, php-format
msgid "Unknown profile %s."
-msgstr "Onbekend profiel %s"
+msgstr "Onbekend profiel %s."
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
@@ -1519,23 +1550,29 @@ msgstr "Het bijwerken van de avatar is mislukt."
msgid "Avatar deleted."
msgstr "De avatar is verwijderd."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr "Reservekopie van gebruiker maken"
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
msgid "Only logged-in users can backup their account."
msgstr "Alleen aangemelde gebruikers kunnen hun gebruiker back-uppen."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr "U kunt geen back-up van uw gebruiker maken."
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
+#, fuzzy
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
@@ -1545,12 +1582,14 @@ msgstr ""
"privégegevens van de gebruiker zoals e-mailadres en IM-adres worden niet "
"meegenomen. Hetzelfde geldt voor geüploade bestanden en directe berichten."
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
msgctxt "BUTTON"
msgid "Backup"
msgstr "Reservekopie"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr "Uw gebruiker back-uppen"
@@ -1584,14 +1623,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Nee"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Gebruiker niet blokkeren"
@@ -1603,7 +1641,7 @@ msgstr "Gebruiker niet blokkeren"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
@@ -1619,32 +1657,6 @@ msgstr "Deze gebruiker blokkeren"
msgid "Failed to save block information."
msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "De opgegeven groep bestaat niet."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1771,7 +1783,8 @@ msgid "Account deleted."
msgstr "De gebruiker is verwijderd."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
msgid "Delete account"
msgstr "Gebruiker verwijderen"
@@ -1796,8 +1809,9 @@ msgstr ""
"alvorens uw gebruiker te verwijderen."
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Bevestigen"
@@ -1872,8 +1886,10 @@ msgid "You must be logged in to delete a group."
msgstr "U moet aangemeld zijn om een groep te kunnen verwijderen."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Geen gebruikersnaam of ID."
@@ -1925,10 +1941,11 @@ msgid "Delete this group"
msgstr "Groep verwijderen"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1968,19 +1985,30 @@ msgstr "Deze mededeling niet verwijderen"
msgid "Delete this notice"
msgstr "Deze mededeling verwijderen"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "U kunt gebruikers niet verwijderen."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "U kunt alleen lokale gebruikers verwijderen."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Gebruiker verwijderen"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Gebruiker verwijderen"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1989,78 +2017,102 @@ msgstr ""
"worden alle gegevens van deze gebruiker uit de database verwijderd. Het is "
"niet mogelijk ze terug te zetten."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Verwijder deze groep niet"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Gebruiker verwijderen"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Uiterlijk"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr "Instellingen voor de vormgeving van deze StatusNet-website"
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "De logo-URL is ongeldig."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "De SSL logo-URL is ongeldig."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "De vormgeving is niet beschikbaar: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Logo wijzigen"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Websitelogo"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "SSL-logo"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Vormgeving wijzigen"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Vormgeving website"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Mogelijke vormgevingen voor deze website."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Aangepaste vormgeving"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "U kunt een vormgeving voor StatusNet uploaden als ZIP-archief."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Achtergrondafbeelding wijzigen"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Achtergrond"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2070,98 +2122,108 @@ msgstr ""
"bestandsgrootte is %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "Aan"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Uit"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Achtergrondafbeelding inschakelen of uitschakelen."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Achtergrondafbeelding naast elkaar"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Kleuren wijzigen"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Inhoud"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Menubalk"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Tekst"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Verwijzingen"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Uitgebreid"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "Aangepaste CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Standaardinstellingen gebruiken"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Standaardontwerp toepassen"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Standaardinstellingen toepassen"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Opslaan"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Ontwerp opslaan"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Deze mededeling staat niet op uw favorietenlijst."
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Aan favorieten toevoegen"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Onbekend document \"%s\""
#. TRANS: Title for "Edit application" form.
@@ -2465,7 +2527,6 @@ msgstr "Dit e-mailadres is al geregistreerd door een andere gebruiker."
#. TRANS: Server error thrown on database error adding SMS confirmation code.
#: actions/emailsettings.php:426 actions/imsettings.php:343
#: actions/smssettings.php:365
-#, fuzzy
msgid "Could not insert confirmation code."
msgstr "De bevestigingscode kon niet ingevoegd worden."
@@ -2495,7 +2556,6 @@ msgstr "Dat is het verkeerde e-mailadres."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
#: actions/emailsettings.php:468 actions/smssettings.php:413
-#, fuzzy
msgid "Could not delete email confirmation."
msgstr "De e-mailbevestiging kon niet verwijderd worden."
@@ -2523,9 +2583,8 @@ msgstr "Geen binnenkomend e-mailadres"
#. TRANS: Server error thrown on database error adding incoming e-mail address.
#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:564 actions/smssettings.php:587
-#, fuzzy
msgid "Could not update user record."
-msgstr "Kan de gebruikersgegevens niet vernieuwen"
+msgstr "Kan de gebruikersgegevens niet vernieuwen."
#. TRANS: Message given after successfully removing an incoming e-mail address.
#: actions/emailsettings.php:544 actions/smssettings.php:567
@@ -2896,7 +2955,7 @@ msgstr ""
"[doorzoek dan de groepen](%%%%action.groupsearch%%%%) of [start zelf een "
"groep!](%%%%action.newgroup%%%%)."
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Nieuwe groep aanmaken"
@@ -3085,7 +3144,6 @@ msgstr "Dat is het verkeerde IM-adres."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:391
-#, fuzzy
msgid "Could not delete IM confirmation."
msgstr "De IM-bevestiging kon niet verwijderd worden."
@@ -3303,26 +3361,33 @@ msgstr ""
"\n"
"Met vriendelijke groet, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "U moet aangemeld zijn om lid te worden van een groep."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s is lid geworden van de groep %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "U moet aangemeld zijn om een groep te kunnen verlaten."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "U bent geen lid van deze groep"
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s heeft de groep %2$s verlaten"
@@ -3428,6 +3493,13 @@ msgstr "URL voor licentieafbeelding"
msgid "URL for an image to display with the license."
msgstr "Een URL voor een afbeelding om weer te geven met de licentie."
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Opslaan"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "Licentieinstellingen opslaan"
@@ -3454,11 +3526,11 @@ msgstr "Aanmelden"
msgid "Login to site"
msgstr "Aanmelden"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Aanmeldgegevens onthouden"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!"
@@ -3852,7 +3924,8 @@ msgstr "Wachtwoord wijzigen"
msgid "Change your password."
msgstr "Wachtwoord wijzigen"
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Wachtwoord wijzigen"
@@ -3860,7 +3933,8 @@ msgstr "Wachtwoord wijzigen"
msgid "Old password"
msgstr "Huidige wachtwoord"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Nieuw wachtwoord"
@@ -3868,7 +3942,7 @@ msgstr "Nieuw wachtwoord"
msgid "6 or more characters"
msgstr "Zes of meer tekens"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Gelijk aan het wachtwoord hierboven"
@@ -3892,11 +3966,12 @@ msgstr "Het oude wachtwoord is onjuist"
msgid "Error saving user; invalid."
msgstr "Fout bij opslaan gebruiker; ongeldig."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Het wachtwoord is opgeslagen."
@@ -4224,22 +4299,23 @@ msgid "Profile information"
msgstr "Profielinformatie"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Volledige naam"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Startpagina"
@@ -4251,7 +4327,7 @@ msgstr "De URL van uw thuispagina, blog of profiel bij een andere website."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4259,27 +4335,27 @@ msgstr[0] "Beschrijf uzelf en uw interesses in %d teken"
msgstr[1] "Beschrijf uzelf en uw interesses in %d tekens"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Beschrijf uzelf en uw interesses"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Beschrijving"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Locatie"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
@@ -4334,7 +4410,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4342,50 +4418,49 @@ msgstr[0] "De persoonlijke beschrijving is te lang (maximaal %d teken)."
msgstr[1] "De persoonlijke beschrijving is te lang (maximaal %d tekens)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Er is geen tijdzone geselecteerd."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
msgid "Language is too long (maximum 50 characters)."
msgstr "De taal is te lang (maximaal 50 tekens)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Ongeldig label: '%s'"
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
-#, fuzzy
+#: actions/profilesettings.php:347
msgid "Could not update user for autosubscribe."
msgstr ""
"Het was niet mogelijk de instelling voor automatisch abonneren voor de "
"gebruiker bij te werken."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
-#, fuzzy
+#: actions/profilesettings.php:405
msgid "Could not save location prefs."
msgstr "Het was niet mogelijk de locatievoorkeuren op te slaan."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Het was niet mogelijk de labels op te slaan."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "De instellingen zijn opgeslagen."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
msgid "Restore account"
msgstr "Gebruiker terugladen van back-up"
@@ -4509,37 +4584,45 @@ msgstr ""
msgid "Tag cloud"
msgstr "Woordwolk"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "U bent al aangemeld!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Onbekende herstelcode."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Geen geldige herstelcode."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Herstelcode voor onbekende gebruiker."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Er is een fout opgetreden die te maken heeft met de bevestigingscode."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Deze bevestigingscode is te oud. Begin alstublieft opnieuw."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr ""
"Het was niet mogelijk het bevestigde e-mailadres voor de gebruiker bij te "
"werken."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4548,69 +4631,102 @@ msgstr ""
"nieuw wachtwoord toegezonden te krijgen op het e-mailadres dat bij uw "
"gebruiker staat opgeslagen."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "U bent geïdentificeerd. Voer hieronder een nieuw wachtwoord in. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Wachtwoordherstel"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Gebruikersnaam of e-mailadres"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "Uw gebruikersnaam op deze server, of uw geregistreerde e-mailadres."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Herstellen"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Herstellen"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Wachtwoord herstellen"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Wachtwoord herstellen"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Wachtwoordherstel aangevraagd"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Onbekende handeling"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "Zes of meer tekens, en vergeet uw wachtwoord niet!"
-#: actions/recoverpassword.php:243
-msgid "Reset"
-msgstr "Herstellen"
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Gelijk aan het wachtwoord hierboven"
-#: actions/recoverpassword.php:252
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+msgctxt "BUTTON"
+msgid "Reset"
+msgstr "Opnieuw instellen"
+
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Voer een gebruikersnaam of e-mailadres in."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr ""
"Er bestaat geen gebruiker met het opgegeven e-mailadres of de opgegeven "
"gebruikersnaam."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Die gebruiker heeft geen e-mailadres geregistreerd."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Er is een fout opgetreden bij het opslaan van de adresbevestiging."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4618,23 +4734,34 @@ msgstr ""
"De instructies om uw wachtwoord te herstellen zijn verstuurd naar het e-"
"mailadres dat voor uw gebruiker is geregistreerd."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Het wachtwoord is onverwacht opnieuw ingesteld."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
msgid "Password must be 6 characters or more."
msgstr "Het wachtwoord moet uit zes of meer tekens bestaan."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Het wachtwoord en de bevestiging komen niet overeen."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Het nieuwe wachtwoord is opgeslagen. U bent nu aangemeld."
@@ -4650,7 +4777,7 @@ msgstr "Sorry. De uitnodigingscode is ongeldig."
msgid "Registration successful"
msgstr "De registratie is voltooid"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registreren"
@@ -4678,60 +4805,53 @@ msgstr ""
"Via dit formulier kunt u een nieuwe gebruiker aanmaken. Daarna kunt u "
"mededelingen uitsturen en contact maken met vrienden en collega's. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties. Verplicht."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "Zes of meer tekens. Verplicht"
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Gelijk aan het wachtwoord hierboven. Verplicht"
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "Zes of meer tekens"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Een langere naam, mogelijk uw echte naam"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "De URL van uw thuispagina, blog of profiel bij een andere website"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"Ik begrijp dat inhoud en gegevens van %1$s persoonlijk en vertrouwelijk zijn."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Voor mijn teksten en bestanden rust het auteursrecht bij %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "Ik ben de rechthebbende voor mijn teksten en bestanden."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Alle rechten voorbehouden."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4740,7 +4860,7 @@ msgstr ""
"Mijn teksten en bestanden zijn beschikbaar onder %s, behalve de volgende "
"privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4774,7 +4894,7 @@ msgstr ""
"Dank u wel voor het registreren en we hopen dat deze dienst u biedt wat u "
"ervan verwacht."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -4834,12 +4954,10 @@ msgstr ""
"gedefinieerd)."
#: actions/remotesubscribe.php:175
-#, fuzzy
msgid "That is a local profile! Login to subscribe."
msgstr "Dat is een lokaal profiel. Meld u aan om te abonneren."
#: actions/remotesubscribe.php:182
-#, fuzzy
msgid "Could not get a request token."
msgstr "Het was niet mogelijk een verzoektoken te krijgen."
@@ -4852,7 +4970,6 @@ msgid "No notice specified."
msgstr "Er is geen mededeling opgegeven."
#: actions/repeat.php:75
-#, fuzzy
msgid "You cannot repeat your own notice."
msgstr "U kunt uw eigen mededeling niet herhalen."
@@ -5093,7 +5210,7 @@ msgstr "Organisatie"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Beschrijving"
@@ -5116,8 +5233,9 @@ msgstr "Applicatiehandelingen"
msgid "Reset key & secret"
msgstr "Sleutel en wachtwoord op nieuw instellen"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Verwijderen"
@@ -5247,7 +5365,7 @@ msgid "Note"
msgstr "Opmerking"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Aliassen"
@@ -7300,7 +7418,6 @@ msgstr ""
"applicatiegebruiker."
#: lib/apioauthstore.php:345
-#, fuzzy
msgid "Database error updating OAuth application user."
msgstr ""
"Er is een databasefout opgetreden tijdens het toevoegen van de OAuth "
@@ -7877,25 +7994,25 @@ msgstr ""
"tracking - nog niet beschikbaar\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
msgid "No configuration file found."
msgstr "Er is geen instellingenbestand aangetroffen."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
msgid "I looked for configuration files in the following places:"
msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
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."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Naar het installatieprogramma gaan."
@@ -7962,11 +8079,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Uit"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Opnieuw instellen"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Kleuren wijzigen"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Standaardinstellingen gebruiken"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -8049,32 +8170,28 @@ msgstr "OK"
msgid "Grant this user the \"%s\" role"
msgstr "Deze gebruiker de rol \"%s\" geven"
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
msgid "URL of the homepage or blog of the group or topic."
msgstr "De URL van de thuispagina of de blog van de groep of het onderwerp"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Beschrijf de groep of het onderwerp"
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Beschrijf de group in %d teken of minder"
msgstr[1] "Beschrijf de group in %d tekens of minder"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
"Locatie voor de groep - als relevant. Iets als \"Plaats, regio, land\"."
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9287,14 +9404,9 @@ msgstr[1] "ongeveer %d maanden geleden"
msgid "about a year ago"
msgstr "ongeveer een jaar geleden"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s is geen geldige kleur."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s is geen geldige kleur. Gebruik drie of zes hexadecimale tekens."
@@ -9335,29 +9447,28 @@ msgstr "Ongeldige XML. De XRD-root mist."
msgid "Getting backup from file '%s'."
msgstr "De back-up wordt uit het bestand \"%s\" geladen."
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "Het AtomPubbericht met onbekende aandachts-URI is %s"
+#~ msgid "No such group"
+#~ msgstr "Deze groep bestaat niet"
-#~ msgid "No such profile"
-#~ msgstr "Het profiel bestaat niet"
+#~ msgid "HTTP method not supported"
+#~ msgstr "HTTP-methode wordt niet ondersteund."
-#~ msgid "Notices %s has favorited to on %s"
-#~ msgstr "Mededelingen die %s als favoriet heeft aangemerkt op %s"
+#~ msgid "Reset"
+#~ msgstr "Herstellen"
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Groepen waar %s lid van is op %s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 kleine letters of cijfers, geen leestekens of spaties. Verplicht."
-#~ msgid "Method not supported"
-#~ msgstr "Methode wordt niet ondersteund"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "Zes of meer tekens. Verplicht"
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Mensen waarop %s geabonneerd is op %s"
+#~ msgid "Same as password above. Required."
+#~ msgstr "Gelijk aan het wachtwoord hierboven. Verplicht"
-#~ msgid "Couldn't update user."
-#~ msgstr "De gebruiker kon gebruiker niet bijwerkt worden."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
-#~ msgid "Couldn't save profile."
-#~ msgstr "Het profiel kon niet opgeslagen worden."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "Het was niet mogelijk de labels op te slaan."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s is geen geldige kleur."
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 939097338b..3179ecd008 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:44+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:36+0000\n"
"Language-Team: Norwegian Nynorsk \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -82,6 +82,7 @@ msgid "Save access settings"
msgstr "Avatar-innstillingar"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -93,13 +94,13 @@ msgstr "Avatar-innstillingar"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
#, fuzzy
msgctxt "BUTTON"
msgid "Save"
@@ -327,7 +328,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Kan ikkje oppdatera brukar."
@@ -351,7 +352,7 @@ msgstr "Brukaren har inga profil."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Kan ikkje lagra profil."
@@ -361,7 +362,7 @@ msgstr "Kan ikkje lagra profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -542,7 +543,8 @@ msgid "That status is not a favorite."
msgstr "Denne notisen er ikkje ein favoritt!"
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Kunne ikkje slette favoritt."
@@ -590,7 +592,7 @@ msgstr "Kan ikkje oppdatera brukar."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
@@ -600,7 +602,7 @@ msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Ikkje eit gyldig brukarnamn."
@@ -612,7 +614,7 @@ msgstr "Ikkje eit gyldig brukarnamn."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Heimesida er ikkje ei gyldig internettadresse."
@@ -622,7 +624,7 @@ msgstr "Heimesida er ikkje ei gyldig internettadresse."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -650,7 +652,7 @@ msgstr[1] "Plassering er for lang (maksimalt 255 teikn)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -708,23 +710,27 @@ msgid "Group not found."
msgstr "Finst ikkje."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
#, fuzzy
msgid "You are already a member of that group."
msgstr "Du er allereie medlem av den gruppa"
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr ""
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Kunne ikkje bli med i gruppa."
@@ -737,9 +743,11 @@ msgstr "Du er ikkje medlem av den gruppa."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -800,9 +808,12 @@ msgid "Request token already authorized."
msgstr "Du tingar ikkje oppdateringar til den profilen."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -810,7 +821,7 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -833,18 +844,20 @@ msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Uventa skjemasending."
@@ -893,7 +906,7 @@ msgstr "Konto"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Kallenamn"
@@ -901,7 +914,7 @@ msgstr "Kallenamn"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Passord"
@@ -1010,10 +1023,12 @@ msgstr "Kan ikkje sletta notisen."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1289,7 +1304,7 @@ msgstr "%s medlemmar i gruppa"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Kan ikkje leggja til ny tinging."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1325,30 +1340,51 @@ msgstr "Denne notisen finst ikkje."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Kunne ikkje slette favoritt."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "Denne gruppa finst ikkje."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "Alle medlemmar"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Fann ikkje API-metode."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Kunne ikkje lagra abonnement."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1522,34 +1558,41 @@ msgstr "Feil ved oppdatering av brukarbilete."
msgid "Avatar deleted."
msgstr "Lasta opp brukarbilete."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Kun brukaren kan lese sine eigne meldingar."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
msgctxt "BUTTON"
msgid "Backup"
msgstr ""
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1580,14 +1623,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Merknad"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
#, fuzzy
msgid "Do not block this user"
msgstr "Lås opp brukaren"
@@ -1600,7 +1642,7 @@ msgstr "Lås opp brukaren"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
@@ -1617,32 +1659,6 @@ msgstr "Blokkér denne brukaren"
msgid "Failed to save block information."
msgstr "Lagring av informasjon feila."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Denne gruppa finst ikkje."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1777,7 +1793,8 @@ msgid "Account deleted."
msgstr "Lasta opp brukarbilete."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Opprett ei ny gruppe"
@@ -1799,8 +1816,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Godta"
@@ -1876,8 +1894,10 @@ msgid "You must be logged in to delete a group."
msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
#, fuzzy
msgid "No nickname or ID."
msgstr "Ingen kallenamn."
@@ -1928,10 +1948,11 @@ msgid "Delete this group"
msgstr "Slett denne gruppa"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1973,106 +1994,141 @@ msgstr "Kan ikkje sletta notisen."
msgid "Delete this notice"
msgstr "Slett denne notisen"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
#, fuzzy
msgid "You cannot delete users."
msgstr "Kan ikkje oppdatera brukar."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: 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
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
+msgid "Delete user"
+msgstr "Slett"
+
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
#, fuzzy
msgid "Delete user"
msgstr "Slett"
-#: actions/deleteuser.php:136
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
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 ""
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Ikkje slett denne gruppa"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
#, fuzzy
msgid "Delete this user"
msgstr "Slett denne notisen"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr ""
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
#, fuzzy
msgid "Invalid logo URL."
msgstr "Ugyldig storleik."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "Ugyldig storleik."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Denne sida er ikkje tilgjengleg i eit"
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Endra"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Statusmelding"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "SSL-logo"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
#, fuzzy
msgid "Change theme"
msgstr "Endra"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
#, fuzzy
msgid "Site theme"
msgstr "Statusmelding"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
#, fuzzy
msgid "Theme for the site."
msgstr "Logg ut or sida"
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
#, fuzzy
msgid "Custom theme"
msgstr "Statusmelding"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr ""
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2080,101 +2136,109 @@ msgid ""
msgstr "Du kan lasta opp ein logo for gruppa."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr ""
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr ""
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr ""
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
#, fuzzy
-msgid "Change colours"
+msgid "Change colors"
msgstr "Endra passordet ditt"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Innhald"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
#, fuzzy
msgid "Sidebar"
msgstr "Søk"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Tekst"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
#, fuzzy
msgid "Links"
msgstr "Logg inn"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr ""
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr ""
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr ""
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr ""
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Lagra"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr ""
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Denne notisen er ikkje ein favoritt!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Legg til i favorittar"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Denne notisen finst ikkje."
#. TRANS: Title for "Edit application" form.
@@ -2913,7 +2977,7 @@ msgid ""
"%%%%)"
msgstr ""
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Opprett ei ny gruppe"
@@ -3312,26 +3376,33 @@ msgstr ""
"\n"
"Beste helsing, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Du må være logga inn for å bli med i ei gruppe."
-#: actions/joingroup.php:141
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%s blei medlem av gruppe %s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Du er ikkje medlem av den gruppa."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s sin status på %2$s"
@@ -3437,6 +3508,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Lagra"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr ""
@@ -3462,11 +3540,11 @@ msgstr "Logg inn"
msgid "Login to site"
msgstr "Logg inn "
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Hugs meg"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)."
@@ -3866,7 +3944,8 @@ msgstr "Endra passord"
msgid "Change your password."
msgstr "Endra passordet ditt"
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Endra passord"
@@ -3874,7 +3953,8 @@ msgstr "Endra passord"
msgid "Old password"
msgstr "Gamalt passord"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Nytt passord"
@@ -3882,7 +3962,7 @@ msgstr "Nytt passord"
msgid "6 or more characters"
msgstr "6 eller fleire teikn"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Samme passord som over"
@@ -3906,11 +3986,12 @@ msgstr "Det gamle passordet stemmer ikkje"
msgid "Error saving user; invalid."
msgstr "Feil ved lagring av brukar; fungerer ikkje."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Klarar ikkje lagra nytt passord."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Lagra passord."
@@ -4254,7 +4335,8 @@ msgid "Profile information"
msgstr "Profil informasjon"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr ""
@@ -4262,16 +4344,16 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Fullt namn"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Heimeside"
@@ -4284,7 +4366,7 @@ msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4292,28 +4374,28 @@ msgstr[0] "Skriv om deg og interessene dine med 140 teikn"
msgstr[1] "Skriv om deg og interessene dine med 140 teikn"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Skildra deg sjølv og din"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Om meg"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Plassering"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
@@ -4367,7 +4449,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4375,49 +4457,50 @@ msgstr[0] "Plassering er for lang (maksimalt %d teikn)."
msgstr[1] "Plassering er for lang (maksimalt %d teikn)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Tidssone er ikkje valt."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "Språk er for langt (maksimalt 50 teikn)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Ugyldig merkelapp: %s"
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Kan ikkje oppdatera brukar for automatisk tinging."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Kan ikkje lagra merkelapp."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Kunne ikkje lagra emneord."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Lagra innstillingar."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Opprett ei ny gruppe"
@@ -4533,35 +4616,43 @@ msgstr ""
msgid "Tag cloud"
msgstr "Emne sky"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Du er allereie logga inn!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Opprettingskoden finst ikkje."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Ikkje ei gjenopprettingskode."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Hent fram passord for ukjend brukar."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Feil med stadfestingskode."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Denne godkjenningskoden er for gammal. Vennligst start på nytt."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Kunne ikkje oppdatera brukar med stadfesta e-postadresse."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
#, fuzzy
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
@@ -4570,69 +4661,102 @@ msgstr ""
"Instruksjonar for å få att passordet ditt er send til epostadressa som er "
"lagra i kontoen din."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
msgstr ""
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
#, fuzzy
msgid "Password recovery"
msgstr "Passord opphenting etterspurt"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
#, fuzzy
msgid "Nickname or email address"
msgstr "Skriv inn kallenamn eller epostadresse."
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "Ditt kallenamn på denne servere, eller din registrerte epost addresse."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Gjenopprett"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Gjenopprett"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Tilbakestill passord"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Hent fram passord"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Passord opphenting etterspurt"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Uventa handling."
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 eller fleire teikn, og ikkje gløym dei."
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Samme passord som over"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Avbryt"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Skriv inn kallenamn eller epostadresse."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "Ingen brukar med den epostadressa eller det brukarnamnet."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Ingen registrert epostadresse for den brukaren."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Feil med lagring av adressestadfesting."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4640,23 +4764,34 @@ msgstr ""
"Instruksjonar for å få att passordet ditt er send til epostadressa som er "
"lagra i kontoen din."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Uventa passordnullstilling."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
msgid "Password must be 6 characters or more."
msgstr "Passord må vera 6 tekn eller meir."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Passord og stadfesting stemmer ikkje."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Klarar ikkje lagra nytt passord."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Feil ved å setja brukar."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Lagra det nye passordet. Du er logga inn."
@@ -4673,7 +4808,7 @@ msgstr "Feil med stadfestingskode."
msgid "Registration successful"
msgstr "Registreringa gikk bra"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrér"
@@ -4699,62 +4834,53 @@ msgid ""
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom. "
-"Kravd."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 eller fleire teikn. Kravd."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Samme som passord over. Påkrevd."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 eller fleire teikn"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Epost"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Blir berre brukt for uppdateringar, viktige meldingar og for gløymde passord"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4763,7 +4889,7 @@ msgstr ""
" unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og "
"telefonnummer."
-#: actions/register.php:589
+#: actions/register.php:588
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4795,7 +4921,7 @@ msgstr ""
"\n"
"Takk for at du blei med, og vi håpar du vil lika tenesta!"
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5116,7 +5242,7 @@ msgstr "Paginering"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Beskriving"
@@ -5139,8 +5265,9 @@ msgstr ""
msgid "Reset key & secret"
msgstr ""
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Slett"
@@ -5259,7 +5386,7 @@ msgid "Note"
msgstr "Merknad"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr ""
@@ -7830,26 +7957,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "Ingen stadfestingskode."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Invitasjon(er) sendt til fylgjande folk:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
#, fuzzy
msgid "Go to the installer."
msgstr "Logg inn or sida"
@@ -7918,12 +8045,16 @@ msgctxt "RADIO"
msgid "Off"
msgstr ""
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Avbryt"
+msgid "Change colours"
+msgstr "Endra passordet ditt"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr ""
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -8009,35 +8140,30 @@ msgstr "Gå"
msgid "Grant this user the \"%s\" role"
msgstr ""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "URL til heimesida eller bloggen for gruppa eller emnet"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
#, fuzzy
msgid "Describe the group or topic"
msgstr "Beskriv gruppa eller emnet med 140 teikn"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Beskriv gruppa eller emnet med 140 teikn"
msgstr[1] "Beskriv gruppa eller emnet med 140 teikn"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr "Kvar er du, t.d. «Stavanger, Rogaland, Noreg»"
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9168,14 +9294,9 @@ msgstr[1] ""
msgid "about a year ago"
msgstr "omtrent eitt år sidan"
-#: lib/webcolor.php:80
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "Heimesida er ikkje ei gyldig internettadresse."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "Heimesida er ikkje ei gyldig internettadresse."
@@ -9212,26 +9333,32 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#~ msgid "No such profile"
-#~ msgstr "Denne notisen finst ikkje"
+#~ msgid "No such group"
+#~ msgstr "Denne gruppa finst ikkje."
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Grupper %s er medlem av"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "Fann ikkje API-metode."
+#~ msgid "Reset"
+#~ msgstr "Avbryt"
+
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller "
+#~ "mellomrom. Kravd."
+
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 eller fleire teikn. Kravd."
+
+#~ msgid "Same as password above. Required."
+#~ msgstr "Samme som passord over. Påkrevd."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr ""
+#~ "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom"
+
#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Mennesker som tingar %s"
-
-#~ msgid "Couldn't update user."
-#~ msgstr "Kan ikkje oppdatera brukar."
-
-#~ msgid "Couldn't save profile."
-#~ msgstr "Kan ikkje lagra profil."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "Kan ikkje lagra merkelapp."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "Heimesida er ikkje ei gyldig internettadresse."
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 9b7a806e4c..75da79f151 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:53+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:43+0000\n"
"Last-Translator: Piotr Drąg \n"
"Language-Team: Polish \n"
"MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
"X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -79,6 +79,7 @@ msgid "Save access settings"
msgstr "Zapisz ustawienia dostępu"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -90,13 +91,13 @@ msgstr "Zapisz ustawienia dostępu"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Zapisz"
@@ -330,7 +331,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Nie można zaktualizować użytkownika."
@@ -354,7 +355,7 @@ msgstr "Użytkownik nie posiada profilu."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Nie można zapisać profilu."
@@ -364,7 +365,7 @@ msgstr "Nie można zapisać profilu."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -408,10 +409,9 @@ msgstr "Nie można zaktualizować wyglądu."
#. TRANS: Title for Atom feed.
#: actions/apiatomservice.php:85
-#, fuzzy
msgctxt "ATOM"
msgid "Main"
-msgstr "Główna"
+msgstr "Główny"
#. TRANS: Title for Atom feed. %s is a user nickname.
#. TRANS: Message is used as link title. %s is a user nickname.
@@ -548,7 +548,8 @@ msgid "That status is not a favorite."
msgstr "Ten stan nie jest ulubiony."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Nie można usunąć ulubionego wpisu."
@@ -595,7 +596,7 @@ msgstr "Nie można odnaleźć użytkownika docelowego."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Pseudonim jest już używany. Spróbuj innego."
@@ -605,7 +606,7 @@ msgstr "Pseudonim jest już używany. Spróbuj innego."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "To nie jest prawidłowy pseudonim."
@@ -617,7 +618,7 @@ msgstr "To nie jest prawidłowy pseudonim."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Strona domowa nie jest prawidłowym adresem URL."
@@ -627,7 +628,7 @@ msgstr "Strona domowa nie jest prawidłowym adresem URL."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
@@ -655,7 +656,7 @@ msgstr[2] "Opis jest za długi (maksymalnie %d znaków)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
@@ -713,22 +714,26 @@ msgid "Group not found."
msgstr "Nie odnaleziono grupy."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Jesteś już członkiem tej grupy."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Zostałeś zablokowany w tej grupie przez administratora."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s."
@@ -740,9 +745,11 @@ msgstr "Nie jesteś członkiem tej grupy."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -799,9 +806,12 @@ msgid "Request token already authorized."
msgstr "Token żądania został już upoważniony."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -809,7 +819,7 @@ msgstr "Token żądania został już upoważniony."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -830,18 +840,20 @@ msgstr "Błąd bazy danych podczas wprowadzania oauth_token_association."
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Nieoczekiwane wysłanie formularza."
@@ -895,7 +907,7 @@ msgstr "Konto"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Pseudonim"
@@ -903,7 +915,7 @@ msgstr "Pseudonim"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Hasło"
@@ -1011,10 +1023,12 @@ msgstr "Już powtórzono ten wpis."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
@@ -1045,7 +1059,6 @@ msgstr "Można usunąć tylko używając formatu Atom."
#. TRANS: Client error displayed when a user has no rights to delete notices of other users.
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
-#, fuzzy
msgid "Cannot delete this notice."
msgstr "Nie można usunąć tego wpisu."
@@ -1250,13 +1263,11 @@ msgstr "Nie ma takiego profilu."
#. TRANS: Client exception thrown when trying to set a favorite for another user.
#. TRANS: Client exception thrown when trying to subscribe another user.
#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
-#, fuzzy
msgid "Cannot add someone else's subscription."
-msgstr "Nie można dodać subskrypcji innej osoby"
+msgstr "Nie można dodać subskrypcji innej osoby."
#. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
#: actions/atompubfavoritefeed.php:240
-#, fuzzy
msgid "Can only handle favorite activities."
msgstr "Można obsługiwać tylko działania ulubionych."
@@ -1285,13 +1296,12 @@ msgstr "%s członków grupy"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Nie można dodać członkostwa innej osoby"
#. TRANS: Client error displayed when not using the POST verb.
#. TRANS: Do not translate POST.
#: actions/atompubmembershipfeed.php:242
-#, fuzzy
msgid "Can only handle join activities."
msgstr "Można obsługiwać tylko działania dołączania."
@@ -1318,29 +1328,51 @@ msgstr "Nie ma takiego ulubionego wpisu."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Nie można usunąć ulubionego wpisu innej osoby"
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "Nie ma takiej grupy."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
-msgid "Not a member"
-msgstr "Nie jest członkiem"
-
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Metoda HTTP nie jest obsługiwana."
+msgid "Not a member."
+msgstr "Nie jest członkiem"
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Nie można usunąć członkostwa innej osoby"
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1348,22 +1380,21 @@ msgstr "Nie można usunąć członkostwa innej osoby"
#: actions/atompubshowsubscription.php:72
#: actions/atompubshowsubscription.php:83
#: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
msgid "No such profile id: %d."
-msgstr "Nie ma takiego identyfikatora profilu: %d"
+msgstr "Nie ma takiego identyfikatora profilu: %d."
#. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
#. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
#: actions/atompubshowsubscription.php:94
-#, fuzzy, php-format
+#, php-format
msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "Profil %1$d nie jest subskrybowany do profilu %2$d"
+msgstr "Profil %1$d nie jest subskrybowany do profilu %2$d."
#. TRANS: Client exception thrown when trying to delete a subscription of another user.
#: actions/atompubshowsubscription.php:157
-#, fuzzy
msgid "Cannot delete someone else's subscription."
-msgstr "Nie można usunąć subskrypcji innej osoby"
+msgstr "Nie można usunąć subskrypcji innej osoby."
#. TRANS: Client error displayed when not using the POST verb.
#. TRANS: Do not translate POST.
@@ -1378,9 +1409,9 @@ msgstr "Można obserwować tylko osoby."
#. TRANS: Client exception thrown when subscribing to a non-existing profile.
#: actions/atompubsubscriptionfeed.php:267
-#, fuzzy, php-format
+#, php-format
msgid "Unknown profile %s."
-msgstr "Nieznany profil %s"
+msgstr "Nieznany profil %s."
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
@@ -1509,24 +1540,30 @@ msgstr "Zaktualizowanie awatara nie powiodło się."
msgid "Avatar deleted."
msgstr "Usunięto awatar."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr "Wykonaj kopię zapasową konta"
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
msgid "Only logged-in users can backup their account."
msgstr ""
"Tylko zalogowani użytkownicy mogą wykonywać kopie zapasowe swoich kont."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr "Użytkownik nie może wykonać kopii zapasowej konta."
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
+#, fuzzy
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
@@ -1537,12 +1574,14 @@ msgstr ""
"zachowywane w kopii zapasowej. Ponadto nie są zachowywane wysłane pliki i "
"bezpośrednie wiadomości."
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
msgctxt "BUTTON"
msgid "Backup"
msgstr "Kopia zapasowa"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr "Wykonuje kopię zapasową konta"
@@ -1576,14 +1615,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Nie"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Nie blokuj tego użytkownika"
@@ -1595,7 +1633,7 @@ msgstr "Nie blokuj tego użytkownika"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Tak"
@@ -1611,32 +1649,6 @@ msgstr "Zablokuj tego użytkownika"
msgid "Failed to save block information."
msgstr "Zapisanie informacji o blokadzie nie powiodło się."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Nie ma takiej grupy."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1763,7 +1775,8 @@ msgid "Account deleted."
msgstr "Usunięto konto."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
msgid "Delete account"
msgstr "Usuń konto"
@@ -1787,8 +1800,9 @@ msgstr ""
"przed usunięciem."
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Potwierdź"
@@ -1860,8 +1874,10 @@ msgid "You must be logged in to delete a group."
msgstr "Musisz być zalogowany, aby usunąć grupę."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Brak pseudonimu lub identyfikatora."
@@ -1912,10 +1928,11 @@ msgid "Delete this group"
msgstr "Usuń tę grupę"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1955,19 +1972,30 @@ msgstr "Nie usuwaj tego wpisu"
msgid "Delete this notice"
msgstr "Usuń ten wpis"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Nie można usuwać użytkowników."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Nie można usuwać lokalnych użytkowników."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Usuń użytkownika"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Usuń użytkownika"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1975,78 +2003,102 @@ msgstr ""
"Na pewno usunąć tego użytkownika? Wyczyści to wszystkie dane o użytkowniku z "
"bazy danych, bez utworzenia kopii zapasowej."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Nie usuwaj tej grupy"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Usuń tego użytkownika"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Wygląd"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr "Ustawienia wyglądu tej witryny StatusNet"
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "Nieprawidłowy adres URL logo."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "Nieprawidłowy adres URL logo SSL."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Motyw nie jest dostępny: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Zmień logo"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo witryny"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "Logo SSL"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Zmień motyw"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Motyw witryny"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Motyw witryny."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Własny motyw"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Można wysłać własny motyw witryny StatusNet jako archiwum zip."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Zmień obraz tła"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Tło"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2054,98 +2106,108 @@ msgid ""
msgstr "Można wysłać obraz tła dla witryny. Maksymalny rozmiar pliku to %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "Włączone"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Wyłączone"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Włącz lub wyłącz obraz tła."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Kafelkowy obraz tła"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Zmień kolory"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Treść"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Panel boczny"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Tekst"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Odnośniki"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Zaawansowane"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "Własny plik CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Użycie domyślnych"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Przywróć domyślny wygląd"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Przywróć domyślne ustawienia"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Zapisz"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Zapisz wygląd"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Ten wpis nie jest ulubiony."
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Dodaj do ulubionych"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Nie ma takiego dokumentu \\\"%s\\\""
#. TRANS: Title for "Edit application" form.
@@ -2448,7 +2510,6 @@ msgstr "Ten adres e-mail należy już do innego użytkownika."
#. TRANS: Server error thrown on database error adding SMS confirmation code.
#: actions/emailsettings.php:426 actions/imsettings.php:343
#: actions/smssettings.php:365
-#, fuzzy
msgid "Could not insert confirmation code."
msgstr "Nie można wprowadzić kodu potwierdzającego."
@@ -2478,7 +2539,6 @@ msgstr "To jest błędny adres e-mail."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
#: actions/emailsettings.php:468 actions/smssettings.php:413
-#, fuzzy
msgid "Could not delete email confirmation."
msgstr "Nie można usunąć potwierdzenia adresu e-mail."
@@ -2506,7 +2566,6 @@ msgstr "Brak przychodzącego adresu e-mail."
#. TRANS: Server error thrown on database error adding incoming e-mail address.
#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:564 actions/smssettings.php:587
-#, fuzzy
msgid "Could not update user record."
msgstr "Nie można zaktualizować wpisu użytkownika."
@@ -2867,7 +2926,7 @@ msgstr ""
"która cię interesuje? Spróbuj ją [znaleźć](%%%%action.groupsearch%%%%) lub "
"[założyć własną.](%%%%action.newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Utwórz nową grupę"
@@ -3054,7 +3113,6 @@ msgstr "To jest błędny adres komunikatora."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:391
-#, fuzzy
msgid "Could not delete IM confirmation."
msgstr "Nie można usunąć potwierdzenia komunikatora."
@@ -3277,26 +3335,33 @@ msgstr ""
"\n"
"Z poważaniem, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Musisz być zalogowany, aby dołączyć do grupy."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "Użytkownik %1$s dołączył do grupy %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Musisz być zalogowany, aby opuścić grupę."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Nie jesteś członkiem tej grupy."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "Użytkownik %1$s opuścił grupę %2$s"
@@ -3402,6 +3467,13 @@ msgstr "Adres URL obrazu licencji"
msgid "URL for an image to display with the license."
msgstr "Adres URL obrazu do wyświetlenia z licencją."
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Zapisz"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "Zapisz ustawienia licencji"
@@ -3426,11 +3498,11 @@ msgstr "Zaloguj się"
msgid "Login to site"
msgstr "Zaloguj się na witrynie"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Zapamiętaj mnie"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Automatyczne logowanie. Nie należy używać na komputerach używanych przez "
@@ -3821,7 +3893,8 @@ msgstr "Zmień hasło"
msgid "Change your password."
msgstr "Zmień hasło."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Zmiana hasła"
@@ -3829,7 +3902,8 @@ msgstr "Zmiana hasła"
msgid "Old password"
msgstr "Poprzednie hasło"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Nowe hasło"
@@ -3837,7 +3911,7 @@ msgstr "Nowe hasło"
msgid "6 or more characters"
msgstr "6 lub więcej znaków"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Takie samo jak powyższe hasło"
@@ -3861,11 +3935,12 @@ msgstr "Niepoprawne poprzednie hasło"
msgid "Error saving user; invalid."
msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Nie można zapisać nowego hasła."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Zapisano hasło."
@@ -4193,22 +4268,23 @@ msgid "Profile information"
msgstr "Informacje o profilu"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Imię i nazwisko"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Strona domowa"
@@ -4220,7 +4296,7 @@ msgstr "Adres URL strony domowej, bloga lub profilu na innej witrynie."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4229,27 +4305,27 @@ msgstr[1] "Opisz siebie i swoje zainteresowania w %d znakach"
msgstr[2] "Opisz siebie i swoje zainteresowania w %d znakach"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Opisz się i swoje zainteresowania"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "O mnie"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Położenie"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
@@ -4303,7 +4379,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4312,48 +4388,47 @@ msgstr[1] "Wpis \"O mnie\" jest za długi (maksymalnie %d znaki)."
msgstr[2] "Wpis \"O mnie\" jest za długi (maksymalnie %d znaków)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Nie wybrano strefy czasowej."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
msgid "Language is too long (maximum 50 characters)."
msgstr "Język jest za długi (maksymalnie 50 znaków)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Nieprawidłowy znacznik: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
-#, fuzzy
+#: actions/profilesettings.php:347
msgid "Could not update user for autosubscribe."
msgstr "Nie można zaktualizować użytkownika do automatycznej subskrypcji."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
-#, fuzzy
+#: actions/profilesettings.php:405
msgid "Could not save location prefs."
msgstr "Nie można zapisać preferencji położenia."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Nie można zapisać znaczników."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Zapisano ustawienia."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
msgid "Restore account"
msgstr "Przywróć konto"
@@ -4476,35 +4551,43 @@ msgstr ""
msgid "Tag cloud"
msgstr "Chmura znaczników"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Jesteś już zalogowany."
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Nie ma takiego kodu przywracania."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "To nie jest kod przywracania."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Kod przywracania dla nieznanego użytkownika."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Błąd kodu potwierdzającego."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Kod potwierdzający jest za stary. Rozpocznij ponownie."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Nie można zaktualizować użytkownika z potwierdzonym adresem e-mail."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4512,67 +4595,100 @@ msgstr ""
"Jeśli zapomniano lub zgubiono swoje hasło, można otrzymać nowe, wysłane na "
"adres e-mail przechowywany w koncie."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Zostałeś zidentyfikowany. Podaj poniżej nowe hasło. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Przywrócenie hasła"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Pseudonim lub adres e-mail"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "Pseudonim na tym serwerze lub zarejestrowany adres e-mail."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Przywróć"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Przywróć"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Przywróć hasło"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Przywróć hasło"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Zażądano przywracania hasła"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Nieznane działanie"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 lub więcej znaków, i nie zapomnij go."
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Takie samo jak powyższe hasło"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Przywróć"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Podaj pseudonim lub adres e-mail."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "Brak użytkownika z tym adresem e-mail lub nazwą użytkownika."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Brak zarejestrowanych adresów e-mail dla tego użytkownika."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Błąd podczas zapisywania potwierdzenia adresu."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4580,23 +4696,34 @@ msgstr ""
"Instrukcje przywracania hasła zostały wysłane na adres e-mail zarejestrowany "
"z twoim kontem."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Nieoczekiwane przywrócenie hasła."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
msgid "Password must be 6 characters or more."
msgstr "Hasło musi mieć sześć lub więcej znaków."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Hasło i potwierdzenie nie pasują do siebie."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Nie można zapisać nowego hasła."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Błąd podczas ustawiania użytkownika."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
@@ -4612,7 +4739,7 @@ msgstr "Nieprawidłowy kod zaproszenia."
msgid "Registration successful"
msgstr "Rejestracja powiodła się"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Zarejestruj się"
@@ -4641,60 +4768,52 @@ msgstr ""
"Za pomocą tego formularza można utworzyć nowe konto. Można wtedy wysyłać "
"wpisy i połączyć się z przyjaciółmi i kolegami. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 małe litery lub liczby, bez spacji i znaków przestankowych. Wymagane."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 lub więcej znaków. Wymagane."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Takie samo jak powyższe hasło. Wymagane."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 lub więcej znaków"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" imię i nazwisko"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Adres URL strony domowej, bloga lub profilu na innej witrynie"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "Rozumiem, że treść i dane %1$s są prywatne i poufne."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Moje teksty i pliki są objęte prawami autorskimi %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "Moje teksty i pliki pozostają pod moimi prawami autorskimi."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Wszystkie prawa zastrzeżone."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4703,7 +4822,7 @@ msgstr ""
"Tekst i pliki są dostępne na warunkach licencji %s, poza tymi prywatnymi "
"danymi: hasło, adres e-mail, adres komunikatora i numer telefonu."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4736,7 +4855,7 @@ msgstr ""
"Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi "
"sprawi ci przyjemność."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -4796,12 +4915,10 @@ msgstr ""
"nieprawidłowe XRDS)."
#: actions/remotesubscribe.php:175
-#, fuzzy
msgid "That is a local profile! Login to subscribe."
msgstr "To jest profil lokalny. Zaloguj się, aby subskrybować."
#: actions/remotesubscribe.php:182
-#, fuzzy
msgid "Could not get a request token."
msgstr "Nie można uzyskać tokenu żądana."
@@ -4814,7 +4931,6 @@ msgid "No notice specified."
msgstr "Nie podano wpisu."
#: actions/repeat.php:75
-#, fuzzy
msgid "You cannot repeat your own notice."
msgstr "Nie można powtórzyć własnego wpisu."
@@ -5051,7 +5167,7 @@ msgstr "Organizacja"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Opis"
@@ -5074,8 +5190,9 @@ msgstr "Czynności aplikacji"
msgid "Reset key & secret"
msgstr "Przywrócenie klucza i sekretu"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Usuń"
@@ -5203,7 +5320,7 @@ msgid "Note"
msgstr "Wpis"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Aliasy"
@@ -7238,9 +7355,8 @@ msgid "Database error inserting OAuth application user."
msgstr "Błąd bazy danych podczas wprowadzania użytkownika aplikacji OAuth."
#: lib/apioauthstore.php:345
-#, fuzzy
msgid "Database error updating OAuth application user."
-msgstr "Błąd bazy danych podczas wprowadzania użytkownika aplikacji OAuth."
+msgstr "Błąd bazy danych podczas aktualizowania użytkownika aplikacji OAuth."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
#: lib/apioauthstore.php:371
@@ -7809,24 +7925,24 @@ msgstr ""
"tracking - jeszcze nie zaimplementowano\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
msgid "No configuration file found."
msgstr "Nie odnaleziono pliku konfiguracji."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
msgid "I looked for configuration files in the following places:"
msgstr "Szukano plików konfiguracji w następujących miejscach:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "Należy uruchomić instalator, aby to naprawić."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Przejdź do instalatora."
@@ -7891,11 +8007,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Wyłączone"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Przywróć"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Zmień kolory"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Użycie domyślnych"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7978,34 +8098,30 @@ msgstr "Przejdź"
msgid "Grant this user the \"%s\" role"
msgstr "Nadaj użytkownikowi rolę \"%s\""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
msgid "URL of the homepage or blog of the group or topic."
msgstr "Adres URL strony domowej lub bloga grupy, albo temat."
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Opisz grupę lub temat"
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Opisz grupę lub temat w %d znaku"
msgstr[1] "Opisz grupę lub temat w %d znakach"
msgstr[2] "Opisz grupę lub temat w %d znakach"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
"Położenie grupy, jeśli istnieje, np. \"miasto, województwo (lub region), kraj"
"\"."
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9227,14 +9343,9 @@ msgstr[2] "około %d miesięcy temu"
msgid "about a year ago"
msgstr "około rok temu"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s nie jest prawidłowym kolorem."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr ""
@@ -9274,29 +9385,28 @@ msgstr "Nieprawidłowy kod XML, brak głównego XRD."
msgid "Getting backup from file '%s'."
msgstr "Pobieranie kopii zapasowej z pliku \"%s\"."
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "Wpis AtomPub z nieznanym adresem URI %s uwagi"
+#~ msgid "No such group"
+#~ msgstr "Nie ma takiej grupy."
-#~ msgid "No such profile"
-#~ msgstr "Nie ma takiego profilu"
+#~ msgid "HTTP method not supported"
+#~ msgstr "Metoda HTTP nie jest obsługiwana"
-#~ msgid "Notices %s has favorited to on %s"
-#~ msgstr "Wpisy %s został oznaczone jako ulubione na %s"
+#~ msgid "Reset"
+#~ msgstr "Przywróć"
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Grupy %s są członkiem w witrynie %s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 małe litery lub liczby, bez spacji i znaków przestankowych. Wymagane."
-#~ msgid "Method not supported"
-#~ msgstr "Metoda nie jest obsługiwana"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 lub więcej znaków. Wymagane."
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Osoby %s są subskrybowane w witrynie %s"
+#~ msgid "Same as password above. Required."
+#~ msgstr "Takie samo jak powyższe hasło. Wymagane."
-#~ msgid "Couldn't update user."
-#~ msgstr "Nie można zaktualizować użytkownika."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych"
-#~ msgid "Couldn't save profile."
-#~ msgstr "Nie można zapisać profilu."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "Nie można zapisać znaczników."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s nie jest prawidłowym kolorem."
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 6458ba3b88..41b430c4c2 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -15,17 +15,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:54+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:46+0000\n"
"Language-Team: Portuguese \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -80,6 +80,7 @@ msgid "Save access settings"
msgstr "Gravar configurações de acesso"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -91,13 +92,13 @@ msgstr "Gravar configurações de acesso"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Gravar"
@@ -330,7 +331,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Não foi possível actualizar o utilizador."
@@ -354,7 +355,7 @@ msgstr "Utilizador não tem perfil."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Não foi possível gravar o perfil."
@@ -364,7 +365,7 @@ msgstr "Não foi possível gravar o perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -544,7 +545,8 @@ msgid "That status is not a favorite."
msgstr "Esse estado não é um favorito."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Não foi possível eliminar o favorito."
@@ -592,7 +594,7 @@ msgstr "Não foi possível encontrar o utilizador de destino."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Utilizador já é usado. Tente outro."
@@ -602,7 +604,7 @@ msgstr "Utilizador já é usado. Tente outro."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Utilizador não é válido."
@@ -614,7 +616,7 @@ msgstr "Utilizador não é válido."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Página de ínicio não é uma URL válida."
@@ -624,7 +626,7 @@ msgstr "Página de ínicio não é uma URL válida."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -652,7 +654,7 @@ msgstr[1] "Descrição demasiado longa (máx. %d caracteres)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -710,22 +712,26 @@ msgid "Group not found."
msgstr "Grupo não foi encontrado."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Já é membro desse grupo."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Foi bloqueado desse grupo pelo gestor."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Não foi possível adicionar %1$s ao grupo %2$s."
@@ -737,9 +743,11 @@ msgstr "Não é membro deste grupo."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -799,9 +807,12 @@ msgid "Request token already authorized."
msgstr "Não tem autorização."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -809,7 +820,7 @@ msgstr "Não tem autorização."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -831,18 +842,20 @@ msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Envio inesperado de formulário."
@@ -897,7 +910,7 @@ msgstr "Conta"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Utilizador"
@@ -905,7 +918,7 @@ msgstr "Utilizador"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Senha"
@@ -1013,10 +1026,12 @@ msgstr "Já repetiu essa nota."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1290,7 +1305,7 @@ msgstr "Membros do grupo %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Não foi possível inserir nova subscrição."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1326,30 +1341,51 @@ msgstr "Ficheiro não foi encontrado."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Não foi possível eliminar o favorito."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Grupo não existe"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+msgstr "Grupo não foi encontrado."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "Todos os membros"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Método da API não encontrado."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Não foi possível apagar a auto-subscrição."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1521,35 +1557,42 @@ msgstr "Falha ao actualizar avatar."
msgid "Avatar deleted."
msgstr "Avatar apagado."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Só utilizadores com sessão iniciada podem repetir notas."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Fundo"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1583,14 +1626,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Não"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Não bloquear este utilizador"
@@ -1602,7 +1644,7 @@ msgstr "Não bloquear este utilizador"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sim"
@@ -1618,32 +1660,6 @@ msgstr "Bloquear este utilizador"
msgid "Failed to save block information."
msgstr "Não foi possível gravar informação do bloqueio."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Grupo não foi encontrado."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1775,7 +1791,8 @@ msgid "Account deleted."
msgstr "Avatar apagado."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Criar uma conta"
@@ -1797,8 +1814,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Confirmação"
@@ -1873,8 +1891,10 @@ msgid "You must be logged in to delete a group."
msgstr "Tem de iniciar uma sessão para deixar um grupo."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Nenhum utilizador ou ID."
@@ -1929,10 +1949,11 @@ msgid "Delete this group"
msgstr "Apagar este utilizador"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1972,19 +1993,30 @@ msgstr "Não apagar esta nota"
msgid "Delete this notice"
msgstr "Apagar esta nota"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Não pode apagar utilizadores."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Só pode apagar utilizadores locais."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Apagar utilizador"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Apagar utilizador"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1992,82 +2024,106 @@ msgstr ""
"Tem a certeza de que quer apagar este utilizador? Todos os dados do "
"utilizador serão eliminados da base de dados, sem haver cópias."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Não apagar esta nota"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Apagar este utilizador"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Estilo"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "URL do logotipo inválida."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "URL do logotipo inválida."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Tema não está disponível: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Alterar logotipo"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logotipo do site"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
#, fuzzy
msgid "SSL logo"
msgstr "Logotipo do site"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Alterar tema"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Tema do site"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "O tema para o site."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Tema personalizado"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
"Pode fazer o upload de um tema personalizado para o StatusNet, na forma de "
"um arquivo .ZIP."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Alterar imagem de fundo"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Fundo"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2077,98 +2133,108 @@ msgstr ""
"é %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "Ligar"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Desligar"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Ligar ou desligar a imagem de fundo."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Repetir imagem de fundo em mosaico"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Alterar cores"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Conteúdo"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Barra"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Texto"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Links"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Avançado"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "CSS personalizado"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Usar predefinições"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Repor estilos predefinidos"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Repor predefinição"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Gravar"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Gravar o estilo"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Esta nota não é uma favorita!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Adicionar às favoritas"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Documento \"%s\" não foi encontrado"
#. TRANS: Title for "Edit application" form.
@@ -2897,7 +2963,7 @@ msgstr ""
"encontra nenhum grupo de que gosta? Tente [pesquisar um grupo](%%action."
"groupsearch%%) ou [crie o seu!](%%action.newgroup%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Criar um grupo novo"
@@ -3306,26 +3372,33 @@ msgstr ""
"\n"
"Sinceramente, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Tem de iniciar uma sessão para se juntar a um grupo."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s juntou-se ao grupo %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Tem de iniciar uma sessão para deixar um grupo."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Não é um membro desse grupo."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
@@ -3430,6 +3503,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Gravar"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr ""
@@ -3454,11 +3534,11 @@ msgstr "Entrar"
msgid "Login to site"
msgstr "Iniciar sessão no site"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Lembrar-me neste computador"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"De futuro, iniciar sessão automaticamente. Não usar em computadores "
@@ -3847,7 +3927,8 @@ msgstr "Modificar senha"
msgid "Change your password."
msgstr "Modificar a sua senha."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Mudança da senha"
@@ -3855,7 +3936,8 @@ msgstr "Mudança da senha"
msgid "Old password"
msgstr "Antiga"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Nova"
@@ -3863,7 +3945,7 @@ msgstr "Nova"
msgid "6 or more characters"
msgstr "6 ou mais caracteres"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Repita a senha nova"
@@ -3887,11 +3969,12 @@ msgstr "Senha antiga incorrecta."
msgid "Error saving user; invalid."
msgstr "Erro ao guardar utilizador; inválido."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Não é possível guardar a nova senha."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Senha gravada."
@@ -4236,23 +4319,24 @@ msgid "Profile information"
msgstr "Informação do perfil"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Nome completo"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Página pessoal"
@@ -4265,7 +4349,7 @@ msgstr "URL da sua página pessoal, blogue ou perfil noutro site na internet"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4273,27 +4357,27 @@ msgstr[0] "Descreva-se e aos seus interesses (máx. 140 caracteres)"
msgstr[1] "Descreva-se e aos seus interesses (máx. 140 caracteres)"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Descreva-se e aos seus interesses"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Biografia"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Localidade"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Onde está, por ex. \"Cidade, Região, País\""
@@ -4346,7 +4430,7 @@ msgstr "Subscrever automaticamente quem me subscreva (óptimo para não-humanos)
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4354,49 +4438,50 @@ msgstr[0] "Biografia demasiado extensa (máx. %d caracteres)."
msgstr[1] "Biografia demasiado extensa (máx. %d caracteres)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Fuso horário não foi seleccionado."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "Língua é demasiado extensa (máx. 50 caracteres)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Categoria inválida: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Não foi possível actualizar o utilizador para subscrição automática."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Não foi possível gravar as preferências de localização."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Não foi possível gravar as categorias."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Configurações gravadas."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Criar uma conta"
@@ -4520,37 +4605,45 @@ msgstr ""
msgid "Tag cloud"
msgstr "Nuvem de categorias"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Já tem uma sessão iniciada!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Código de recuperação não foi encontrado."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Não é um código de recuperação."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Código de recuperação para um utilizador desconhecido."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Erro no código de confirmação."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Este código de confirmação é demasiado antigo. Por favor, recomece."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr ""
"Não foi possivel actualizar o utilizador com um correio electrónico "
"confirmado."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4558,69 +4651,103 @@ msgstr ""
"Se perdeu ou se esqueceu da sua senha, podemos enviar-lhe uma nova para o "
"correio electrónico registado na sua conta."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Identificação positiva. Introduza abaixo uma senha nova. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Recuperação da senha"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Utilizador ou endereço de correio electrónico"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr ""
"O seu utilizador neste servidor, ou o seu correio electrónico registado."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Recuperar"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Recuperar"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Reiniciar senha"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Recuperar senha"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Solicitada recuperação da senha"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Acção desconhecida"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 ou mais caracteres, e não a esqueça!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Repita a senha nova"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Reiniciar"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Introduza um utilizador ou um endereço de correio electrónico."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr ""
"Não existe nenhum utilizador com esse correio electrónico nem com esse nome."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Nenhum endereço de email registado para esse utilizador."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Erro ao guardar confirmação do endereço."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4628,24 +4755,35 @@ msgstr ""
"Instruções para recuperação da sua senha foram enviadas para o correio "
"electrónico registado na sua conta."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Reinício inesperado da senha."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "Senha tem de ter 6 ou mais caracteres."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "A senha e a confirmação não coincidem."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Não é possível guardar a nova senha."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Erro ao configurar utilizador."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "A senha nova foi gravada com sucesso. Iniciou uma sessão."
@@ -4661,7 +4799,7 @@ msgstr "Desculpe, código de convite inválido."
msgid "Registration successful"
msgstr "Registo efectuado"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registar"
@@ -4689,64 +4827,56 @@ msgstr ""
"Com este formulário pode criar uma conta nova. Poderá então publicar notas e "
"ligar-se a amigos e colegas. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 ou mais caracteres. Obrigatório."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Repita a senha acima. Obrigatório."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 ou mais caracteres"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Correio"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Usado apenas para actualizações, anúncios e recuperação da senha"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\""
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL da sua página pessoal, blogue ou perfil noutro site na internet"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"Compreendo que o conteúdo e dados do site %1$s são privados e confidenciais."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
"Os meus textos e ficheiros estão protegidos pelos direitos de autor de %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
"Os meus textos e ficheiros permanecem protegidos pelos meus próprios "
"direitos de autor."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Todos os direitos reservados."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4756,7 +4886,7 @@ msgstr ""
"estes dados privados: senha, endereço de correio electrónico, endereço de "
"mensageiro instantâneo, número de telefone."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4789,7 +4919,7 @@ msgstr ""
"\n"
"Obrigado por se ter registado e esperamos que se divirta usando este serviço."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5105,7 +5235,7 @@ msgstr "Organização"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Descrição"
@@ -5128,8 +5258,9 @@ msgstr "Operações da aplicação"
msgid "Reset key & secret"
msgstr "Reiniciar chave e segredo"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Apagar"
@@ -5258,7 +5389,7 @@ msgid "Note"
msgstr "Anotação"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Nomes alternativos"
@@ -7858,26 +7989,26 @@ msgstr ""
"tracking - ainda não implementado.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "Ficheiro de configuração não encontrado. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Procurei ficheiros de configuração nos seguintes sítios: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "Talvez queira correr o instalador para resolver esta questão."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Ir para o instalador."
@@ -7949,12 +8080,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Desligar"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Reiniciar"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Alterar cores"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Usar predefinições"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -8038,33 +8172,29 @@ msgstr "Prosseguir"
msgid "Grant this user the \"%s\" role"
msgstr "Atribuir a este utilizador a função \"%s\""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "URL da página ou do blogue, deste grupo ou assunto"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Descreva o grupo ou assunto"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Descreva o grupo ou o assunto em %d caracteres"
msgstr[1] "Descreva o grupo ou o assunto em %d caracteres"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr "Localidade do grupo, se aplicável, por ex. \"Cidade, Região, País\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, fuzzy, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9274,14 +9404,9 @@ msgstr[1] "há cerca de %d meses atrás"
msgid "about a year ago"
msgstr "há cerca de um ano"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s não é uma cor válida!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s não é uma cor válida! Use 3 ou 6 caracteres hexadecimais."
@@ -9318,27 +9443,29 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Perfil não foi encontrado."
+#~ msgid "No such group"
+#~ msgstr "Grupo não existe"
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Grupos de que %s é membro"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "Método da API não encontrado."
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Pessoas que subscrevem %s"
+#~ msgid "Reset"
+#~ msgstr "Reiniciar"
-#~ msgid "Couldn't update user."
-#~ msgstr "Não foi possível actualizar o utilizador."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
-#~ msgid "Couldn't save profile."
-#~ msgstr "Não foi possível gravar o perfil."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 ou mais caracteres. Obrigatório."
-#~ msgid "Couldn't save tags."
-#~ msgstr "Não foi possível gravar as categorias."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Repita a senha acima. Obrigatório."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s não é uma cor válida!"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index a11dc37a54..84d6080221 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:55+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:51+0000\n"
"Language-Team: Brazilian Portuguese \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -81,6 +81,7 @@ msgid "Save access settings"
msgstr "Salvar as configurações de acesso"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -92,13 +93,13 @@ msgstr "Salvar as configurações de acesso"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Salvar"
@@ -333,7 +334,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Não foi possível atualizar o usuário."
@@ -357,7 +358,7 @@ msgstr "O usuário não tem perfil."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Não foi possível salvar o perfil."
@@ -367,7 +368,7 @@ msgstr "Não foi possível salvar o perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -551,7 +552,8 @@ msgid "That status is not a favorite."
msgstr "Essa mensagem não é favorita!"
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Não foi possível excluir a favorita."
@@ -597,7 +599,7 @@ msgstr "Não foi possível encontrar usuário de destino."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Esta identificação já está em uso. Tente outro."
@@ -607,7 +609,7 @@ msgstr "Esta identificação já está em uso. Tente outro."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Não é uma identificação válida."
@@ -619,7 +621,7 @@ msgstr "Não é uma identificação válida."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "A URL informada não é válida."
@@ -629,7 +631,7 @@ msgstr "A URL informada não é válida."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
@@ -656,7 +658,7 @@ msgstr[1] "A descrição é muito extensa (máximo %d caracteres)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "A localização é muito extensa (máx. 255 caracteres)."
@@ -713,22 +715,26 @@ msgid "Group not found."
msgstr "O grupo não foi encontrado."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Você já é membro desse grupo."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "O administrador desse grupo bloqueou sua inscrição."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Não foi possível associar o usuário %1$s ao grupo %2$s."
@@ -740,9 +746,11 @@ msgstr "Você não é membro deste grupo."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -799,9 +807,12 @@ msgid "Request token already authorized."
msgstr "O token solicitado já foi autorizado."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -809,7 +820,7 @@ msgstr "O token solicitado já foi autorizado."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -831,18 +842,20 @@ msgstr "Erro no banco de dados durante a inserção de oauth_token_association."
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Submissão inesperada de formulário."
@@ -897,7 +910,7 @@ msgstr "Conta"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Usuário"
@@ -905,7 +918,7 @@ msgstr "Usuário"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Senha"
@@ -1013,10 +1026,12 @@ msgstr "Você já repetiu essa mensagem."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
@@ -1282,7 +1297,7 @@ msgstr "Membros do grupo %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Não é possível adicionar a assinatura de outra pessoa"
#. TRANS: Client error displayed when not using the POST verb.
@@ -1315,29 +1330,51 @@ msgstr "Essa Favorita não existe."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Não é possível excluir a Favorita de outra pessoa"
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "Esse grupo não existe."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
-msgid "Not a member"
-msgstr "Não é um membro"
-
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
#, fuzzy
-msgid "HTTP method not supported"
-msgstr "O método HTTP não é suportado."
+msgid "Not a member."
+msgstr "Não é um membro"
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Não é possível excluir a assinatura de outra pessoa"
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1507,23 +1544,29 @@ msgstr "Não foi possível atualizar o avatar."
msgid "Avatar deleted."
msgstr "O avatar foi excluído."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr "Fazer backup da conta"
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
msgid "Only logged-in users can backup their account."
msgstr "Apenas usuários autenticados podem fazer backups de suas contas."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr "Você não pode fazer backup da sua conta."
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
+#, fuzzy
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
@@ -1533,13 +1576,15 @@ msgstr ""
"endereços de e-mail e de mensagens instantâneas não são copiados. Além "
"disso, arquivos enviados e mensagens diretas também não entram no backup."
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Fundo"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1574,14 +1619,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Não"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Não bloquear este usuário"
@@ -1593,7 +1637,7 @@ msgstr "Não bloquear este usuário"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sim"
@@ -1609,32 +1653,6 @@ msgstr "Bloquear este usuário"
msgid "Failed to save block information."
msgstr "Não foi possível salvar a informação de bloqueio."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Esse grupo não existe."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1764,7 +1782,8 @@ msgid "Account deleted."
msgstr "O avatar foi excluído."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Criar uma conta"
@@ -1786,8 +1805,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -1861,8 +1881,10 @@ msgid "You must be logged in to delete a group."
msgstr "Você deve estar autenticado para excluir um grupo."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Nenhum apelido ou identificação."
@@ -1913,10 +1935,11 @@ msgid "Delete this group"
msgstr "Excluir este grupo"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1956,19 +1979,30 @@ msgstr "Não excluir esta mensagem."
msgid "Delete this notice"
msgstr "Excluir esta mensagem"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Você não pode excluir usuários."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Você só pode excluir usuários locais."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Excluir usuário"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Excluir usuário"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1976,80 +2010,104 @@ msgstr ""
"Tem certeza que deseja excluir este usuário? Isso eliminará todos os dados "
"deste usuário do banco de dados, sem cópia de segurança."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Não excluir este grupo"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Excluir este usuário"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Aparência"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr "Configurações da aparência deste site StatusNet."
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "A URL da logo é inválida."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "A URL da logo SSL é inválida."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Tema não disponível: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Alterar a logo"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo do site"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "Logo do SSL"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Alterar o tema"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Tema do site"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Tema para o site."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Tema personalizado"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
"Você pode enviar um tema personalizado para o StatusNet, na forma de um "
"arquivo .zip."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Alterar imagem do fundo"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Fundo"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2059,98 +2117,108 @@ msgstr ""
"arquivo é de %1 $s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "Ativado"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Desativado"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Ativar/desativar a imagem de fundo."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Ladrilhar a imagem de fundo"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Alterar a cor"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Conteúdo"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Barra lateral"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Texto"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Links"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Avançado"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "CSS personalizado"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Usar o padrão|"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Restaura a aparência padrão"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Restaura de volta ao padrão"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Salvar"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Salvar a aparência"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Esta mensagem não é uma favorita!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Adicionar às favoritas"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "O documento \"%s\" não existe"
#. TRANS: Title for "Edit application" form.
@@ -2879,7 +2947,7 @@ msgstr ""
"\". Não encontrou um grupo que lhe agrade? Experimente [procurar por um](%%%%"
"action.groupsearch%%%%) ou [criar o seu próprio!](%%%%action.newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Criar um novo grupo"
@@ -3285,26 +3353,33 @@ msgstr ""
"\n"
"Cordialmente, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Você deve estar autenticado para se associar a um grupo."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s associou-se ao grupo %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Você deve estar autenticado para sair de um grupo."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Você não é um membro desse grupo."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
@@ -3415,6 +3490,13 @@ msgstr "URL da imagem da licença"
msgid "URL for an image to display with the license."
msgstr "URL de uma imagem a ser exibida com a licença."
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Salvar"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "Salvar as configurações da licença"
@@ -3440,11 +3522,11 @@ msgstr "Entrar"
msgid "Login to site"
msgstr "Autenticar-se no site"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Lembrar neste computador"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Entra automaticamente da próxima vez, sem pedir a senha. Não use em "
@@ -3840,7 +3922,8 @@ msgstr "Alterar a senha"
msgid "Change your password."
msgstr "Altere a sua senha"
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Alterar a senha"
@@ -3848,7 +3931,8 @@ msgstr "Alterar a senha"
msgid "Old password"
msgstr "Senha anterior"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Senha nova"
@@ -3856,7 +3940,7 @@ msgstr "Senha nova"
msgid "6 or more characters"
msgstr "No mínimo 6 caracteres"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Igual à senha acima"
@@ -3880,11 +3964,12 @@ msgstr "A senha anterior está errada"
msgid "Error saving user; invalid."
msgstr "Erro ao salvar usuário; inválido."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Não é possível salvar a nova senha."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "A senha foi salva."
@@ -4211,22 +4296,23 @@ msgid "Profile information"
msgstr "Informações do perfil"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Nome completo"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Site"
@@ -4238,7 +4324,7 @@ msgstr "URL do seu site, blog ou perfil em outro site."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4246,27 +4332,27 @@ msgstr[0] "Descreva a si mesmo e os seus interesses em %d caractere"
msgstr[1] "Descreva a si mesmo e os seus interesses em %d caracteres"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Descreva a si mesmo e os seus interesses"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Descrição"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Localização"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
@@ -4320,7 +4406,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4328,48 +4414,49 @@ msgstr[0] "A descrição é muito extensa (máximo %d caractere)."
msgstr[1] "A descrição é muito extensa (máximo %d caracteres)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "O fuso horário não foi selecionado."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
msgid "Language is too long (maximum 50 characters)."
msgstr "O nome do idioma é muito extenso (máx. 50 caracteres)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Etiqueta inválida: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Não foi possível atualizar o usuário para assinar automaticamente."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Não foi possível salvar as preferências de localização."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Não foi possível salvar as etiquetas."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "As configurações foram salvas."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Criar uma conta"
@@ -4493,36 +4580,44 @@ msgstr ""
msgid "Tag cloud"
msgstr "Nuvem de etiquetas"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Você já está autenticado!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Esse código de recuperação não existe."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Não é um código de recuperação"
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Código de recuperação para usuário desconhecido."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Erro com o código de confirmação."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Este código de confirmação é muito antigo. Por favor inicie novamente."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr ""
"Não foi possível atualizar o usuário com o endereço de e-mail confirmado."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4530,69 +4625,103 @@ msgstr ""
"Se você esqueceu ou perdeu a sua senha, você pode receber uma nova no "
"endereço de e-mail que cadastrou na sua conta."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Você foi identificado. Digite uma nova senha abaixo. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Recuperação de senha"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Identificação ou endereço de e-mail"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "Sua identificação neste servidor, ou seu e-mail cadastrado."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Recuperar"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Recuperar"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Restaurar a senha"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Recuperar a senha"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Foi solicitada a recuperação da senha"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Ação desconhecida"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "No mínimo 6 caracteres. E não se esqueça dela!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Igual à senha acima"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Restaurar"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Digite a identificação ou endereço de e-mail."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr ""
"Não foi encontrado nenhum usuário com essa identificação ou endereço de "
"email."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Nenhum endereço de e-mail registrado para esse usuário."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Erro ao salvar o endereço de confirmação."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4600,23 +4729,34 @@ msgstr ""
"As instruções para recuperar a sua senha foram enviadas para o endereço de e-"
"mail informado no seu cadastro."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Restauração inesperada da senha."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
msgid "Password must be 6 characters or more."
msgstr "A senha deve ter 6 ou mais caracteres."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "A senha e a confirmação não coincidem."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Não é possível salvar a nova senha."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Erro na configuração do usuário."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr ""
"A nova senha foi salva com sucesso. A partir de agora você já está "
@@ -4634,7 +4774,7 @@ msgstr "Desculpe, mas o código do convite é inválido."
msgid "Registration successful"
msgstr "Registro realizado com sucesso"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrar-se"
@@ -4662,38 +4802,30 @@ msgstr ""
"Através deste formulário você pode criar uma nova conta. A partir daí você "
"pode publicar mensagens e se conectar a amigos e colegas. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "No mínimo 6 caracteres. Obrigatório."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Igual à senha acima. Obrigatório."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "No mínimo 6 caracteres"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Usado apenas para atualizações, anúncios e recuperações de senha"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome completo, de preferência seu nome \"real\""
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL do seu site, blog ou perfil em outro site"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
@@ -4701,23 +4833,23 @@ msgstr ""
"Eu entendo que o conteúdo e os dados de %1$s são particulares e "
"confidenciais."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Meus textos e arquivos estão licenciados sob a %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "Meus textos e arquivos permanecem sob meus próprios direitos autorais."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Todos os direitos reservados."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4727,7 +4859,7 @@ msgstr ""
"particulares: senha, endereço de e-mail, endereço do mensageiro instantâneo "
"e número de telefone."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4760,7 +4892,7 @@ msgstr ""
"\n"
"Obrigado por se registrar e esperamos que você aproveite o serviço."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5078,7 +5210,7 @@ msgstr "Organização"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Descrição"
@@ -5101,8 +5233,9 @@ msgstr "Ações da aplicação"
msgid "Reset key & secret"
msgstr "Restaurar a chave e o segredo"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Excluir"
@@ -5229,7 +5362,7 @@ msgid "Note"
msgstr "Mensagem"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Apelidos"
@@ -7831,26 +7964,26 @@ msgstr ""
"tracking - não implementado ainda\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "Não foi encontrado nenhum arquivo de configuração. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Eu procurei pelos arquivos de configuração nos seguintes lugares: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "Você pode querer executar o instalador para corrigir isto."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Ir para o instalador."
@@ -7921,12 +8054,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Desativado"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Restaurar"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Alterar a cor"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Usar o padrão|"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -8010,27 +8146,23 @@ msgstr "Ir"
msgid "Grant this user the \"%s\" role"
msgstr "Associa o papel \"%s\" a este usuário"
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "URL para o site ou blog do grupo ou tópico"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Descreva o grupo ou tópico"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Descreva o grupo ou tópico em %d caracteres."
msgstr[1] "Descreva o grupo ou tópico em %d caracteres."
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8038,7 +8170,7 @@ msgstr ""
"Localização do grupo, caso tenha alguma, como \"cidade, estado (ou região), "
"país\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, fuzzy, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9249,14 +9381,9 @@ msgstr[1] "há cerca de %d meses atrás"
msgid "about a year ago"
msgstr "cerca de 1 ano atrás"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s não é uma cor válida!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s não é uma cor válida! Utilize 3 ou 6 caracteres hexadecimais."
@@ -9295,28 +9422,29 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "Publicação AtomPub com uma URI de atenção desconhecida %s"
-
-#~ msgid "No such profile"
-#~ msgstr "Este perfil não existe"
+#~ msgid "No such group"
+#~ msgstr "Esse grupo não existe."
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Grupos dos quais %s é membro"
+#~ msgid "HTTP method not supported"
+#~ msgstr "O método HTTP não é suportado."
-#~ msgid "Method not supported"
-#~ msgstr "O método não é suportado"
+#~ msgid "Reset"
+#~ msgstr "Restaurar"
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Assinantes de %s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
-#~ msgid "Couldn't update user."
-#~ msgstr "Não foi possível atualizar o usuário."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "No mínimo 6 caracteres. Obrigatório."
-#~ msgid "Couldn't save profile."
-#~ msgstr "Não foi possível salvar o perfil."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Igual à senha acima. Obrigatório."
-#~ msgid "Couldn't save tags."
-#~ msgstr "Não foi possível salvar as etiquetas."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s não é uma cor válida!"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 3580dd1b6b..6a1e10d2c7 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -16,18 +16,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:56+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:54+0000\n"
"Language-Team: Russian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -83,6 +83,7 @@ msgid "Save access settings"
msgstr "Сохранить настройки доступа"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -94,13 +95,13 @@ msgstr "Сохранить настройки доступа"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Сохранить"
@@ -333,7 +334,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Не удаётся обновить пользователя."
@@ -357,7 +358,7 @@ msgstr "У пользователя нет профиля."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Не удаётся сохранить профиль."
@@ -367,7 +368,7 @@ msgstr "Не удаётся сохранить профиль."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -551,7 +552,8 @@ msgid "That status is not a favorite."
msgstr "Этот статус не входит в число ваших любимых."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Не удаётся удалить любимую запись."
@@ -599,7 +601,7 @@ msgstr "Не удаётся найти целевого пользователя
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
@@ -609,7 +611,7 @@ msgstr "Такое имя уже используется. Попробуйте
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Неверное имя."
@@ -621,7 +623,7 @@ msgstr "Неверное имя."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "URL Главной страницы неверен."
@@ -631,7 +633,7 @@ msgstr "URL Главной страницы неверен."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Полное имя слишком длинное (максимум 255 символов)."
@@ -659,7 +661,7 @@ msgstr[2] "Слишком длинное описание (максимум %d
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Слишком длинное месторасположение (максимум 255 символов)."
@@ -717,22 +719,26 @@ msgid "Group not found."
msgstr "Группа не найдена."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Вы уже являетесь членом этой группы."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Вы заблокированы из этой группы администратором."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Не удаётся присоединить пользователя %1$s к группе %2$s."
@@ -744,9 +750,11 @@ msgstr "Вы не являетесь членом этой группы."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -803,9 +811,12 @@ msgid "Request token already authorized."
msgstr "Ключ запроса уже авторизован."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -813,7 +824,7 @@ msgstr "Ключ запроса уже авторизован."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -834,18 +845,20 @@ msgstr "Ошибка базы данных при вставке oauth_token_ass
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Нетиповое подтверждение формы."
@@ -900,7 +913,7 @@ msgstr "Аккаунт"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Имя"
@@ -908,7 +921,7 @@ msgstr "Имя"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Пароль"
@@ -1016,10 +1029,12 @@ msgstr "Запись уже повторена."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
@@ -1294,7 +1309,7 @@ msgstr "Участники группы %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Не удаётся вставить новую подписку."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1330,30 +1345,51 @@ msgstr "Нет такого файла."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Не удаётся удалить любимую запись."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "Нет такой группы."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "Все участники"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTTP-метод не поддерживается."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Невозможно удалить подписку на самого себя."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1524,35 +1560,42 @@ msgstr "Неудача при обновлении аватары."
msgid "Avatar deleted."
msgstr "Аватар удалён."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Повторять записи могут только вошедшие пользователи."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Фон"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1586,14 +1629,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Нет"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Не блокировать этого пользователя"
@@ -1605,7 +1647,7 @@ msgstr "Не блокировать этого пользователя"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Да"
@@ -1621,32 +1663,6 @@ msgstr "Заблокировать пользователя."
msgid "Failed to save block information."
msgstr "Не удаётся сохранить информацию о блокировании."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Нет такой группы."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1776,7 +1792,8 @@ msgid "Account deleted."
msgstr "Аватар удалён."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Создать новый аккаунт"
@@ -1798,8 +1815,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Подтверждение"
@@ -1873,8 +1891,10 @@ msgid "You must be logged in to delete a group."
msgstr "Вы должны авторизоваться, чтобы удалить группу."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Нет имени или ID."
@@ -1925,10 +1945,11 @@ msgid "Delete this group"
msgstr "Удалить эту группу"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1968,19 +1989,30 @@ msgstr "Не удалять эту запись"
msgid "Delete this notice"
msgstr "Удалить эту запись"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Вы не можете удалять пользователей."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Вы можете удалять только внутренних пользователей."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Удалить пользователя"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Удалить пользователя"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1988,78 +2020,102 @@ msgstr ""
"Вы действительно хотите удалить этого пользователя? Это повлечёт удаление "
"всех данных о пользователе из базы данных без возможности восстановления."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Не удаляйте эту группу"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Удалить этого пользователя"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Оформление"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr "Настройки оформления для этого сайта StatusNet"
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "Неверный URL логотипа."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "Неверный URL логотипа SSL."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Тема не доступна: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Изменить логотип"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Логотип сайта"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "Логотип SSL"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Изменить тему"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Тема сайта"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Тема для сайта."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Особая тема"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Вы можете загрузить особую тему StatusNet в виде ZIP-архива."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Изменение фонового изображения"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Фон"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2069,98 +2125,108 @@ msgstr ""
"составляет %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "Включить"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Отключить"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Включить или отключить показ фонового изображения."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Растянуть фоновое изображение"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Изменение цветовой гаммы"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Содержание"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Боковая панель"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Текст"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Ссылки"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Расширенный"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "Особый CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Использовать значения по умолчанию"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Восстановить оформление по умолчанию"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Восстановить значения по умолчанию"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Сохранить"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Сохранить оформление"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Эта запись не входит в число ваших любимых записей!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Добавить в любимые"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Нет такого документа «%s»"
#. TRANS: Title for "Edit application" form.
@@ -2893,7 +2959,7 @@ msgstr ""
"группу, которая вас интересует? Попробуйте [найти её](%%%%action.groupsearch%"
"%%%) или [создайте собственную](%%%%action.newgroup%%%%)!"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Создать новую группу"
@@ -3306,26 +3372,33 @@ msgstr ""
"\n"
"С уважением, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Вы должны авторизоваться для вступления в группу."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s вступил в группу %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Вы должны авторизоваться, чтобы покинуть группу."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Вы не являетесь членом этой группы."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s покинул группу %2$s"
@@ -3431,6 +3504,13 @@ msgstr "URL изображения лицензии"
msgid "URL for an image to display with the license."
msgstr "URL изображения, отображаемого вместе с лицензией."
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Сохранить"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "Сохранить настройки лицензии"
@@ -3455,11 +3535,11 @@ msgstr "Вход"
msgid "Login to site"
msgstr "Авторизоваться"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Запомнить меня"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "Автоматическии входить в дальнейшем. Не для общедоступных компьютеров!"
@@ -3850,7 +3930,8 @@ msgstr "Изменение пароля"
msgid "Change your password."
msgstr "Измените ваш пароль."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Пароль сохранён."
@@ -3858,7 +3939,8 @@ msgstr "Пароль сохранён."
msgid "Old password"
msgstr "Старый пароль"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Новый пароль"
@@ -3866,7 +3948,7 @@ msgstr "Новый пароль"
msgid "6 or more characters"
msgstr "6 или больше знаков"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Тот же пароль, что и выше"
@@ -3890,11 +3972,12 @@ msgstr "Некорректный старый пароль"
msgid "Error saving user; invalid."
msgstr "Ошибка сохранения пользователя; неверное имя."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Не удаётся сохранить новый пароль."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Пароль сохранён."
@@ -4219,23 +4302,24 @@ msgid "Profile information"
msgstr "Информация профиля"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr ""
"1-64 латинских строчных буквы или цифры, без знаков препинания и пробелов"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Полное имя"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Главная"
@@ -4247,7 +4331,7 @@ msgstr "Адрес вашей домашней страницы, блога ил
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4256,27 +4340,27 @@ msgstr[1] "Опишите себя и свои увлечения при пом
msgstr[2] "Опишите себя и свои увлечения при помощи %d символов"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Опишите себя и свои интересы"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Биография"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Месторасположение"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Где вы находитесь, например «Город, область, страна»"
@@ -4329,7 +4413,7 @@ msgstr "Автоматически подписываться на всех, к
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4338,48 +4422,49 @@ msgstr[1] "Слишком длинная биография (максимум %d
msgstr[2] "Слишком длинная биография (максимум %d символов)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Часовой пояс не выбран."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
msgid "Language is too long (maximum 50 characters)."
msgstr "Слишком длинный язык (максимум 50 символов)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Неверный тег: «%s»"
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Не удаётся обновить пользователя для автоподписки."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Не удаётся сохранить настройки местоположения."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Не удаётся сохранить теги."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Настройки сохранены."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Создать новый аккаунт"
@@ -4502,35 +4587,43 @@ msgstr ""
msgid "Tag cloud"
msgstr "Облако тегов"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Вы уже авторизованы!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Нет такого кода восстановления."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Нет кода восстановления."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Код восстановления неизвестного пользователя."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Ошибка, связанная с кодом подтверждения."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Код подтверждения слишком старый. Попробуйте ещё раз."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Не удаётся обновить пользователя с подтверждённым электронным адресом."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4538,67 +4631,100 @@ msgstr ""
"Если вы забыли или потеряли свой пароль, вы можете запросить новый пароль на "
"email-адрес вашей учётной записи."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Вы опознаны системой. Введите новый пароль ниже. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Восстановление пароля"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Имя или email-адрес"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "Ваше имя на этом сервере или электронный адрес регистрации."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Восстановление"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Восстановление"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Переустановить пароль"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Восстановление пароля"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Запрошено восстановление пароля"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Неизвестное действие"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 или более символов, и не забывайте его!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Тот же пароль, что и выше"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Сбросить"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Введите имя или электронный адрес."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "Нет пользователя с таким электронным адресом или именем."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Нет зарегистрированных электронных адресов для этого пользователя."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Ошибка сохранения подтверждённого адреса."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4606,23 +4732,34 @@ msgstr ""
"Инструкции по восстановлению пароля посланы на электронный адрес, который Вы "
"указали при регистрации вашего аккаунта."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Нетиповая переустановка пароля."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
msgid "Password must be 6 characters or more."
msgstr "Пароль должен быть длиной не менее 6 символов."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Пароль и его подтверждение не совпадают."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Не удаётся сохранить новый пароль."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Ошибка в установках пользователя."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Новый пароль успешно сохранён. Вы авторизовались."
@@ -4638,7 +4775,7 @@ msgstr "Извините, неверный пригласительный код
msgid "Registration successful"
msgstr "Регистрация успешна!"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистрация"
@@ -4669,38 +4806,30 @@ msgstr ""
"получите возможность публиковать короткие сообщения и устанавливать связи с "
"друзьями и коллегами. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 латинских строчных букв или цифр, без пробелов. Обязательное поле."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 или более символов. Обязательное поле."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Тот же пароль что и сверху. Обязательное поле."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 или больше знаков"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Email"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Нужна только для обновлений, осведомлений и восстановления пароля."
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Полное имя, предпочтительно Ваше настоящее имя"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Адрес твоей страницы, дневника или профиля на другом портале"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
@@ -4708,23 +4837,23 @@ msgstr ""
"Я понимаю, что содержание и данные %1$s являются частными и "
"конфиденциальными."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Авторским правом на мои тексты и файлы обладает %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "Авторские права на мои тексты и файлы остаются за мной."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Все права защищены."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4733,7 +4862,7 @@ msgstr ""
"Мои тексты и файлы доступны на условиях %s, за исключением следующей личной "
"информации: пароля, почтового адреса, номера мессенджера и номера телефона."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4767,7 +4896,7 @@ msgstr ""
"Спасибо за то, что присоединились к нам, надеемся, что вы получите "
"удовольствие от использования данного сервиса!"
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5080,7 +5209,7 @@ msgstr "Организация"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Описание"
@@ -5103,8 +5232,9 @@ msgstr "Действия приложения"
msgid "Reset key & secret"
msgstr "Сбросить ключ и секретную фразу"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Удалить"
@@ -5232,7 +5362,7 @@ msgid "Note"
msgstr "Запись"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Алиасы"
@@ -7839,24 +7969,24 @@ msgstr ""
"tracking — пока не реализовано.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
msgid "No configuration file found."
msgstr "Конфигурационный файл не найден."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
msgid "I looked for configuration files in the following places:"
msgstr "Конфигурационные файлы искались в следующих местах:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "Возможно, вы решите запустить установщик для исправления этого."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Перейти к установщику"
@@ -7923,11 +8053,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Выключено"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Сбросить"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Изменение цветовой гаммы"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Использовать значения по умолчанию"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -8011,34 +8145,30 @@ msgstr "Перейти"
msgid "Grant this user the \"%s\" role"
msgstr "Назначить этому пользователю роль «%s»"
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 латинских строчных буквы или цифры, без пробелов"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
msgid "URL of the homepage or blog of the group or topic."
msgstr "Адрес домашней страницы или блога группы или темы."
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Опишите группу или тему"
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Опишите группу или тему, используя до %d символов"
msgstr[1] "Опишите группу или тему, используя до %d символов"
msgstr[2] "Опишите группу или тему, используя до %d символов"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
"Местонахождение группы, если есть, например «Город, область (или регион), "
"страна»."
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9258,14 +9388,9 @@ msgstr[2] "около %d месяцев назад"
msgid "about a year ago"
msgstr "около года назад"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s не допустимым подходящим цветом!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr ""
@@ -9309,30 +9434,29 @@ msgstr "Неверный XML, отсутствует корень XRD."
msgid "Getting backup from file '%s'."
msgstr "Получение резервной копии из файла «%s»."
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "Запись AtomPub с неизвестным целевым URI %s"
+#~ msgid "No such group"
+#~ msgstr "Нет такой группы."
#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Нет такого профиля."
-
-#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Группы, в которых состоит %s"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "HTTP-метод не поддерживается."
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Люди подписанные на %s"
+#~ msgid "Reset"
+#~ msgstr "Сбросить"
-#~ msgid "Couldn't update user."
-#~ msgstr "Не удаётся обновить пользователя."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 латинских строчных букв или цифр, без пробелов. Обязательное поле."
-#~ msgid "Couldn't save profile."
-#~ msgstr "Не удаётся сохранить профиль."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 или более символов. Обязательное поле."
-#~ msgid "Couldn't save tags."
-#~ msgstr "Не удаётся сохранить теги."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Тот же пароль что и сверху. Обязательное поле."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 латинских строчных буквы или цифры, без пробелов"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s не допустимым подходящим цветом!"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 78785a5200..920ce732cc 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -70,6 +70,7 @@ msgid "Save access settings"
msgstr ""
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -81,13 +82,13 @@ msgstr ""
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr ""
@@ -312,7 +313,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr ""
@@ -336,7 +337,7 @@ msgstr ""
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr ""
@@ -346,7 +347,7 @@ msgstr ""
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -519,7 +520,8 @@ msgid "That status is not a favorite."
msgstr ""
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr ""
@@ -565,7 +567,7 @@ msgstr ""
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr ""
@@ -575,7 +577,7 @@ msgstr ""
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr ""
@@ -587,7 +589,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr ""
@@ -597,7 +599,7 @@ msgstr ""
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr ""
@@ -624,7 +626,7 @@ msgstr[1] ""
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr ""
@@ -681,22 +683,26 @@ msgid "Group not found."
msgstr ""
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr ""
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr ""
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr ""
@@ -708,9 +714,11 @@ msgstr ""
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -767,9 +775,12 @@ msgid "Request token already authorized."
msgstr ""
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -777,7 +788,7 @@ msgstr ""
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -798,18 +809,20 @@ msgstr ""
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr ""
@@ -857,7 +870,7 @@ msgstr ""
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr ""
@@ -865,7 +878,7 @@ msgstr ""
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr ""
@@ -969,10 +982,12 @@ msgstr ""
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
@@ -1234,7 +1249,7 @@ msgstr ""
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr ""
#. TRANS: Client error displayed when not using the POST verb.
@@ -1265,27 +1280,49 @@ msgstr ""
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr ""
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr ""
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
-msgid "Not a member"
-msgstr ""
-
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-msgid "HTTP method not supported"
+msgid "Not a member."
msgstr ""
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr ""
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1453,33 +1490,40 @@ msgstr ""
msgid "Avatar deleted."
msgstr ""
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
msgid "Only logged-in users can backup their account."
msgstr ""
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
msgctxt "BUTTON"
msgid "Backup"
msgstr ""
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1510,14 +1554,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr ""
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr ""
@@ -1529,7 +1572,7 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr ""
@@ -1545,32 +1588,6 @@ msgstr ""
msgid "Failed to save block information."
msgstr ""
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr ""
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1697,7 +1714,8 @@ msgid "Account deleted."
msgstr ""
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
msgid "Delete account"
msgstr ""
@@ -1718,8 +1736,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr ""
@@ -1789,8 +1808,10 @@ msgid "You must be logged in to delete a group."
msgstr ""
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr ""
@@ -1838,10 +1859,11 @@ msgid "Delete this group"
msgstr ""
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1879,96 +1901,129 @@ msgstr ""
msgid "Delete this notice"
msgstr ""
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr ""
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr ""
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+msgctxt "TITLE"
msgid "Delete user"
msgstr ""
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr ""
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
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 ""
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+msgid "Do not delete this user"
+msgstr ""
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr ""
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr ""
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr ""
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr ""
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr ""
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr ""
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr ""
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr ""
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr ""
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr ""
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr ""
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr ""
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1976,98 +2031,106 @@ msgid ""
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr ""
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr ""
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr ""
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+msgid "Change colors"
msgstr ""
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr ""
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr ""
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr ""
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr ""
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr ""
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr ""
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr ""
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr ""
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr ""
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr ""
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr ""
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr ""
-#: actions/doc.php:158
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
#, php-format
-msgid "No such document \"%s\""
+msgid "No such document \"%s\"."
msgstr ""
#. TRANS: Title for "Edit application" form.
@@ -2764,7 +2827,7 @@ msgid ""
"%%%%)"
msgstr ""
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr ""
@@ -3118,26 +3181,33 @@ msgid ""
"Sincerely, %2$s\n"
msgstr ""
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr ""
-#: actions/joingroup.php:141
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
#, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr ""
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr ""
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr ""
-#: actions/leavegroup.php:137
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
#, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr ""
@@ -3241,6 +3311,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr ""
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr ""
@@ -3265,11 +3342,11 @@ msgstr ""
msgid "Login to site"
msgstr ""
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr ""
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
@@ -3641,7 +3718,8 @@ msgstr ""
msgid "Change your password."
msgstr ""
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr ""
@@ -3649,7 +3727,8 @@ msgstr ""
msgid "Old password"
msgstr ""
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr ""
@@ -3657,7 +3736,7 @@ msgstr ""
msgid "6 or more characters"
msgstr ""
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr ""
@@ -3681,11 +3760,12 @@ msgstr ""
msgid "Error saving user; invalid."
msgstr ""
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr ""
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr ""
@@ -4006,22 +4086,23 @@ msgid "Profile information"
msgstr ""
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr ""
@@ -4033,7 +4114,7 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4041,27 +4122,27 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr ""
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr ""
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -4112,7 +4193,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4120,46 +4201,47 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr ""
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
msgid "Language is too long (maximum 50 characters)."
msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr ""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
msgid "Could not update user for autosubscribe."
msgstr ""
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
msgid "Could not save location prefs."
msgstr ""
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr ""
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr ""
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
msgid "Restore account"
msgstr ""
@@ -4269,123 +4351,170 @@ msgstr ""
msgid "Tag cloud"
msgstr ""
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr ""
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr ""
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr ""
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr ""
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr ""
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr ""
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr ""
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr ""
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
msgstr ""
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr ""
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr ""
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr ""
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr ""
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr ""
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr ""
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr ""
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr ""
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr ""
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+msgid "6 or more characters, and do not forget it!"
msgstr ""
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+msgid "Same as password above."
+msgstr ""
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+msgctxt "BUTTON"
msgid "Reset"
msgstr ""
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr ""
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr ""
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr ""
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr ""
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr ""
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr ""
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
msgid "Password must be 6 characters or more."
msgstr ""
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+msgid "Cannot save new password."
+msgstr ""
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr ""
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr ""
@@ -4401,7 +4530,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -4427,66 +4556,58 @@ msgid ""
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr ""
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
+#: actions/register.php:437
+msgid "6 or more characters."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr ""
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4505,7 +4626,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -4798,7 +4919,7 @@ msgstr ""
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr ""
@@ -4821,8 +4942,9 @@ msgstr ""
msgid "Reset key & secret"
msgstr ""
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr ""
@@ -4940,7 +5062,7 @@ msgid "Note"
msgstr ""
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr ""
@@ -7378,24 +7500,24 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
msgid "No configuration file found."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
msgid "I looked for configuration files in the following places:"
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr ""
@@ -7460,10 +7582,14 @@ msgctxt "RADIO"
msgid "Off"
msgstr ""
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr ""
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
msgstr ""
#. TRANS: Error message displayed if design settings could not be saved.
@@ -7547,31 +7673,27 @@ msgstr ""
msgid "Grant this user the \"%s\" role"
msgstr ""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
msgid "URL of the homepage or blog of the group or topic."
msgstr ""
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr ""
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] ""
msgstr[1] ""
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8657,14 +8779,9 @@ msgstr[1] ""
msgid "about a year ago"
msgstr ""
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr ""
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 7b80e62217..dd2445baee 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:58+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:58+0000\n"
"Language-Team: Swedish \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -78,6 +78,7 @@ msgid "Save access settings"
msgstr "Spara inställningar för åtkomst"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -89,13 +90,13 @@ msgstr "Spara inställningar för åtkomst"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Spara"
@@ -326,7 +327,7 @@ msgstr "Du måste ange ett värdet på parametern 'device': sms, im, none"
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Kunde inte uppdatera användare."
@@ -350,7 +351,7 @@ msgstr "Användaren har ingen profil."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Kunde inte spara profil."
@@ -360,7 +361,7 @@ msgstr "Kunde inte spara profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -539,7 +540,8 @@ msgid "That status is not a favorite."
msgstr "Denna status är inte en favorit."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Kunde inte ta bort favoriten."
@@ -586,7 +588,7 @@ msgstr "Kunde inte hitta målanvändare."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Smeknamnet används redan. Försök med ett annat."
@@ -596,7 +598,7 @@ msgstr "Smeknamnet används redan. Försök med ett annat."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Inte ett giltigt smeknamn."
@@ -608,7 +610,7 @@ msgstr "Inte ett giltigt smeknamn."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Hemsida är inte en giltig webbadress."
@@ -618,7 +620,7 @@ msgstr "Hemsida är inte en giltig webbadress."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Fullständigt namn är för långt (max 255 tecken)."
@@ -645,7 +647,7 @@ msgstr[1] "Beskrivning är för lång (max %d tecken)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Beskrivning av plats är för lång (max 255 tecken)."
@@ -702,22 +704,26 @@ msgid "Group not found."
msgstr "Grupp hittades inte."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Du är redan en medlem i denna grupp."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Du har blivit blockerad från denna grupp av administratören."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Kunde inte ansluta användare %1$s till grupp %2$s."
@@ -729,9 +735,11 @@ msgstr "Du är inte en medlem i denna grupp."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -789,9 +797,12 @@ msgid "Request token already authorized."
msgstr "Begäran-token är redan auktoriserad."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -799,7 +810,7 @@ msgstr "Begäran-token är redan auktoriserad."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -821,18 +832,20 @@ msgstr "Databasfel vid infogning av OAuth-applikationsanvändare."
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Oväntat inskick av formulär."
@@ -886,7 +899,7 @@ msgstr "Konto"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Smeknamn"
@@ -894,7 +907,7 @@ msgstr "Smeknamn"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Lösenord"
@@ -1001,10 +1014,12 @@ msgstr "Redan upprepat denna notis."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1276,7 +1291,7 @@ msgstr "%s gruppmedlemmar"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Kunde inte infoga ny prenumeration."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1312,30 +1327,51 @@ msgstr "Ingen sådan fil."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Kunde inte ta bort favoriten."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Ingen sådan grupp"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+msgstr "Ingen sådan grupp."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "Alla medlemmar"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "API-metod hittades inte."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Kunde inte spara prenumeration."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1505,35 +1541,42 @@ msgstr "Misslyckades uppdatera avatar."
msgid "Avatar deleted."
msgstr "Avatar borttagen."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "Bara inloggade användaren kan upprepa notiser."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Bakgrund"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1567,14 +1610,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Nej"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Blockera inte denna användare"
@@ -1586,7 +1628,7 @@ msgstr "Blockera inte denna användare"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
@@ -1602,32 +1644,6 @@ msgstr "Blockera denna användare"
msgid "Failed to save block information."
msgstr "Misslyckades att spara blockeringsinformation."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Ingen sådan grupp."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1758,7 +1774,8 @@ msgid "Account deleted."
msgstr "Avatar borttagen."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Skapa ett konto"
@@ -1780,8 +1797,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Bekräfta"
@@ -1855,8 +1873,10 @@ msgid "You must be logged in to delete a group."
msgstr "Du måste vara inloggad för att ta bort en grupp."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Inget smeknamn eller ID."
@@ -1907,10 +1927,11 @@ msgid "Delete this group"
msgstr "Ta bort denna grupp"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1950,19 +1971,30 @@ msgstr "Ta inte bort denna notis"
msgid "Delete this notice"
msgstr "Ta bort denna notis"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Du kan inte ta bort användare."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Du kan bara ta bort lokala användare."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Ta bort användare"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Ta bort användare"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1970,78 +2002,102 @@ msgstr ""
"Är du säker på att du vill ta bort denna användare? Det kommer rensa all "
"data om användaren från databasen, utan en säkerhetskopia."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Ta inte bort denna grupp"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Ta bort denna användare"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Utseende"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "Ogiltig webbadress för logtyp."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "Ogiltig webbadress för SSL-logtyp."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Tema inte tillgängligt: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Byt logotyp"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Webbplatslogotyp"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "SSL-logotyp"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Byt tema"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Webbplatstema"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Tema för webbplatsen."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Anpassat tema"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Du kan ladda upp ett eget StatusNet-tema som ett .ZIP-arkiv."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Ändra bakgrundsbild"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Bakgrund"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2051,98 +2107,108 @@ msgstr ""
"filstorleken är %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "På"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Av"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Sätt på eller stäng av bakgrundsbild."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Upprepa bakgrundsbild"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Byt färger"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Innehåll"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Sidofält"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Text"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Länkar"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Avancerat"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "Anpassad CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Använd standardvärden"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Återställ standardutseende"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Återställ till standardvärde"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Spara"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Spara utseende"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Denna notis är inte en favorit!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Lägg till i favoriter"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Inget sådant dokument \"%s\""
#. TRANS: Title for "Edit application" form.
@@ -2865,7 +2931,7 @@ msgstr ""
"inte någon grupp du gillar? Prova att [söka efter en](%%%%action.groupsearch%"
"%%%) eller [starta din egen!](%%%%action.newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Skapa en ny grupp"
@@ -3274,26 +3340,33 @@ msgstr ""
"\n"
"Vänliga hälsningar, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Du måste vara inloggad för att kunna gå med i en grupp."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s gick med i grupp %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Du måste vara inloggad för att lämna en grupp."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Du är inte en medlem i den gruppen."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s lämnade grupp %2$s"
@@ -3398,6 +3471,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Spara"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "Spara licensinsällningar"
@@ -3422,11 +3502,11 @@ msgstr "Logga in"
msgid "Login to site"
msgstr "Logga in på webbplatsen"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Kom ihåg mig"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "Logga in automatiskt i framtiden; inte för delade datorer!"
@@ -3815,7 +3895,8 @@ msgstr "Byt lösenord"
msgid "Change your password."
msgstr "Byt ditt lösenord."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Byte av lösenord"
@@ -3823,7 +3904,8 @@ msgstr "Byte av lösenord"
msgid "Old password"
msgstr "Gammalt lösenord"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Nytt lösenord"
@@ -3831,7 +3913,7 @@ msgstr "Nytt lösenord"
msgid "6 or more characters"
msgstr "Minst 6 tecken"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Samma som lösenordet ovan"
@@ -3855,11 +3937,12 @@ msgstr "Felaktigt gammalt lösenord"
msgid "Error saving user; invalid."
msgstr "Fel vid sparande av användare; ogiltig."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Kan inte spara nytt lösenord."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Lösenord sparat."
@@ -4195,23 +4278,24 @@ msgid "Profile information"
msgstr "Profilinformation"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Fullständigt namn"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Hemsida"
@@ -4224,7 +4308,7 @@ msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4232,27 +4316,27 @@ msgstr[0] "Beskriv dig själv och dina intressen med högst 140 tecken"
msgstr[1] "Beskriv dig själv och dina intressen med högst 140 tecken"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Beskriv dig själv och dina intressen"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Biografi"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Plats"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Var du håller till, såsom \"Stad, Län, Land\""
@@ -4307,7 +4391,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4315,49 +4399,50 @@ msgstr[0] "Biografin är för lång (max %d tecken)."
msgstr[1] "Biografin är för lång (max %d tecken)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Tidszon inte valt."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "Språknamn är för långt (max 50 tecken)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Ogiltig tagg: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Kunde inte uppdatera användaren för automatisk prenumeration."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Kunde inte spara platsinställningar."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Kunde inte spara taggar."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Inställningar sparade."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Skapa ett konto"
@@ -4481,35 +4566,43 @@ msgstr ""
msgid "Tag cloud"
msgstr "Taggmoln"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Du är redan inloggad!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Ingen sådan återskapningskod."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Inte en återskapningskod."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Återskapningskod för okänd användare."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Fel med bekräftelsekod."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Denna bekräftelsekod är för gammal. Var vänlig börja om igen."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Kunde inte uppdatera användaren med bekräftad e-postadress."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4517,68 +4610,101 @@ msgstr ""
"Om du har glömt eller förlorat ditt lösenord kan du få ett nytt skickat till "
"den e-postadress du har sparat i ditt konto."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Du har blivit identifierad. Ange ett nytt lösenord nedan. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Återskapande av lösenord"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Smeknamn eller e-postadress"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr ""
"Ditt användarnamn på denna server, eller din registrerade e-postadress."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Återskapa"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Återskapa"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Återställ lösenord"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Återskapa lösenord"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Återskapande av lösenord begärd"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Okänd funktion"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "Minst 6 tecken, och glöm inte bort det!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Samma som lösenordet ovan"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Återställ"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Skriv in ett smeknamn eller en e-postadress."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "Ingen användare med den e-postadressen eller användarnamn."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Ingen registrerad e-postadress för den användaren."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Fel vid sparande av adressbekräftelse."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4586,24 +4712,35 @@ msgstr ""
"Instruktioner för att återställa ditt lösenord har skickats till e-"
"postadressen som är registrerat till ditt konto "
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Oväntad återställning av lösenord."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "Lösenordet måste vara minst 6 tecken."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Lösenord och bekräftelse matchar inte."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Kan inte spara nytt lösenord."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Fel uppstog i användarens inställning"
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Nya lösenordet sparat. Du är nu inloggad."
@@ -4619,7 +4756,7 @@ msgstr "Tyvärr, ogiltig inbjudningskod."
msgid "Registration successful"
msgstr "Registreringen genomförd"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrera"
@@ -4647,64 +4784,55 @@ msgstr ""
"Med detta formulär kan du skapa ett nytt konto. Du kan sedan posta notiser "
"och ansluta till vänner och kollegor. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 små bokstäver eller nummer, inga punkter eller mellanslag. Måste fyllas "
-"i."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "Minst 6 tecken. Måste fyllas i."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Samma som lösenordet ovan. Måste fyllas i."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "Minst 6 tecken"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-post"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Används endast för uppdateringar, tillkännagivanden och återskapande av "
"lösenord"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Längre namn, förslagsvis ditt \"verkliga\" namn"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"Jag förstår att innehåll och data av %1$s är privata och konfidentiella."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Upphovsrätten till min text och mina filer innehas av %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "Upphovsrätten till min text och mina filer är fortsatt min."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Alla rättigheter reserverade."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4713,7 +4841,7 @@ msgstr ""
"Mina texter och filer är tillgängliga under %s med undantag av den här "
"privata datan: lösenord, e-postadress, IM-adress, telefonnummer."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4746,7 +4874,7 @@ msgstr ""
"Tack för att du anmält dig och vi hoppas att du kommer tycka om att använda "
"denna tjänst."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5062,7 +5190,7 @@ msgstr "Organisation"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Beskrivning"
@@ -5085,8 +5213,9 @@ msgstr "Åtgärder för applikation"
msgid "Reset key & secret"
msgstr "Återställ nyckel & hemlighet"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Ta bort"
@@ -5214,7 +5343,7 @@ msgid "Note"
msgstr "Notis"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Alias"
@@ -7800,26 +7929,26 @@ msgstr ""
"tracking - inte implementerat än.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "Ingen konfigurationsfil hittades. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Jag letade efter konfigurationsfiler på följande platser: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "Du kanske vill köra installeraren för att åtgärda detta."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Gå till installeraren."
@@ -7886,11 +8015,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Av"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Återställ"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Byt färger"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Använd standardvärden"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7974,33 +8107,29 @@ msgstr "Gå"
msgid "Grant this user the \"%s\" role"
msgstr "Bevilja denna användare \"%s\"-rollen"
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "URL till gruppen eller ämnets hemsida eller blogg"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Beskriv gruppen eller ämnet"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Beskriv gruppen eller ämnet med högst %d tecken"
msgstr[1] "Beskriv gruppen eller ämnet med högst %d tecken"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr "Plats för gruppen, om den finns, såsom \"Stad, Län, Land\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, fuzzy, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9204,14 +9333,9 @@ msgstr[1] "för ungefär %d månader sedan"
msgid "about a year ago"
msgstr "för ett år sedan"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s är inte en giltig färg!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s är inte en giltig färg! Använd 3 eller 6 hexadecimala tecken."
@@ -9248,26 +9372,30 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#~ msgid "No such profile"
-#~ msgstr "Ingen sådan profil"
+#~ msgid "No such group"
+#~ msgstr "Ingen sådan grupp"
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Grupper %s är en medlem i"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "API-metod hittades inte."
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Personer som prenumererar på %s"
+#~ msgid "Reset"
+#~ msgstr "Återställ"
-#~ msgid "Couldn't update user."
-#~ msgstr "Kunde inte uppdatera användare."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 små bokstäver eller nummer, inga punkter eller mellanslag. Måste "
+#~ "fyllas i."
-#~ msgid "Couldn't save profile."
-#~ msgstr "Kunde inte spara profil."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "Minst 6 tecken. Måste fyllas i."
-#~ msgid "Couldn't save tags."
-#~ msgstr "Kunde inte spara taggar."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Samma som lösenordet ovan. Måste fyllas i."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s är inte en giltig färg!"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 3bea408a76..3cdea242a4 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:59+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:58:01+0000\n"
"Language-Team: Telugu \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -75,6 +75,7 @@ msgid "Save access settings"
msgstr "అందుబాటు అమరికలను భద్రపరచు"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -86,13 +87,13 @@ msgstr "అందుబాటు అమరికలను భద్రపరచ
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "భద్రపరచు"
@@ -319,7 +320,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
#, fuzzy
msgid "Could not update user."
@@ -344,7 +345,7 @@ msgstr "వాడుకరికి ప్రొఫైలు లేదు."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
#, fuzzy
msgid "Could not save profile."
msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
@@ -355,7 +356,7 @@ msgstr "ప్రొఫైలుని భద్రపరచలేకున్
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -532,7 +533,8 @@ msgid "That status is not a favorite."
msgstr "ఆ నోటీసు ఇష్టాంశం కాదు."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "ఇష్టాంశాన్ని తొలగించలేకపోయాం."
@@ -578,7 +580,7 @@ msgstr "లక్ష్యిత వాడుకరిని కనుగొన
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
@@ -588,7 +590,7 @@ msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "సరైన పేరు కాదు."
@@ -600,7 +602,7 @@ msgstr "సరైన పేరు కాదు."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "హోమ్ పేజీ URL సరైనది కాదు."
@@ -610,7 +612,7 @@ msgstr "హోమ్ పేజీ URL సరైనది కాదు."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
@@ -638,7 +640,7 @@ msgstr[1] "వివరణ చాలా పెద్దగా ఉంది (%d
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
@@ -696,22 +698,26 @@ msgid "Group not found."
msgstr "గుంపు దొరకలేదు."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "నిర్వాహకులు ఆ గుంపు నుండి మిమ్మల్ని నిరోధించారు."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "వాడుకరి %1$sని %2$s గుంపులో చేర్చలేకపోయాం"
@@ -723,9 +729,11 @@ msgstr "మీరు ఈ గుంపులో సభ్యులు కాద
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -785,9 +793,12 @@ msgid "Request token already authorized."
msgstr "మీకు అధీకరణ లేదు."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -795,7 +806,7 @@ msgstr "మీకు అధీకరణ లేదు."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -817,18 +828,20 @@ msgstr "అవతారాన్ని పెట్టడంలో పొరప
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr ""
@@ -876,7 +889,7 @@ msgstr "ఖాతా"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "పేరు"
@@ -884,7 +897,7 @@ msgstr "పేరు"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "సంకేతపదం"
@@ -990,10 +1003,12 @@ msgstr "ఇప్పటికే ఆ నోటీసుని పునరావ
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
@@ -1268,7 +1283,7 @@ msgstr "%s గుంపు సభ్యులు"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "కొత్త చందాని చేర్చలేకపోయాం."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1304,30 +1319,51 @@ msgstr "అటువంటి ఫైలు లేదు."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "ఇష్టాంశాన్ని తొలగించలేకపోయాం."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "అటువంటి గుంపు లేదు"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+msgstr "అటువంటి గుంపు లేదు."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "అందరు సభ్యులూ"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "కొత్త చందాని చేర్చలేకపోయాం."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1497,35 +1533,42 @@ msgstr "అవతారపు తాజాకరణ విఫలమైంది.
msgid "Avatar deleted."
msgstr "అవతారాన్ని తొలగించాం."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "కేవలం ప్రవేశించిన వాడుకరులు మాత్రమే నోటీసులని పునరావృతించగలరు."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "నేపథ్యం"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1558,14 +1601,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "కాదు"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "ఈ వాడుకరిని నిరోధించకు"
@@ -1577,7 +1619,7 @@ msgstr "ఈ వాడుకరిని నిరోధించకు"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "అవును"
@@ -1593,32 +1635,6 @@ msgstr "ఈ వాడుకరిని నిరోధించు"
msgid "Failed to save block information."
msgstr "నిరోధపు సమాచారాన్ని భద్రపరచడంలో విఫలమయ్యాం."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "అటువంటి గుంపు లేదు."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1750,7 +1766,8 @@ msgid "Account deleted."
msgstr "అవతారాన్ని తొలగించాం."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "ఖాతాని సృష్టించుకోండి"
@@ -1772,8 +1789,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "నిర్థారించు"
@@ -1846,8 +1864,10 @@ msgid "You must be logged in to delete a group."
msgstr "గుంపుని తొలగించడానికి మీరు ప్రవేశించి ఉండాలి."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Jabber ID లేదు."
@@ -1898,10 +1918,11 @@ msgid "Delete this group"
msgstr "ఈ గుంపుని తొలగించు"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1939,19 +1960,30 @@ msgstr "ఈ నోటీసుని తొలగించకు"
msgid "Delete this notice"
msgstr "ఈ నోటీసుని తొలగించు"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "మీరు వాడుకరులని తొలగించలేరు."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "మీరు స్థానిక వాడుకరులను మాత్రమే తొలగించగలరు."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "వాడుకరిని తొలగించు"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "వాడుకరిని తొలగించు"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1959,79 +1991,103 @@ msgstr ""
"మీరు నిజంగానే ఈ వాడుకరిని తొలగించాలనుకుంటున్నారా? ఇది ఆ వాడుకరి భోగట్టాని డాటాబేసు నుండి తొలగిస్తుంది, "
"వెనక్కి తేలేకుండా."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "ఈ గుంపును తొలగించకు"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "ఈ వాడుకరిని తొలగించు"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "రూపురేఖలు"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "చిహ్నపు URL చెల్లదు."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "SSL చిహ్నపు URL చెల్లదు."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "అలంకారం అందుబాటులో లేదు: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "చిహ్నాన్ని మార్చు"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "సైటు చిహ్నం"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "SSL చిహ్నం"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "అలంకారాన్ని మార్చు"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "సైటు అలంకారం"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "సైటుకి అలంకారం."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
#, fuzzy
msgid "Custom theme"
msgstr "సైటు అలంకారం"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "నేపథ్య చిత్రాన్ని మార్చు"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "నేపథ్యం"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2039,102 +2095,112 @@ msgid ""
msgstr "సైటుకి మీరు నేపథ్యపు చిత్రాన్ని ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "ఆన్"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "ఆఫ్"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
#, fuzzy
msgid "Turn background image on or off."
msgstr "నేపథ్య చిత్రాన్ని మార్చు"
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
#, fuzzy
msgid "Tile background image"
msgstr "నేపథ్య చిత్రాన్ని మార్చు"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "రంగులను మార్చు"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "విషయం"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "పక్కపట్టీ"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "పాఠ్యం"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "లంకెలు"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "ఉన్నత"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "ప్రత్యేక CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "అప్రమేయాలని ఉపయోగించు"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
#, fuzzy
msgid "Restore default designs"
msgstr "అప్రమేయాలని ఉపయోగించు"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
#, fuzzy
msgid "Reset back to default"
msgstr "అప్రమేయాలని ఉపయోగించు"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "భద్రపరచు"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "రూపురేఖలని భద్రపరచు"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "ఈ నోటీసు ఇష్టాంశం కాదు!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "ఇష్టాంశాలకు చేర్చు"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "అటువంటి జోడింపు లేదు."
#. TRANS: Title for "Edit application" form.
@@ -2862,7 +2928,7 @@ msgstr ""
"గుంపు లోని సభ్యులందరికీ సందేశాలని పంపించవచ్చు. మీకు నచ్చిన గుంపు కనబడలేదా? [దాని కోసం వెతకండి](%%"
"%%action.groupsearch%%%%) లేదా [మీరే కొత్తది సృష్టించండి!](%%%%action.newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "కొత్త గుంపుని సృష్టించు"
@@ -3253,26 +3319,33 @@ msgstr ""
"\n"
"వినమ్రతతో, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "గుంపుల్లో చేరడానికి మీరు ప్రవేశించి ఉండాలి."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s %2$s గుంపులో చేరారు"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "గుంపుని వదిలివెళ్ళడానికి మీరు ప్రవేశించి ఉండాలి."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "మీరు ఆ గుంపులో సభ్యులు కాదు."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు"
@@ -3377,6 +3450,13 @@ msgstr ""
msgid "URL for an image to display with the license."
msgstr ""
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "భద్రపరచు"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "లైసెన్సు అమరికలను భద్రపరచు"
@@ -3401,11 +3481,11 @@ msgstr "ప్రవేశించండి"
msgid "Login to site"
msgstr "సైటు లోనికి ప్రవేశించు"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "నన్ను గుర్తుంచుకో"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!"
@@ -3792,7 +3872,8 @@ msgstr "సంకేతపదం మార్చుకోండి"
msgid "Change your password."
msgstr "మీ సంకేతపదం మార్చుకోండి."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "సంకేతపదం మార్పు"
@@ -3800,7 +3881,8 @@ msgstr "సంకేతపదం మార్పు"
msgid "Old password"
msgstr "పాత సంకేతపదం"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "కొత్త సంకేతపదం"
@@ -3808,7 +3890,7 @@ msgstr "కొత్త సంకేతపదం"
msgid "6 or more characters"
msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "పై సంకేతపదం వలెనే"
@@ -3832,11 +3914,12 @@ msgstr "పాత సంకేతపదం తప్పు"
msgid "Error saving user; invalid."
msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "సంకేతపదం భద్రమయ్యింది."
@@ -4177,23 +4260,24 @@ msgid "Profile information"
msgstr "ప్రొఫైలు సమాచారం"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "పూర్తి పేరు"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "హోమ్ పేజీ"
@@ -4206,7 +4290,7 @@ msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వ
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4214,27 +4298,27 @@ msgstr[0] "మీ గురించి మరియు మీ ఆసక్త
msgstr[1] "మీ గురించి మరియు మీ ఆసక్తుల గురించి %d అక్షరాల్లో చెప్పండి"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి చెప్పండి"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "స్వపరిచయం"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "ప్రాంతం"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
@@ -4285,7 +4369,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4293,49 +4377,50 @@ msgstr[0] "స్వపరిచయం చాలా పెద్దగా ఉం
msgstr[1] "స్వపరిచయం చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "కాలమండలాన్ని ఎంచుకోలేదు."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "భాష మరీ పెద్దగా ఉంది (50 అక్షరాలు గరిష్ఠం)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "తప్పుడు మారుపేరు: \"%s\""
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "ట్యాగులని భద్రపరచలేకున్నాం."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "ట్యాగులని భద్రపరచలేకపోయాం."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "అమరికలు భద్రమయ్యాయి."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "ఖాతాని సృష్టించుకోండి"
@@ -4455,132 +4540,184 @@ msgstr "[ఒక ఖాతాని నమోదుచేసుకుని](%%ac
msgid "Tag cloud"
msgstr "ట్యాగు మేఘం"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
#, fuzzy
msgid "No such recovery code."
msgstr "అటువంటి సందేశమేమీ లేదు."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
#, fuzzy
msgid "Not a recovery code."
msgstr "నమోదైన వాడుకరి కాదు."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr ""
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "నిర్ధారణ సంకేతంలో పొరపాటు."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "ఈ నిర్ధారణ సంకేతం చాలా పాతది. మళ్ళీ మొదలుపెట్టండి."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "నిర్ధారిత ఈమెయిలు చిరునామాతో వాడుకరిని తాజాకరించలేకపోయాం."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr ""
"మీరు మీ సంకేతపదాన్ని మర్చిపోతే, మీ ఖాతాలో నమోదైన ఈమెయిలు చిరునామాకి కొత్త సంకేతపదం వచ్చేలా చేసుకోవచ్చు."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "మిమ్మల్ని గుర్తించాం. మీ కొత్త సంకేతపదాన్ని క్రింత ఇవ్వండి. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
#, fuzzy
msgid "Password recovery"
msgstr "సంకేతపదం మార్పు"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "ముద్దుపేరు లేదా ఈమెయిలు చిరునామా"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "ఈ సర్వరులో మీ పేరు, లేదా నమౌదైన మీ ఈమెయిల్ చిరునామా."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
#, fuzzy
msgid "Recover"
msgstr "తొలగించు"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "తొలగించు"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
#, fuzzy
msgid "Reset password"
msgstr "కొత్త సంకేతపదం"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
#, fuzzy
msgid "Recover password"
msgstr "కొత్త సంకేతపదం"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr ""
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "తెలియని చర్య"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు, మర్చిపోకండి!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "పై సంకేతపదం వలెనే"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+msgctxt "BUTTON"
msgid "Reset"
msgstr "రీసెట్"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "పేరు లేదా ఈమెయిల్ చిరునామా ఇవ్వండి."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "ఈ వాడుకరికై నమోదైన ఈమెయిల్ చిరునామాలు ఏమీ లేవు."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "చిరునామా నిర్ధారణని భద్రపరచడంలో పొరపాటు."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr "మీ సంకేతపదాన్ని తిరిగి పొందడానికై అవసరమైన సూచనలని మీ ఖాతాతో నమోదైన ఈమెయిల్ చిరునామాకి పంపించాం."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr ""
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక్కవ అక్షరాలుండాలి."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "సంకేతపదం మరియు నిర్ధారణ సరిపోలేదు."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
#, fuzzy
msgid "Error setting user."
msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "మీ కొత్త సంకేతపదం భద్రమైంది. మీరు ఇప్పుడు లోనికి ప్రవేశించారు."
@@ -4596,7 +4733,7 @@ msgstr "క్షమించండి, తప్పు ఆహ్వాన స
msgid "Registration successful"
msgstr "నమోదు విజయవంతం"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "నమోదు"
@@ -4622,59 +4759,52 @@ msgid ""
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామ చిహ్నాలు లేదా ఖాళీలు లేకుండా. తప్పనిసరి."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు. తప్పనిసరి."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "ఈమెయిల్"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "తాజా విశేషాలు, ప్రకటనలు, మరియు సంకేతపదం పోయినప్పుడు మాత్రమే ఉపయోగిస్తాం."
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "సర్వహక్కులూ సురక్షితం."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4683,7 +4813,7 @@ msgstr ""
"నా పాఠ్యం మరియు దస్త్రాలు %s క్రింద లభ్యం, ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM "
"చిరునామా, మరియు ఫోన్ నంబర్."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4714,7 +4844,7 @@ msgstr ""
"\n"
"నమోదుచేసుకున్నందుకు కృతజ్ఞతలు మరియు ఈ సేవని ఉపయోగిస్తూ మీరు ఆనందిస్తారని మేం ఆశిస్తున్నాం."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5027,7 +5157,7 @@ msgstr "సంస్ధ"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "వివరణ"
@@ -5050,8 +5180,9 @@ msgstr "ఉపకరణ చర్యలు"
msgid "Reset key & secret"
msgstr ""
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "తొలగించు"
@@ -5174,7 +5305,7 @@ msgid "Note"
msgstr "గమనిక"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "మారుపేర్లు"
@@ -7705,26 +7836,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "స్వరూపణపు దస్త్రమేమీ కనబడలేదు. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "స్వరూపణపు దస్త్రాల కొరకు ఈ ప్రదేశాలతో చూసాం: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
#, fuzzy
msgid "Go to the installer."
msgstr "సైటు లోనికి ప్రవేశించండి"
@@ -7792,11 +7923,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "ఆఫ్"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "రీసెట్"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "రంగులను మార్చు"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "అప్రమేయాలని ఉపయోగించు"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7882,33 +8017,29 @@ msgstr "వెళ్ళు"
msgid "Grant this user the \"%s\" role"
msgstr ""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr "ఈ ఉపకరణం యొక్క హోమ్పేజీ చిరునామా"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "గుంపుని లేదా విషయాన్ని వివరించండి"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "గుంపు లేదా విషయాన్ని గురించి %d అక్షరాల్లో వివరించండి"
msgstr[1] "గుంపు లేదా విషయాన్ని గురించి %d అక్షరాల్లో వివరించండి"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr "గుంపు యొక్క ప్రాంతం, ఉంటే, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9099,14 +9230,9 @@ msgstr[1] "సుమారు %d నెలల క్రితం"
msgid "about a year ago"
msgstr "ఒక సంవత్సరం క్రితం"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s అనేది సరైన రంగు కాదు!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s అనేది సరైన రంగు కాదు! 3 లేదా 6 హెక్స్ అక్షరాలను వాడండి."
@@ -9143,27 +9269,28 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "అటువంటి ఫైలు లేదు."
+#~ msgid "No such group"
+#~ msgstr "అటువంటి గుంపు లేదు"
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "%s సభ్యులుగా ఉన్న గుంపులు"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "%sకి చందాచేరిన వ్యక్తులు"
+#~ msgid "Reset"
+#~ msgstr "రీసెట్"
-#~ msgid "Couldn't update user."
-#~ msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామ చిహ్నాలు లేదా ఖాళీలు లేకుండా. తప్పనిసరి."
-#~ msgid "Couldn't save profile."
-#~ msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు. తప్పనిసరి."
-#~ msgid "Couldn't save tags."
-#~ msgstr "ట్యాగులని భద్రపరచలేకున్నాం."
+#~ msgid "Same as password above. Required."
+#~ msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s అనేది సరైన రంగు కాదు!"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index f16ec3a889..640b8a412e 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:06:01+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:58:09+0000\n"
"Language-Team: Turkish \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -77,6 +77,7 @@ msgid "Save access settings"
msgstr "Erişim ayarlarını kaydet"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -88,13 +89,13 @@ msgstr "Erişim ayarlarını kaydet"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Kaydet"
@@ -330,7 +331,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Kullanıcı güncellenemedi."
@@ -354,7 +355,7 @@ msgstr "Kullanıcının profili yok."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Profil kaydedilemedi."
@@ -364,7 +365,7 @@ msgstr "Profil kaydedilemedi."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -540,7 +541,8 @@ msgid "That status is not a favorite."
msgstr "Bu durum mesajı bir favori değil."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Favori silinemedi."
@@ -586,7 +588,7 @@ msgstr "Hedef kullanıcı bulunamadı."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Takma ad kullanımda. Başka bir tane deneyin."
@@ -596,7 +598,7 @@ msgstr "Takma ad kullanımda. Başka bir tane deneyin."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Geçersiz bir takma ad."
@@ -608,7 +610,7 @@ msgstr "Geçersiz bir takma ad."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
@@ -618,7 +620,7 @@ msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
@@ -644,7 +646,7 @@ msgstr[0] "Tanım çok uzun (en fazla %d karakter)."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
@@ -700,22 +702,26 @@ msgid "Group not found."
msgstr "Onay kodu bulunamadı."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Bize o profili yollamadınız"
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Bu gruptan yönetici tarafından engellendiniz."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "%1$s kullanıcısı, %2$s grubuna katılamadı."
@@ -727,9 +733,11 @@ msgstr "Bu grubun bir üyesi değilsiniz."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -786,9 +794,12 @@ msgid "Request token already authorized."
msgstr "İstek belirteci zaten yetkili."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -796,7 +807,7 @@ msgstr "İstek belirteci zaten yetkili."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -817,18 +828,20 @@ msgstr "oauth_token_association eklerken veritabanı hatası."
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Beklenmeğen form girdisi."
@@ -884,7 +897,7 @@ msgstr "Hesap"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Takma ad"
@@ -892,7 +905,7 @@ msgstr "Takma ad"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Parola"
@@ -1000,10 +1013,12 @@ msgstr "Bu durum mesajı zaten tekrarlanmış."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
@@ -1274,7 +1289,7 @@ msgstr "%s grup üyeleri"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Yeni abonelik eklenemedi."
#. TRANS: Client error displayed when not using the POST verb.
@@ -1310,30 +1325,51 @@ msgstr "Böyle bir dosya yok."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Favori silinemedi."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "Böyle bir kullanıcı yok."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "Tüm üyeler"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTTP yöntemi desteklenmiyor."
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Yeni abonelik eklenemedi."
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1505,34 +1541,41 @@ msgstr "Avatar güncellemede hata."
msgid "Avatar deleted."
msgstr "Kullanıcı resmi silindi."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
msgid "Only logged-in users can backup their account."
msgstr ""
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "Arkaplan"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1567,14 +1610,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Hayır"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Bu kullanıcıyı engelleme"
@@ -1586,7 +1628,7 @@ msgstr "Bu kullanıcıyı engelleme"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Evet"
@@ -1602,32 +1644,6 @@ msgstr "Bu kullanıcıyı engelle"
msgid "Failed to save block information."
msgstr "Engelleme bilgisinin kaydedilmesi başarısızlığa uğradı."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Böyle bir kullanıcı yok."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1758,7 +1774,8 @@ msgid "Account deleted."
msgstr "Kullanıcı resmi silindi."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "Bir hesap oluştur"
@@ -1780,8 +1797,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Onayla"
@@ -1856,8 +1874,10 @@ msgid "You must be logged in to delete a group."
msgstr "Bir grup oluşturmak için giriş yapmış olmanız gerekir."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
#, fuzzy
msgid "No nickname or ID."
msgstr "Takma ad yok"
@@ -1913,10 +1933,11 @@ msgid "Delete this group"
msgstr "Bu kullanıcıyı sil"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1956,19 +1977,30 @@ msgstr "Bu durum mesajını silme"
msgid "Delete this notice"
msgstr "Bu durum mesajını sil"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Kullanıcıları silemezsiniz."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Sadece yerel kullanıcıları silebilirsiniz."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Kullanıcıyı sil"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Kullanıcıyı sil"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1976,79 +2008,103 @@ msgstr ""
"Bu kullanıcıyı silmek istediğinizden emin misiniz? Bu, veritabanından "
"kullanıcıya ait tüm verileri herhangi bir yedek olmaksızın temizleyecektir."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Bu durum mesajını silme"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Bu kullanıcıyı sil"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Dizayn"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "Geçersiz logo bağlantısı."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
#, fuzzy
msgid "Invalid SSL logo URL."
msgstr "Geçersiz logo bağlantısı."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Tema mevcut değil: %s"
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Değiştir"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Site logosu"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "SSL logosu"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Temayı değiştir"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Site teması"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Site için tema."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Özel tema"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Özel bir StatusNet temasını .ZIP arşivi olarak yükleyebilirsiniz."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Arkaplan resmini değiştir"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Arkaplan"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2058,98 +2114,108 @@ msgstr ""
"$s'dir."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "Açık"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Kapalı"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Arkaplan resmini açın ya da kapatın."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Arkaplan resmini döşe"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Renkleri değiştir"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "İçerik"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Kenar Çubuğu"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Metin"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Bağlantılar"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Gelişmiş"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "Özel CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "Öntanımlıları kullan"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr ""
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Öntanımlıya geri dön"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Kaydet"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Dizaynı kaydet"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Bu durum mesajı bir favori değil!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Favorilere ekle"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Böyle bir durum mesajı yok."
#. TRANS: Title for "Edit application" form.
@@ -2876,7 +2942,7 @@ msgid ""
"%%%%)"
msgstr ""
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Yeni bir grup oluştur"
@@ -3246,26 +3312,33 @@ msgid ""
"Sincerely, %2$s\n"
msgstr ""
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Gruba katılmak için giriş yapmalısınız."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
-msgstr ""
+msgstr "%1$s'in %2$s'deki durum mesajları "
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr ""
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Bu grubun bir üyesi değilsiniz."
-#: actions/leavegroup.php:137
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s'in %2$s'deki durum mesajları "
@@ -3371,6 +3444,13 @@ msgstr "Lisans Resminin Bağlantısı"
msgid "URL for an image to display with the license."
msgstr "Lisansla birlikte gösterilecek bir resim için bağlantı."
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Kaydet"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "Lisans ayarlarını kaydet"
@@ -3396,11 +3476,11 @@ msgstr "Giriş"
msgid "Login to site"
msgstr "Siteye giriş"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Beni hatırla"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!"
@@ -3789,7 +3869,8 @@ msgstr "Parolayı değiştir"
msgid "Change your password."
msgstr "Parolanızı değiştirin."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Parola değiştirildi"
@@ -3797,7 +3878,8 @@ msgstr "Parola değiştirildi"
msgid "Old password"
msgstr "Eski parola"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Yeni parola"
@@ -3805,7 +3887,7 @@ msgstr "Yeni parola"
msgid "6 or more characters"
msgstr "6 veya daha fazla karakter"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "yukarıdaki parolanın aynısı"
@@ -3829,11 +3911,12 @@ msgstr "Eski parola yanlış"
msgid "Error saving user; invalid."
msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Yeni parola kaydedilemedi."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Parola kaydedildi."
@@ -4175,7 +4258,8 @@ msgid "Profile information"
msgstr "Profil ayarları"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr ""
@@ -4184,16 +4268,16 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Tam İsim"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Başlangıç Sayfası"
@@ -4207,35 +4291,35 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
msgstr[0] "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Hakkında"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Yer"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
@@ -4288,56 +4372,57 @@ msgstr "Bana abone olan herkese abone yap (insan olmayanlar için en iyisi)"
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
msgstr[0] "Yer bilgisi çok uzun (azm: %d karakter)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Zaman dilimi seçilmedi."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "Dil çok uzun (maksimum: 50 karakter)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Geçersiz büyüklük."
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Kullanıcı güncellenemedi."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Profil kaydedilemedi."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Profil kaydedilemedi."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Ayarlar kaydedildi."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "Bir hesap oluştur"
@@ -4453,36 +4538,44 @@ msgstr ""
msgid "Tag cloud"
msgstr ""
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Zaten giriş yapmış durumdasıznız!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Böyle bir geri alma kodu yok."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Bir geri alma kodu değil."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Bilinmeye kullanıcı için geri alma kodu"
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Onay kodu hatası."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Onay kodu çok eski. Lütfen tekrar başlayınız."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
#, fuzzy
msgid "Could not update user with confirmed email address."
msgstr "Kullanıcı güncellenemedi."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
#, fuzzy
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
@@ -4491,70 +4584,103 @@ msgstr ""
"Hesabınıza eklemiş olduğunuz eposta adresine parolanızı geri getirmek için "
"gerekli olan talimatlar yollanmıştır."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
msgstr ""
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
#, fuzzy
msgid "Password recovery"
msgstr "Parola geri alma isteği"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
#, fuzzy
msgid "Nickname or email address"
msgstr "Bir takma ad veya eposta adresi girin."
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "Bu sunucudaki takma adınız veya kaydedilmiş eposta adresiniz."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Geri al"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Geri al"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Parolayı sıfırla"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Parolanı geri al"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Parola geri alma isteği"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr ""
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "Unutmayın, 6 veya daha fazla karakter"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "yukarıdaki parolanın aynısı"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Sıfırla"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Bir takma ad veya eposta adresi girin."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
#, fuzzy
msgid "No user with that email address or username."
msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Adres onayını kaydetmede hata."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4562,24 +4688,35 @@ msgstr ""
"Hesabınıza eklemiş olduğunuz eposta adresine parolanızı geri getirmek için "
"gerekli olan talimatlar yollanmıştır."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Beklemeğen parola sıfırlaması."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Parola ve onaylaması birbirini tutmuyor."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Yeni parola kaydedilemedi."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Kullanıcı ayarlamada hata oluştu."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız."
@@ -4596,7 +4733,7 @@ msgstr "Onay kodu hatası."
msgid "Registration successful"
msgstr "Kayıt başarılı"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Kayıt"
@@ -4622,66 +4759,54 @@ msgid ""
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:433
+#: actions/register.php:437
#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
-"verilmez"
-
-#: actions/register.php:438
-#, fuzzy
-msgid "6 or more characters. Required."
+msgid "6 or more characters."
msgstr "6 veya daha fazla karakter"
-#: actions/register.php:442
-#, fuzzy
-msgid "Same as password above. Required."
-msgstr "yukarıdaki parolanın aynısı"
-
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Eposta"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Sadece sistem güncellemeleri, duyurular ve parola geri alma için kullanılır."
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
"Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Tüm hakları saklıdır."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4690,7 +4815,7 @@ msgstr ""
"bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
"numarası."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4709,7 +4834,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5019,7 +5144,7 @@ msgstr "Organizasyon"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Tanım"
@@ -5042,8 +5167,9 @@ msgstr ""
msgid "Reset key & secret"
msgstr ""
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Sil"
@@ -5162,7 +5288,7 @@ msgid "Note"
msgstr "Not"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Diğerisimler"
@@ -7688,25 +7814,25 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
#, fuzzy
msgid "No configuration file found."
msgstr "Onay kodu yok."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
msgid "I looked for configuration files in the following places:"
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr ""
@@ -7777,12 +7903,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Kapalı"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Sıfırla"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Renkleri değiştir"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "Öntanımlıları kullan"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7868,36 +7997,30 @@ msgstr ""
msgid "Grant this user the \"%s\" role"
msgstr ""
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
-"verilmez"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
msgstr ""
"Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
#, fuzzy
msgid "Describe the group or topic"
msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
#, fuzzy, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9018,14 +9141,9 @@ msgstr[0] ""
msgid "about a year ago"
msgstr "yaklaşık bir yıl önce"
-#: lib/webcolor.php:80
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, fuzzy, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
@@ -9061,28 +9179,36 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Böyle bir durum mesajı yok."
+#~ msgid "No such group"
+#~ msgstr "Böyle bir kullanıcı yok."
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "%2$s kullanıcısının üye olduğu %1$s grupları."
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "HTTP yöntemi desteklenmiyor."
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Uzaktan abonelik"
-
-#~ msgid "Couldn't update user."
-#~ msgstr "Kullanıcı güncellenemedi."
-
-#~ msgid "Couldn't save profile."
-#~ msgstr "Profil kaydedilemedi."
+#~ msgid "Reset"
+#~ msgstr "Sıfırla"
#, fuzzy
-#~ msgid "Couldn't save tags."
-#~ msgstr "Profil kaydedilemedi."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
+#~ "verilmez"
+
+#, fuzzy
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 veya daha fazla karakter"
+
+#, fuzzy
+#~ msgid "Same as password above. Required."
+#~ msgstr "yukarıdaki parolanın aynısı"
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr ""
+#~ "1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
+#~ "verilmez"
+
+#, fuzzy
+#~ msgid "%s is not a valid color!"
+#~ msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 265ccfc77b..a856164ca4 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -12,18 +12,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:06:08+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:58:13+0000\n"
"Language-Team: Ukrainian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -80,6 +80,7 @@ msgid "Save access settings"
msgstr "Зберегти параметри доступу"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -91,13 +92,13 @@ msgstr "Зберегти параметри доступу"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "Зберегти"
@@ -329,7 +330,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "Не вдалося оновити користувача."
@@ -353,7 +354,7 @@ msgstr "Користувач не має профілю."
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "Не вдалося зберегти профіль."
@@ -363,7 +364,7 @@ msgstr "Не вдалося зберегти профіль."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -548,7 +549,8 @@ msgid "That status is not a favorite."
msgstr "Цей статус не є обраним."
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "Не можна видалити зі списку обраних."
@@ -596,7 +598,7 @@ msgstr "Не вдалося знайти цільового користувач
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Це ім’я вже використовується. Спробуйте інше."
@@ -606,7 +608,7 @@ msgstr "Це ім’я вже використовується. Спробуйт
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Це недійсне ім’я користувача."
@@ -618,7 +620,7 @@ msgstr "Це недійсне ім’я користувача."
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Веб-сторінка має недійсну URL-адресу."
@@ -628,7 +630,7 @@ msgstr "Веб-сторінка має недійсну URL-адресу."
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Повне ім’я надто довге (не більше 255 символів)."
@@ -656,7 +658,7 @@ msgstr[2] "Опис надто довгий (максимум — %d знакі
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Розташування надто довге (не більше 255 символів)."
@@ -714,22 +716,26 @@ msgid "Group not found."
msgstr "Спільноту не знайдено."
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Ви вже стоїте у цій спільноти."
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Адміністратор спільноти заблокував ваш профіль."
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Не вдалось долучити користувача %1$s до спільноти %2$s."
@@ -741,9 +747,11 @@ msgstr "Ви не стоїте у цій спільноті."
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -800,9 +808,12 @@ msgid "Request token already authorized."
msgstr "Токен запиту вже авторизовано."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -810,7 +821,7 @@ msgstr "Токен запиту вже авторизовано."
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -832,18 +843,20 @@ msgstr "Помилка бази даних при додаванні парам
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Несподіване представлення форми."
@@ -898,7 +911,7 @@ msgstr "Акаунт"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Ім’я користувача"
@@ -906,7 +919,7 @@ msgstr "Ім’я користувача"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Пароль"
@@ -1014,10 +1027,12 @@ msgstr "Цей допис вже повторено."
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
@@ -1291,7 +1306,7 @@ msgstr "Учасники спільноти %s"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "Не вдається надати комусь членство"
#. TRANS: Client error displayed when not using the POST verb.
@@ -1324,29 +1339,51 @@ msgstr "Немає такого обраного допису."
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "Не вдається видалити допис з чийогось списку обраних."
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "Такої спільноти не існує."
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
-msgid "Not a member"
-msgstr "Не є учасником"
-
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
#, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTTP спосіб не підтримується."
+msgid "Not a member."
+msgstr "Не є учасником"
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "Неможливо позбавити когось членства"
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1515,25 +1552,31 @@ msgstr "Оновлення аватари невдале."
msgid "Avatar deleted."
msgstr "Аватару видалено."
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr "Резерв. копія"
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
msgid "Only logged-in users can backup their account."
msgstr ""
"Лише користувачі, що знаходяться у системі, можуть зробити резервну копію "
"свого акаунту."
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr "Ви не можете створити резервну копію свого акаунту."
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
+#, fuzzy
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
@@ -1544,12 +1587,14 @@ msgstr ""
"До того ж, прикріплені до ваших повідомлень файли і прямі повідомлення також "
"не долучаються до резервного файлу."
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
msgctxt "BUTTON"
msgid "Backup"
msgstr "Резерв. копія"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr "Резервне копіювання вашого акаунту"
@@ -1583,14 +1628,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Ні"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "Не блокувати цього користувача"
@@ -1602,7 +1646,7 @@ msgstr "Не блокувати цього користувача"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Так"
@@ -1618,32 +1662,6 @@ msgstr "Блокувати користувача"
msgid "Failed to save block information."
msgstr "Збереження інформації про блокування завершилось невдачею."
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Такої спільноти не існує."
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1771,7 +1789,8 @@ msgid "Account deleted."
msgstr "Акаунт видалено."
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
msgid "Delete account"
msgstr "Видалити акаунт"
@@ -1796,8 +1815,9 @@ msgstr ""
"вашого акаунту, перш ніж видаляти його з сервера."
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "Підтвердити"
@@ -1870,8 +1890,10 @@ msgid "You must be logged in to delete a group."
msgstr "Ви повинні спочатку увійти на сайт, аби видалити спільноту."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "Немає імені або ІД."
@@ -1922,10 +1944,11 @@ msgid "Delete this group"
msgstr "Видалити спільноту"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1963,19 +1986,30 @@ msgstr "Не видаляти цей допис"
msgid "Delete this notice"
msgstr "Видалити допис"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "Ви не можете видаляти користувачів."
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "Ви можете видаляти лише локальних користувачів."
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "Видалити користувача"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "Видалити користувача"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
@@ -1983,78 +2017,102 @@ msgstr ""
"Впевнені, що бажаєте видалити цього користувача? Усі дані буде знищено без "
"можливості відновлення."
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Не видаляти цю спільноту"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "Видалити цього користувача"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Дизайн"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr "Налаштування дизайну для цього сайту StatusNet"
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "Помилкова URL-адреса логотипу."
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "Невірний SSL або URL-адреса логотипу."
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "Тема недоступна: %s."
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "Змінити логотип"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Логотип сайту"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "Логотип сайту з SSL"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "Змінити тему"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "Тема сайту"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Тема для цього сайту."
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "Своя тема"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Ви можете завантажити свою тему для сайту StatusNet як .ZIP архів."
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "Змінити фонове зображення"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "Фон"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2064,98 +2122,108 @@ msgstr ""
"%1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "Увімк."
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "Вимк."
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Увімкнути або вимкнути фонове зображення."
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Замостити фон"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "Змінити кольори"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "Зміст"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Сайдбар"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "Текст"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "Посилання"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "Додатково"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "Свій CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "За замовч."
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Оновити налаштування за замовчуванням"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Повернутись до початкових налаштувань"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Зберегти"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "Зберегти дизайн"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "Цей допис не є обраним!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "Додати до обраних"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "Немає такого документа «%s»"
#. TRANS: Title for "Edit application" form.
@@ -2881,7 +2949,7 @@ msgstr ""
"повідомлення. Не бачите спільноту, яка вас цікавить? Спробуйте її [знайти](%%"
"%%action.groupsearch%%%%) або [створіть власну!](%%%%action.newgroup%%%%)"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "Створити нову спільноту"
@@ -3294,26 +3362,33 @@ msgstr ""
"\n"
"Щиро ваші, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "Ви повинні спочатку увійти на сайт, аби долучитися до спільноти."
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s приєднався до спільноти %2$s"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "Ви повинні спочатку увійти на сайт, аби залишити спільноту."
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Ви не є учасником цієї спільноти."
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s залишив спільноту %2$s"
@@ -3419,6 +3494,13 @@ msgstr "URL-адреса логотипу ліцензії"
msgid "URL for an image to display with the license."
msgstr "URL-адреса зображення (логотипу) для показу поруч з ліцензією"
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Зберегти"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "Зберегти налаштування ліцензії"
@@ -3443,11 +3525,11 @@ msgstr "Увійти"
msgid "Login to site"
msgstr "Вхід на сайт"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "Пам’ятати мене"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Автоматично входити у майбутньому; не для комп’ютерів загального "
@@ -3843,7 +3925,8 @@ msgstr "Змінити пароль"
msgid "Change your password."
msgstr "Змінити пароль."
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "Пароль замінено"
@@ -3851,7 +3934,8 @@ msgstr "Пароль замінено"
msgid "Old password"
msgstr "Старий пароль"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "Новий пароль"
@@ -3859,7 +3943,7 @@ msgstr "Новий пароль"
msgid "6 or more characters"
msgstr "6 або більше знаків"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "Такий само, як і пароль вище"
@@ -3883,11 +3967,12 @@ msgstr "Старий пароль є неточним"
msgid "Error saving user; invalid."
msgstr "Помилка при збереженні користувача; недійсний."
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "Неможна зберегти новий пароль."
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "Пароль збережено."
@@ -4212,22 +4297,23 @@ msgid "Profile information"
msgstr "Інформація профілю"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1-64 рядкових літер і цифр, ніякої пунктуації або інтервалів."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "Повне ім’я"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "Веб-сторінка"
@@ -4239,7 +4325,7 @@ msgstr "URL-адреса вашої веб-сторінки, блоґу, або
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4248,27 +4334,27 @@ msgstr[1] "Опишіть себе та свої інтереси інтерес
msgstr[2] "Опишіть себе та свої інтереси інтереси вкладаючись у %d символів"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "Опишіть себе та свої інтереси"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "Про себе"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "Розташування"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Де ви живете, на кшталт «Місто, область (регіон), країна»"
@@ -4322,7 +4408,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4331,48 +4417,49 @@ msgstr[1] "Біографія надто довга (не більше %d сим
msgstr[2] "Біографія надто довга (не більше %d символів)."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "Часовий пояс не обрано."
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
msgid "Language is too long (maximum 50 characters)."
msgstr "Мова надто довга (не більше 50 символів)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Недійсний теґ: «%s»"
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "Не вдалося оновити користувача для автопідписки."
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "Не вдалося зберегти налаштування розташування."
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "Не вдалося зберегти теґи."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Налаштування збережено."
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
msgid "Restore account"
msgstr "Відновити акаунт"
@@ -4495,35 +4582,43 @@ msgstr ""
msgid "Tag cloud"
msgstr "Хмарка теґів"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "Ви вже в системі!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "Немає такого коду відновлення."
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "Це не код відновлення."
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "Код відновлення для невідомого користувача."
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "Помилка з кодом підтвердження."
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "Цей код підтвердження застарілий. Будь ласка, розпочніть спочатку."
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "Не вдалося оновити користувача з підтвердженною електронною адресою."
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
@@ -4531,68 +4626,101 @@ msgstr ""
"Якщо загубите або втратите свій пароль, його буде легко відновити за "
"допомогою електронної адреси, яку ви зазначили у власному профілі."
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "Ідентифікація успішна. Введіть новий пароль. "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "Відновлення паролю"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "Ім’я користувача або поштова адреса"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr ""
"Ваше ім’я користувача на цьому сервері, або зареєстрована електронна адреса."
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "Відновити"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Відновити"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "Скинути пароль"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "Відновити пароль"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "Запит на відновлення паролю відправлено"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "Дія невідома"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "6 або більше знаків, і не забудьте їх!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Такий само, як і пароль вище"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+msgctxt "BUTTON"
msgid "Reset"
msgstr "Скинути"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "Введіть ім’я або електронну адресу."
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "Користувача з такою електронною адресою або ім’ям немає."
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "Для цього користувача немає зареєстрованої електронної адреси."
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "Помилка при збереженні підтвердження адреси."
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
@@ -4600,23 +4728,34 @@ msgstr ""
"Інструкції з відновлення паролю було надіслано на електронну адресу, яку ви "
"вказали у налаштуваннях вашого профілю."
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "Несподіване скидання паролю."
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
msgid "Password must be 6 characters or more."
msgstr "Пароль має складатись з 6-ти або більше знаків."
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "Пароль та підтвердження не співпадають."
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Неможна зберегти новий пароль."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "Помилка в налаштуваннях користувача."
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "Новий пароль успішно збережено. Тепер ви увійшли."
@@ -4633,7 +4772,7 @@ msgstr "Даруйте, помилка у коді запрошення."
msgid "Registration successful"
msgstr "Реєстрація успішна"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "Реєстрація"
@@ -4661,61 +4800,52 @@ msgstr ""
"Ця форма дозволить вам створити новий акаунт. Ви зможете робити дописи і "
"будете в курсі справ ваших друзів та колег. "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 літери нижнього регістра і цифри, ніякої пунктуації або інтервалів. "
-"Неодмінно."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 або більше знаків. Неодмінно."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Такий само, як і пароль вище. Неодмінно."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 або більше знаків"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Пошта"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Використовується лише для оновлень, оголошень та відновлення паролю"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Повне ім’я, звісно ж ваше справжнє ім’я"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL-адреса вашої веб-сторінки, блоґу, або профілю на іншому сайті"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "Я розумію, що зміст і дані %1$s є приватними і конфіденційними."
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Авторські права на мої тексти і файли належать %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "Авторські права на мої тексти і файли залишаються за мною."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "Всі права захищені."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4724,7 +4854,7 @@ msgstr ""
"Мої дописи і файли доступні на умовах %s, окрім цих приватних даних: пароль, "
"електронна адреса, адреса IM, телефонний номер."
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4757,7 +4887,7 @@ msgstr ""
"Дякуємо, що зареєструвались у нас, і, сподіваємось, вам сподобається наш "
"сервіс."
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5073,7 +5203,7 @@ msgstr "Організація"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "Опис"
@@ -5096,8 +5226,9 @@ msgstr "Можливості додатку"
msgid "Reset key & secret"
msgstr "Призначити новий ключ і таємне слово"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "Видалити"
@@ -5225,7 +5356,7 @@ msgid "Note"
msgstr "Зауваження"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "Додаткові імена"
@@ -7821,24 +7952,24 @@ msgstr ""
"tracking — наразі не виконується\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
msgid "No configuration file found."
msgstr "Файл конфігурації не знайдено."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
msgid "I looked for configuration files in the following places:"
msgstr "Пошук файлів конфігурації проводився тут:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "Запустіть файл інсталяції, аби полагодити це."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "Іти до файлу інсталяції."
@@ -7905,11 +8036,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "Вимк."
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Скинути"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "Змінити кольори"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "За замовч."
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7992,34 +8127,29 @@ msgstr "Вперед"
msgid "Grant this user the \"%s\" role"
msgstr "Надати цьому користувачеві роль «%s»"
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
msgid "URL of the homepage or blog of the group or topic."
msgstr "URL-адреса веб-сторінки або тематичного блоґу спільноти"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "Опишіть спільноту або тему"
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "Опишіть спільноту або тему, вкладаючись у %d знак"
msgstr[1] "Опишіть спільноту або тему, вкладаючись у %d знаків"
msgstr[2] "Опишіть спільноту або тему, вкладаючись у %d знаків"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
"Розташування спільноти, на кшталт «Місто, область (або регіон), країна»."
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9243,14 +9373,9 @@ msgstr[2] "близько %d місяців тому"
msgid "about a year ago"
msgstr "близько року тому"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s є неприпустимим кольором!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s є неприпустимим кольором! Використайте 3 або 6 знаків (HEX-формат)"
@@ -9294,29 +9419,31 @@ msgstr "Неправильний XML, корінь XRD відсутній."
msgid "Getting backup from file '%s'."
msgstr "Отримання резервної копії файлу «%s»."
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "Запис AtomPub з невідомим цільовим URI %s"
+#~ msgid "No such group"
+#~ msgstr "Такої спільноти не існує."
-#~ msgid "No such profile"
-#~ msgstr "Немає такого профілю"
+#, fuzzy
+#~ msgid "HTTP method not supported"
+#~ msgstr "HTTP спосіб не підтримується."
-#~ msgid "Notices %s has favorited to on %s"
-#~ msgstr "Дописи, що їх %s позначив як обрані на %s"
+#~ msgid "Reset"
+#~ msgstr "Скинути"
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Спільноти, до яких залучений %s на %s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 літери нижнього регістра і цифри, ніякої пунктуації або інтервалів. "
+#~ "Неодмінно."
-#~ msgid "Method not supported"
-#~ msgstr "Метод не підтримується"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 або більше знаків. Неодмінно."
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Люди, до яких підписався %s на %s"
+#~ msgid "Same as password above. Required."
+#~ msgstr "Такий само, як і пароль вище. Неодмінно."
-#~ msgid "Couldn't update user."
-#~ msgstr "Не вдалося оновити користувача."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr ""
+#~ "1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
-#~ msgid "Couldn't save profile."
-#~ msgstr "Не вдалося зберегти профіль."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "Не вдалося зберегти теґи."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s є неприпустимим кольором!"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 236a3f6708..c071fa458a 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -14,18 +14,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:06:09+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:58:19+0000\n"
"Language-Team: Simplified Chinese \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -80,6 +80,7 @@ msgid "Save access settings"
msgstr "保存访问设置"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button text for saving "Other settings" in profile.
@@ -91,13 +92,13 @@ msgstr "保存访问设置"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
msgctxt "BUTTON"
msgid "Save"
msgstr "保存"
@@ -327,7 +328,7 @@ msgstr ""
#: actions/confirmaddress.php:118 actions/emailsettings.php:359
#: actions/emailsettings.php:508 actions/imsettings.php:276
#: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "无法更新用户。"
@@ -351,7 +352,7 @@ msgstr "用户没有个人信息。"
#. TRANS: Server error displayed if a user profile could not be saved.
#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "无法保存个人信息。"
@@ -361,7 +362,7 @@ msgstr "无法保存个人信息。"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
@@ -533,7 +534,8 @@ msgid "That status is not a favorite."
msgstr "此消息未被收藏。"
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
msgid "Could not delete favorite."
msgstr "无法删除收藏。"
@@ -579,7 +581,7 @@ msgstr "无法找到目标用户。"
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "昵称已被使用,换一个吧。"
@@ -589,7 +591,7 @@ msgstr "昵称已被使用,换一个吧。"
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "不是有效的昵称。"
@@ -601,7 +603,7 @@ msgstr "不是有效的昵称。"
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:181 actions/editapplication.php:233
#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "主页的URL不正确。"
@@ -611,7 +613,7 @@ msgstr "主页的URL不正确。"
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "全名过长(不能超过 255 个字符)。"
@@ -637,7 +639,7 @@ msgstr[0] "D描述过长(不能超过%d 个字符)。"
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "位置过长(不能超过255个字符)。"
@@ -693,22 +695,26 @@ msgid "Group not found."
msgstr "小组未找到。"
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
msgid "You are already a member of that group."
msgstr "你已经是该小组成员。"
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "你已经被管理员从该小组中屏蔽。"
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "无法把用户%1$s添加到%2$s小组"
@@ -720,9 +726,11 @@ msgstr "你不是该小组成员。"
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
@@ -779,9 +787,12 @@ msgid "Request token already authorized."
msgstr "请求 token 已被授权了。"
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:324
#: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -789,7 +800,7 @@ msgstr "请求 token 已被授权了。"
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
#: actions/register.php:172 actions/remotesubscribe.php:76
#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
@@ -810,18 +821,20 @@ msgstr "插入 oauth_token_association 时数据库出错。"
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Form validation error message when an unsupported argument is used.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
#: actions/emailsettings.php:316 actions/grouplogo.php:335
#: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "未预料的表单提交。"
@@ -873,7 +886,7 @@ msgstr "帐号"
#: actions/apioauthauthorize.php:459 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
#: lib/userprofile.php:134
msgid "Nickname"
msgstr "昵称"
@@ -881,7 +894,7 @@ msgstr "昵称"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "密码"
@@ -985,10 +998,12 @@ msgstr "已转发了该消息。"
#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
#. TRANS: Client error shown when using a non-supported HTTP method.
#. TRANS: Client exception thrown when using an unsupported HTTP method.
#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
#: actions/atompubshowsubscription.php:122
#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
@@ -1256,7 +1271,7 @@ msgstr "%s 的小组成员"
#. TRANS: Client exception thrown when trying subscribe someone else to a group.
#: actions/atompubmembershipfeed.php:219
#, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
msgstr "无法添加新的关注。"
#. TRANS: Client error displayed when not using the POST verb.
@@ -1292,30 +1307,51 @@ msgstr "没有这个文件。"
#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
#: actions/atompubshowfavorite.php:151
#, fuzzy
-msgid "Cannot delete someone else's favorite"
+msgid "Cannot delete someone else's favorite."
msgstr "无法删除收藏。"
#. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
msgstr "没有这个组。"
#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
#: actions/atompubshowmembership.php:91
#, fuzzy
-msgid "Not a member"
+msgid "Not a member."
msgstr "所有成员"
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTTP 方法不支持。"
-
#. TRANS: Client exception thrown when deleting someone else's membership.
#: actions/atompubshowmembership.php:151
#, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
msgstr "无法删除自我关注。"
#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1484,35 +1520,42 @@ msgstr "更新头像失败。"
msgid "Avatar deleted."
msgstr "头像已删除。"
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
msgid "Backup account"
msgstr ""
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
#, fuzzy
msgid "Only logged-in users can backup their account."
msgstr "只有登录的用户才能重复发消息。"
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
#: actions/backupaccount.php:84
msgid "You may not backup your account."
msgstr ""
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
msgid ""
"You can backup your account data in Activity Streams format. This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
"addresses is not backed up. Additionally, uploaded files and direct messages "
"are not backed up."
msgstr ""
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
#, fuzzy
msgctxt "BUTTON"
msgid "Backup"
msgstr "背景"
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
msgid "Backup your account"
msgstr ""
@@ -1545,14 +1588,13 @@ msgstr ""
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "否"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
msgid "Do not block this user"
msgstr "不要屏蔽这个用户"
@@ -1564,7 +1606,7 @@ msgstr "不要屏蔽这个用户"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "是"
@@ -1580,32 +1622,6 @@ msgstr "屏蔽这个用户"
msgid "Failed to save block information."
msgstr "保存屏蔽信息失败。"
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "没有这个组。"
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
@@ -1735,7 +1751,8 @@ msgid "Account deleted."
msgstr "头像已删除。"
#. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
#, fuzzy
msgid "Delete account"
msgstr "创建一个账户"
@@ -1757,8 +1774,9 @@ msgid ""
msgstr ""
#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
msgid "Confirm"
msgstr "密码确认"
@@ -1831,8 +1849,10 @@ msgid "You must be logged in to delete a group."
msgstr "你必须登录才能删除小组。"
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "没有昵称或 ID。"
@@ -1882,10 +1902,11 @@ msgid "Delete this group"
msgstr "删除这个小组"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1923,97 +1944,132 @@ msgstr "不要删除这个消息"
msgid "Delete this notice"
msgstr "删除"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "你不能删除用户。"
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "你只能删除本地用户。"
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
msgid "Delete user"
msgstr "删除用户"
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
+msgid "Delete user"
+msgstr "删除用户"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
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 ""
"你确定要删除这个用户吗?这将从数据库中清除有关这个用户的所有数据,没有备份。"
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "不要删除这个小组"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "删除这个用户"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "外观"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr "这个 StatusNet 网站的外观设置"
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "无效的 logo URL。"
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "无效的 SSL logo URL。"
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "主题不可用:%s。"
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "更换 logo"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "网站 logo"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "网站 SSL logo"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "更换主题"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "网站主题"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "这个网站的主题。"
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "自定义主题"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "你可以上传一个 .ZIP 压缩文件作为一个自定义的 StatusNet 主题"
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "更换背景图像"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "背景"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -2021,98 +2077,108 @@ msgid ""
msgstr "你可以为网站上传一个背景图像。文件大小限制在%1$s以下。"
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "打开"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "关闭"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "打开或关闭背景图片"
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "平铺背景图片"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
msgstr "改变颜色"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "内容"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "边栏"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "文字"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "链接"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "高级"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "自定义CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "使用默认值"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "恢复默认外观"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "重置到默认"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "保存"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "保存外观"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
msgid "This notice is not a favorite!"
msgstr "此消息未被收藏!"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
msgid "Add to favorites"
msgstr "加入收藏"
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."
msgstr "没有这个文件“%s”。"
#. TRANS: Title for "Edit application" form.
@@ -2822,7 +2888,7 @@ msgstr ""
"组?试一下[搜索小组](%%%%action.groupsearch%%%%)或[建立自己的小组](%%%%"
"action.newgroup%%%%)!"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "新建一个小组"
@@ -3206,26 +3272,33 @@ msgstr ""
"\n"
"诚挚的感谢, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "你必须登录才能加入小组。"
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
msgstr "%1$s加入了%2$s小组"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "你必须登录才能离开小组。"
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
msgid "You are not a member of that group."
msgstr "你不是该群小组成员。"
-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
msgstr "%1$s离开了%2$s小组。"
@@ -3329,6 +3402,13 @@ msgstr "许可协议图片 URL。"
msgid "URL for an image to display with the license."
msgstr "与许可协议一起出现的图片 URL。"
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "保存"
+
#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "保存许可协议设置"
@@ -3353,11 +3433,11 @@ msgstr "登录"
msgid "Login to site"
msgstr "登录"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "记住登录状态"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "下次自动登录,请不要在公共电脑上使用此选项!"
@@ -3737,7 +3817,8 @@ msgstr "修改密码"
msgid "Change your password."
msgstr "修改你的密码"
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "修改密码"
@@ -3745,7 +3826,8 @@ msgstr "修改密码"
msgid "Old password"
msgstr "旧密码"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "新密码"
@@ -3753,7 +3835,7 @@ msgstr "新密码"
msgid "6 or more characters"
msgstr "6 个或更多字符"
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
msgid "Same as password above"
msgstr "与上面相同的密码"
@@ -3777,11 +3859,12 @@ msgstr "旧密码不正确"
msgid "Error saving user; invalid."
msgstr "保存用户时出错;无效。"
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
msgid "Can't save new password."
msgstr "无法保存新密码。"
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "密码已保存。"
@@ -4104,22 +4187,23 @@ msgid "Profile information"
msgstr "个人信息"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1 到 64 个小写字母或数字,不包含标点或空格。"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
msgid "Full name"
msgstr "全名"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
msgid "Homepage"
msgstr "主页"
@@ -4131,34 +4215,34 @@ msgstr "你的主页、博客或在其他网站的URL。"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
msgstr[0] "用不超过%d个字符描述你自己和你的兴趣"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "描述你自己和你的兴趣"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "自述"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
#: lib/userprofile.php:167
msgid "Location"
msgstr "位置"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "你的地理位置,格式类似\"城市,省份,国家\""
@@ -4209,55 +4293,56 @@ msgstr "自动关注任何关注我的人 (这个选项适合机器人)"
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:257 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
msgstr[0] "自述过长(不能超过%d个字符)。"
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "未选择时区。"
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
msgid "Language is too long (maximum 50 characters)."
msgstr "语言过长(不能超过50个字符)。"
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "无效的标签:\"%s\"。"
#. TRANS: Server error thrown when user profile settings could not be updated to
#. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
#, fuzzy
msgid "Could not update user for autosubscribe."
msgstr "无法更新用户的自动关注。"
#. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
#, fuzzy
msgid "Could not save location prefs."
msgstr "无法保存标签。"
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
msgid "Could not save tags."
msgstr "无法保存标签。"
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "设置已保存。"
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
#, fuzzy
msgid "Restore account"
msgstr "创建一个账户"
@@ -4374,123 +4459,175 @@ msgstr "现在就[注册](%%action.register%%)并发布第一个!"
msgid "Tag cloud"
msgstr "标签云"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "你已经登录了!"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "没有这个恢复码。"
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "不是恢复码。"
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "未知用户的恢复码"
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "验证码出错。"
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "验证码已过期,请重来。"
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "无法更新已确认的电子邮件。"
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr "如果你忘记或丢失了密码,你可以发送一个新的密码到你之前设置的邮箱中。"
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
msgstr "你的身份已被验证,请在下面输入新的密码。 "
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "恢复密码"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "昵称或电子邮件"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "你在此服务器的昵称,或登记的邮箱。"
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
msgid "Recover"
msgstr "恢复"
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "恢复"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "重置密码"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "恢复密码"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "已请求密码恢复"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "未知动作"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"
msgstr "至少6个字符,还有,别忘记它!"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "与上面相同的密码"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+msgctxt "BUTTON"
msgid "Reset"
msgstr "重置"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "输入昵称或电子邮件。"
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "没有拥有这个用户名或电子邮件的用户。"
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "该用户没有登记电子邮件。"
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "保存地址确认时出错。"
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr "恢复密码的说明已被发送到你登记的电子邮箱中。"
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "未预料的密码重置。"
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
msgid "Password must be 6 characters or more."
msgstr "密码必须是 6 位或更多字符。"
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "密码和确认密码不匹配。"
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "无法保存新密码。"
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "保存用户设置时出错。"
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "新密码已保存,你现在已登录。"
@@ -4506,7 +4643,7 @@ msgstr "对不起,无效的邀请码。"
msgid "Registration successful"
msgstr "注册成功"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
msgid "Register"
msgstr "注册"
@@ -4534,59 +4671,52 @@ msgstr ""
"你可以通过此表单建立一个新的账户。然后你就可以发布消息并与朋友和同事们保持联"
"系。 "
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1 到 64 位的小写字母或数字,不能使用标点和空格。此项必填。"
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "至少 6 位字符。此项必填。"
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "与上面输入相同的密码。此项必填。"
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 个或更多字符"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "电子邮件"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "只用于更新、通知及密码恢复"
-#: actions/register.php:458
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "更长的名字,最好是“真实姓名”"
-#: actions/register.php:463
+#: actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "你的主页、博客或在其他网站的URL"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "我明白%1$s的信息是私人且保密的。"
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "我的文字和文件的版权归%1$s所有。"
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "我的文字和文件的版权由我自己保留。"
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "保留所有权利。"
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4595,7 +4725,7 @@ msgstr ""
"我的文字和文件在%s下提供,除了如下隐私内容:密码、电子邮件地址、IM 地址和电话"
"号码。"
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4625,7 +4755,7 @@ msgstr ""
"\n"
"感谢你的注册,希望你喜欢这个服务。"
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -4932,7 +5062,7 @@ msgstr "组织名称必填。"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
msgid "Description"
msgstr "描述"
@@ -4955,8 +5085,9 @@ msgstr "应用程序动作"
msgid "Reset key & secret"
msgstr "重置key和secret"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "删除"
@@ -5078,7 +5209,7 @@ msgid "Note"
msgstr "注释"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
msgid "Aliases"
msgstr "别名"
@@ -7595,24 +7726,24 @@ msgstr ""
"tracking - 尚未实现。\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
msgid "No configuration file found."
msgstr "没有找到配置文件。"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
+#: lib/common.php:158
msgid "I looked for configuration files in the following places:"
msgstr "我在以下位置查找了配置文件:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
msgid "You may wish to run the installer to fix this."
msgstr "或许你想运行安装程序来解决这个问题。"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
+#: lib/common.php:165
msgid "Go to the installer."
msgstr "去安装程序。"
@@ -7677,11 +7808,15 @@ msgctxt "RADIO"
msgid "Off"
msgstr "关闭"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "重置"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "改变颜色"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "使用默认值"
#. TRANS: Error message displayed if design settings could not be saved.
#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
@@ -7765,30 +7900,26 @@ msgstr "执行"
msgid "Grant this user the \"%s\" role"
msgstr "给这个用户添加\\\"%s\\\"权限"
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 到 64 个小写字母或数字,不包含标点或空格"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
msgid "URL of the homepage or blog of the group or topic."
msgstr "这个小组或主题的主页或博客 URL。"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
msgid "Describe the group or topic"
msgstr "小组或主题的描述"
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
msgstr[0] "用不超过%d个字符描述下这个小组或者主题"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr "小组的地理位置,例如“国家、省份、城市”。"
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8965,14 +9096,9 @@ msgstr[0] "约%d个月前"
msgid "about a year ago"
msgstr "约1年前"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s不是有效的颜色!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s不是有效的颜色!应使用3或6个十六进制字符。"
@@ -9007,27 +9133,28 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr "从文件'%s'获取备份。"
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "没有这个文件。"
+#~ msgid "No such group"
+#~ msgstr "没有这个组。"
#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "%s 组是成员组成了"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
#~ msgstr "HTTP 方法不支持。"
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "关注了%s的用户"
+#~ msgid "Reset"
+#~ msgstr "重置"
-#~ msgid "Couldn't update user."
-#~ msgstr "无法更新用户。"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr "1 到 64 位的小写字母或数字,不能使用标点和空格。此项必填。"
-#~ msgid "Couldn't save profile."
-#~ msgstr "无法保存个人信息。"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "至少 6 位字符。此项必填。"
-#~ msgid "Couldn't save tags."
-#~ msgstr "无法保存标签。"
+#~ msgid "Same as password above. Required."
+#~ msgstr "与上面输入相同的密码。此项必填。"
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1 到 64 个小写字母或数字,不包含标点或空格"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s不是有效的颜色!"
diff --git a/plugins/Facebook/locale/Facebook.pot b/plugins/Facebook/locale/Facebook.pot
index f41ee06615..b7c6dead94 100644
--- a/plugins/Facebook/locale/Facebook.pot
+++ b/plugins/Facebook/locale/Facebook.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -129,28 +129,28 @@ msgstr ""
#. TRANS: Client error trying to register with registrations not allowed.
#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
msgid "Registration not allowed."
msgstr ""
#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
msgid "Not a valid invitation code."
msgstr ""
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
msgid "Nickname not allowed."
msgstr ""
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
msgid "Nickname already in use. Try another one."
msgstr ""
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
msgid "Error connecting user to Facebook."
msgstr ""
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
msgid "Invalid username or password."
msgstr ""
diff --git a/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
index 52511e51de..cae852296f 100644
--- a/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
@@ -10,14 +10,14 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:05+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:35+0000\n"
"Language-Team: Belarusian (Taraškievica orthography) \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: be-tarask\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -154,28 +154,28 @@ msgstr "Злучыць"
#. TRANS: Client error trying to register with registrations not allowed.
#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
msgid "Registration not allowed."
msgstr "Рэгістрацыя не дазволеная."
#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
msgid "Not a valid invitation code."
msgstr "Няслушны код запрашэньня."
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
msgid "Nickname not allowed."
msgstr "Мянушка забароненая."
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
msgid "Nickname already in use. Try another one."
msgstr "Мянушка ўжо выкарыстоўваецца. Паспрабуйце іншую."
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
msgid "Error connecting user to Facebook."
msgstr "Памылка далучэньня карыстальніка да Facebook."
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
msgid "Invalid username or password."
msgstr "Няслушнае імя карыстальніка ці пароль."
diff --git a/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
index 1ee2bf7f1a..c2edf3bf20 100644
--- a/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:35+0000\n"
"Language-Team: Breton \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -138,28 +138,28 @@ msgstr "Kevreañ"
#. TRANS: Client error trying to register with registrations not allowed.
#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
msgid "Registration not allowed."
msgstr "N'eo ket aotreet krouiñ kontoù."
#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
msgid "Not a valid invitation code."
msgstr "N'eo ket reizh ar c'hod pedadenn."
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
msgid "Nickname not allowed."
msgstr "Lesanv nann-aotreet."
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
msgid "Nickname already in use. Try another one."
msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
msgid "Error connecting user to Facebook."
msgstr ""
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
msgid "Invalid username or password."
msgstr "Anv implijer pe ger-tremen direizh."
diff --git a/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
index 3ae1c2fa8a..3781695ab3 100644
--- a/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:35+0000\n"
"Language-Team: German \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -158,28 +158,28 @@ msgstr "Verbinden"
#. TRANS: Client error trying to register with registrations not allowed.
#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
msgid "Registration not allowed."
msgstr "Registrierung nicht erlaubt."
#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
msgid "Not a valid invitation code."
msgstr "Kein gültiger Einladungscode."
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
msgid "Nickname not allowed."
msgstr "Benutzername nicht erlaubt."
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
msgid "Nickname already in use. Try another one."
msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
msgid "Error connecting user to Facebook."
msgstr "Fehler beim Verbinden des Benutzers mit Facebook."
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
msgid "Invalid username or password."
msgstr "Benutzername oder Passwort falsch."
diff --git a/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
index 8ba04b2829..f72df84434 100644
--- a/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
@@ -11,13 +11,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:36+0000\n"
"Language-Team: Spanish \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -153,28 +153,28 @@ msgstr "Conectar"
#. TRANS: Client error trying to register with registrations not allowed.
#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
msgid "Registration not allowed."
msgstr "Registro de usuario no permitido."
#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
msgid "Not a valid invitation code."
msgstr "No es un código de invitación válido."
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
msgid "Nickname not allowed."
msgstr "Nombre de usuario no autorizado."
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
msgid "Nickname already in use. Try another one."
msgstr "El nombre de usuario ya existe. Prueba con otro."
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
msgid "Error connecting user to Facebook."
msgstr "Error de conexión del usuario a Facebook."
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
msgid "Invalid username or password."
msgstr "Nombre de usuario o contraseña inválidos."
diff --git a/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
index d4bb47a5e1..02242d2348 100644
--- a/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:36+0000\n"
"Language-Team: French \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -157,28 +157,28 @@ msgstr "Connexion"
#. TRANS: Client error trying to register with registrations not allowed.
#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
msgid "Registration not allowed."
msgstr "Inscription non autorisée."
#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
msgid "Not a valid invitation code."
msgstr "Le code d’invitation n’est pas valide."
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
msgid "Nickname not allowed."
msgstr "Pseudonyme non autorisé."
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
msgid "Nickname already in use. Try another one."
msgstr "Pseudonyme déjà utilisé. Essayez-en un autre."
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
msgid "Error connecting user to Facebook."
msgstr "Erreur de connexion de l’utilisateur à Facebook."
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
msgid "Invalid username or password."
msgstr "Nom d’utilisateur ou mot de passe incorrect."
diff --git a/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
index d46ed10995..4fbedad9d1 100644
--- a/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:36+0000\n"
"Language-Team: Galician \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: gl\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -139,28 +139,28 @@ msgstr "Conectar"
#. TRANS: Client error trying to register with registrations not allowed.
#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
msgid "Registration not allowed."
msgstr "Non se permite o rexistro."
#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
msgid "Not a valid invitation code."
msgstr "O código da invitación é incorrecto."
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
msgid "Nickname not allowed."
msgstr ""
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
msgid "Nickname already in use. Try another one."
msgstr "Ese alcume xa está en uso. Probe con outro."
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
msgid "Error connecting user to Facebook."
msgstr ""
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
msgid "Invalid username or password."
msgstr "O nome de usuario ou contrasinal non son correctos."
diff --git a/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
index 3f2eebf349..8aae8310f0 100644
--- a/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:36+0000\n"
"Language-Team: Interlingua \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -152,28 +152,28 @@ msgstr "Connecter"
#. TRANS: Client error trying to register with registrations not allowed.
#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
msgid "Registration not allowed."
msgstr "Creation de conto non permittite."
#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
msgid "Not a valid invitation code."
msgstr "Le codice de invitation es invalide."
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
msgid "Nickname not allowed."
msgstr "Pseudonymo non permittite."
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
msgid "Nickname already in use. Try another one."
msgstr "Pseudonymo ja in uso. Proba un altere."
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
msgid "Error connecting user to Facebook."
msgstr "Error durante le connexion del usator a Facebook."
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
msgid "Invalid username or password."
msgstr "Nomine de usator o contrasigno invalide."
diff --git a/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
index 20349393a7..93d93a6362 100644
--- a/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:36+0000\n"
"Language-Team: Macedonian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -152,28 +152,28 @@ msgstr "Поврзи се"
#. TRANS: Client error trying to register with registrations not allowed.
#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
msgid "Registration not allowed."
msgstr "Регистрацијата не е дозволена."
#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
msgid "Not a valid invitation code."
msgstr "Ова не е важечки код за покана."
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
msgid "Nickname not allowed."
msgstr "Прекарот не е дозволен."
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
msgid "Nickname already in use. Try another one."
msgstr "Прекарот е зафатен. Одберете друг."
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
msgid "Error connecting user to Facebook."
msgstr "Грешка при поврзувањето на корисникот со Facebook."
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
msgid "Invalid username or password."
msgstr "Неважечко корисничко име или лозинка."
@@ -201,7 +201,7 @@ msgstr "Расположиви знаци"
#: facebooknoticeform.php:196
msgctxt "BUTTON"
msgid "Send"
-msgstr "Прати"
+msgstr "Испрати"
#: facebookhome.php:103
msgid "Server error: Couldn't get user!"
diff --git a/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
index bf797b3ac4..4c05ffa666 100644
--- a/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:37+0000\n"
"Language-Team: Norwegian (bokmål) \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -134,28 +134,28 @@ msgstr "Koble til"
#. TRANS: Client error trying to register with registrations not allowed.
#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
msgid "Registration not allowed."
msgstr "Registrering ikke tillatt."
#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
msgid "Not a valid invitation code."
msgstr "Ikke en gyldig invitasjonskode."
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
msgid "Nickname not allowed."
msgstr "Kallenavn er ikke tillatt."
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
msgid "Nickname already in use. Try another one."
msgstr "Kallenavnet er allerede i bruk. Prøv et annet."
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
msgid "Error connecting user to Facebook."
msgstr ""
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
msgid "Invalid username or password."
msgstr "Ugyldig brukernavn eller passord."
diff --git a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
index 794c5db7e4..74a7171f55 100644
--- a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:59+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:36+0000\n"
"Language-Team: Dutch \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -157,29 +157,29 @@ msgstr "Koppelen"
#. TRANS: Client error trying to register with registrations not allowed.
#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
msgid "Registration not allowed."
msgstr "Registratie is niet toegestaan."
#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
msgid "Not a valid invitation code."
msgstr "De uitnodigingscode is ongeldig."
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
msgid "Nickname not allowed."
msgstr "Gebruikersnaam niet toegestaan."
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
msgid "Nickname already in use. Try another one."
msgstr ""
"De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
msgid "Error connecting user to Facebook."
msgstr "Fout bij het verbinden van de gebruiker met Facebook."
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
msgid "Invalid username or password."
msgstr "Ongeldige gebruikersnaam of wachtwoord."
diff --git a/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
index b6c5a45c97..b13d1750f2 100644
--- a/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
@@ -10,14 +10,14 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:37+0000\n"
"Language-Team: Brazilian Portuguese \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -136,28 +136,28 @@ msgstr "Conectar"
#. TRANS: Client error trying to register with registrations not allowed.
#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
msgid "Registration not allowed."
msgstr "Não é permitido o registro."
#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
msgid "Not a valid invitation code."
msgstr "O código de convite é inválido."
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
msgid "Nickname not allowed."
msgstr "Apelido não permitido."
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
msgid "Nickname already in use. Try another one."
msgstr "Este apelido já está em uso. Tente outro."
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
msgid "Error connecting user to Facebook."
msgstr "Erro ao conectar o usuário ao Facebook."
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
msgid "Invalid username or password."
msgstr ""
diff --git a/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
index 8d975e3a2b..0eaedbb800 100644
--- a/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:37+0000\n"
"Language-Team: Tagalog \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tl\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -158,28 +158,28 @@ msgstr "Umugnay"
#. TRANS: Client error trying to register with registrations not allowed.
#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
msgid "Registration not allowed."
msgstr "Hindi pinapahintulutan ang pagpapatala."
#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
msgid "Not a valid invitation code."
msgstr "Hindi isang tanggap na kodigo ng paanyaya."
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
msgid "Nickname not allowed."
msgstr "Hindi pinapahintulutan ang palayaw."
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
msgid "Nickname already in use. Try another one."
msgstr "Ginagamit na ang palayaw. Subukan ang iba."
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
msgid "Error connecting user to Facebook."
msgstr "May kamalian sa pag-ugnay ng tagagamit sa Facebook."
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
msgid "Invalid username or password."
msgstr "Hindi tanggap na pangalan ng tagagamit o hudyat."
diff --git a/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
index 5f28c03f52..88aef430fd 100644
--- a/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:07+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:37+0000\n"
"Language-Team: Ukrainian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -154,28 +154,28 @@ msgstr "Під’єднати"
#. TRANS: Client error trying to register with registrations not allowed.
#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
msgid "Registration not allowed."
msgstr "Реєстрацію не дозволено."
#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
msgid "Not a valid invitation code."
msgstr "Це не дійсний код запрошення."
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
msgid "Nickname not allowed."
msgstr "Нікнейм не допускається."
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
msgid "Nickname already in use. Try another one."
msgstr "Цей нікнейм вже використовується. Спробуйте інший."
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
msgid "Error connecting user to Facebook."
msgstr "Помилка при підключенні до Facebook."
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
msgid "Invalid username or password."
msgstr "Невірне ім’я або пароль."
diff --git a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
index 40c83bb8f5..f81d46986d 100644
--- a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
@@ -10,14 +10,14 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:07+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:38+0000\n"
"Language-Team: Simplified Chinese \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -148,28 +148,28 @@ msgstr "连接"
#. TRANS: Client error trying to register with registrations not allowed.
#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
msgid "Registration not allowed."
msgstr "不允许注册。"
#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
msgid "Not a valid invitation code."
msgstr "对不起,无效的邀请码。"
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
msgid "Nickname not allowed."
msgstr "昵称不被允许。"
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
msgid "Nickname already in use. Try another one."
msgstr "昵称已被使用,换一个吧。"
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
msgid "Error connecting user to Facebook."
msgstr "连接用户至Facebook时发生错误。"
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
msgid "Invalid username or password."
msgstr "用户名或密码不正确。"
diff --git a/plugins/OpenID/locale/OpenID.pot b/plugins/OpenID/locale/OpenID.pot
index bc49dd91e4..9bbf73f793 100644
--- a/plugins/OpenID/locale/OpenID.pot
+++ b/plugins/OpenID/locale/OpenID.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -447,43 +447,43 @@ msgstr ""
#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
msgid "Registration not allowed."
msgstr ""
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:285
+#: finishopenidlogin.php:289
msgid "Not a valid invitation code."
msgstr ""
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:299
+#: finishopenidlogin.php:303
msgid "Nickname not allowed."
msgstr ""
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
msgid "Nickname already in use. Try another one."
msgstr ""
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
msgid "Stored OpenID not found."
msgstr ""
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
msgid "Creating new account for OpenID that already has a user."
msgstr ""
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:388
+#: finishopenidlogin.php:395
msgid "Invalid username or password."
msgstr ""
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:408
+#: finishopenidlogin.php:415
msgid "Error connecting user to OpenID."
msgstr ""
diff --git a/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po
index b4b7424a14..5cb552eb7a 100644
--- a/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:28+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00:48+0000\n"
"Language-Team: Breton \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -454,43 +454,43 @@ msgstr ""
#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
msgid "Registration not allowed."
msgstr "N'eo ket aotreet krouiñ kontoù."
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:285
+#: finishopenidlogin.php:289
msgid "Not a valid invitation code."
msgstr "N'eo ket reizh ar c'hod pedadenn."
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:299
+#: finishopenidlogin.php:303
msgid "Nickname not allowed."
msgstr "Lesanv nann-aotreet."
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
msgid "Nickname already in use. Try another one."
msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
msgid "Stored OpenID not found."
msgstr ""
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
msgid "Creating new account for OpenID that already has a user."
msgstr ""
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:388
+#: finishopenidlogin.php:395
msgid "Invalid username or password."
msgstr ""
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:408
+#: finishopenidlogin.php:415
msgid "Error connecting user to OpenID."
msgstr ""
diff --git a/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
index 12b2de53cc..0f608c299b 100644
--- a/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:28+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00:48+0000\n"
"Language-Team: Catalan \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -465,44 +465,44 @@ msgstr ""
#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
msgid "Registration not allowed."
msgstr "No es permet el registre."
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:285
+#: finishopenidlogin.php:289
msgid "Not a valid invitation code."
msgstr "No és un codi d'invitació vàlid."
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:299
+#: finishopenidlogin.php:303
msgid "Nickname not allowed."
msgstr "No es permet el sobrenom."
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
msgid "Nickname already in use. Try another one."
msgstr "El sobrenom ja és en ús. Proveu-ne un altre."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
msgid "Stored OpenID not found."
msgstr "No s'ha trobat la connexió OpenID emmagatzemada."
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
msgid "Creating new account for OpenID that already has a user."
msgstr ""
"S'està creant un compte nou per a una connexió OpenID que ja té un usuari."
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:388
+#: finishopenidlogin.php:395
msgid "Invalid username or password."
msgstr "El nom d'usuari o la contrasenya no són vàlids."
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:408
+#: finishopenidlogin.php:415
msgid "Error connecting user to OpenID."
msgstr "S'ha produït un error en connectar l'usuari amb la connexió OpenID."
diff --git a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
index e9143aeb07..c2a9aa6a83 100644
--- a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:29+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00:49+0000\n"
"Language-Team: German \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -489,43 +489,43 @@ msgstr ""
#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
msgid "Registration not allowed."
msgstr "Registrierung nicht erlaubt."
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:285
+#: finishopenidlogin.php:289
msgid "Not a valid invitation code."
msgstr "Kein gültiger Einladungscode."
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:299
+#: finishopenidlogin.php:303
msgid "Nickname not allowed."
msgstr "Benutzername nicht erlaubt."
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
msgid "Nickname already in use. Try another one."
msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
msgid "Stored OpenID not found."
msgstr ""
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
msgid "Creating new account for OpenID that already has a user."
msgstr ""
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:388
+#: finishopenidlogin.php:395
msgid "Invalid username or password."
msgstr "Benutzername oder Passwort falsch."
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:408
+#: finishopenidlogin.php:415
msgid "Error connecting user to OpenID."
msgstr ""
diff --git a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
index a0a2d5d6e5..c3cf1af981 100644
--- a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:29+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00:49+0000\n"
"Language-Team: French \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -499,43 +499,43 @@ msgstr ""
#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
msgid "Registration not allowed."
msgstr "Inscription non autorisée."
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:285
+#: finishopenidlogin.php:289
msgid "Not a valid invitation code."
msgstr "Le code d’invitation n’est pas valide."
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:299
+#: finishopenidlogin.php:303
msgid "Nickname not allowed."
msgstr "Pseudonyme non autorisé."
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
msgid "Nickname already in use. Try another one."
msgstr "Pseudonyme déjà utilisé. Essayez-en un autre."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
msgid "Stored OpenID not found."
msgstr "OpenID stocké non trouvé."
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
msgid "Creating new account for OpenID that already has a user."
msgstr "Créer un nouveau compte pour OpenID qui a déjà un utilisateur."
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:388
+#: finishopenidlogin.php:395
msgid "Invalid username or password."
msgstr "Nom d’utilisateur ou mot de passe incorrect."
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:408
+#: finishopenidlogin.php:415
msgid "Error connecting user to OpenID."
msgstr "Erreur de connexion de l’utilisateur à OpenID."
diff --git a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
index 3ca10002c8..a9c6ab0e9b 100644
--- a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:29+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00:49+0000\n"
"Language-Team: Interlingua \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -489,43 +489,43 @@ msgstr ""
#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
msgid "Registration not allowed."
msgstr "Creation de conto non permittite."
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:285
+#: finishopenidlogin.php:289
msgid "Not a valid invitation code."
msgstr "Le codice de invitation es invalide."
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:299
+#: finishopenidlogin.php:303
msgid "Nickname not allowed."
msgstr "Pseudonymo non permittite."
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
msgid "Nickname already in use. Try another one."
msgstr "Pseudonymo ja in uso. Proba un altere."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
msgid "Stored OpenID not found."
msgstr "Le OpenID immagazinate non esseva trovate."
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
msgid "Creating new account for OpenID that already has a user."
msgstr "Tentativa de crear un nove conto pro un OpenID que ha jam un usator."
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:388
+#: finishopenidlogin.php:395
msgid "Invalid username or password."
msgstr "Nomine de usator o contrasigno invalide."
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:408
+#: finishopenidlogin.php:415
msgid "Error connecting user to OpenID."
msgstr "Error durante le connexion del usator a OpenID."
diff --git a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
index bbdee40b9f..1146039913 100644
--- a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:30+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00:49+0000\n"
"Language-Team: Macedonian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -485,43 +485,43 @@ msgstr ""
#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
msgid "Registration not allowed."
msgstr "Регистрацијата не е дозволена."
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:285
+#: finishopenidlogin.php:289
msgid "Not a valid invitation code."
msgstr "Ова не е важечки код за покана."
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:299
+#: finishopenidlogin.php:303
msgid "Nickname not allowed."
msgstr "Прекарот не е дозволен."
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
msgid "Nickname already in use. Try another one."
msgstr "Прекарот е зафатен. Одберете друг."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
msgid "Stored OpenID not found."
msgstr "Складираниот OpenID не е пронајден."
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
msgid "Creating new account for OpenID that already has a user."
msgstr "Создавање на сметка за OpenID што веќе има корисник."
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:388
+#: finishopenidlogin.php:395
msgid "Invalid username or password."
msgstr "Неважечко корисничко име или лозинка."
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:408
+#: finishopenidlogin.php:415
msgid "Error connecting user to OpenID."
msgstr "Грешка при поврзувањето на корисникот со OpenID."
diff --git a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
index c83d6a5def..0c5ca2d9d9 100644
--- a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
@@ -10,16 +10,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:30+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00:49+0000\n"
"Last-Translator: Siebrand Mazeland \n"
"Language-Team: Dutch \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -491,43 +491,43 @@ msgstr ""
#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
msgid "Registration not allowed."
msgstr "Registreren is niet mogelijk."
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:285
+#: finishopenidlogin.php:289
msgid "Not a valid invitation code."
msgstr "De uitnodigingscode is niet geldig."
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:299
+#: finishopenidlogin.php:303
msgid "Nickname not allowed."
msgstr "Deze gebruikersnaam is niet toegestaan."
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
msgid "Nickname already in use. Try another one."
msgstr "Deze gebruikersnaam wordt al gebruikt. Kies een andere."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
msgid "Stored OpenID not found."
msgstr "Het opgeslagen OpenID is niet aangetroffen."
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
msgid "Creating new account for OpenID that already has a user."
msgstr "Poging tot aanmaken van een OpenID-account dat al een gebruiker heeft."
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:388
+#: finishopenidlogin.php:395
msgid "Invalid username or password."
msgstr "Ongeldige gebruikersnaam of wachtwoord."
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:408
+#: finishopenidlogin.php:415
msgid "Error connecting user to OpenID."
msgstr "Fout bij het koppelen met OpenID."
diff --git a/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
index a9df86fcea..bf92b41710 100644
--- a/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:30+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00:49+0000\n"
"Language-Team: Tagalog \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tl\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -502,44 +502,44 @@ msgstr ""
#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
msgid "Registration not allowed."
msgstr "Hindi pinayagan ang pagpapatala."
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:285
+#: finishopenidlogin.php:289
msgid "Not a valid invitation code."
msgstr "Hindi isang tanggap na kodigo ng paanyaya."
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:299
+#: finishopenidlogin.php:303
msgid "Nickname not allowed."
msgstr "Hindi pinayagan ang palayaw."
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
msgid "Nickname already in use. Try another one."
msgstr "Ginagamit na ang palayaw. Sumubok ng iba."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
msgid "Stored OpenID not found."
msgstr "Hindi natagpuan ang nakalagak na OpenID."
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
msgid "Creating new account for OpenID that already has a user."
msgstr ""
"Nililikha ang bagong akawnt para sa OpenID na mayroon nang isang tagagamit."
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:388
+#: finishopenidlogin.php:395
msgid "Invalid username or password."
msgstr "Hindi tanggap na pangalan ng tagagamit o hudyat."
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:408
+#: finishopenidlogin.php:415
msgid "Error connecting user to OpenID."
msgstr "May kamalian sa pag-ugnay ng tagagamit sa OpenID."
diff --git a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
index 8eb976a4de..f7646149de 100644
--- a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:31+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00:49+0000\n"
"Language-Team: Ukrainian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -492,43 +492,43 @@ msgstr "Автентифікацію за OpenID перервано: ви не
#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
msgid "Registration not allowed."
msgstr "Реєстрацію не дозволено."
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:285
+#: finishopenidlogin.php:289
msgid "Not a valid invitation code."
msgstr "Це не дійсний код запрошення."
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:299
+#: finishopenidlogin.php:303
msgid "Nickname not allowed."
msgstr "Нікнейм не допускається."
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
msgid "Nickname already in use. Try another one."
msgstr "Цей нікнейм вже використовується. Спробуйте інший."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
msgid "Stored OpenID not found."
msgstr "Збережений OpenID не знайдено."
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
msgid "Creating new account for OpenID that already has a user."
msgstr "Створення нового акаунту для OpenID користувачем, який вже існує."
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:388
+#: finishopenidlogin.php:395
msgid "Invalid username or password."
msgstr "Невірне ім’я або пароль."
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:408
+#: finishopenidlogin.php:415
msgid "Error connecting user to OpenID."
msgstr "Помилка при підключенні користувача до OpenID."
diff --git a/plugins/RegisterThrottle/locale/RegisterThrottle.pot b/plugins/RegisterThrottle/locale/RegisterThrottle.pot
index 3cb4394b1e..f5bfd954fa 100644
--- a/plugins/RegisterThrottle/locale/RegisterThrottle.pot
+++ b/plugins/RegisterThrottle/locale/RegisterThrottle.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
+#: RegisterThrottlePlugin.php:134
msgid "Cannot find IP address."
msgstr ""
@@ -28,10 +28,6 @@ msgstr ""
msgid "A banned user has registered from this address."
msgstr ""
-#: RegisterThrottlePlugin.php:191
-msgid "Cannot find user after successful registration."
-msgstr ""
-
-#: RegisterThrottlePlugin.php:224
+#: RegisterThrottlePlugin.php:220
msgid "Throttles excessive registration from a single IP address."
msgstr ""
diff --git a/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po
index 75a4e57cf5..8dc9ff8b30 100644
--- a/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po
@@ -9,19 +9,19 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RegisterThrottle\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:50+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:21+0000\n"
"Language-Team: German \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
+#: RegisterThrottlePlugin.php:134
msgid "Cannot find IP address."
msgstr "Kann IP-Addresse nicht finden."
@@ -34,10 +34,9 @@ msgstr ""
msgid "A banned user has registered from this address."
msgstr "Ein gesperrter Benutzer hat sich von dieser Adresse registriert."
-#: RegisterThrottlePlugin.php:191
-msgid "Cannot find user after successful registration."
-msgstr "Kann Benutzer nach erfolgreicher Registrierung nicht finden."
-
-#: RegisterThrottlePlugin.php:224
+#: RegisterThrottlePlugin.php:220
msgid "Throttles excessive registration from a single IP address."
msgstr "Drosselt exzessive Registrierungen einer einzelnen IP-Adresse."
+
+#~ msgid "Cannot find user after successful registration."
+#~ msgstr "Kann Benutzer nach erfolgreicher Registrierung nicht finden."
diff --git a/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
index b6992d1c35..6f5774f079 100644
--- a/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
@@ -10,19 +10,19 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RegisterThrottle\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:50+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:21+0000\n"
"Language-Team: French \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
+#: RegisterThrottlePlugin.php:134
msgid "Cannot find IP address."
msgstr "Impossible de trouver l’adresse IP."
@@ -36,10 +36,9 @@ msgstr ""
msgid "A banned user has registered from this address."
msgstr "Un utilisateur banni s’est inscrit depuis cette adresse."
-#: RegisterThrottlePlugin.php:191
-msgid "Cannot find user after successful registration."
-msgstr "Impossible de trouver l’utilisateur après un enregistrement réussi."
-
-#: RegisterThrottlePlugin.php:224
+#: RegisterThrottlePlugin.php:220
msgid "Throttles excessive registration from a single IP address."
msgstr "Évite les inscriptions excessives depuis une même adresse IP."
+
+#~ msgid "Cannot find user after successful registration."
+#~ msgstr "Impossible de trouver l’utilisateur après un enregistrement réussi."
diff --git a/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
index 2ca1bbf8ef..0720574e22 100644
--- a/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
@@ -9,19 +9,19 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RegisterThrottle\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:50+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:21+0000\n"
"Language-Team: Interlingua \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
+#: RegisterThrottlePlugin.php:134
msgid "Cannot find IP address."
msgstr "Non pote trovar adresse IP."
@@ -33,10 +33,9 @@ msgstr "Troppo de registrationes. Face un pausa e reproba plus tarde."
msgid "A banned user has registered from this address."
msgstr "Un usator bannite se ha registrate ab iste adresse."
-#: RegisterThrottlePlugin.php:191
-msgid "Cannot find user after successful registration."
-msgstr "Non pote trovar usator post registration succedite."
-
-#: RegisterThrottlePlugin.php:224
+#: RegisterThrottlePlugin.php:220
msgid "Throttles excessive registration from a single IP address."
msgstr "Inhibi le creation de contos excessive ab un sol adresse IP."
+
+#~ msgid "Cannot find user after successful registration."
+#~ msgstr "Non pote trovar usator post registration succedite."
diff --git a/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
index 25f2400af2..7011380d38 100644
--- a/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
@@ -9,19 +9,19 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RegisterThrottle\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:50+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:21+0000\n"
"Language-Team: Macedonian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
+#: RegisterThrottlePlugin.php:134
msgid "Cannot find IP address."
msgstr "Не можам да ја пронајдам IP-адресата."
@@ -33,10 +33,9 @@ msgstr "Премногу регистрации. Направете пауза
msgid "A banned user has registered from this address."
msgstr "Од оваа адреса се регистрирал забранет корисник."
-#: RegisterThrottlePlugin.php:191
-msgid "Cannot find user after successful registration."
-msgstr "Не можам да го пронајдам корисникот по успешната регистрација."
-
-#: RegisterThrottlePlugin.php:224
+#: RegisterThrottlePlugin.php:220
msgid "Throttles excessive registration from a single IP address."
msgstr "Истиснува прекумерни регистрации од една IP-адреса."
+
+#~ msgid "Cannot find user after successful registration."
+#~ msgstr "Не можам да го пронајдам корисникот по успешната регистрација."
diff --git a/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
index 8a6c3d10d8..0f90a2420b 100644
--- a/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
@@ -10,19 +10,19 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RegisterThrottle\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:50+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:21+0000\n"
"Language-Team: Dutch \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
+#: RegisterThrottlePlugin.php:134
msgid "Cannot find IP address."
msgstr "Het IP-adres kon niet gevonden worden."
@@ -34,10 +34,9 @@ msgstr "Te veel registraties. Wacht even en probeer het later opnieuw."
msgid "A banned user has registered from this address."
msgstr "Er is een geblokkeerde gebruiker die vanaf dit adres is geregistreerd."
-#: RegisterThrottlePlugin.php:191
-msgid "Cannot find user after successful registration."
-msgstr "Het was niet mogelijk de gebruiker te vinden na registratie."
-
-#: RegisterThrottlePlugin.php:224
+#: RegisterThrottlePlugin.php:220
msgid "Throttles excessive registration from a single IP address."
msgstr "Beperkt excessieve aantallen registraties vanaf één IP-adres."
+
+#~ msgid "Cannot find user after successful registration."
+#~ msgstr "Het was niet mogelijk de gebruiker te vinden na registratie."
diff --git a/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
index 24128e8ba4..ae7c980e36 100644
--- a/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
@@ -9,19 +9,19 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RegisterThrottle\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:50+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:21+0000\n"
"Language-Team: Tagalog \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tl\n"
"X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
+#: RegisterThrottlePlugin.php:134
msgid "Cannot find IP address."
msgstr "Hindi matagpuan ang tirahan ng IP."
@@ -33,12 +33,12 @@ msgstr "Napakaraming mga pagpapatala. Magpahinga muna at subukan uli mamaya."
msgid "A banned user has registered from this address."
msgstr ""
-#: RegisterThrottlePlugin.php:191
-msgid "Cannot find user after successful registration."
-msgstr "Hindi matagpuan ang tagagamit pagkatapos ng matagumpay na pagpapatala."
-
-#: RegisterThrottlePlugin.php:224
+#: RegisterThrottlePlugin.php:220
msgid "Throttles excessive registration from a single IP address."
msgstr ""
"Naglilipat-lipat ng labis na pagpapatala mula sa isang nag-iisang tirahan ng "
"IP."
+
+#~ msgid "Cannot find user after successful registration."
+#~ msgstr ""
+#~ "Hindi matagpuan ang tagagamit pagkatapos ng matagumpay na pagpapatala."
diff --git a/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
index 2abe652fe1..7d2920b0ea 100644
--- a/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
@@ -10,20 +10,20 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RegisterThrottle\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:50+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:21+0000\n"
"Language-Team: Ukrainian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
+#: RegisterThrottlePlugin.php:134
msgid "Cannot find IP address."
msgstr "Не вдається знайти IP-адресу."
@@ -35,10 +35,9 @@ msgstr "Забагато реєстрацій. Випийте поки що ка
msgid "A banned user has registered from this address."
msgstr "Заблокований користувач був зареєстрований з цієї адреси."
-#: RegisterThrottlePlugin.php:191
-msgid "Cannot find user after successful registration."
-msgstr "Не вдається знайти користувача після успішної реєстрації."
-
-#: RegisterThrottlePlugin.php:224
+#: RegisterThrottlePlugin.php:220
msgid "Throttles excessive registration from a single IP address."
msgstr "Цей додаток обмежує кількість реєстрацій з певної IP-адреси."
+
+#~ msgid "Cannot find user after successful registration."
+#~ msgstr "Не вдається знайти користувача після успішної реєстрації."
diff --git a/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po
new file mode 100644
index 0000000000..47bfc8ae30
--- /dev/null
+++ b/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - SQLProfile to Russian (Русский)
+# Expored from translatewiki.net
+#
+# Author: Александр Сигачёв
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SQLProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:33+0000\n"
+"Language-Team: Russian \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-01-20 20:16:03+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#: SQLProfilePlugin.php:41
+msgid "Debug tool to watch for poorly indexed DB queries."
+msgstr ""
+"Отладочный инструмент для наблюдения плохо индексированных запросов к БД."
diff --git a/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po
index 64e5fc4157..1774841cdf 100644
--- a/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TabFocus\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:38+0000\n"
"Language-Team: Macedonian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-tabfocus\n"
@@ -28,5 +28,5 @@ msgid ""
"Twitter."
msgstr ""
"TabFocus го менува поведението на образецот за забелешки: со пристискање на "
-"копчето Tab во местото за текст се означува копчето „Прати“, така "
+"копчето Tab во местото за текст се означува копчето „Испрати“, така "
"поситоветувајќи се со поведението на Twitter."
diff --git a/plugins/TwitterBridge/locale/TwitterBridge.pot b/plugins/TwitterBridge/locale/TwitterBridge.pot
index e684baae0e..dc02c0154e 100644
--- a/plugins/TwitterBridge/locale/TwitterBridge.pot
+++ b/plugins/TwitterBridge/locale/TwitterBridge.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -242,32 +242,32 @@ msgstr ""
msgid "Connect"
msgstr ""
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
msgid "Registration not allowed."
msgstr ""
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
msgid "Not a valid invitation code."
msgstr ""
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
msgid "Nickname not allowed."
msgstr ""
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
msgid "Nickname already in use. Try another one."
msgstr ""
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
msgid "Error registering user."
msgstr ""
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
msgid "Error connecting user to Twitter."
msgstr ""
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
msgid "Invalid username or password."
msgstr ""
diff --git a/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
index 8fb31bea0c..49116b6544 100644
--- a/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:13+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
"Language-Team: Breton \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -247,32 +247,32 @@ msgstr "Ger-tremen"
msgid "Connect"
msgstr "Kevreañ"
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
msgid "Registration not allowed."
msgstr "N'eo ket aotreet krouiñ kontoù."
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
msgid "Not a valid invitation code."
msgstr ""
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
msgid "Nickname not allowed."
msgstr "Lesanv nann-aotreet."
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
msgid "Nickname already in use. Try another one."
msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
msgid "Error registering user."
msgstr ""
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
msgid "Error connecting user to Twitter."
msgstr ""
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
msgid "Invalid username or password."
msgstr "Anv implijer pe ger-tremen direizh."
diff --git a/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
index d7d7aff526..cb23b7a420 100644
--- a/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:14+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
"Language-Team: Catalan \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -275,32 +275,32 @@ msgstr "Contrasenya"
msgid "Connect"
msgstr "Connecta"
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
msgid "Registration not allowed."
msgstr "No es permet el registre."
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
msgid "Not a valid invitation code."
msgstr "No és un codi d'invitació vàlid."
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
msgid "Nickname not allowed."
msgstr "El sobrenom no és permès."
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
msgid "Nickname already in use. Try another one."
msgstr "El sobrenom ja és en ús. Proveu-ne un altre."
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
msgid "Error registering user."
msgstr "Error en registrar l'usuari."
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
msgid "Error connecting user to Twitter."
msgstr "Error en connectar l'usuari al Twitter."
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
msgid "Invalid username or password."
msgstr "Nom d'usuari o contrasenya no vàlida."
diff --git a/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
index 1cf6c42123..2b07bbce82 100644
--- a/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:14+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
"Language-Team: Persian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fa\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -247,32 +247,32 @@ msgstr "رمز عبور"
msgid "Connect"
msgstr "اتصال"
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
msgid "Registration not allowed."
msgstr "اجازهٔ ثبتنام داده نشده است."
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
msgid "Not a valid invitation code."
msgstr "کد دعوت نامعتبر است."
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
msgid "Nickname not allowed."
msgstr "نام مستعار مجاز نیست."
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
msgid "Nickname already in use. Try another one."
msgstr "این نام مستعار در حال حاضر مورد استفاده است. یکی دیگر را بیازمایید."
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
msgid "Error registering user."
msgstr "خطا در ثبت نام کاربر."
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
msgid "Error connecting user to Twitter."
msgstr "خطا در اتصال کاربر به توییتر."
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
msgid "Invalid username or password."
msgstr "نام کاربری یا رمز عبور اشتباه است."
diff --git a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
index 0074adcaaa..53dbbcba3b 100644
--- a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:14+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
"Language-Team: French \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -279,32 +279,32 @@ msgstr "Mot de passe"
msgid "Connect"
msgstr "Connexion"
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
msgid "Registration not allowed."
msgstr "Inscription non autorisée."
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
msgid "Not a valid invitation code."
msgstr "Le code d’invitation n’est pas valide."
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
msgid "Nickname not allowed."
msgstr "Pseudonyme non autorisé."
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
msgid "Nickname already in use. Try another one."
msgstr "Pseudonyme déjà utilisé. Essayez-en un autre."
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
msgid "Error registering user."
msgstr "Erreur lors de l’inscription de l’utilisateur."
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
msgid "Error connecting user to Twitter."
msgstr "Erreur de connexion de l’utilisateur à Twitter."
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
msgid "Invalid username or password."
msgstr "Nom d’utilisateur ou mot de passe incorrect."
diff --git a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
index 7208474565..c4f8cd4511 100644
--- a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:14+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
"Language-Team: Interlingua \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -270,32 +270,32 @@ msgstr "Contrasigno"
msgid "Connect"
msgstr "Connecter"
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
msgid "Registration not allowed."
msgstr "Creation de conto non permittite."
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
msgid "Not a valid invitation code."
msgstr "Le codice de invitation es invalide."
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
msgid "Nickname not allowed."
msgstr "Pseudonymo non permittite."
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
msgid "Nickname already in use. Try another one."
msgstr "Pseudonymo ja in uso. Proba un altere."
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
msgid "Error registering user."
msgstr "Error durante le registration del usator."
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
msgid "Error connecting user to Twitter."
msgstr "Error durante le connexion del usator a Twitter."
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
msgid "Invalid username or password."
msgstr "Nomine de usator o contrasigno invalide."
diff --git a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
index 8962394f0e..eac1eba11e 100644
--- a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:15+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
"Language-Team: Macedonian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -272,32 +272,32 @@ msgstr "Лозинка"
msgid "Connect"
msgstr "Поврзи се"
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
msgid "Registration not allowed."
msgstr "Регистрацијата не е дозволена."
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
msgid "Not a valid invitation code."
msgstr "Ова не е важечки код за покана."
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
msgid "Nickname not allowed."
msgstr "Прекарот не е дозволен."
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
msgid "Nickname already in use. Try another one."
msgstr "Прекарот е зафатен. Одберете друг."
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
msgid "Error registering user."
msgstr "Грешка при регистрирање на корисникот."
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
msgid "Error connecting user to Twitter."
msgstr "Грешка при поврзувањето на корисникот со Twitter."
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
msgid "Invalid username or password."
msgstr "Неважечко корисничко име или лозинка."
diff --git a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
index 6763193f09..ab4b92a4b6 100644
--- a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:15+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
"Language-Team: Dutch \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -277,33 +277,33 @@ msgstr "Wachtwoord"
msgid "Connect"
msgstr "Koppelen"
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
msgid "Registration not allowed."
msgstr "Registratie is niet toegestaan."
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
msgid "Not a valid invitation code."
msgstr "De uitnodigingscode is ongeldig."
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
msgid "Nickname not allowed."
msgstr "Gebruikersnaam niet toegestaan."
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
msgid "Nickname already in use. Try another one."
msgstr ""
"De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
msgid "Error registering user."
msgstr "Fout bij het registreren van de gebruiker."
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
msgid "Error connecting user to Twitter."
msgstr "Fout bij het verbinden van de gebruiker met Twitter."
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
msgid "Invalid username or password."
msgstr "Ongeldige gebruikersnaam of wachtwoord."
diff --git a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
index 9bcd226ce5..28f190b3c3 100644
--- a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:15+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
"Language-Team: Turkish \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -256,32 +256,32 @@ msgstr "Parola"
msgid "Connect"
msgstr "Bağlan"
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
msgid "Registration not allowed."
msgstr "Kayıt yapılmasına izin verilmiyor."
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
msgid "Not a valid invitation code."
msgstr "Geçerli bir davet kodu değil."
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
msgid "Nickname not allowed."
msgstr "Bu kullanıcı adına izin verilmiyor."
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
msgid "Nickname already in use. Try another one."
msgstr "Kullanıcı adı halihazırda kullanılıyor. Başka bir tane deneyin."
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
msgid "Error registering user."
msgstr "Kullanıcı kayıt hatası."
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
msgid "Error connecting user to Twitter."
msgstr "Twitter'a kullanıcı bağlama hatası."
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
msgid "Invalid username or password."
msgstr "Geçersiz kullanıcı adı veya parola."
diff --git a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
index 1a26acc4cc..536ecb8429 100644
--- a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:15+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
"Language-Team: Ukrainian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -274,32 +274,32 @@ msgstr "Пароль"
msgid "Connect"
msgstr "Під’єднати"
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
msgid "Registration not allowed."
msgstr "Реєстрацію не дозволено."
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
msgid "Not a valid invitation code."
msgstr "Це не дійсний код запрошення."
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
msgid "Nickname not allowed."
msgstr "Нікнейм не допускається."
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
msgid "Nickname already in use. Try another one."
msgstr "Цей нікнейм вже використовується. Спробуйте інший."
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
msgid "Error registering user."
msgstr "Помилка при реєстрації користувача."
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
msgid "Error connecting user to Twitter."
msgstr "Помилка при підключенні користувача до Twitter."
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
msgid "Invalid username or password."
msgstr "Недійсне ім’я або пароль."
diff --git a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
index ef027ff8d5..7b694b2eb6 100644
--- a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
@@ -10,14 +10,14 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:15+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
"Language-Team: Simplified Chinese \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -264,32 +264,32 @@ msgstr "密码"
msgid "Connect"
msgstr "关联"
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
msgid "Registration not allowed."
msgstr "不允许注册。"
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
msgid "Not a valid invitation code."
msgstr "无效的邀请码。"
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
msgid "Nickname not allowed."
msgstr "昵称不被允许。"
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
msgid "Nickname already in use. Try another one."
msgstr "昵称已被使用,换一个吧。"
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
msgid "Error registering user."
msgstr "注册用户出错。"
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
msgid "Error connecting user to Twitter."
msgstr "关联用户到 Twitter 出错。"
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
msgid "Invalid username or password."
msgstr "用户名或密码不正确。"