summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-12-11 01:49:38 -0300
committerGitHub <noreply@github.com>2016-12-11 01:49:38 -0300
commit40afc39684890d9560f3ff34a9435c003dbba999 (patch)
tree61ab9b986eaa8a0e11c280080cc44f14b6e4e929 /webapp/i18n/en.json
parentddacfa58ba25002a7c3c35a1fe89898bb6e78c0a (diff)
downloadchat-40afc39684890d9560f3ff34a9435c003dbba999.tar.gz
chat-40afc39684890d9560f3ff34a9435c003dbba999.tar.bz2
chat-40afc39684890d9560f3ff34a9435c003dbba999.zip
translations PR 20161208 (#4740)
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r--webapp/i18n/en.json8
1 files changed, 4 insertions, 4 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 55768d7c6..5cc7f0bbf 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1264,6 +1264,7 @@
"general_tab.codeTitle": "Invite Code",
"general_tab.dirDisabled": "Team Directory has been disabled. Please ask a System Admin to enable the Team Directory in the System Console team settings.",
"general_tab.dirOff": "Team directory is turned off for this system.",
+ "general_tab.emptyDescription": "Click 'Edit' to add a team description.",
"general_tab.includeDirDesc": "Including this team will display the team name from the Team Directory section of the Home Page, and provide a link to the sign-in page.",
"general_tab.includeDirTitle": "Include this team in the Team Directory",
"general_tab.no": "No",
@@ -1271,13 +1272,12 @@
"general_tab.openInviteTitle": "Allow any user with an account on this server to join this team",
"general_tab.regenerate": "Regenerate",
"general_tab.required": "This field is required",
- "general_tab.teamName": "Team Name",
- "general_tab.teamNameInfo": "Set the name of the team as it appears on your sign-in screen and at the top of the left-hand sidebar.",
"general_tab.teamDescription": "Team Description",
"general_tab.teamDescriptionInfo": "Team description provides additional information to help users select the right team. Maximum of 50 characters.",
+ "general_tab.teamName": "Team Name",
+ "general_tab.teamNameInfo": "Set the name of the team as it appears on your sign-in screen and at the top of the left-hand sidebar.",
"general_tab.title": "General Settings",
"general_tab.yes": "Yes",
- "general_tab.emptyDescription": "Click 'Edit' to add a team description.",
"get_app.alreadyHaveIt": "Already have it?",
"get_app.androidAppName": "Mattermost for Android",
"get_app.androidHeader": "Mattermost works best if you switch to our Android app",
@@ -1793,8 +1793,8 @@
"team_import_tab.failure": " Import failure: ",
"team_import_tab.import": "Import",
"team_import_tab.importHelpDocsLink": "documentation",
- "team_import_tab.importHelpExporterLink": "Slack Advanced Exporter",
"team_import_tab.importHelpExportInstructions": "Slack > Team Settings > Import/Export Data > Export > Start Export",
+ "team_import_tab.importHelpExporterLink": "Slack Advanced Exporter",
"team_import_tab.importHelpLine1": "Slack import to Mattermost supports importing of messages in your Slack team's public channels.",
"team_import_tab.importHelpLine2": "To import a team from Slack, go to {exportInstructions}. See {uploadDocsLink} to learn more.",
"team_import_tab.importHelpLine3": "To import posts with attached files, see {slackAdvancedExporterLink} for details.",