From 4dcb0258a5317df0507fcb8042bffbb9dc6cc0aa Mon Sep 17 00:00:00 2001 From: Lauryn Menard Date: Thu, 18 Apr 2024 15:20:36 +0200 Subject: [PATCH] web-i18n: Update frontend translated strings for stream rename channel. Updates translated strings in web/ that do not need updates to any tests. The majority of these strings are also unique to the file/ template that they are in. A few have overlap with one other file. Some changes here update placeholders/variables in these strings to no longer use stream so that all the translation updates for this rename happen at the same time. The exception to this are cases of "" placeholders in these translated strings. Part of the stream to channel rename project. --- tools/lib/capitalization.py | 2 +- web/src/admin.js | 6 +++--- web/src/buddy_list.ts | 2 +- web/src/compose_banner.ts | 4 ++-- web/src/compose_notifications.ts | 2 +- web/src/compose_tooltips.ts | 2 +- web/src/compose_ui.ts | 6 +++--- web/src/info_overlay.ts | 10 +++++----- web/src/message_edit_history.ts | 2 +- web/src/settings.js | 2 +- web/src/settings_components.ts | 2 +- web/src/settings_org.js | 6 +++--- web/src/settings_streams.js | 4 ++-- web/src/stream_edit.js | 10 +++++----- web/src/stream_edit_subscribers.js | 2 +- web/src/stream_ui_updates.js | 4 ++-- web/src/tippyjs.ts | 8 ++++---- web/src/views_util.ts | 2 +- web/templates/bookend.hbs | 8 ++++---- .../automatic_new_visibility_policy_banner.hbs | 4 ++-- .../compose_banner/not_subscribed_warning.hbs | 8 ++++---- .../stream_does_not_exist_error.hbs | 4 ++-- .../compose_banner/unmute_topic_banner.hbs | 2 +- .../confirm_deactivate_stream.hbs | 6 +++--- .../confirm_merge_topics_with_rename.hbs | 2 +- .../confirm_dialog/confirm_reactivate_bot.hbs | 4 ++-- .../confirm_dialog/confirm_reactivate_user.hbs | 2 +- .../confirm_unsubscribe_private_stream.hbs | 6 +++--- web/templates/invite_user_modal.hbs | 6 +++--- web/templates/message_feed_errors.hbs | 2 +- web/templates/message_view_header.hbs | 4 ++-- web/templates/move_topic_to_stream.hbs | 2 +- web/templates/recent_view_table.hbs | 2 +- web/templates/search_operators.hbs | 10 +++++----- web/templates/settings/data_exports_admin.hbs | 4 ++-- .../settings/default_stream_choice.hbs | 2 +- web/templates/settings/display_settings.hbs | 2 +- .../settings/notification_settings.hbs | 2 +- .../organization_permissions_admin.hbs | 14 +++++++------- .../settings/user_topics_settings.hbs | 2 +- .../stream_settings/add_subscribers_form.hbs | 2 +- .../announce_stream_checkbox.hbs | 2 +- .../browse_streams_list_item.hbs | 2 +- .../change_stream_info_modal.hbs | 2 +- .../confirm_stream_privacy_change_modal.hbs | 2 +- .../copy_email_address_modal.hbs | 4 ++-- .../stream_settings/new_stream_users.hbs | 2 +- .../stream_settings/stream_creation_form.hbs | 12 ++++++------ .../stream_settings/stream_description.hbs | 2 +- .../stream_settings/stream_members.hbs | 2 +- .../stream_settings/stream_settings.hbs | 18 +++++++++--------- .../stream_settings/stream_settings_tip.hbs | 2 +- web/templates/stream_settings/stream_types.hbs | 8 ++++---- web/templates/typeahead_list_item.hbs | 2 +- .../user_group_settings/add_members_form.hbs | 2 +- web/templates/user_stream_list_item.hbs | 2 +- 56 files changed, 120 insertions(+), 120 deletions(-) diff --git a/tools/lib/capitalization.py b/tools/lib/capitalization.py index fcb0c6548d..41ab6479fd 100644 --- a/tools/lib/capitalization.py +++ b/tools/lib/capitalization.py @@ -83,7 +83,7 @@ IGNORED_PHRASES = [ r"acme", # Fragments of larger strings r"is …", - r"your subscriptions on your Streams page", + r"your subscriptions on your Channels page", r"Add global time
Everyone sees global times in their own time zone\.", r"user", r"an unknown operating system", diff --git a/web/src/admin.js b/web/src/admin.js index cb650a8f40..73054a0b69 100644 --- a/web/src/admin.js +++ b/web/src/admin.js @@ -29,8 +29,8 @@ const admin_settings_label = { }), // Organization settings realm_allow_edit_history: $t({defaultMessage: "Enable message edit history"}), - realm_mandatory_topics: $t({defaultMessage: "Require topics in stream messages"}), - realm_new_stream_announcements_stream: $t({defaultMessage: "New stream announcements"}), + realm_mandatory_topics: $t({defaultMessage: "Require topics in channel messages"}), + realm_new_stream_announcements_stream: $t({defaultMessage: "New channel announcements"}), realm_signup_announcements_stream: $t({defaultMessage: "New user announcements"}), realm_zulip_update_announcements_stream: $t({defaultMessage: "Zulip update announcements"}), realm_inline_image_preview: $t({ @@ -42,7 +42,7 @@ const admin_settings_label = { defaultMessage: "Allow message content in message notification emails", }), realm_enable_spectator_access: $t({ - defaultMessage: "Allow creating web-public streams (visible to anyone on the Internet)", + defaultMessage: "Allow creating web-public channels (visible to anyone on the Internet)", }), realm_digest_emails_enabled: $t({ defaultMessage: "Send weekly digest emails to inactive users", diff --git a/web/src/buddy_list.ts b/web/src/buddy_list.ts index 3531d8abc7..84b5eef0fa 100644 --- a/web/src/buddy_list.ts +++ b/web/src/buddy_list.ts @@ -328,7 +328,7 @@ export class BuddyList extends BuddyListConf { let header_text; if (current_sub) { - header_text = $t({defaultMessage: "In this stream"}); + header_text = $t({defaultMessage: "In this channel"}); } else { header_text = $t({defaultMessage: "In this conversation"}); } diff --git a/web/src/compose_banner.ts b/web/src/compose_banner.ts index aab749230e..f466b4af8c 100644 --- a/web/src/compose_banner.ts +++ b/web/src/compose_banner.ts @@ -173,7 +173,7 @@ export function show_stream_does_not_exist_error(stream_name: string): void { const new_row_html = render_stream_does_not_exist_error({ banner_type: ERROR, - stream_name, + channel_name: stream_name, classname: CLASSNAMES.stream_does_not_exist, }); append_compose_banner_to_banner_list($(new_row_html), $("#compose_banners")); @@ -192,7 +192,7 @@ export function show_stream_not_subscribed_error(sub: StreamSubscription): void banner_type: ERROR, banner_text: $t({ defaultMessage: - "You're not subscribed to this stream. You will not be notified if other users reply to your message.", + "You're not subscribed to this channel. You will not be notified if other users reply to your message.", }), button_text: stream_data.can_toggle_subscription(sub) ? $t({defaultMessage: "Subscribe"}) diff --git a/web/src/compose_notifications.ts b/web/src/compose_notifications.ts index 725a925cff..fe8a8ee070 100644 --- a/web/src/compose_notifications.ts +++ b/web/src/compose_notifications.ts @@ -69,7 +69,7 @@ export function notify_automatic_new_visibility_policy( banner_type: compose_banner.SUCCESS, classname: compose_banner.CLASSNAMES.automatic_new_visibility_policy, link_msg_id: data.id, - stream_topic, + channel_topic: stream_topic, narrow_url, followed, button_text: $t({defaultMessage: "Change setting"}), diff --git a/web/src/compose_tooltips.ts b/web/src/compose_tooltips.ts index 0180859196..d194c6a89a 100644 --- a/web/src/compose_tooltips.ts +++ b/web/src/compose_tooltips.ts @@ -171,7 +171,7 @@ export function initialize(): void { narrow_filter.operands("channel")[0] === compose_state.stream_name() ) { display_current_view = $t({ - defaultMessage: "Currently viewing the entire stream.", + defaultMessage: "Currently viewing the entire channel.", }); } else if ( _.isEqual(narrow_filter.sorted_term_types(), ["is-dm"]) && diff --git a/web/src/compose_ui.ts b/web/src/compose_ui.ts index 2ee49ee644..0efc5dac9e 100644 --- a/web/src/compose_ui.ts +++ b/web/src/compose_ui.ts @@ -304,11 +304,11 @@ export function compute_placeholder_text(opts: ComposePlaceholderOptions): strin if (stream_name && opts.topic) { return $t( - {defaultMessage: "Message #{stream_name} > {topic_name}"}, - {stream_name, topic_name: opts.topic}, + {defaultMessage: "Message #{channel_name} > {topic_name}"}, + {channel_name: stream_name, topic_name: opts.topic}, ); } else if (stream_name) { - return $t({defaultMessage: "Message #{stream_name}"}, {stream_name}); + return $t({defaultMessage: "Message #{channel_name}"}, {channel_name: stream_name}); } } else if (opts.direct_message_user_ids.length > 0) { const users = people.get_users_from_ids(opts.direct_message_user_ids); diff --git a/web/src/info_overlay.ts b/web/src/info_overlay.ts index c88f437228..0883447e04 100644 --- a/web/src/info_overlay.ts +++ b/web/src/info_overlay.ts @@ -53,13 +53,13 @@ const markdown_help_rows = [ usage_html: format_usage_html("Ctrl", "Shift", "L"), }, { - markdown: "#**stream name**", - output_html: "

#stream name

", - effect_html: "(links to a stream)", + markdown: "#**channel name**", + output_html: "

#channel name

", + effect_html: "(links to a channel)", }, { - markdown: "#**stream name>topic name**", - output_html: "

#stream name > topic name

", + markdown: "#**channel name>topic name**", + output_html: "

#channel name > topic name

", effect_html: "(links to topic)", }, { diff --git a/web/src/message_edit_history.ts b/web/src/message_edit_history.ts index 2806df4304..b47da2f881 100644 --- a/web/src/message_edit_history.ts +++ b/web/src/message_edit_history.ts @@ -89,7 +89,7 @@ const keyboard_handling_context: messages_overlay_ui.Context = { function get_display_stream_name(stream_id: number): string { const stream_name = sub_store.maybe_get_stream_name(stream_id); if (stream_name === undefined) { - return $t({defaultMessage: "Unknown stream"}); + return $t({defaultMessage: "Unknown channel"}); } return stream_name; } diff --git a/web/src/settings.js b/web/src/settings.js index b429e297de..606ad7d480 100644 --- a/web/src/settings.js +++ b/web/src/settings.js @@ -33,7 +33,7 @@ function setup_settings_label() { }), presence_enabled_parens_text: $t({defaultMessage: "invisible mode off"}), send_stream_typing_notifications: $t({ - defaultMessage: "Let recipients see when I'm typing messages in streams", + defaultMessage: "Let recipients see when I'm typing messages in channels", }), send_private_typing_notifications: $t({ defaultMessage: "Let recipients see when I'm typing direct messages", diff --git a/web/src/settings_components.ts b/web/src/settings_components.ts index 46b8b3badd..3b3e2ad712 100644 --- a/web/src/settings_components.ts +++ b/web/src/settings_components.ts @@ -821,7 +821,7 @@ export function save_discard_widget_status_handler( banner_type: compose_banner.WARNING, banner_text: $t({ defaultMessage: - "Only subscribers can access or join private streams, so you will lose access to this stream if you convert it to a private stream while not subscribed to it.", + "Only subscribers can access or join private channels, so you will lose access to this channel if you convert it to a private channel while not subscribed to it.", }), button_text: $t({defaultMessage: "Subscribe"}), classname: "stream_privacy_warning", diff --git a/web/src/settings_org.js b/web/src/settings_org.js index 4657ace67d..7bbf205958 100644 --- a/web/src/settings_org.js +++ b/web/src/settings_org.js @@ -673,7 +673,7 @@ export function init_dropdown_widgets() { }, default_id: realm.realm_new_stream_announcements_stream_id, unique_id_type: dropdown_widget.DataTypes.NUMBER, - text_if_current_value_not_in_options: $t({defaultMessage: "Cannot view stream"}), + text_if_current_value_not_in_options: $t({defaultMessage: "Cannot view channel"}), }); settings_components.set_new_stream_announcements_stream_widget( new_stream_announcements_stream_widget, @@ -696,7 +696,7 @@ export function init_dropdown_widgets() { }, default_id: realm.realm_signup_announcements_stream_id, unique_id_type: dropdown_widget.DataTypes.NUMBER, - text_if_current_value_not_in_options: $t({defaultMessage: "Cannot view stream"}), + text_if_current_value_not_in_options: $t({defaultMessage: "Cannot view channel"}), }); settings_components.set_signup_announcements_stream_widget(signup_announcements_stream_widget); signup_announcements_stream_widget.setup(); @@ -717,7 +717,7 @@ export function init_dropdown_widgets() { }, default_id: realm.realm_zulip_update_announcements_stream_id, unique_id_type: dropdown_widget.DataTypes.NUMBER, - text_if_current_value_not_in_options: $t({defaultMessage: "Cannot view stream"}), + text_if_current_value_not_in_options: $t({defaultMessage: "Cannot view channel"}), }); settings_components.set_zulip_update_announcements_stream_widget( zulip_update_announcements_stream_widget, diff --git a/web/src/settings_streams.js b/web/src/settings_streams.js index c0750ab519..498a7899bd 100644 --- a/web/src/settings_streams.js +++ b/web/src/settings_streams.js @@ -187,7 +187,7 @@ function show_add_default_streams_modal() { }, error(xhr) { ui_report.error( - $t_html({defaultMessage: "Failed adding one or more streams."}), + $t_html({defaultMessage: "Failed adding one or more channels."}), xhr, $("#dialog_error"), ); @@ -209,7 +209,7 @@ function show_add_default_streams_modal() { } dialog_widget.launch({ - html_heading: $t_html({defaultMessage: "Add default streams"}), + html_heading: $t_html({defaultMessage: "Add default channels"}), html_body, html_submit_button: $t_html({defaultMessage: "Add"}), help_link: "/help/set-default-streams-for-new-users", diff --git a/web/src/stream_edit.js b/web/src/stream_edit.js index 902c7eacc3..520e6a6b60 100644 --- a/web/src/stream_edit.js +++ b/web/src/stream_edit.js @@ -388,7 +388,7 @@ function show_stream_email_address_modal(address) { }); dialog_widget.launch({ - html_heading: $t_html({defaultMessage: "Generate stream email address"}), + html_heading: $t_html({defaultMessage: "Generate channel email address"}), html_body: copy_email_address_modal_html, id: "copy_email_address_modal", html_submit_button: $t_html({defaultMessage: "Copy address"}), @@ -452,8 +452,8 @@ export function initialize() { const change_stream_info_modal = render_change_stream_info_modal(template_data); dialog_widget.launch({ html_heading: $t_html( - {defaultMessage: "Edit #{stream_name}"}, - {stream_name: stream.name}, + {defaultMessage: "Edit #{channel_name}"}, + {channel_name: stream.name}, ), html_body: change_stream_info_modal, id: "change_stream_info_modal", @@ -592,7 +592,7 @@ export function initialize() { const stream_id = get_stream_id(e.target); if (!stream_id) { ui_report.client_error( - $t_html({defaultMessage: "Invalid stream ID"}), + $t_html({defaultMessage: "Invalid channel ID"}), $(".stream_change_property_info"), ); return; @@ -602,7 +602,7 @@ export function initialize() { const stream_id = $(".dialog_submit_button").data("stream-id"); if (!stream_id) { ui_report.client_error( - $t_html({defaultMessage: "Invalid stream ID"}), + $t_html({defaultMessage: "Invalid channel ID"}), $(".stream_change_property_info"), ); return; diff --git a/web/src/stream_edit_subscribers.js b/web/src/stream_edit_subscribers.js index af0b3c55e2..ce2796e0ac 100644 --- a/web/src/stream_edit_subscribers.js +++ b/web/src/stream_edit_subscribers.js @@ -247,7 +247,7 @@ function remove_subscriber({stream_id, target_user_id, $list_entry}) { function removal_failure() { show_stream_subscription_request_result({ - message: $t({defaultMessage: "Error removing user from this stream."}), + message: $t({defaultMessage: "Error removing user from this channel."}), add_class: "text-error", remove_class: "text-success", }); diff --git a/web/src/stream_ui_updates.js b/web/src/stream_ui_updates.js index d1244fe23a..46dba119f6 100644 --- a/web/src/stream_ui_updates.js +++ b/web/src/stream_ui_updates.js @@ -362,11 +362,11 @@ export function update_add_subscriptions_elements(sub) { if (!settings_data.user_can_subscribe_other_users()) { tooltip_message = $t({ defaultMessage: - "You do not have permission to add other users to streams in this organization.", + "You do not have permission to add other users to channels in this organization.", }); } else { tooltip_message = $t({ - defaultMessage: "Only stream members can add users to a private stream.", + defaultMessage: "Only channel members can add users to a private channel.", }); } settings_components.initialize_disable_btn_hint_popover( diff --git a/web/src/tippyjs.ts b/web/src/tippyjs.ts index 3a6ff70654..6612fb5ce5 100644 --- a/web/src/tippyjs.ts +++ b/web/src/tippyjs.ts @@ -380,7 +380,7 @@ export function initialize(): void { delegate("body", { target: ".settings-radio-input-parent.default_stream_private_tooltip", content: $t({ - defaultMessage: "Default streams for new users cannot be made private.", + defaultMessage: "Default channels for new users cannot be made private.", }), appendTo: () => document.body, onHidden(instance) { @@ -391,7 +391,7 @@ export function initialize(): void { delegate("body", { target: ".default-stream.default_stream_private_tooltip", content: $t({ - defaultMessage: "Private streams cannot be default streams for new users.", + defaultMessage: "Private channels cannot be default channels for new users.", }), appendTo: () => document.body, onHidden(instance) { @@ -480,7 +480,7 @@ export function initialize(): void { target: "#stream_creation_form .add_subscribers_disabled", content: $t({ defaultMessage: - "You do not have permission to add other users to streams in this organization.", + "You do not have permission to add other users to channels in this organization.", }), appendTo: () => document.body, onHidden(instance) { @@ -555,7 +555,7 @@ export function initialize(): void { instance.setContent( $t({ defaultMessage: - "You do not have permission to move messages to another stream in this organization.", + "You do not have permission to move messages to another channel in this organization.", }), ); return undefined; diff --git a/web/src/views_util.ts b/web/src/views_util.ts index 09cba27aae..6888a01515 100644 --- a/web/src/views_util.ts +++ b/web/src/views_util.ts @@ -56,7 +56,7 @@ export function filters_dropdown_options(current_value: string | number | undefi unique_id: FILTERS.ALL_TOPICS, name: $t({defaultMessage: "All topics"}), description: $t({ - defaultMessage: "Includes muted streams and topics", + defaultMessage: "Includes muted channels and topics", }), bold_current_selection: current_value === FILTERS.ALL_TOPICS, }, diff --git a/web/templates/bookend.hbs b/web/templates/bookend.hbs index f9bfe40dc5..32c3f217f6 100644 --- a/web/templates/bookend.hbs +++ b/web/templates/bookend.hbs @@ -7,20 +7,20 @@ {{else}} {{#if deactivated}} - {{t "This stream has been archived." }} + {{t "This channel has been archived." }} {{else if subscribed }} {{#tr}} - You subscribed to stream . + You subscribed to channel . {{#*inline "z-stream-name"}}{{> stream_privacy }} {{stream_name}}{{/inline}} {{/tr}} {{else if just_unsubscribed }} {{#tr}} - You unsubscribed from stream . + You unsubscribed from channel . {{#*inline "z-stream-name"}}{{> stream_privacy }} {{stream_name}}{{/inline}} {{/tr}} {{else}} {{#tr}} - You are not subscribed to stream . + You are not subscribed to channel . {{#*inline "z-stream-name"}}{{> stream_privacy }} {{stream_name}}{{/inline}} {{/tr}} {{/if}} diff --git a/web/templates/compose_banner/automatic_new_visibility_policy_banner.hbs b/web/templates/compose_banner/automatic_new_visibility_policy_banner.hbs index 4ad7e12ad8..a82493f5cd 100644 --- a/web/templates/compose_banner/automatic_new_visibility_policy_banner.hbs +++ b/web/templates/compose_banner/automatic_new_visibility_policy_banner.hbs @@ -2,12 +2,12 @@ diff --git a/web/templates/compose_banner/stream_does_not_exist_error.hbs b/web/templates/compose_banner/stream_does_not_exist_error.hbs index beda3cd6af..07aa2c4825 100644 --- a/web/templates/compose_banner/stream_does_not_exist_error.hbs +++ b/web/templates/compose_banner/stream_does_not_exist_error.hbs @@ -1,8 +1,8 @@ {{#> compose_banner }} diff --git a/web/templates/compose_banner/unmute_topic_banner.hbs b/web/templates/compose_banner/unmute_topic_banner.hbs index 77ef7a1e91..f7cb13b443 100644 --- a/web/templates/compose_banner/unmute_topic_banner.hbs +++ b/web/templates/compose_banner/unmute_topic_banner.hbs @@ -1,7 +1,7 @@ {{#> compose_banner }}

{{#tr}} - Archiving stream will immediately unsubscribe everyone. This action cannot be undone. + Archiving channel will immediately unsubscribe everyone. This action cannot be undone. {{#*inline "z-stream"}}{{{stream_name_with_privacy_symbol_html}}}{{/inline}} {{/tr}}

{{#if is_announcement_stream}} -

{{#tr}}Archiving this stream will also disable settings that were configured to use this stream:{{/tr}}

+

{{#tr}}Archiving this channel will also disable settings that were configured to use this channel:{{/tr}}

    {{#if is_new_stream_announcements_stream}} -
  • {{#tr}}New stream notifications{{/tr}}
    • +
  • {{#tr}}New channel notifications{{/tr}}
    • {{/if}} {{#if is_signup_announcements_stream}}
  • {{#tr}}New user notifications{{/tr}}
    • diff --git a/web/templates/confirm_dialog/confirm_merge_topics_with_rename.hbs b/web/templates/confirm_dialog/confirm_merge_topics_with_rename.hbs index 0b8e63c79b..5acc7389f5 100644 --- a/web/templates/confirm_dialog/confirm_merge_topics_with_rename.hbs +++ b/web/templates/confirm_dialog/confirm_merge_topics_with_rename.hbs @@ -1,6 +1,6 @@

    {{#tr}} - The topic {topic_name} already exists in this stream. + The topic {topic_name} already exists in this channel. Are you sure you want to combine messages from these topics? This cannot be undone. {{/tr}}

    diff --git a/web/templates/confirm_dialog/confirm_reactivate_bot.hbs b/web/templates/confirm_dialog/confirm_reactivate_bot.hbs index 7fbe1ea7d9..b8a0d92571 100644 --- a/web/templates/confirm_dialog/confirm_reactivate_bot.hbs +++ b/web/templates/confirm_dialog/confirm_reactivate_bot.hbs @@ -1,7 +1,7 @@

    {{#tr}} will have the same properties as it did prior to deactivation, - including role, owner and stream subscriptions. + including role, owner and channel subscriptions. {{#*inline "z-user"}}{{username}}{{/inline}} {{/tr}}

    @@ -11,6 +11,6 @@ Because the original owner of this bot is deactivated, you will become the owner for this bot. {{#*inline "z-bot-owner"}}{{owner_name}}{{/inline}} {{/tr}} - {{t "However, it will no longer be subscribed to the private streams that you are not subscribed to." }} + {{t "However, it will no longer be subscribed to the private channels that you are not subscribed to." }}

    {{/if}} diff --git a/web/templates/confirm_dialog/confirm_reactivate_user.hbs b/web/templates/confirm_dialog/confirm_reactivate_user.hbs index a883b91a28..48eb9851b8 100644 --- a/web/templates/confirm_dialog/confirm_reactivate_user.hbs +++ b/web/templates/confirm_dialog/confirm_reactivate_user.hbs @@ -1,6 +1,6 @@

    {{#tr}} - will have the same role, stream subscriptions, + will have the same role, channel subscriptions, user group memberships, and other settings and permissions as they did prior to deactivation. {{#*inline "z-user"}}{{username}}{{/inline}} diff --git a/web/templates/confirm_dialog/confirm_unsubscribe_private_stream.hbs b/web/templates/confirm_dialog/confirm_unsubscribe_private_stream.hbs index d49a5885b6..58ccfe2333 100644 --- a/web/templates/confirm_dialog/confirm_unsubscribe_private_stream.hbs +++ b/web/templates/confirm_dialog/confirm_unsubscribe_private_stream.hbs @@ -1,16 +1,16 @@ {{#unless unsubscribing_other_user}} -

    {{t "Once you leave this stream, you will not be able to rejoin."}}

    +

    {{t "Once you leave this channel, you will not be able to rejoin."}}

    {{/unless}} {{#if display_stream_archive_warning}}

    {{#if unsubscribing_other_user}} {{#tr}} - Because you are removing the last subscriber from a private stream, it will be automatically archived. + Because you are removing the last subscriber from a private channel, it will be automatically archived. {{#*inline "z-link"}}{{> @partial-block}}{{/inline}} {{/tr}} {{else}} {{#tr}} - Because you are the only subscriber, this stream will be automatically archived. + Because you are the only subscriber, this channel will be automatically archived. {{#*inline "z-link"}}{{> @partial-block}}{{/inline}} {{/tr}} {{/if}} diff --git a/web/templates/invite_user_modal.hbs b/web/templates/invite_user_modal.hbs index 81339e1172..f7544c1423 100644 --- a/web/templates/invite_user_modal.hbs +++ b/web/templates/invite_user_modal.hbs @@ -56,14 +56,14 @@

    - +
    {{#if show_select_default_streams_option}}
    {{/if}} @@ -83,7 +83,7 @@ #{{name}} {{/if}} {{#if (eq name ../new_stream_announcements_stream)}} - ({{t 'Receives new stream announcements' }}) + ({{t 'Receives new channel announcements' }}) {{/if}} {{/each}} diff --git a/web/templates/message_feed_errors.hbs b/web/templates/message_feed_errors.hbs index 643c168d04..04d041215e 100644 --- a/web/templates/message_feed_errors.hbs +++ b/web/templates/message_feed_errors.hbs @@ -21,7 +21,7 @@   {{#tr}} - Consider searching all public streams. + Consider searching all public channels. {{#*inline "z-link"}}{{> @partial-block}}{{/inline}} {{/tr}} diff --git a/web/templates/message_view_header.hbs b/web/templates/message_view_header.hbs index 19e52e177b..b08d74da40 100644 --- a/web/templates/message_view_header.hbs +++ b/web/templates/message_view_header.hbs @@ -4,10 +4,10 @@