From 528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 15 Jun 2017 11:05:43 -0400 Subject: Merge release-3.10 into master (#6654) * PLT-6787 Fixed being able to send a post before files finished uploading (#6617) * Fix quick switcher for channels/users not stored locally (#6610) * Fix button text on confirm mention modal (#6609) * fix post delete permission of channel admin (#6608) * open comment thread for the most recent reply-able message (#6605) * Use mutex flag with yarn to prevent concurrent builds interfering (#6619) * Use mutex flag with yarn to prevent concurrent builds interfering * Remove yarn mutex file with clean * Minor bug fixes (#6615) * PLT-6774 - Fixing color for offline icon * PLT-6784 - Fixing status icon * Fixing icon margin * Updating caret position * PLT-6070 Have ChannelMentionProvider stop searching after a term returns no results (#6620) * Fixing JS error (#6623) * Minor bug fixes (#6622) * PLT-6808 - Updating channel switcher on mobile * PLT-6743 - Updating scrollbar styling * Login instead of failing if user exists in OAuth sign-up flow (#6627) * PLT-6802 Disable team switcher (#6626) * Disable team switcher * Fix ESLint errors * PLT-6807 Ensured select teams page can scroll on iOS (#6630) * Do not redirect from account switch pages on 401 (#6631) * Fixing loadtest command and renaming to /test (#6624) * PLT-6820 Update mattermost-redux dependency (#6632) * translations PR 20170612 (#6629) * Bump HTTP client timeout to 30 seconds (#6633) * For team unreads return empty array instead of null (#6636) * PLT-6831 Fix status modal localization IDs (#6637) * Fix status modal localization IDs * Update test snapshot --- webapp/i18n/en.json | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'webapp/i18n/en.json') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 9cb75648c..33d87ce01 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1170,7 +1170,7 @@ "channel_switch_modal.dm": "(Direct Message)", "channel_switch_modal.failed_to_open": "Failed to open channel.", "quick_switch_modal.help": "Start typing then use TAB to toggle channels/teams, ↑↓ to browse, ↵ to select, and ESC to dismiss.", - "quick_switch_modal.help_no_team": "Start typing then use ↑↓ to browse, ↵ to select, and ESC to dismiss.", + "quick_switch_modal.help_no_team": "Type to find a channel. Use ↑↓ to browse, ↵ to select, ESC to dismiss.", "quick_switch_modal.channels": "Channels", "quick_switch_modal.teams": "Teams", "quick_switch_modal.teamsShortcut.mac": "- ⌘⌥K", @@ -1692,6 +1692,7 @@ "mobile.account_notifications.threads_mentions": "Mentions in threads", "mobile.account_notifications.threads_start": "Threads that I start", "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in", + "mobile.channel_drawer.search": "Jump to a conversation", "mobile.channel_info.alertMessageDeleteChannel": "Are you sure you want to delete the {term} {name}?", "mobile.channel_info.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?", "mobile.channel_info.alertNo": "No", @@ -1708,6 +1709,7 @@ "mobile.channel_list.closeGM": "Close Group Message", "mobile.channel_list.dm": "Direct Message", "mobile.channel_list.gm": "Group Message", + "mobile.channel_list.not_member": "NOT A MEMBER", "mobile.channel_list.open": "Open {term}", "mobile.channel_list.openDM": "Open Direct Message", "mobile.channel_list.openGM": "Open Group Message", @@ -1724,11 +1726,12 @@ "mobile.create_channel.private": "New Private Channel", "mobile.create_channel.public": "New Public Channel", "mobile.custom_list.no_results": "No Results", + "mobile.drawer.teamsTitle": "Teams", "mobile.edit_post.title": "Editing Message", "mobile.file_upload.camera": "Take Photo or Video", "mobile.file_upload.library": "Photo Library", "mobile.file_upload.more": "More", - "mobile.file_upload.video": "Video Libary", + "mobile.file_upload.video": "Video Library", "mobile.help.title": "Help", "mobile.intro_messages.DM": "This is the start of your direct message history with {teammate}. Direct messages and files shared here are not shown to people outside this area.", "mobile.intro_messages.default_message": "This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.", @@ -1776,6 +1779,11 @@ "mobile.server_url.invalid_format": "URL must start with http:// or https://", "mobile.session_expired": "Session Expired: Please log in to continue receiving notifications.", "mobile.settings.team_selection": "Team Selection", + "modal.manaul_status.ask": "Do not ask me again", + "modal.manaul_status.button": "Yes, set my status to \"Online\"", + "modal.manaul_status.cancel": "No, keep it as \"{status}\"", + "modal.manaul_status.message": "Would you like to switch your status to \"Online\"?", + "modal.manaul_status.title": "Your status is set to \"{status}\"", "more_channels.close": "Close", "more_channels.create": "Create New Channel", "more_channels.createClick": "Click 'Create New Channel' to make a new one", @@ -1789,11 +1797,6 @@ "more_direct_channels.new_convo_note": "This will start a new conversation. If you’re adding a lot of people, consider creating a private channel instead.", "more_direct_channels.new_convo_note.full": "You’ve reached the maximum number of people for this conversation. Consider creating a private channel instead.", "more_direct_channels.title": "Direct Messages", - "modal.manaul_status.title": "Your status is set to \"{status}\"", - "modal.manaul_status.message": "Would you like to switch your status to \"Online\"?", - "modal.manaul_status.button": "Yes, set my status to \"Online\"", - "modal.manaul_status.cancel": "No, keep it as \"{status}\"", - "modal.manaul_status.ask": "Do not ask me again", "msg_typing.areTyping": "{users} and {last} are typing...", "msg_typing.isTyping": "{user} is typing...", "msg_typing.someone": "Someone", @@ -1886,6 +1889,12 @@ "posts_view.loadMore": "Load more messages", "posts_view.newMsg": "New Messages", "posts_view.newMsgBelow": "New {count, plural, one {message} other {messages}} below", + "quick_switch_modal.channels": "Channels", + "quick_switch_modal.channelsShortcut.mac": "- ⌘K", + "quick_switch_modal.channelsShortcut.windows": "- CTRL+K", + "quick_switch_modal.teams": "Teams", + "quick_switch_modal.teamsShortcut.mac": "- ⌘⌥K", + "quick_switch_modal.teamsShortcut.windows": "- CTRL+ALT+K", "reaction.clickToAdd": "(click to add)", "reaction.clickToRemove": "(click to remove)", "reaction.othersReacted": "{otherUsers, number} {otherUsers, plural, one {user} other {users}}", @@ -2047,6 +2056,9 @@ "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", + "status_dropdown.set_away": "Away", + "status_dropdown.set_offline": "Offline", + "status_dropdown.set_online": "Online", "suggestion.loading": "Loading...", "suggestion.mention.all": "CAUTION: This mentions everyone in channel", "suggestion.mention.channel": "Notifies everyone in the channel", @@ -2459,8 +2471,5 @@ "webrtc.unmute_audio": "Unmute microphone", "webrtc.unpause_video": "Turn on camera", "webrtc.unsupported": "{username} client does not support video calls.", - "youtube_video.notFound": "Video not found", - "status_dropdown.set_online": "Online", - "status_dropdown.set_away": "Away", - "status_dropdown.set_offline": "Offline" + "youtube_video.notFound": "Video not found" } -- cgit v1.2.3-1-g7c22