From f9c51c247839344f2a1b2015ae2725cd0308d64b Mon Sep 17 00:00:00 2001
From: aroquen <aroquen@sfr.fr>
Date: Sun, 7 Jun 2015 22:24:14 +0200
Subject: [PATCH 1/3] No corporate-only strings in code base anymore

---
 lib/invitebuttonsection.php | 2 +-
 lib/toselector.php          | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/invitebuttonsection.php b/lib/invitebuttonsection.php
index 57e204cf86..37bbfe92a2 100644
--- a/lib/invitebuttonsection.php
+++ b/lib/invitebuttonsection.php
@@ -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;
         }
diff --git a/lib/toselector.php b/lib/toselector.php
index 566b6a0f29..153d9001b5 100644
--- a/lib/toselector.php
+++ b/lib/toselector.php
@@ -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();
 

From a42d74a238d98948463f4558c21fd6b76610b454 Mon Sep 17 00:00:00 2001
From: aroquen <aroquen@sfr.fr>
Date: Sun, 7 Jun 2015 22:27:31 +0200
Subject: [PATCH 2/3] Rewording: people instead of user directory

---
 plugins/Directory/DirectoryPlugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php
index cae94e3427..e06c1c7271 100644
--- a/plugins/Directory/DirectoryPlugin.php
+++ b/plugins/Directory/DirectoryPlugin.php
@@ -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'
         );

From 267a49103e3527395cd2f8f3a87612d38c9eee6a Mon Sep 17 00:00:00 2001
From: aroquen <aroquen@sfr.fr>
Date: Sun, 7 Jun 2015 22:28:19 +0200
Subject: [PATCH 3/3] Rewording: trends instead of trending topics for
 consistency with other occurrences

---
 lib/publictagcloudsection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/publictagcloudsection.php b/lib/publictagcloudsection.php
index 1d9dd0e751..bf88091a90 100644
--- a/lib/publictagcloudsection.php
+++ b/lib/publictagcloudsection.php
@@ -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()