GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'drop_corporate_text' into 'nightly'

Browse Source 
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
This commit is contained in:
mmn 2015-06-20 22:48:31 +00:00
commit ee9176f20d
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/invitebuttonsection.php
View File

@ -53,7 +53,7 @@ class InviteButtonSection extends Section
$this->out = $out; $this->out = $out;
if (empty($buttonText)) { if (empty($buttonText)) {
// TRANS: Default button text for inviting more users to the StatusNet instance. // 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 { } else {
$this->buttonText = $buttonText; $this->buttonText = $buttonText;
} }

2
lib/publictagcloudsection.php
View File

@ -50,7 +50,7 @@ class PublicTagCloudSection extends TagCloudSection
function title() function title()
{ {
// TRANS: Title for inbox tag cloud section. // TRANS: Title for inbox tag cloud section.
return _m('TITLE', 'Trending topics'); return _m('TITLE', 'Trends');
} }
function getTags() function getTags()

3
lib/toselector.php
View File

@ -87,10 +87,9 @@ class ToSelector extends Widget
$choices['public:everyone'] = _m('SENDTO','Everyone'); $choices['public:everyone'] = _m('SENDTO','Everyone');
$default = 'public:everyone'; $default = 'public:everyone';
} }
// XXX: better name...?
// TRANS: Option in drop-down of potential addressees. // TRANS: Option in drop-down of potential addressees.
// TRANS: %s is a StatusNet sitename. // 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(); $groups = $this->user->getGroups();

4
plugins/Directory/DirectoryPlugin.php
View File

@ -238,9 +238,9 @@ class DirectoryPlugin extends Plugin
$nav->out->menuItem( $nav->out->menuItem(
common_local_url('userdirectory'), common_local_url('userdirectory'),
// TRANS: Menu item text for user directory. // TRANS: Menu item text for user directory.
_m('MENU','Directory'), _m('MENU','People'),
// TRANS: Menu item title for user directory. // TRANS: Menu item title for user directory.
_m('User Directory.'), _m('People.'),
$actionName == 'userdirectory', $actionName == 'userdirectory',
'nav_directory' 'nav_directory'
); );