We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit ff656a8b authored by Evan Prodromou's avatar Evan Prodromou

Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x

parents 827b13a2 edd80453
......@@ -187,9 +187,9 @@ class AccessAdminPanelForm extends AdminForm
*/
function formActions()
{
// TRANS: Title for button to save access settings in site admin panel.
$title = _('Save access settings');
// TRANS: Tooltip for button to save access settings in site admin panel.
// TRANS: Button title to save access settings in site admin panel.
$title = _('Save access settings.');
// TRANS: Button text to save access settings in site admin panel.
$this->out->submit('submit', _m('BUTTON', 'Save'), 'submit', null, $title);
}
}
......@@ -320,6 +320,6 @@ class DeleteAccountForm extends Form
'submit',
null,
// TRANS: Button title for user account deletion.
_('Permanently delete your account'));
_('Permanently delete your account.'));
}
}
......@@ -67,7 +67,7 @@ class ImsettingsAction extends SettingsAction
// TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
// TRANS: the order and formatting of link text and link should remain unchanged.
return _('You can send and receive notices through '.
'instant messaging [instant messages](%%doc.im%%). '.
'[instant messaging](%%doc.im%%). '.
'Configure your addresses and settings below.');
}
......
......@@ -462,7 +462,7 @@ class PathsAdminPanelForm extends AdminForm
// TRANS: Button text to store form data in the Paths admin panel.
$this->out->submit('save', _m('BUTTON','Save'), 'submit',
// TRANS: Button title text to store form data in the Paths admin panel.
'save', _('Save paths'));
'save', _('Save path settings.'));
}
/**
......
......@@ -197,7 +197,7 @@ class SiteNoticeAdminPanelForm extends AdminForm
_m('BUTTON','Save'),
'submit',
null,
// TRANS: Title for button to save site notice in admin panel.
// TRANS: Button title to save site notice in admin panel.
_('Save site notice.')
);
}
......
......@@ -252,7 +252,7 @@ class SnapshotAdminPanelForm extends AdminForm
_m('BUTTON','Save'),
'submit',
null,
// TRANS: Title for button to save snapshot settings.
// TRANS: Button title to save snapshot settings.
_('Save snapshot settings.')
);
}
......
......@@ -300,7 +300,7 @@ class UserAdminPanelForm extends AdminForm
_m('BUTTON','Save'),
'submit',
null,
// TRANS: Title for button to save user settings in user admin panel.
// TRANS: Button title to save user settings in user admin panel.
_('Save user settings.'));
}
}
......@@ -350,10 +350,10 @@ class ApplicationEditForm extends Form
// TRANS: Button label in the "Edit application" form.
$this->out->submit('cancel', _m('BUTTON','Cancel'), 'submit form_action-primary',
// TRANS: Submit button title.
'cancel', _('Cancel'));
'cancel', _('Cancel application changes.'));
// TRANS: Button label in the "Edit application" form.
$this->out->submit('save', _m('BUTTON','Save'), 'submit form_action-secondary',
// TRANS: Submit button title.
'save', _('Save'));
'save', _('Save application changes.'));
}
}
......@@ -136,8 +136,8 @@ class DisfavorForm extends Form
_m('BUTTON','Disfavor favorite'),
'submit',
null,
// TRANS: Title for button text for removing the favourite status for a favourite notice.
_('Disfavor this notice'));
// TRANS: Button title for removing the favourite status for a favourite notice.
_('Remove this notice from your list of favorite notices.'));
}
/**
......
......@@ -135,8 +135,8 @@ class FavorForm extends Form
_m('BUTTON','Favor'),
'submit',
null,
// TRANS: Title for button text for adding the favourite status to a notice.
_('Favor this notice'));
// TRANS: Button title for adding the favourite status to a notice.
_('Add this notice to your list of favorite notices.');
}
/**
......
......@@ -125,6 +125,6 @@ class GroupBlockForm extends Form
'submit',
null,
// TRANS: Submit button title.
_m('TOOLTIP', 'Block this user'));
_m('TOOLTIP', 'Block this user so that they can no longer post messages to it.'));
}
}
......@@ -121,6 +121,6 @@ class MakeAdminForm extends Form
'submit',
null,
// TRANS: Submit button title.
_m('TOOLTIP','Make this user an admin'));
_m('TOOLTIP','Make this user an admin.'));
}
}
......@@ -626,7 +626,7 @@ class NoticeListItem extends Widget
$this->out->elementStart('a', array('href' => $reply_url,
'class' => 'notice_reply',
// TRANS: Link title in notice list item to reply to a notice.
'title' => _('Reply to this notice')));
'title' => _('Reply to this notice.')));
// TRANS: Link text in notice list item to reply to a notice.
$this->out->text(_('Reply'));
$this->out->text(' ');
......@@ -654,7 +654,7 @@ class NoticeListItem extends Widget
$this->out->element('a', array('href' => $deleteurl,
'class' => 'notice_delete',
// TRANS: Link title in notice list item to delete a notice.
'title' => _('Delete this notice')),
'title' => _('Delete this notice from the timeline.')),
// TRANS: Link text in notice list item to delete a notice.
_('Delete'));
}
......
......@@ -131,6 +131,6 @@ class UnsubscribeForm extends Form
// TRANS: Button text on unsubscribe form.
$this->out->submit('submit', _m('BUTTON','Unsubscribe'), 'submit', null,
// TRANS: Button title on unsubscribe form.
_('Unsubscribe from this user'));
_('Unsubscribe from this user.'));
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment