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

This commit is contained in:
Evan Prodromou
2011-08-18 17:27:55 -07:00
14 changed files with 20 additions and 20 deletions

View File

@@ -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.'));
}
}

View File

@@ -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.'));
}
/**

View File

@@ -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.');
}
/**

View File

@@ -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.'));
}
}

View File

@@ -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.'));
}
}

View File

@@ -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'));
}

View File

@@ -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.'));
}
}