diff options
author | Corey Hulen <corey@hulen.com> | 2016-05-04 06:31:42 -0700 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-05-04 09:31:42 -0400 |
commit | 6611229cd7bd3cdfc0082c0a581145aaac0ab322 (patch) | |
tree | db6670a8c2716179bfe6e07b82588d83d3afb6bd /webapp/i18n | |
parent | 6b06f49e8910ed44f619adad15ab268758312852 (diff) | |
download | chat-6611229cd7bd3cdfc0082c0a581145aaac0ab322.tar.gz chat-6611229cd7bd3cdfc0082c0a581145aaac0ab322.tar.bz2 chat-6611229cd7bd3cdfc0082c0a581145aaac0ab322.zip |
PLT-2707 Adding option to show DM list from all of server (#2871)
* PLT-2707 Adding option to show DM list from all of server
* Fixing loc
Diffstat (limited to 'webapp/i18n')
-rw-r--r-- | webapp/i18n/en.json | 9 | ||||
-rw-r--r-- | webapp/i18n/es.json | 2 | ||||
-rw-r--r-- | webapp/i18n/fr.json | 2 | ||||
-rw-r--r-- | webapp/i18n/ja.json | 2 | ||||
-rw-r--r-- | webapp/i18n/pt.json | 2 |
5 files changed, 12 insertions, 5 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index fbbf66fbd..da2acba3d 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -542,6 +542,10 @@ "admin.team.userCreationTitle": "Enable User Creation: ", "admin.team_analytics.activeUsers": "Active Users With Posts", "admin.team_analytics.totalPosts": "Total Posts", + "admin.team.restrictDirectMessage": "Enable users to open Direct Message channels with:", + "admin.team.restrictDirectMessageDesc": "'Any user on the Mattermost server' enables users to open a Direct Message channel with any user on the server, even if they are not on any teams together. 'Any member of the team' limits the ability to open Direct Message channels to only users who are in the same team.", + "admin.team.restrict_direct_message_any": "Any user on the Mattermost server", + "admin.team.restrict_direct_message_team": "Any member of the team", "admin.userList.title": "Users for {team}", "admin.userList.title2": "Users for {team} ({count})", "admin.user_item.authServiceEmail": ", <strong>Sign-in Method:</strong> Email", @@ -859,6 +863,9 @@ "file_upload.pasted": "Image Pasted at ", "filtered_user_list.count": "{count} {count, plural, =0 {0 members} one {member} other {members}}", "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 members} one {member} other {members}} of {total} Total", + "filtered_user_list.show": "Show", + "filtered_user_list.any_team": "All Users", + "filtered_user_list.team_only": "Members of this Team", "filtered_user_list.member": "Member", "filtered_user_list.search": "Search members", "find_team.email": "Email", @@ -1120,7 +1127,7 @@ "sidebar.createChannel": "Create new channel", "sidebar.createGroup": "Create new group", "sidebar.direct": "Direct Messages", - "sidebar.more": "More ({count})", + "sidebar.more": "More", "sidebar.moreElips": "More...", "sidebar.pg": "Private Groups", "sidebar.removeList": "Remove from list", diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json index 34e4360b5..b6189916e 100644 --- a/webapp/i18n/es.json +++ b/webapp/i18n/es.json @@ -1118,7 +1118,7 @@ "sidebar.createChannel": "Crear un nuevo canal", "sidebar.createGroup": "Crear un nuevo grupo", "sidebar.direct": "Mensajes Directos", - "sidebar.more": "Más ({count})", + "sidebar.more": "Más", "sidebar.moreElips": "Más...", "sidebar.pg": "Grupos Privados", "sidebar.removeList": "Remover de la lista", diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json index c92dff181..31f646d84 100644 --- a/webapp/i18n/fr.json +++ b/webapp/i18n/fr.json @@ -976,7 +976,7 @@ "sidebar.createChannel": "Créer un nouveau canal", "sidebar.createGroup": "Créer un nouveau groupe", "sidebar.direct": "Messages privés", - "sidebar.more": "Plus ({count})", + "sidebar.more": "Plus", "sidebar.moreElips": "Plus...", "sidebar.pg": "Groupes privés", "sidebar.removeList": "Retirer de la liste", diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json index 88e10498e..f6bc8cc7d 100644 --- a/webapp/i18n/ja.json +++ b/webapp/i18n/ja.json @@ -1078,7 +1078,7 @@ "sidebar.createChannel": "新しいチャンネルを作成する", "sidebar.createGroup": "新しいグループを作成する", "sidebar.direct": "ダイレクトメッセージ", - "sidebar.more": "もっと表示する({count})", + "sidebar.more": "もっと表示する", "sidebar.moreElips": "もっと…", "sidebar.pg": "非公開グループ", "sidebar.removeList": "一覧から削除する", diff --git a/webapp/i18n/pt.json b/webapp/i18n/pt.json index d10487c79..501727f98 100644 --- a/webapp/i18n/pt.json +++ b/webapp/i18n/pt.json @@ -1120,7 +1120,7 @@ "sidebar.createChannel": "Criar novo canal", "sidebar.createGroup": "Criar um novo grupo", "sidebar.direct": "Mensagens Diretas", - "sidebar.more": "Mais ({count})", + "sidebar.more": "Mais", "sidebar.moreElips": "Mais...", "sidebar.pg": "Grupos Privados", "sidebar.removeList": "Remover da lista", |