Wording #12113

(cherry picked from commit f47daee)
(cherry picked from commit bb57273)

Author: michaelklishin

deps/rabbit/src/rabbit_upgrade_preparation.erl

@@ -74,12 +74,12 @@ do_await_safe_online_quorum(IterationsLeft) ->
                 0 ->
                     case length(EndangeredQueues) of
                         0 -> ok;
-                        N -> rabbit_log:info("Waiting for ~p queues to have quorum+1 members online."
+                        N -> rabbit_log:info("Waiting for ~ts queues and streams to have quorum+1 replicas online."
                                              "You can list them with `rabbitmq-diagnostics check_if_node_is_quorum_critical`", [N])
                     end,
                     case endangered_critical_components() of
                         [] -> ok;
-                        _ -> rabbit_log:info("Waiting for the following critical components to have quorum+1 members online: ~p.",
+                        _ -> rabbit_log:info("Waiting for the following critical components to have quorum+1 replicas online: ~p.",
                                              [endangered_critical_components()])
                     end;
                 _ ->

deps/rabbitmq_cli/lib/rabbitmq/cli/streams/commands/add_replica_command.ex

@@ -25,10 +25,10 @@ defmodule RabbitMQ.CLI.Streams.Commands.AddReplicaCommand do
            to_atom(node)
          ]) do
       {:error, :classic_queue_not_supported} ->
-        {:error, "Cannot add replicas to a classic queue"}
+        {:error, "Cannot add replicas to classic queues"}
 
       {:error, :quorum_queue_not_supported} ->
-        {:error, "Cannot add replicas to a quorum queue"}
+        {:error, "Cannot add replicas to quorum queues"}
 
       other ->
         other
@@ -37,11 +37,11 @@ defmodule RabbitMQ.CLI.Streams.Commands.AddReplicaCommand do
 
   use RabbitMQ.CLI.DefaultOutput
 
-  def usage, do: "add_replica [--vhost <vhost>] <queue> <node>"
+  def usage, do: "add_replica [--vhost <vhost>] <stream> <node>"
 
   def usage_additional do
     [
-      ["<queue>", "stream queue name"],
+      ["<queue>", "stream name"],
       ["<node>", "node to add a new replica on"]
     ]
   end
@@ -54,11 +54,11 @@ defmodule RabbitMQ.CLI.Streams.Commands.AddReplicaCommand do
 
   def help_section, do: :replication
 
-  def description, do: "Adds a stream queue replica on the given node."
+  def description, do: "Adds a stream replica on the given node"
 
   def banner([name, node], _) do
     [
-      "Adding a replica for queue #{name} on node #{node}..."
+      "Adding a replica for stream #{name} on node #{node}..."
     ]
   end
 end