summaryrefslogtreecommitdiffstats
path: root/webapp/i18n
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-05-31 16:51:42 -0400
committerGitHub <noreply@github.com>2017-05-31 16:51:42 -0400
commit5aaedb9663b987caf1fb11ea6062bcc44e6bafca (patch)
treebd77c10168f9fb1b0f998b08a3b2a3761512a451 /webapp/i18n
parent8ce72aedc3a5b4f783fb6ebab38aac8bf5f413ae (diff)
downloadchat-5aaedb9663b987caf1fb11ea6062bcc44e6bafca.tar.gz
chat-5aaedb9663b987caf1fb11ea6062bcc44e6bafca.tar.bz2
chat-5aaedb9663b987caf1fb11ea6062bcc44e6bafca.zip
PLT-5699 Improvements to channel switcher (#6486)
* Refactor channel switcher to not wait on server results * Change channel switcher to quick switcher and include team switching * Add sections, update ordering and add discoverability button * Fix styling error * Use CMD in text if on mac * Clean yarn cache on every install * Various UX updates per feedback * Add shortcut help text for team switcher * Couple more updates per feedback * Some minor fixes for GM and autocomplete race * Updating UI for channel switcher (#6504) * Updating channel switcher button (#6506) * Updating switcher modal on mobile (#6507) * Removed jQuery usage * Rename function to toggleQuickSwitchModal
Diffstat (limited to 'webapp/i18n')
-rwxr-xr-xwebapp/i18n/en.json14
1 files changed, 13 insertions, 1 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 41f830ac8..a73068360 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1161,7 +1161,14 @@
"channel_select.placeholder": "--- Select a channel ---",
"channel_switch_modal.dm": "(Direct Message)",
"channel_switch_modal.failed_to_open": "Failed to open channel.",
- "channel_switch_modal.help": "Type channel name. Use ↑↓ to browse, TAB to select, ↵ to confirm, ESC to dismiss",
+ "quick_switch_modal.help": "Use TAB to toggle between teams/channels, ↑↓ to browse, ↵ to confirm, ESC to dismiss",
+ "quick_switch_modal.help_no_team": "Type a channel name. Use ↑↓ to browse, ↵ to confirm, ESC to dismiss",
+ "quick_switch_modal.channels": "Channels",
+ "quick_switch_modal.teams": "Teams",
+ "quick_switch_modal.teamsShortcut.mac": "(CMD+ALT+K)",
+ "quick_switch_modal.teamsShortcut.windows": "(CTRL+ALT+K)",
+ "quick_switch_modal.channelsShortcut.mac": "(CMD+K)",
+ "quick_switch_modal.channelsShortcut.windows": "(CTRL+K)",
"channel_switch_modal.not_found": "No matches found.",
"channel_switch_modal.submit": "Switch",
"channel_switch_modal.title": "Switch Channels",
@@ -1950,6 +1957,8 @@
"sidebar.moreElips": "More...",
"sidebar.otherMembers": "Outside this team",
"sidebar.pg": "Private Channels",
+ "sidebar.switch_channels": "Switch Channels (CTRL + K)",
+ "sidebar.switch_channels.mac": "Switch Channels (CMD + K)",
"sidebar.removeList": "Remove from list",
"sidebar.tutorialScreen1": "<h4>Channels</h4><p><strong>Channels</strong> organize conversations across different topics. They’re open to everyone on your team. To send private communications use <strong>Direct Messages</strong> for a single person or <strong>Private Channel</strong> for multiple people.</p>",
"sidebar.tutorialScreen2": "<h4>\"{townsquare}\" and \"{offtopic}\" channels</h4><p>Here are two public channels to start:</p><p><strong>{townsquare}</strong> is a place for team-wide communication. Everyone in your team is a member of this channel.</p><p><strong>{offtopic}</strong> is a place for fun and humor outside of work-related channels. You and your team can decide what other channels to create.</p>",
@@ -2022,7 +2031,10 @@
"sso_signup.length_error": "Name must be 3 or more characters up to a maximum of 15",
"sso_signup.teamName": "Enter name of new team",
"sso_signup.team_error": "Please enter a team name",
+ "suggestion.loading": "Loading...",
"suggestion.mention.all": "CAUTION: This mentions everyone in channel",
+ "suggestion.mention.in_channel": "Channels",
+ "suggestion.mention.not_in_channel": "Other Channels",
"suggestion.mention.channel": "Notifies everyone in the channel",
"suggestion.mention.channels": "My Channels",
"suggestion.mention.here": "Notifies everyone in the channel and online",