From 4f8abfaeeebcbed03b5f377946d646d52943cc5e Mon Sep 17 00:00:00 2001 From: enahum Date: Thu, 2 Mar 2017 13:23:01 -0300 Subject: translations PR 20170227 (#5554) --- webapp/i18n/en.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'webapp/i18n/en.json') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 48c27df38..7bddea682 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -96,7 +96,6 @@ "add_incoming_webhook.name": "Name", "add_incoming_webhook.save": "Save", "add_incoming_webhook.url": "URL: {url}", - "update_incoming_webhook.update": "Update", "add_oauth_app.callbackUrls.help": "The redirect URIs to which the service will redirect users after accepting or denying authorization of your application, and which will handle authorization codes or access tokens. Must be a valid URL and start with http:// or https://.", "add_oauth_app.callbackUrlsRequired": "One or more callback URLs are required", "add_oauth_app.clientId": "Client ID: {id}", @@ -138,9 +137,6 @@ "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choose when to trigger the outgoing webhook; if the first word of a message matches a Trigger Word exactly, or if it starts with a Trigger Word.", "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "First word matches a trigger word exactly", "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "First word starts with a trigger word", - "update_outgoing_webhook.update": "Update", - "update_outgoing_webhook.confirm": "Edit Outgoing Webhook", - "update_outgoing_webhook.question": "Your changes may break the existing outgoing webhook. Are you sure you would like to update it?", "admin.advance.cluster": "High Availability (Beta)", "admin.advance.metrics": "Performance Monitoring (Beta)", "admin.audits.reload": "Reload User Activity Logs", @@ -322,11 +318,11 @@ "admin.general.policy.permissionsAdmin": "Team and System Admins", "admin.general.policy.permissionsAll": "All team members", "admin.general.policy.permissionsAllChannel": "All channel members", + "admin.general.policy.permissionsChannelAdmin": "Channel, Team and System Admins", "admin.general.policy.permissionsDeletePostAdmin": "Team Admins and System Admins", "admin.general.policy.permissionsDeletePostAll": "Message authors can delete their own messages, and Administrators can delete any message", "admin.general.policy.permissionsDeletePostSystemAdmin": "System Admins", "admin.general.policy.permissionsSystemAdmin": "System Admins", - "admin.general.policy.permissionsChannelAdmin": "Channel, Team and System Admins", "admin.general.policy.restrictPostDeleteDescription": "Set policy on who has permission to delete messages.", "admin.general.policy.restrictPostDeleteTitle": "Allow which users to delete messages:", "admin.general.policy.restrictPrivateChannelCreationDescription": "Set policy on who can create private groups.", @@ -1136,6 +1132,7 @@ "channel_modal.publicChannel2": "Create a new public channel anyone can join. ", "channel_modal.purpose": "Purpose", "channel_modal.purposeEx": "E.g.: \"A channel to file bugs and improvements\"", + "channel_notification.push": "Send mobile push notifications", "channel_notifications.allActivity": "For all activity", "channel_notifications.allUnread": "For all unread messages", "channel_notifications.globalDefault": "Global default ({notifyLevel})", @@ -1145,7 +1142,6 @@ "channel_notifications.override": "Selecting an option other than \"Default\" will override the global notification settings. Desktop notifications are available on Firefox, Safari, and Chrome.", "channel_notifications.overridePush": "Selecting an option other than \"Global default\" will override the global notification settings for mobile push notifications in account settings. Push notifications must be enabled by the System Admin.", "channel_notifications.preferences": "Notification Preferences for ", - "channel_notification.push": "Send mobile push notifications", "channel_notifications.sendDesktop": "Send desktop notifications", "channel_notifications.unreadInfo": "The channel name is bolded in the sidebar when there are unread messages. Selecting \"Only for mentions\" will bold the channel only when you are mentioned.", "channel_select.placeholder": "--- Select a channel ---", @@ -1943,6 +1939,10 @@ "update_command.confirm": "Edit Slash Command", "update_command.question": "Your changes may break the existing slash command. Are you sure you would like to update it?", "update_command.update": "Update", + "update_incoming_webhook.update": "Update", + "update_outgoing_webhook.confirm": "Edit Outgoing Webhook", + "update_outgoing_webhook.question": "Your changes may break the existing outgoing webhook. Are you sure you would like to update it?", + "update_outgoing_webhook.update": "Update", "upload_overlay.info": "Drop a file to upload it.", "user.settings.advance.embed_preview": "For the first web link in a message, display a preview of website content below the message, if available", "user.settings.advance.embed_toggle": "Show toggle for all embed previews", -- cgit v1.2.3-1-g7c22