git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit ee9176f2 authored by mmn's avatar mmn

Merge branch 'drop_corporate_text' into 'nightly'

Drop corporate text plus minor rewording

Following [this discussion](https://gnusocial.no/conversation/190441#notice-190441) I only fixed corporate-only occurrences. I suggest People instead of User directory. Moreover I fixed a minor inconsistency (Trends should be preferred to Trending topics).

The full locale folder should be fixed once we have digitaldreamer's feedback. But we can at least start from this.

See merge request !16
parents 1d111533 267a4910
......@@ -53,7 +53,7 @@ class InviteButtonSection extends Section
$this->out = $out;
if (empty($buttonText)) {
// TRANS: Default button text for inviting more users to the StatusNet instance.
$this->buttonText = _m('BUTTON', 'Invite more colleagues');
$this->buttonText = _m('BUTTON', 'Invite more people');
} else {
$this->buttonText = $buttonText;
}
......
......@@ -50,7 +50,7 @@ class PublicTagCloudSection extends TagCloudSection
function title()
{
// TRANS: Title for inbox tag cloud section.
return _m('TITLE', 'Trending topics');
return _m('TITLE', 'Trends');
}
function getTags()
......
......@@ -87,10 +87,9 @@ class ToSelector extends Widget
$choices['public:everyone'] = _m('SENDTO','Everyone');
$default = 'public:everyone';
}
// XXX: better name...?
// TRANS: Option in drop-down of potential addressees.
// TRANS: %s is a StatusNet sitename.
$choices['public:site'] = sprintf(_('My colleagues at %s'), common_config('site', 'name'));
$choices['public:site'] = sprintf(_('Everyone at %s'), common_config('site', 'name'));
$groups = $this->user->getGroups();
......
......@@ -238,9 +238,9 @@ class DirectoryPlugin extends Plugin
$nav->out->menuItem(
common_local_url('userdirectory'),
// TRANS: Menu item text for user directory.
_m('MENU','Directory'),
_m('MENU','People'),
// TRANS: Menu item title for user directory.
_m('User Directory.'),
_m('People.'),
$actionName == 'userdirectory',
'nav_directory'
);
......
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