PLT-5873 Renamed private groups to private channels (#5924)

* PLT-5873 Renamed private groups to private channels in web app

* PLT-5873 Renamed private groups to private channels in server
Этот коммит содержится в:
Harrison Healey
2017-04-03 08:42:05 -04:00
коммит произвёл George Goldberg
родитель 06e09a0553
Коммит 36c74d7b47
20 изменённых файлов: 150 добавлений и 323 удалений

Просмотреть файл

@@ -446,7 +446,7 @@ export default class Sidebar extends React.Component {
<div>
<FormattedHTMLMessage
id='sidebar.tutorialScreen1'
defaultMessage='<h4>Channels</h4><p><strong>Channels</strong> organize conversations across different topics. Theyre open to everyone on your team. To send private communications use <strong>Direct Messages</strong> for a single person or <strong>Private Groups</strong> for multiple people.</p>'
defaultMessage='<h4>Channels</h4><p><strong>Channels</strong> organize conversations across different topics. Theyre open to everyone on your team. To send private communications use <strong>Direct Messages</strong> for a single person or <strong>Private Channels</strong> for multiple people.</p>'
/>
</div>
);
@@ -473,7 +473,7 @@ export default class Sidebar extends React.Component {
id='sidebar.tutorialScreen3'
defaultMessage='<h4>Creating and Joining Channels</h4>
<p>Click <strong>"More..."</strong> to create a new channel or join an existing one.</p>
<p>You can also create a new channel or private group by clicking the <strong>"+" symbol</strong> next to the channel or private group header.</p>'
<p>You can also create a new public or private channel by clicking the <strong>"+" symbol</strong> next to the public or private channel header.</p>'
/>
</div>
);
@@ -700,7 +700,7 @@ export default class Sidebar extends React.Component {
<Tooltip id='new-channel-tooltip' >
<FormattedMessage
id='sidebar.createChannel'
defaultMessage='Create new channel'
defaultMessage='Create new public channel'
/>
</Tooltip>
);
@@ -708,7 +708,7 @@ export default class Sidebar extends React.Component {
<Tooltip id='new-group-tooltip'>
<FormattedMessage
id='sidebar.createGroup'
defaultMessage='Create new group'
defaultMessage='Create new private channel'
/>
</Tooltip>
);
@@ -872,7 +872,7 @@ export default class Sidebar extends React.Component {
<h4>
<FormattedMessage
id='sidebar.pg'
defaultMessage='Private Groups'
defaultMessage='Private Channels'
/>
{createPrivateChannelIcon}
</h4>