From 19ff83b86c664e71fcb3b7bb7a9dbbeec3749708 Mon Sep 17 00:00:00 2001
From: Luke Policinski <luke@lukepolo.com>
Date: Mon, 5 Oct 2026 09:44:48 -0400
Subject: [PATCH 1/3] feature: match actions in the admin dock too, Force Ready
 in the menu, confirm before cancel, server or winner changes

---
 components/match/MatchActions.vue             | 266 +++++++++++++++---
 components/match/MatchAdminBottomBar.vue      |  31 +-
 components/match/MatchSelectServer.vue        |  71 ++---
 components/match/MatchSelectWinner.vue        |  56 +---
 i18n/locales/ar_SA.json                       |   9 +-
 i18n/locales/da_DK.json                       |   9 +-
 i18n/locales/de_DE.json                       |   9 +-
 i18n/locales/en.json                          |   9 +-
 i18n/locales/es_ES.json                       |   9 +-
 i18n/locales/fr_FR.json                       |   9 +-
 i18n/locales/it_IT.json                       |   9 +-
 i18n/locales/ja_JP.json                       |   9 +-
 i18n/locales/ko_KR.json                       |   9 +-
 i18n/locales/pl_PL.json                       |   9 +-
 i18n/locales/pt_BR.json                       |   9 +-
 i18n/locales/ru_RU.json                       |   9 +-
 i18n/locales/sv_SE.json                       |   9 +-
 i18n/locales/tr_TR.json                       |   9 +-
 i18n/locales/uk_UA.json                       |   9 +-
 i18n/locales/zh_Hans.json                     |   9 +-
 i18n/locales/zh_Hant.json                     |   9 +-
 .../match/MatchActionsConfirm.spec.ts         | 128 +++++++++
 22 files changed, 541 insertions(+), 164 deletions(-)
 create mode 100644 tests/components/match/MatchActionsConfirm.spec.ts

diff --git a/components/match/MatchActions.vue b/components/match/MatchActions.vue
index 34ac569fc..580ad1b79 100644
--- a/components/match/MatchActions.vue
+++ b/components/match/MatchActions.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import {
+  CheckCheck,
   LifeBuoy,
   MoreVertical,
   Pause,
@@ -7,6 +8,7 @@ import {
   Radio,
   RefreshCw,
   Scissors,
+  SlidersHorizontal,
   Square,
   Trash2,
   XCircle,
@@ -33,8 +35,11 @@ import {
 </script>
 
 <template>
-  <div class="flex gap-2 items-center" v-if="canAct || canWatchCameras">
-    <MatchCameraStatus v-if="canWatchCameras" :match-id="match.id" />
+  <div
+    class="flex gap-2 items-center"
+    v-if="dock ? hasOrganizerItems : canAct || canWatchCameras"
+  >
+    <MatchCameraStatus v-if="canWatchCameras && !dock" :match-id="match.id" />
 
     <!-- The pause control appears when a map goes live; its column animates
          0fr -> 1fr so the kebab slides over instead of jumping. Both labels
@@ -46,7 +51,7 @@ import {
       leave-active-class="pause-reveal"
       leave-to-class="pause-reveal-collapsed"
     >
-      <div v-if="canPauseResume" class="grid min-w-0 grid-cols-[1fr]">
+      <div v-if="canPauseResume && !dock" class="grid min-w-0 grid-cols-[1fr]">
         <div class="min-w-0 overflow-hidden">
           <Button
             size="sm"
@@ -84,13 +89,24 @@ import {
 
     <DropdownMenu>
       <DropdownMenuTrigger as-child>
-        <Button size="icon" variant="outline">
+        <!-- Admin dock: a chip matching its Veto Override toggle. -->
+        <button
+          v-if="dock"
+          type="button"
+          class="inline-flex items-center gap-2 whitespace-nowrap rounded-md border border-border bg-background/60 px-2.5 py-1 font-mono text-[0.62rem] font-bold uppercase tracking-[0.18em] text-muted-foreground transition-colors duration-200 ease-out hover:border-[hsl(var(--tac-amber)/0.4)] hover:text-foreground data-[state=open]:border-[hsl(var(--tac-amber)/0.4)] data-[state=open]:text-foreground"
+        >
+          <SlidersHorizontal class="h-3 w-3 shrink-0" />
+          <span class="sr-only sm:not-sr-only">
+            {{ $t("match.admin_bar.actions") }}
+          </span>
+        </button>
+        <Button v-else size="icon" variant="outline">
           <MoreVertical class="h-3.5 w-3.5" />
           <span class="sr-only">{{ $t("common.more") }}</span>
         </Button>
       </DropdownMenuTrigger>
-      <DropdownMenuContent align="end">
-        <template v-if="match.is_in_lineup">
+      <DropdownMenuContent align="end" :side="dock ? 'top' : 'bottom'">
+        <template v-if="match.is_in_lineup && !dock">
           <DropdownMenuItem
             class="text-destructive"
             @click="callForOrganizer"
@@ -105,15 +121,15 @@ import {
         </template>
 
         <DropdownMenuItem v-if="match.can_assign_server">
-          <MatchSelectServer :match="match"></MatchSelectServer>
+          <MatchSelectServer :match="match" @select="confirmServer" />
         </DropdownMenuItem>
 
         <DropdownMenuItem v-if="canSetMatchWinner">
-          <MatchSelectWinner :match="match"></MatchSelectWinner>
+          <MatchSelectWinner :match="match" @select="confirmWinner" />
         </DropdownMenuItem>
 
         <template v-if="match.is_organizer && hasOrganizerLiveActions">
-          <DropdownMenuSeparator />
+          <DropdownMenuSeparator class="first:hidden" />
           <!-- "Start" only shows when there's nothing running. Once
                a Job exists (booting OR live), the only remaining
                action is to stop it — booting needs to be cancellable
@@ -283,8 +299,10 @@ import {
             match.can_start ||
             match.can_cancel ||
             canDeleteMatch ||
-            canReparseDemos
+            canReparseDemos ||
+            canForceReady
           "
+          class="first:hidden"
         />
 
         <DropdownMenuItem v-if="canReparseDemos" @click="reparseAllDemos">
@@ -292,6 +310,11 @@ import {
           {{ $t("match.actions.reparse_demos") }}
         </DropdownMenuItem>
 
+        <DropdownMenuItem v-if="canForceReady" @click="forceReady">
+          <CheckCheck />
+          {{ $t("match.commands.force_ready") }}
+        </DropdownMenuItem>
+
         <template v-if="match.can_start">
           <DropdownMenuItem
             @click.prevent.stop="startMatch"
@@ -312,17 +335,14 @@ import {
         </template>
 
         <template v-if="match.can_cancel">
-          <DropdownMenuItem class="text-destructive" @click="cancelMatch">
+          <DropdownMenuItem class="text-destructive" @click="confirmCancel">
             <XCircle />
             {{ $t("match.actions.cancel") }}
           </DropdownMenuItem>
         </template>
 
         <template v-if="canDeleteMatch">
-          <DropdownMenuItem
-            class="text-destructive"
-            @click="showDeleteDialog = true"
-          >
+          <DropdownMenuItem class="text-destructive" @click="confirmDelete">
             <Trash2 />
             {{ $t("match.actions.delete") }}
           </DropdownMenuItem>
@@ -330,28 +350,32 @@ import {
       </DropdownMenuContent>
     </DropdownMenu>
 
-    <AlertDialog :open="showDeleteDialog">
+    <!-- One confirm for every consequential item. It lives outside the menu so
+         it survives the menu closing as the dialog takes focus. -->
+    <AlertDialog
+      :open="confirmOpen"
+      @update:open="(open) => !open && !confirmBusy && (confirmOpen = false)"
+    >
       <AlertDialogContent>
         <AlertDialogHeader>
-          <AlertDialogTitle>{{
-            $t("match.delete_confirm.title")
-          }}</AlertDialogTitle>
+          <AlertDialogTitle>{{ confirming?.title }}</AlertDialogTitle>
           <AlertDialogDescription>
-            {{ $t("match.delete_confirm.description") }}
+            {{ confirming?.description }}
           </AlertDialogDescription>
         </AlertDialogHeader>
         <AlertDialogFooter>
-          <AlertDialogCancel @click="showDeleteDialog = false">
+          <AlertDialogCancel :disabled="confirmBusy">
             {{ $t("common.cancel") }}
           </AlertDialogCancel>
-          <AlertDialogAction
-            @click="
-              deleteMatch();
-              showDeleteDialog = false;
-            "
+          <!-- Plain button: AlertDialogAction closes the dialog before an
+               async click handler gets to run. -->
+          <Button
+            :variant="confirming?.destructive ? 'destructive' : 'default'"
+            :disabled="confirmBusy"
+            @click="runConfirm"
           >
-            {{ $t("common.delete") }}
-          </AlertDialogAction>
+            {{ confirming?.action }}
+          </Button>
         </AlertDialogFooter>
       </AlertDialogContent>
     </AlertDialog>
@@ -386,9 +410,18 @@ import { useApplicationSettingsStore } from "~/stores/ApplicationSettings";
 import { canWatchMatchCameras } from "~/composables/useMatchCameraStatus";
 import {
   RconAction,
+  matchCommandsForStatus,
   resolveRconCommand,
   effectivePluginRuntime,
 } from "~/constants/rconCommands";
+type MatchActionConfirm = {
+  title: string;
+  description: string;
+  action: string;
+  destructive?: boolean;
+  run: () => Promise<void>;
+};
+
 export default {
   inject: {
     refetchMatchStatic: {
@@ -400,11 +433,21 @@ export default {
       type: Object,
       required: true,
     },
+    // The admin dock's copy: organizer items only, behind a labeled chip that
+    // opens upward. The camera chip, pause button and support call stay in
+    // the header.
+    dock: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
-      showDeleteDialog: false,
+      confirmOpen: false,
+      confirmBusy: false,
+      confirming: null as MatchActionConfirm | null,
       rconUuid: undefined as string | undefined,
+      rconSuccessTitle: "",
       switching: false,
       renderSummary: [] as Array<{
         match_map_id: string;
@@ -438,6 +481,116 @@ export default {
     },
   },
   methods: {
+    ask(confirming: MatchActionConfirm) {
+      this.confirming = confirming;
+      this.confirmOpen = true;
+    },
+    async runConfirm() {
+      if (this.confirmBusy || !this.confirming) {
+        return;
+      }
+      this.confirmBusy = true;
+      try {
+        await this.confirming.run();
+        this.confirmOpen = false;
+      } finally {
+        this.confirmBusy = false;
+      }
+    },
+    confirmCancel() {
+      this.ask({
+        title: this.$t("match.actions.cancel"),
+        description: this.$t("match.cancel_confirm.description"),
+        action: this.$t("match.actions.cancel"),
+        destructive: true,
+        run: this.cancelMatch,
+      });
+    },
+    confirmDelete() {
+      this.ask({
+        title: this.$t("match.delete_confirm.title"),
+        description: this.$t("match.delete_confirm.description"),
+        action: this.$t("common.delete"),
+        destructive: true,
+        run: this.deleteMatch,
+      });
+    },
+    confirmServer({ value, label }: { value: string; label: string }) {
+      this.ask({
+        title: this.$t("match.server.assign"),
+        description: this.$t("match.server.assign_confirm", { server: label }),
+        action: this.$t("match.server.assign"),
+        run: () => this.assignServer(value),
+      });
+    },
+    confirmWinner({ value, label }: { value: string; label: string }) {
+      this.ask({
+        title: this.$t("match.winner.set"),
+        description: this.$t("match.winner.set_confirm", { team: label }),
+        action: this.$t("match.winner.set"),
+        run: () => this.setWinner(value),
+      });
+    },
+    // "0:<region>" is an on-demand server in that region; anything else is a
+    // dedicated server id.
+    async assignServer(value: string) {
+      const [serverId, region] = value.split(":");
+
+      await this.$apollo.mutate({
+        mutation: generateMutation({
+          update_matches_by_pk: [
+            {
+              pk_columns: {
+                id: this.match.id,
+              },
+              _set: {
+                region,
+                server_id: serverId === "0" ? null : value,
+              },
+            },
+            {
+              id: true,
+            },
+          ],
+        }),
+      });
+
+      toast({
+        title: this.$t("match.server.assigned"),
+      });
+    },
+    // Goes through setMatchWinner rather than writing winning_lineup_id
+    // directly: the action is what enforces organizer permission and blocks a
+    // reassignment once a downstream tournament match has already been
+    // played. A direct mutation skips both.
+    async setWinner(lineupId: string) {
+      try {
+        await this.$apollo.mutate({
+          mutation: generateMutation({
+            setMatchWinner: [
+              {
+                match_id: this.match.id,
+                winning_lineup_id: lineupId,
+              },
+              {
+                success: true,
+              },
+            ],
+          }),
+        });
+      } catch (error) {
+        toast({
+          title: this.$t("match.winner.set_failed"),
+          description: (error as Error)?.message,
+          variant: "destructive",
+        });
+        return;
+      }
+
+      toast({
+        title: this.$t("match.winner.set"),
+      });
+    },
     async cancelMatch() {
       if (this.cancellingMatch) {
         return;
@@ -720,29 +873,38 @@ export default {
           title: this.$t("common.error"),
         });
       } else {
-        toast({
-          title: this.isPaused
-            ? this.$t("match.actions.match_resumed")
-            : this.$t("match.actions.match_paused"),
-        });
+        toast({ title: this.rconSuccessTitle });
       }
     },
-    togglePause() {
+    // The success title is fixed at send time: by the time the reply lands,
+    // the map status may already have flipped.
+    sendRcon(action: RconAction, successTitle: string) {
       const pluginRuntime = effectivePluginRuntime(
         this.match.server_plugin_runtime,
         useApplicationSettingsStore().gameServerPluginRuntime,
       );
-      const command = resolveRconCommand(
-        this.isPaused ? RconAction.Resume : RconAction.Pause,
-        pluginRuntime,
-      );
       this.rconUuid = uuidv4();
+      this.rconSuccessTitle = successTitle;
       socket.event("rcon", {
         uuid: this.rconUuid,
         serverId: this.match.server_id,
-        command,
+        command: resolveRconCommand(action, pluginRuntime),
       });
     },
+    togglePause() {
+      this.sendRcon(
+        this.isPaused ? RconAction.Resume : RconAction.Pause,
+        this.isPaused
+          ? this.$t("match.actions.match_resumed")
+          : this.$t("match.actions.match_paused"),
+      );
+    },
+    forceReady() {
+      this.sendRcon(
+        RconAction.ForceReady,
+        this.$t("match.actions.forced_ready"),
+      );
+    },
     async callForOrganizer() {
       await this.$apollo.mutate({
         mutation: generateMutation({
@@ -783,6 +945,17 @@ export default {
     hasOrganizerLiveActions() {
       return this.isLive || this.hasMatchDemos;
     },
+    hasOrganizerItems() {
+      return (
+        this.match.can_assign_server ||
+        this.canSetMatchWinner ||
+        (this.match.is_organizer && this.hasOrganizerLiveActions) ||
+        this.canReparseDemos ||
+        this.match.can_start ||
+        this.match.can_cancel ||
+        this.canDeleteMatch
+      );
+    },
     activeStreamElsewhere() {
       const streams = useStreamerStore().liveStreams ?? [];
       return streams.find(
@@ -930,6 +1103,19 @@ export default {
     isPaused() {
       return this.currentMap?.status === e_match_map_status_enum.Paused;
     },
+    // Same rule as the console's Force Ready, narrowed to when it can act: the
+    // current map is warming up on a live, reachable server.
+    canForceReady() {
+      return (
+        this.match.is_organizer &&
+        this.isLive &&
+        !!this.match.is_server_online &&
+        useAuthStore().isRoleAbove(e_player_roles_enum.moderator) &&
+        matchCommandsForStatus(this.currentMap?.status).some(
+          (command) => command.action === RconAction.ForceReady,
+        )
+      );
+    },
     canPauseResume() {
       if (!this.match.is_organizer) {
         return false;
diff --git a/components/match/MatchAdminBottomBar.vue b/components/match/MatchAdminBottomBar.vue
index a446c3826..33d977397 100644
--- a/components/match/MatchAdminBottomBar.vue
+++ b/components/match/MatchAdminBottomBar.vue
@@ -10,6 +10,7 @@ import {
   Zap,
 } from "lucide-vue-next";
 import { useVetoOverride } from "~/composables/useVetoOverride";
+import MatchActions from "~/components/match/MatchActions.vue";
 import MatchServerRebootControl from "~/components/match/MatchServerRebootControl.vue";
 import RconCommander from "~/components/servers/RconCommander.vue";
 import ServiceLogs from "~/components/ServiceLogs.vue";
@@ -241,10 +242,11 @@ function runCommand(
         />
       </div>
 
-      <!-- Split into three regions so the override toggle can sit between the
-           status and the expander without nesting a button inside a button.
-           The two expander halves shade off the shared `group` rather than
-           their own :hover, otherwise each lights up as its own patch. -->
+      <!-- Split into three regions so the override toggle and the actions menu
+           can sit between the status and the expander without nesting a button
+           inside a button. The two expander halves shade off the shared `group`
+           rather than their own :hover, otherwise each lights up as its own
+           patch. -->
       <div class="group flex items-stretch" :class="dragging && 'select-none'">
         <button
           type="button"
@@ -263,24 +265,13 @@ function runCommand(
             <Shield class="w-3 h-3" />
             {{ $t("match.admin") }}
           </div>
-
-          <span
-            v-if="canSendRCONCommands"
-            class="truncate font-mono text-[0.65rem] tracking-[0.18em] uppercase text-muted-foreground"
-          >
-            {{
-              match.is_server_online
-                ? $t("common.connected")
-                : $t("common.disconnected")
-            }}
-          </span>
         </button>
 
         <div
-          v-if="isVetoing"
-          class="flex shrink-0 items-center px-2 group-hover:bg-muted/40 transition-colors duration-200 ease-out"
+          class="flex shrink-0 items-center gap-2 px-2 group-hover:bg-muted/40 transition-colors duration-200 ease-out empty:hidden"
         >
           <button
+            v-if="isVetoing"
             type="button"
             class="inline-flex items-center gap-2 whitespace-nowrap rounded-md border px-2.5 py-1 font-mono text-[0.62rem] font-bold uppercase tracking-[0.18em] transition-colors duration-200 ease-out"
             :class="
@@ -294,17 +285,17 @@ function runCommand(
             <Zap class="h-3 w-3 shrink-0" />
             {{ $t("match.admin_bar.veto_override") }}
           </button>
+
+          <MatchActions :match="match" dock />
         </div>
 
         <button
           type="button"
           class="flex shrink-0 items-center gap-1.5 pl-2 pr-4 py-2 text-xs text-muted-foreground group-hover:bg-muted/40 transition-colors duration-200 ease-out"
           :aria-expanded="open"
+          :aria-label="open ? $t('common.close') : $t('common.more')"
           @click="open = !open"
         >
-          <span class="hidden sm:inline">{{
-            open ? $t("common.close") : $t("common.more")
-          }}</span>
           <ChevronUp
             class="w-4 h-4 transition-transform duration-300 ease-out"
             :class="open ? 'rotate-180' : 'rotate-0'"
diff --git a/components/match/MatchSelectServer.vue b/components/match/MatchSelectServer.vue
index 483d6e692..bf61c6276 100644
--- a/components/match/MatchSelectServer.vue
+++ b/components/match/MatchSelectServer.vue
@@ -21,7 +21,7 @@ import SettingHeader from "~/components/match/SettingHeader.vue";
     <FormField v-slot="{ componentField }" name="server_id">
       <FormItem class="space-y-1.5">
         <SettingHeader>{{ $t("match.server.assign") }}</SettingHeader>
-        <Select v-bind="componentField" @update:modelValue="updateMatchServer">
+        <Select v-bind="componentField" @update:modelValue="pick">
           <FormControl>
             <SelectTrigger>
               <SelectValue :placeholder="$t('match.server.select')" />
@@ -42,11 +42,11 @@ import SettingHeader from "~/components/match/SettingHeader.vue";
             <SelectGroup>
               <SelectLabel>{{ $t("match.server.on_demand") }}</SelectLabel>
               <SelectItem
-                v-for="region in regions"
+                v-for="region in regionOptions"
                 :key="region.value"
-                :value="`0:${region.value}`"
+                :value="region.value"
               >
-                {{ region.description || region.value }}
+                {{ region.display }}
               </SelectItem>
             </SelectGroup>
           </SelectContent>
@@ -62,8 +62,6 @@ import * as z from "zod";
 import { useForm } from "vee-validate";
 import { toTypedSchema } from "~/utilities/vee-validate-zod";
 import { typedGql } from "~/generated/zeus/typedDocumentNode";
-import { generateMutation } from "~/graphql/graphqlGen";
-import { toast } from "@/components/ui/toast";
 import { useApplicationSettingsStore } from "~/stores/ApplicationSettings";
 import { e_server_types_enum } from "~/generated/zeus";
 
@@ -74,6 +72,8 @@ export default {
       required: true,
     },
   },
+  // The parent confirms and assigns; this only reports the pick.
+  emits: ["select"],
   apollo: {
     $subscribe: {
       servers: {
@@ -116,52 +116,39 @@ export default {
   watch: {
     match: {
       immediate: true,
-      handler(match) {
-        if (match) {
-          let server_id = match.server_id;
-
-          if (!server_id || match.server_type === "On Demand") {
-            server_id = `${match.region ? `0:${match.region}` : "0"}`;
-          }
-
-          this.form.setValues({
-            server_id,
-          });
-        }
+      handler() {
+        this.syncFromMatch();
       },
     },
   },
   methods: {
-    async updateMatchServer() {
-      const [serverId, region] = this.form.values.server_id?.split(":");
+    syncFromMatch() {
+      let server_id = this.match.server_id;
 
-      await this.$apollo.mutate({
-        mutation: generateMutation({
-          update_matches_by_pk: [
-            {
-              pk_columns: {
-                id: this.match.id,
-              },
-              _set: {
-                region,
-                server_id: serverId === "0" ? null : this.form.values.server_id,
-              },
-            },
-            {
-              id: true,
-            },
-          ],
-        }),
-      });
+      if (!server_id || this.match.server_type === "On Demand") {
+        server_id = `${this.match.region ? `0:${this.match.region}` : "0"}`;
+      }
 
-      toast({
-        title: this.$t("match.server.assigned"),
+      this.form.setValues({
+        server_id,
       });
     },
+    // Snap back to the match's real server; the pick only takes effect once
+    // the parent's confirm runs.
+    pick(value: string) {
+      const option = [...this.availableServers, ...this.regionOptions].find(
+        (option) => option.value === value,
+      );
+      this.$emit("select", { value, label: option?.display ?? value });
+      this.syncFromMatch();
+    },
   },
   computed: {
-    regions() {
-      return useApplicationSettingsStore().availableRegions;
+    regionOptions() {
+      return useApplicationSettingsStore().availableRegions.map((region) => ({
+        value: `0:${region.value}`,
+        display: region.description || region.value,
+      }));
     },
     canSelectDedicatedServer() {
       const { isAdmin, isMatchOrganizer, isTournamentOrganizer } =
diff --git a/components/match/MatchSelectWinner.vue b/components/match/MatchSelectWinner.vue
index b375a54dc..a7a860e61 100644
--- a/components/match/MatchSelectWinner.vue
+++ b/components/match/MatchSelectWinner.vue
@@ -21,7 +21,7 @@ import SettingHeader from "~/components/match/SettingHeader.vue";
     <FormField v-slot="{ componentField }" name="lineup_id">
       <FormItem class="space-y-1.5">
         <SettingHeader>{{ $t("match.winner.set") }}</SettingHeader>
-        <Select v-bind="componentField" @update:modelValue="updateMatchWinner">
+        <Select v-bind="componentField" @update:modelValue="pick">
           <FormControl>
             <SelectTrigger>
               <SelectValue :placeholder="$t('match.winner.select_lineup')" />
@@ -49,8 +49,6 @@ import SettingHeader from "~/components/match/SettingHeader.vue";
 import * as z from "zod";
 import { useForm } from "vee-validate";
 import { toTypedSchema } from "~/utilities/vee-validate-zod";
-import { generateMutation } from "~/graphql/graphqlGen";
-import { toast } from "@/components/ui/toast";
 
 export default {
   props: {
@@ -59,6 +57,8 @@ export default {
       required: true,
     },
   },
+  // The parent confirms and sets the winner; this only reports the pick.
+  emits: ["select"],
   data() {
     return {
       servers: [],
@@ -80,48 +80,14 @@ export default {
     },
   },
   methods: {
-    async updateMatchWinner() {
-      // setMatchWinner takes a non-null lineup. The select only ever offers
-      // the two lineups, so this is just a guard against firing before one
-      // has been chosen.
-      if (!this.form.values.lineup_id) {
-        return;
-      }
-
-      // Goes through setMatchWinner rather than writing winning_lineup_id
-      // directly: the action is what enforces organizer permission and blocks
-      // a reassignment once a downstream tournament match has already been
-      // played. A direct mutation skips both.
-      try {
-        await this.$apollo.mutate({
-          mutation: generateMutation({
-            setMatchWinner: [
-              {
-                match_id: this.match.id,
-                winning_lineup_id: this.form.values.lineup_id,
-              },
-              {
-                success: true,
-              },
-            ],
-          }),
-        });
-      } catch (error) {
-        // Put the selector back on the winner the match actually has, so it
-        // doesn't sit showing a change that was rejected.
-        this.form.setFieldValue("lineup_id", this.match.winning_lineup_id);
-
-        toast({
-          title: this.$t("match.winner.set_failed"),
-          description: (error as Error)?.message,
-          variant: "destructive",
-        });
-        return;
-      }
-
-      toast({
-        title: this.$t("match.winner.set"),
-      });
+    // Snap back to the match's real winner; the pick only takes effect once
+    // the parent's confirm runs.
+    pick(value: string) {
+      const lineup = this.availableLineups.find(
+        (lineup) => lineup.value === value,
+      );
+      this.$emit("select", { value, label: lineup?.display ?? value });
+      this.form.setFieldValue("lineup_id", this.match.winning_lineup_id);
     },
   },
   computed: {
diff --git a/i18n/locales/ar_SA.json b/i18n/locales/ar_SA.json
index 395da9d7d..6ba302c83 100644
--- a/i18n/locales/ar_SA.json
+++ b/i18n/locales/ar_SA.json
@@ -8508,6 +8508,7 @@
     },
     "winner": {
       "set": "حدّد الفائز بالمباراة",
+      "set_confirm": "هل تريد جعل {team} الفائز في هذه المباراة؟",
       "set_failed": "تعذّر تحديد الفائز بالمباراة",
       "select_lineup": "اختر التشكيلة"
     },
@@ -8583,6 +8584,7 @@
       "resume": "استأنف المباراة",
       "match_paused": "تم إيقاف المباراة مؤقتًا",
       "match_resumed": "تم استئناف المباراة",
+      "forced_ready": "تم فرض الجاهزية على اللاعبين",
       "start_live": "ابدأ البث المباشر",
       "pause_highlights_and_start_live": "أوقف أبرز اللقطات وابدأ البث المباشر",
       "start_live_preempt_highlights_hint": "أبرز اللقطات تتوقف بعد الحالية · البث يبدأ فور تفرّغ GPU",
@@ -8619,6 +8621,9 @@
       "title": "احذف المباراة",
       "description": "هل تريد حذف هذه المباراة؟ لا يمكن التراجع عن هذا الإجراء."
     },
+    "cancel_confirm": {
+      "description": "هل أنت متأكد من أنك تريد إلغاء هذه المباراة؟"
+    },
     "lineup": {
       "lineup_1": "التشكيلة 1",
       "lineup_2": "التشكيلة 2",
@@ -8874,6 +8879,7 @@
       "dedicated": "السيرفرات المخصصة",
       "on_demand": "عند الطلب",
       "assigned": "سيرفر المباراة المعيّن",
+      "assign_confirm": "هل تريد تعيين {server} لهذه المباراة؟",
       "reboot_label": "إعادة تشغيل السيرفر",
       "reboot": "أعد تشغيل السيرفر",
       "rebooting": "جارٍ إعادة التشغيل...",
@@ -9045,7 +9051,8 @@
     "admin_bar": {
       "rcon_unavailable": "RCON غير متاح",
       "not_controllable": "المباراة ليست في حالة تسمح بالتحكم.",
-      "veto_override": "تجاوز الاستبعاد"
+      "veto_override": "تجاوز الاستبعاد",
+      "actions": "الإجراءات"
     },
     "demo_processing_hint": "يجري رفع تسجيل المباراة من خادم اللعب. وستظهر الإحصاءات وإعادة العرض ثنائية الأبعاد وأبرز اللقطات بمجرد اكتماله.",
     "demo_playback": {
diff --git a/i18n/locales/da_DK.json b/i18n/locales/da_DK.json
index fac77d429..9afa7272c 100644
--- a/i18n/locales/da_DK.json
+++ b/i18n/locales/da_DK.json
@@ -8508,6 +8508,7 @@
     },
     "winner": {
       "set": "Sæt kampvinder",
+      "set_confirm": "Gør {team} til vinder af denne kamp?",
       "set_failed": "Kunne ikke angive kampens vinder",
       "select_lineup": "Vælg opstilling"
     },
@@ -8583,6 +8584,7 @@
       "resume": "Genoptag kampen",
       "match_paused": "Kampen er sat på pause",
       "match_resumed": "Kampen er genoptaget",
+      "forced_ready": "Spillerne er tvunget klar",
       "start_live": "Start livestream",
       "pause_highlights_and_start_live": "Pause highlights og start livestream",
       "start_live_preempt_highlights_hint": "Highlights pauser efter den aktuelle · live starter når GPU er ledig",
@@ -8619,6 +8621,9 @@
       "title": "Slet kampen",
       "description": "Vil du slette denne kamp? Handlingen kan ikke fortrydes."
     },
+    "cancel_confirm": {
+      "description": "Er du sikker på, at du vil annullere denne kamp?"
+    },
     "lineup": {
       "lineup_1": "Opstilling 1",
       "lineup_2": "Opstilling 2",
@@ -8874,6 +8879,7 @@
       "dedicated": "Dedikerede servere",
       "on_demand": "On demand",
       "assigned": "Tildelt kampserver",
+      "assign_confirm": "Tildel {server} til denne kamp?",
       "reboot_label": "Genstart af server",
       "reboot": "Genstart server",
       "rebooting": "Genstarter...",
@@ -9045,7 +9051,8 @@
     "admin_bar": {
       "rcon_unavailable": "RCON utilgængelig",
       "not_controllable": "Kampen er ikke i en tilstand, der kan styres.",
-      "veto_override": "Tilsidesæt veto"
+      "veto_override": "Tilsidesæt veto",
+      "actions": "Handlinger"
     },
     "demo_processing_hint": "Kampens demo uploades fra spilserveren. Statistik, 2D-replay og højdepunkter kommer, når den er færdig.",
     "demo_playback": {
diff --git a/i18n/locales/de_DE.json b/i18n/locales/de_DE.json
index 39458cb93..1d45041de 100644
--- a/i18n/locales/de_DE.json
+++ b/i18n/locales/de_DE.json
@@ -8508,6 +8508,7 @@
     },
     "winner": {
       "set": "Match-Sieger festlegen",
+      "set_confirm": "{team} zum Sieger dieses Matches erklären?",
       "set_failed": "Match-Sieger konnte nicht festgelegt werden",
       "select_lineup": "Lineup wählen"
     },
@@ -8583,6 +8584,7 @@
       "resume": "Match fortsetzen",
       "match_paused": "Match pausiert",
       "match_resumed": "Match fortgesetzt",
+      "forced_ready": "Spieler zwangsweise bereit gesetzt",
       "start_live": "Live-Stream starten",
       "pause_highlights_and_start_live": "Highlights pausieren & Live-Stream starten",
       "start_live_preempt_highlights_hint": "Highlights pausieren nach dem aktuellen · Live startet, sobald die GPU frei ist",
@@ -8619,6 +8621,9 @@
       "title": "Match löschen",
       "description": "Willst du dieses Match wirklich löschen? Das lässt sich nicht rückgängig machen."
     },
+    "cancel_confirm": {
+      "description": "Möchtest du dieses Match wirklich abbrechen?"
+    },
     "lineup": {
       "lineup_1": "Lineup 1",
       "lineup_2": "Lineup 2",
@@ -8874,6 +8879,7 @@
       "dedicated": "Dedicated Server",
       "on_demand": "On Demand",
       "assigned": "Zugewiesener Match-Server",
+      "assign_confirm": "{server} diesem Match zuweisen?",
       "reboot_label": "Server-Neustart",
       "reboot": "Server neu starten",
       "rebooting": "Startet neu...",
@@ -9045,7 +9051,8 @@
     "admin_bar": {
       "rcon_unavailable": "RCON nicht verfügbar",
       "not_controllable": "Match ist in keinem steuerbaren Status.",
-      "veto_override": "Veto überschreiben"
+      "veto_override": "Veto überschreiben",
+      "actions": "Aktionen"
     },
     "demo_processing_hint": "Die Match-Demo wird vom Gameserver hochgeladen. Statistiken, das 2D-Replay und Highlights folgen, sobald das abgeschlossen ist.",
     "demo_playback": {
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index fe5c942b1..3490f5160 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -8510,6 +8510,7 @@
     },
     "winner": {
       "set": "Set Match Winner",
+      "set_confirm": "Make {team} the winner of this match?",
       "set_failed": "Could not set match winner",
       "select_lineup": "Select Lineup"
     },
@@ -8585,6 +8586,7 @@
       "resume": "Resume Match",
       "match_paused": "Match paused",
       "match_resumed": "Match resumed",
+      "forced_ready": "Players forced ready",
       "start_live": "Start Live Stream",
       "pause_highlights_and_start_live": "Pause Highlights & Start Live Stream",
       "start_live_preempt_highlights_hint": "Highlights pause after current · live goes up once GPU frees",
@@ -8621,6 +8623,9 @@
       "title": "Delete Match",
       "description": "Are you sure you want to delete this match? This action cannot be undone."
     },
+    "cancel_confirm": {
+      "description": "Are you sure you want to cancel this match?"
+    },
     "lineup": {
       "lineup_1": "Lineup 1",
       "lineup_2": "Lineup 2",
@@ -8876,6 +8881,7 @@
       "dedicated": "Dedicated Servers",
       "on_demand": "On Demand",
       "assigned": "Assigned Match Server",
+      "assign_confirm": "Assign {server} to this match?",
       "reboot_label": "Server Reboot",
       "reboot": "Reboot Server",
       "rebooting": "Rebooting...",
@@ -9047,7 +9053,8 @@
     "admin_bar": {
       "rcon_unavailable": "RCON unavailable",
       "not_controllable": "Match is not in a controllable state.",
-      "veto_override": "Veto Override"
+      "veto_override": "Veto Override",
+      "actions": "Actions"
     },
     "demo_processing_hint": "The match demo is uploading from the game server. Stats, the 2D replay and highlights land once it finishes.",
     "demo_playback": {
diff --git a/i18n/locales/es_ES.json b/i18n/locales/es_ES.json
index 8aa29d75f..b8eafe0a3 100644
--- a/i18n/locales/es_ES.json
+++ b/i18n/locales/es_ES.json
@@ -8508,6 +8508,7 @@
     },
     "winner": {
       "set": "Definir ganador de la partida",
+      "set_confirm": "¿Declarar a {team} ganador de esta partida?",
       "set_failed": "No se pudo establecer el ganador de la partida",
       "select_lineup": "Seleccionar alineación"
     },
@@ -8583,6 +8584,7 @@
       "resume": "Reanudar partida",
       "match_paused": "Partida pausada",
       "match_resumed": "Partida reanudada",
+      "forced_ready": "Jugadores forzados a listos",
       "start_live": "Iniciar stream en directo",
       "pause_highlights_and_start_live": "Pausar highlights e iniciar stream",
       "start_live_preempt_highlights_hint": "Los highlights se pausan tras el actual · el directo arranca cuando se libere la GPU",
@@ -8619,6 +8621,9 @@
       "title": "Eliminar partida",
       "description": "¿Seguro que quieres eliminar esta partida? Esta acción no se puede deshacer."
     },
+    "cancel_confirm": {
+      "description": "¿Seguro que quieres cancelar esta partida?"
+    },
     "lineup": {
       "lineup_1": "Alineación 1",
       "lineup_2": "Alineación 2",
@@ -8874,6 +8879,7 @@
       "dedicated": "Servidores dedicados",
       "on_demand": "Bajo demanda",
       "assigned": "Servidor de partida asignado",
+      "assign_confirm": "¿Asignar {server} a esta partida?",
       "reboot_label": "Reinicio del servidor",
       "reboot": "Reiniciar servidor",
       "rebooting": "Reiniciando...",
@@ -9045,7 +9051,8 @@
     "admin_bar": {
       "rcon_unavailable": "RCON no disponible",
       "not_controllable": "La partida no está en un estado controlable.",
-      "veto_override": "Anular veto"
+      "veto_override": "Anular veto",
+      "actions": "Acciones"
     },
     "demo_processing_hint": "La demo de la partida se está subiendo desde el servidor de juego. Las estadísticas, la repetición 2D y los momentos destacados llegan cuando termine.",
     "demo_playback": {
diff --git a/i18n/locales/fr_FR.json b/i18n/locales/fr_FR.json
index 724bbfce3..29845496e 100644
--- a/i18n/locales/fr_FR.json
+++ b/i18n/locales/fr_FR.json
@@ -8508,6 +8508,7 @@
     },
     "winner": {
       "set": "Définir le vainqueur du match",
+      "set_confirm": "Désigner {team} vainqueur de ce match ?",
       "set_failed": "Impossible de définir le vainqueur du match",
       "select_lineup": "Choisir une composition"
     },
@@ -8583,6 +8584,7 @@
       "resume": "Reprendre le match",
       "match_paused": "Match en pause",
       "match_resumed": "Match repris",
+      "forced_ready": "Joueurs forcés prêts",
       "start_live": "Lancer le live",
       "pause_highlights_and_start_live": "Mettre les highlights en pause et lancer le live",
       "start_live_preempt_highlights_hint": "Les highlights se mettent en pause après le rendu en cours · le live démarre dès que le GPU se libère",
@@ -8619,6 +8621,9 @@
       "title": "Supprimer le match",
       "description": "Supprimer ce match ? Cette action est irréversible."
     },
+    "cancel_confirm": {
+      "description": "Voulez-vous vraiment annuler ce match ?"
+    },
     "lineup": {
       "lineup_1": "Composition 1",
       "lineup_2": "Composition 2",
@@ -8874,6 +8879,7 @@
       "dedicated": "Serveurs dédiés",
       "on_demand": "À la demande",
       "assigned": "Serveur de match assigné",
+      "assign_confirm": "Attribuer {server} à ce match ?",
       "reboot_label": "Redémarrage du serveur",
       "reboot": "Redémarrer le serveur",
       "rebooting": "Redémarrage…",
@@ -9045,7 +9051,8 @@
     "admin_bar": {
       "rcon_unavailable": "RCON indisponible",
       "not_controllable": "Le match n'est pas dans un état contrôlable.",
-      "veto_override": "Forcer le veto"
+      "veto_override": "Forcer le veto",
+      "actions": "Actions"
     },
     "demo_processing_hint": "La démo du match est en cours de téléversement depuis le serveur de jeu. Les statistiques, la rediffusion 2D et les temps forts arriveront une fois terminé.",
     "demo_playback": {
diff --git a/i18n/locales/it_IT.json b/i18n/locales/it_IT.json
index 0274d83b1..cbca2e1c9 100644
--- a/i18n/locales/it_IT.json
+++ b/i18n/locales/it_IT.json
@@ -8508,6 +8508,7 @@
     },
     "winner": {
       "set": "Imposta vincitore del match",
+      "set_confirm": "Rendere {team} vincitore di questo match?",
       "set_failed": "Impossibile impostare il vincitore della partita",
       "select_lineup": "Seleziona lineup"
     },
@@ -8583,6 +8584,7 @@
       "resume": "Riprendi il match",
       "match_paused": "Match in pausa",
       "match_resumed": "Match ripreso",
+      "forced_ready": "Giocatori forzati pronti",
       "start_live": "Avvia live stream",
       "pause_highlights_and_start_live": "Metti in pausa gli highlight e avvia il live stream",
       "start_live_preempt_highlights_hint": "Gli highlight si mettono in pausa dopo quello in corso · il live parte quando la GPU si libera",
@@ -8619,6 +8621,9 @@
       "title": "Elimina match",
       "description": "Eliminare questo match? L'operazione è irreversibile."
     },
+    "cancel_confirm": {
+      "description": "Vuoi davvero annullare questo match?"
+    },
     "lineup": {
       "lineup_1": "Lineup 1",
       "lineup_2": "Lineup 2",
@@ -8874,6 +8879,7 @@
       "dedicated": "Server dedicati",
       "on_demand": "On demand",
       "assigned": "Server match assegnato",
+      "assign_confirm": "Assegnare {server} a questo match?",
       "reboot_label": "Riavvio server",
       "reboot": "Riavvia server",
       "rebooting": "Riavvio in corso…",
@@ -9045,7 +9051,8 @@
     "admin_bar": {
       "rcon_unavailable": "RCON non disponibile",
       "not_controllable": "Il match non è in uno stato controllabile.",
-      "veto_override": "Forza il veto"
+      "veto_override": "Forza il veto",
+      "actions": "Azioni"
     },
     "demo_processing_hint": "La demo della partita è in caricamento dal server di gioco. Statistiche, replay 2D e highlight arriveranno al termine.",
     "demo_playback": {
diff --git a/i18n/locales/ja_JP.json b/i18n/locales/ja_JP.json
index 74837957d..93ca4e0b1 100644
--- a/i18n/locales/ja_JP.json
+++ b/i18n/locales/ja_JP.json
@@ -8508,6 +8508,7 @@
     },
     "winner": {
       "set": "試合の勝者を設定",
+      "set_confirm": "{team}をこの試合の勝者にしますか？",
       "set_failed": "試合の勝者を設定できませんでした",
       "select_lineup": "出場メンバーを選択"
     },
@@ -8583,6 +8584,7 @@
       "resume": "試合を再開",
       "match_paused": "試合を一時停止しました",
       "match_resumed": "試合を再開しました",
+      "forced_ready": "プレイヤーを強制的に準備完了にしました",
       "start_live": "ライブ配信を開始",
       "pause_highlights_and_start_live": "ハイライトを一時停止してライブ配信を開始",
       "start_live_preempt_highlights_hint": "現在のハイライト後に一時停止 · GPU が空き次第ライブ開始",
@@ -8619,6 +8621,9 @@
       "title": "試合を削除",
       "description": "この試合を削除しますか？この操作は取り消せません。"
     },
+    "cancel_confirm": {
+      "description": "この試合をキャンセルしてもよろしいですか？"
+    },
     "lineup": {
       "lineup_1": "出場メンバー1",
       "lineup_2": "出場メンバー2",
@@ -8874,6 +8879,7 @@
       "dedicated": "専用サーバー",
       "on_demand": "オンデマンド",
       "assigned": "割り当て済みマッチサーバー",
+      "assign_confirm": "この試合に{server}を割り当てますか？",
       "reboot_label": "サーバー再起動",
       "reboot": "サーバーを再起動",
       "rebooting": "再起動中...",
@@ -9045,7 +9051,8 @@
     "admin_bar": {
       "rcon_unavailable": "RCON利用不可",
       "not_controllable": "試合は操作可能な状態ではありません。",
-      "veto_override": "拒否を上書き"
+      "veto_override": "拒否を上書き",
+      "actions": "操作"
     },
     "demo_processing_hint": "試合のデモをゲームサーバーからアップロードしています。完了すると統計、2Dリプレイ、ハイライトが表示されます。",
     "demo_playback": {
diff --git a/i18n/locales/ko_KR.json b/i18n/locales/ko_KR.json
index a35e2d9bc..3a9d921de 100644
--- a/i18n/locales/ko_KR.json
+++ b/i18n/locales/ko_KR.json
@@ -8508,6 +8508,7 @@
     },
     "winner": {
       "set": "매치 승자 지정",
+      "set_confirm": "{team}을(를) 이 매치의 승자로 지정하시겠습니까?",
       "set_failed": "경기 승자를 설정하지 못했습니다",
       "select_lineup": "라인업 선택"
     },
@@ -8583,6 +8584,7 @@
       "resume": "매치 재개",
       "match_paused": "매치가 일시정지되었습니다",
       "match_resumed": "매치가 재개되었습니다",
+      "forced_ready": "플레이어를 강제로 준비 완료했습니다",
       "start_live": "라이브 스트림 시작",
       "pause_highlights_and_start_live": "하이라이트 일시정지 후 라이브 스트림 시작",
       "start_live_preempt_highlights_hint": "현재 작업 후 하이라이트 일시정지 · GPU 확보 시 라이브 시작",
@@ -8619,6 +8621,9 @@
       "title": "매치 삭제",
       "description": "정말 이 매치를 삭제하시겠습니까? 이 작업은 되돌릴 수 없습니다."
     },
+    "cancel_confirm": {
+      "description": "이 매치를 취소하시겠습니까?"
+    },
     "lineup": {
       "lineup_1": "라인업 1",
       "lineup_2": "라인업 2",
@@ -8874,6 +8879,7 @@
       "dedicated": "데디케이티드 서버",
       "on_demand": "온디맨드",
       "assigned": "지정된 매치 서버",
+      "assign_confirm": "이 매치에 {server}을(를) 할당하시겠습니까?",
       "reboot_label": "서버 재부팅",
       "reboot": "서버 재부팅",
       "rebooting": "재부팅 중...",
@@ -9045,7 +9051,8 @@
     "admin_bar": {
       "rcon_unavailable": "RCON 사용 불가",
       "not_controllable": "매치가 제어 가능한 상태가 아닙니다.",
-      "veto_override": "거부 재정의"
+      "veto_override": "거부 재정의",
+      "actions": "작업"
     },
     "demo_processing_hint": "경기 데모를 게임 서버에서 업로드하고 있습니다. 완료되면 통계, 2D 리플레이, 하이라이트가 표시됩니다.",
     "demo_playback": {
diff --git a/i18n/locales/pl_PL.json b/i18n/locales/pl_PL.json
index 1e73412e7..c16f2fc00 100644
--- a/i18n/locales/pl_PL.json
+++ b/i18n/locales/pl_PL.json
@@ -8508,6 +8508,7 @@
     },
     "winner": {
       "set": "Ustaw zwycięzcę meczu",
+      "set_confirm": "Ustawić {team} jako zwycięzcę tego meczu?",
       "set_failed": "Nie udało się ustawić zwycięzcy meczu",
       "select_lineup": "Wybierz ustawienie"
     },
@@ -8583,6 +8584,7 @@
       "resume": "Wznów mecz",
       "match_paused": "Mecz wstrzymany",
       "match_resumed": "Mecz wznowiony",
+      "forced_ready": "Gracze wymuszeni jako gotowi",
       "start_live": "Rozpocznij transmisję na żywo",
       "pause_highlights_and_start_live": "Wstrzymaj highlighty i rozpocznij transmisję na żywo",
       "start_live_preempt_highlights_hint": "Highlighty wstrzymają się po bieżącym · transmisja ruszy po zwolnieniu GPU",
@@ -8619,6 +8621,9 @@
       "title": "Usuń mecz",
       "description": "Czy na pewno chcesz usunąć ten mecz? Tej operacji nie można cofnąć."
     },
+    "cancel_confirm": {
+      "description": "Czy na pewno chcesz anulować ten mecz?"
+    },
     "lineup": {
       "lineup_1": "Ustawienie 1",
       "lineup_2": "Ustawienie 2",
@@ -8874,6 +8879,7 @@
       "dedicated": "Serwery dedykowane",
       "on_demand": "On demand",
       "assigned": "Przypisany serwer meczu",
+      "assign_confirm": "Przypisać {server} do tego meczu?",
       "reboot_label": "Restart serwera",
       "reboot": "Zrestartuj serwer",
       "rebooting": "Restartowanie…",
@@ -9045,7 +9051,8 @@
     "admin_bar": {
       "rcon_unavailable": "RCON niedostępne",
       "not_controllable": "Mecz nie jest w stanie umożliwiającym sterowanie",
-      "veto_override": "Nadpisz veto"
+      "veto_override": "Nadpisz veto",
+      "actions": "Akcje"
     },
     "demo_processing_hint": "Demo meczu jest przesyłane z serwera gry. Statystyki, powtórka 2D i highlighty pojawią się po zakończeniu.",
     "demo_playback": {
diff --git a/i18n/locales/pt_BR.json b/i18n/locales/pt_BR.json
index e8c3b14d9..faea069f5 100644
--- a/i18n/locales/pt_BR.json
+++ b/i18n/locales/pt_BR.json
@@ -8508,6 +8508,7 @@
     },
     "winner": {
       "set": "Definir Vencedor",
+      "set_confirm": "Definir {team} como vencedor desta partida?",
       "set_failed": "Não foi possível definir o vencedor",
       "select_lineup": "Selecionar escalação"
     },
@@ -8583,6 +8584,7 @@
       "resume": "⏯ Despausar Partida",
       "match_paused": "Partida Pausada",
       "match_resumed": "Partida Retomada",
+      "forced_ready": "Jogadores forçados como prontos",
       "start_live": "Iniciar Live Stream",
       "pause_highlights_and_start_live": "Pausar Highlights & Iniciar Live Stream",
       "start_live_preempt_highlights_hint": "Highlights pausam após o atual · transmissão inicia assim que a GPU estiver livre",
@@ -8619,6 +8621,9 @@
       "title": "Deletar Partida",
       "description": "Tem certeza que deseja deletar esta partida? Esta ação não pode ser desfeita."
     },
+    "cancel_confirm": {
+      "description": "Tem certeza de que deseja cancelar esta partida?"
+    },
     "lineup": {
       "lineup_1": "Lineup 1",
       "lineup_2": "Lineup 2",
@@ -8874,6 +8879,7 @@
       "dedicated": "Servidores Dedicados",
       "on_demand": "Sob Demanda",
       "assigned": "Servidor de Partida Atribuído",
+      "assign_confirm": "Atribuir {server} a esta partida?",
       "reboot_label": "Reiniciar Servidor",
       "reboot": "Reiniciar Servidor",
       "rebooting": "Reiniciando...",
@@ -9045,7 +9051,8 @@
     "admin_bar": {
       "rcon_unavailable": "RCON indisponível",
       "not_controllable": "A partida não está em um estado controlável.",
-      "veto_override": "Veto Sobrescrito"
+      "veto_override": "Veto Sobrescrito",
+      "actions": "Ações"
     },
     "demo_processing_hint": "A demo da partida está sendo enviada do servidor de jogo. Estatísticas, replay 2D e destaques ficam disponíveis quando terminar.",
     "demo_playback": {
diff --git a/i18n/locales/ru_RU.json b/i18n/locales/ru_RU.json
index 6192e4bc8..b7551ba6e 100644
--- a/i18n/locales/ru_RU.json
+++ b/i18n/locales/ru_RU.json
@@ -8508,6 +8508,7 @@
     },
     "winner": {
       "set": "Указать победителя матча",
+      "set_confirm": "Сделать {team} победителем этого матча?",
       "set_failed": "Не удалось назначить победителя матча",
       "select_lineup": "Выбрать состав"
     },
@@ -8583,6 +8584,7 @@
       "resume": "Возобновить матч",
       "match_paused": "Матч поставлен на паузу",
       "match_resumed": "Матч возобновлён",
+      "forced_ready": "Игроки принудительно готовы",
       "start_live": "Начать прямую трансляцию",
       "pause_highlights_and_start_live": "Приостановить хайлайты и начать трансляцию",
       "start_live_preempt_highlights_hint": "Хайлайты остановятся после текущего · трансляция начнётся, как только освободится GPU",
@@ -8619,6 +8621,9 @@
       "title": "Удалить матч",
       "description": "Удалить этот матч? Это действие нельзя отменить."
     },
+    "cancel_confirm": {
+      "description": "Вы уверены, что хотите отменить этот матч?"
+    },
     "lineup": {
       "lineup_1": "Состав 1",
       "lineup_2": "Состав 2",
@@ -8874,6 +8879,7 @@
       "dedicated": "Выделенные серверы",
       "on_demand": "По требованию",
       "assigned": "Назначенный сервер матча",
+      "assign_confirm": "Назначить {server} для этого матча?",
       "reboot_label": "Перезагрузка сервера",
       "reboot": "Перезагрузить сервер",
       "rebooting": "Перезагрузка…",
@@ -9045,7 +9051,8 @@
     "admin_bar": {
       "rcon_unavailable": "RCON недоступен",
       "not_controllable": "Матч не в управляемом состоянии.",
-      "veto_override": "Переопределить вето"
+      "veto_override": "Переопределить вето",
+      "actions": "Действия"
     },
     "demo_processing_hint": "Демо матча загружается с игрового сервера. Статистика, 2D-повтор и хайлайты появятся, когда загрузка завершится.",
     "demo_playback": {
diff --git a/i18n/locales/sv_SE.json b/i18n/locales/sv_SE.json
index d3ca24081..d92e3f0a8 100644
--- a/i18n/locales/sv_SE.json
+++ b/i18n/locales/sv_SE.json
@@ -8508,6 +8508,7 @@
     },
     "winner": {
       "set": "Sätt matchvinnare",
+      "set_confirm": "Gör {team} till vinnare av matchen?",
       "set_failed": "Kunde inte ange matchens vinnare",
       "select_lineup": "Välj laguppställning"
     },
@@ -8583,6 +8584,7 @@
       "resume": "Återuppta match",
       "match_paused": "Matchen pausad",
       "match_resumed": "Matchen återupptagen",
+      "forced_ready": "Spelarna tvingades redo",
       "start_live": "Starta livesändning",
       "pause_highlights_and_start_live": "Pausa höjdpunkter och starta livesändning",
       "start_live_preempt_highlights_hint": "Höjdpunkter pausar efter aktuell · livesändning startar när GPU:n frigörs",
@@ -8619,6 +8621,9 @@
       "title": "Ta bort match",
       "description": "Vill du ta bort den här matchen? Detta går inte att ångra."
     },
+    "cancel_confirm": {
+      "description": "Är du säker på att du vill avbryta matchen?"
+    },
     "lineup": {
       "lineup_1": "Laguppställning 1",
       "lineup_2": "Laguppställning 2",
@@ -8874,6 +8879,7 @@
       "dedicated": "Dedikerade servrar",
       "on_demand": "On demand",
       "assigned": "Tilldelad matchserver",
+      "assign_confirm": "Tilldela {server} till matchen?",
       "reboot_label": "Serveromstart",
       "reboot": "Starta om server",
       "rebooting": "Startar om…",
@@ -9045,7 +9051,8 @@
     "admin_bar": {
       "rcon_unavailable": "RCON otillgängligt",
       "not_controllable": "Matchen kan inte styras i sitt nuvarande läge.",
-      "veto_override": "Åsidosätt veto"
+      "veto_override": "Åsidosätt veto",
+      "actions": "Åtgärder"
     },
     "demo_processing_hint": "Matchens demo laddas upp från spelservern. Statistik, 2D-replay och höjdpunkter kommer när den är klar.",
     "demo_playback": {
diff --git a/i18n/locales/tr_TR.json b/i18n/locales/tr_TR.json
index baf3b8e57..eaf546de4 100644
--- a/i18n/locales/tr_TR.json
+++ b/i18n/locales/tr_TR.json
@@ -8508,6 +8508,7 @@
     },
     "winner": {
       "set": "Maç Kazananını Belirle",
+      "set_confirm": "{team} bu maçın kazananı yapılsın mı?",
       "set_failed": "Maçın galibi belirlenemedi",
       "select_lineup": "Diziliş Seç"
     },
@@ -8583,6 +8584,7 @@
       "resume": "Maçı Devam Ettir",
       "match_paused": "Maç duraklatıldı",
       "match_resumed": "Maç devam ettirildi",
+      "forced_ready": "Oyuncular zorla hazır yapıldı",
       "start_live": "Canlı Yayını Başlat",
       "pause_highlights_and_start_live": "Öne Çıkan Anları Duraklat ve Canlı Yayını Başlat",
       "start_live_preempt_highlights_hint": "Mevcut render bitince öne çıkan anlar duraklar · GPU boşalınca yayın başlar",
@@ -8619,6 +8621,9 @@
       "title": "Maçı Sil",
       "description": "Bu maçı silmek istediğine emin misin? Bu işlem geri alınamaz."
     },
+    "cancel_confirm": {
+      "description": "Bu maçı iptal etmek istediğinden emin misin?"
+    },
     "lineup": {
       "lineup_1": "Diziliş 1",
       "lineup_2": "Diziliş 2",
@@ -8874,6 +8879,7 @@
       "dedicated": "Özel sunucular",
       "on_demand": "Talep üzerine",
       "assigned": "Atanan maç sunucusu",
+      "assign_confirm": "{server} bu maça atansın mı?",
       "reboot_label": "Sunucu yeniden başlatma",
       "reboot": "Sunucuyu yeniden başlat",
       "rebooting": "Yeniden başlatılıyor...",
@@ -9045,7 +9051,8 @@
     "admin_bar": {
       "rcon_unavailable": "RCON kullanılamıyor",
       "not_controllable": "Maç kontrol edilebilir durumda değil.",
-      "veto_override": "Vetoyu geçersiz kıl"
+      "veto_override": "Vetoyu geçersiz kıl",
+      "actions": "İşlemler"
     },
     "demo_processing_hint": "Maç demosu oyun sunucusundan yükleniyor. İstatistikler, 2B tekrar ve öne çıkanlar tamamlandığında gelir.",
     "demo_playback": {
diff --git a/i18n/locales/uk_UA.json b/i18n/locales/uk_UA.json
index ff23a3f4c..ca57d4c86 100644
--- a/i18n/locales/uk_UA.json
+++ b/i18n/locales/uk_UA.json
@@ -8508,6 +8508,7 @@
     },
     "winner": {
       "set": "Встановити переможця матчу",
+      "set_confirm": "Зробити {team} переможцем цього матчу?",
       "set_failed": "Не вдалося призначити переможця матчу",
       "select_lineup": "Обрати склад"
     },
@@ -8583,6 +8584,7 @@
       "resume": "Відновити матч",
       "match_paused": "Матч призупинено",
       "match_resumed": "Матч відновлено",
+      "forced_ready": "Гравців примусово позначено готовими",
       "start_live": "Почати пряму трансляцію",
       "pause_highlights_and_start_live": "Призупинити хайлайти й почати трансляцію",
       "start_live_preempt_highlights_hint": "Хайлайти призупиняться після поточного · трансляція почнеться, коли звільниться GPU",
@@ -8619,6 +8621,9 @@
       "title": "Видалити матч",
       "description": "Видалити цей матч? Цю дію не можна скасувати."
     },
+    "cancel_confirm": {
+      "description": "Ви впевнені, що хочете скасувати цей матч?"
+    },
     "lineup": {
       "lineup_1": "Склад 1",
       "lineup_2": "Склад 2",
@@ -8874,6 +8879,7 @@
       "dedicated": "Виділені сервери",
       "on_demand": "На вимогу",
       "assigned": "Призначений сервер матчу",
+      "assign_confirm": "Призначити {server} для цього матчу?",
       "reboot_label": "Перезавантаження сервера",
       "reboot": "Перезавантажити сервер",
       "rebooting": "Перезавантаження...",
@@ -9045,7 +9051,8 @@
     "admin_bar": {
       "rcon_unavailable": "RCON недоступний",
       "not_controllable": "Матч не в стані, що дозволяє керування.",
-      "veto_override": "Перевизначити вето"
+      "veto_override": "Перевизначити вето",
+      "actions": "Дії"
     },
     "demo_processing_hint": "Демо матчу завантажується з ігрового сервера. Статистика, 2D-повтор і хайлайти з'являться, коли завантаження завершиться.",
     "demo_playback": {
diff --git a/i18n/locales/zh_Hans.json b/i18n/locales/zh_Hans.json
index 433e8f86f..43cf4a54f 100644
--- a/i18n/locales/zh_Hans.json
+++ b/i18n/locales/zh_Hans.json
@@ -8508,6 +8508,7 @@
     },
     "winner": {
       "set": "设置比赛胜者",
+      "set_confirm": "将{team}设为这场比赛的胜者？",
       "set_failed": "无法设置比赛胜方",
       "select_lineup": "选择阵容"
     },
@@ -8583,6 +8584,7 @@
       "resume": "恢复比赛",
       "match_paused": "比赛已暂停",
       "match_resumed": "比赛已恢复",
+      "forced_ready": "已强制所有玩家准备",
       "start_live": "开始直播",
       "pause_highlights_and_start_live": "暂停高光并开始直播",
       "start_live_preempt_highlights_hint": "高光渲染在完成后暂停 · GPU 空闲后直播上线",
@@ -8619,6 +8621,9 @@
       "title": "删除比赛",
       "description": "您确定要删除此比赛吗？此操作无法撤销。"
     },
+    "cancel_confirm": {
+      "description": "确定要取消这场比赛吗？"
+    },
     "lineup": {
       "lineup_1": "阵容 1",
       "lineup_2": "阵容 2",
@@ -8874,6 +8879,7 @@
       "dedicated": "专用服务器",
       "on_demand": "按需",
       "assigned": "已分配比赛服务器",
+      "assign_confirm": "将{server}分配给这场比赛？",
       "reboot_label": "服务器重启",
       "reboot": "重启服务器",
       "rebooting": "重启中...",
@@ -9045,7 +9051,8 @@
     "admin_bar": {
       "rcon_unavailable": "RCON 不可用",
       "not_controllable": "比赛处于不可控状态。",
-      "veto_override": "覆盖否决"
+      "veto_override": "覆盖否决",
+      "actions": "操作"
     },
     "demo_processing_hint": "比赛 demo 正从游戏服务器上传。完成后就会出现数据、2D 回放和集锦。",
     "demo_playback": {
diff --git a/i18n/locales/zh_Hant.json b/i18n/locales/zh_Hant.json
index 10bdb8357..5c94e4c53 100644
--- a/i18n/locales/zh_Hant.json
+++ b/i18n/locales/zh_Hant.json
@@ -8508,6 +8508,7 @@
     },
     "winner": {
       "set": "設定比賽勝者",
+      "set_confirm": "將{team}設為這場比賽的勝者？",
       "set_failed": "無法設定比賽勝方",
       "select_lineup": "選擇陣容"
     },
@@ -8583,6 +8584,7 @@
       "resume": "繼續比賽",
       "match_paused": "比賽已暫停",
       "match_resumed": "比賽已繼續",
+      "forced_ready": "已強制所有玩家準備",
       "start_live": "開始直播",
       "pause_highlights_and_start_live": "暫停精華並開始直播",
       "start_live_preempt_highlights_hint": "精華算繪於目前項目完成後暫停 · GPU 空閒後直播上線",
@@ -8619,6 +8621,9 @@
       "title": "刪除比賽",
       "description": "您確定要刪除此比賽嗎？此操作無法復原。"
     },
+    "cancel_confirm": {
+      "description": "確定要取消這場比賽嗎？"
+    },
     "lineup": {
       "lineup_1": "陣容 1",
       "lineup_2": "陣容 2",
@@ -8874,6 +8879,7 @@
       "dedicated": "專用伺服器",
       "on_demand": "隨選",
       "assigned": "已指派比賽伺服器",
+      "assign_confirm": "將{server}指派給這場比賽？",
       "reboot_label": "伺服器重新啟動",
       "reboot": "重新啟動伺服器",
       "rebooting": "重新啟動中...",
@@ -9045,7 +9051,8 @@
     "admin_bar": {
       "rcon_unavailable": "RCON 無法使用",
       "not_controllable": "比賽處於無法控制的狀態。",
-      "veto_override": "覆寫否決"
+      "veto_override": "覆寫否決",
+      "actions": "操作"
     },
     "demo_processing_hint": "比賽 demo 正從遊戲伺服器上傳。完成後就會出現數據、2D 重播與精華片段。",
     "demo_playback": {
diff --git a/tests/components/match/MatchActionsConfirm.spec.ts b/tests/components/match/MatchActionsConfirm.spec.ts
new file mode 100644
index 000000000..d2fb19f75
--- /dev/null
+++ b/tests/components/match/MatchActionsConfirm.spec.ts
@@ -0,0 +1,128 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { flushPromises } from "@vue/test-utils";
+import { mountSuspended } from "@nuxt/test-utils/runtime";
+import { print } from "graphql";
+import MatchActions from "~/components/match/MatchActions.vue";
+import MatchSelectWinner from "~/components/match/MatchSelectWinner.vue";
+import { useAuthStore } from "~/stores/AuthStore";
+import { e_player_roles_enum } from "~/generated/zeus";
+
+let mutate: ReturnType<typeof vi.fn>;
+let wrapper: Awaited<ReturnType<typeof mountSuspended>> | undefined;
+
+const sent = () => mutate.mock.calls.map(([{ mutation }]) => print(mutation));
+
+function match(mapStatus = "Live") {
+  return {
+    id: "m-1",
+    status: "Live",
+    is_organizer: true,
+    is_in_lineup: false,
+    is_server_online: true,
+    can_cancel: true,
+    server_id: "server-1",
+    server_plugin_runtime: null,
+    options: { type: "Competitive" },
+    match_maps: [{ id: "map-1", is_current_map: true, status: mapStatus }],
+    streams: [],
+    lineup_1: { id: "l-1", name: "Northwind", lineup_players: [] },
+    lineup_2: { id: "l-2", name: "Ember Six", lineup_players: [] },
+    winning_lineup_id: null,
+  };
+}
+
+function signIn(role: e_player_roles_enum) {
+  useAuthStore().me = { steam_id: "76561198000000001", role } as any;
+}
+
+async function mountActions(mapStatus = "Live") {
+  wrapper = await mountSuspended(MatchActions, {
+    props: { match: match(mapStatus) },
+    global: { mixins: (useNuxtApp().vueApp as any)._context.mixins },
+  });
+  await flushPromises();
+  return wrapper.vm as any;
+}
+
+beforeEach(() => {
+  const client = (useNuxtApp() as any).$apollo.defaultClient;
+  mutate = vi.fn().mockResolvedValue({ data: {} });
+  vi.spyOn(client, "mutate").mockImplementation(mutate);
+  vi.spyOn(client, "subscribe").mockImplementation(() => ({
+    subscribe: () => ({ unsubscribe() {}, closed: false }),
+  }));
+});
+
+afterEach(() => {
+  wrapper?.unmount();
+  wrapper = undefined;
+  useAuthStore().me = undefined;
+  vi.restoreAllMocks();
+});
+
+describe("match actions confirm before acting", () => {
+  it("asks before cancelling, and only cancels once confirmed", async () => {
+    signIn(e_player_roles_enum.administrator);
+    const actions = await mountActions();
+
+    actions.confirmCancel();
+    expect(actions.confirmOpen).toBe(true);
+    expect(mutate).not.toHaveBeenCalled();
+
+    await actions.runConfirm();
+    expect(sent()[0]).toContain("cancelMatch");
+    expect(actions.confirmOpen).toBe(false);
+  });
+
+  it("names the picked server and assigns it only once confirmed", async () => {
+    signIn(e_player_roles_enum.administrator);
+    const actions = await mountActions();
+
+    actions.confirmServer({ value: "0:Dallas", label: "Dallas" });
+    expect(actions.confirming.description).toContain("Dallas");
+    expect(mutate).not.toHaveBeenCalled();
+
+    await actions.runConfirm();
+    expect(sent()[0]).toContain("update_matches_by_pk");
+    expect(sent()[0]).toContain("Dallas");
+  });
+
+  it("leaves the winner picker to report the pick without saving it", async () => {
+    signIn(e_player_roles_enum.administrator);
+    const picker = await mountSuspended(MatchSelectWinner, {
+      props: { match: match() },
+      global: { mixins: (useNuxtApp().vueApp as any)._context.mixins },
+    });
+
+    (picker.vm as any).pick("l-2");
+
+    expect(picker.emitted("select")?.[0]).toEqual([
+      { value: "l-2", label: "Ember Six" },
+    ]);
+    expect(mutate).not.toHaveBeenCalled();
+    picker.unmount();
+  });
+});
+
+describe("match actions force ready", () => {
+  it("offers Force Ready to a moderator while the map warms up", async () => {
+    signIn(e_player_roles_enum.moderator);
+    const actions = await mountActions("Warmup");
+
+    expect(actions.canForceReady).toBe(true);
+  });
+
+  it("hides Force Ready once the map is live", async () => {
+    signIn(e_player_roles_enum.moderator);
+    const actions = await mountActions("Live");
+
+    expect(actions.canForceReady).toBe(false);
+  });
+
+  it("hides Force Ready from a non-staff organizer", async () => {
+    signIn(e_player_roles_enum.user);
+    const actions = await mountActions("Warmup");
+
+    expect(actions.canForceReady).toBe(false);
+  });
+});

From 2251ad8a2e06c12b01d1e1a849d23acab3267dc0 Mon Sep 17 00:00:00 2001
From: Luke Policinski <luke@lukepolo.com>
Date: Mon, 5 Oct 2026 10:09:24 -0400
Subject: [PATCH 2/3] feature: guided admin dock with match steps, one main
 action per step, cancel and delete up front, and only actions your role can
 use

---
 components/match/MatchActions.vue             | 272 +++++++++++++++---
 components/match/MatchAdminBottomBar.vue      |  23 +-
 components/match/MatchAdminSteps.vue          | 117 ++++++++
 components/match/MatchSelectServer.vue        |  16 +-
 components/match/MatchSelectWinner.vue        |  17 +-
 i18n/locales/ar_SA.json                       |  21 +-
 i18n/locales/da_DK.json                       |  21 +-
 i18n/locales/de_DE.json                       |  21 +-
 i18n/locales/en.json                          |  21 +-
 i18n/locales/es_ES.json                       |  21 +-
 i18n/locales/fr_FR.json                       |  21 +-
 i18n/locales/it_IT.json                       |  21 +-
 i18n/locales/ja_JP.json                       |  21 +-
 i18n/locales/ko_KR.json                       |  21 +-
 i18n/locales/pl_PL.json                       |  21 +-
 i18n/locales/pt_BR.json                       |  21 +-
 i18n/locales/ru_RU.json                       |  21 +-
 i18n/locales/sv_SE.json                       |  21 +-
 i18n/locales/tr_TR.json                       |  21 +-
 i18n/locales/uk_UA.json                       |  21 +-
 i18n/locales/zh_Hans.json                     |  21 +-
 i18n/locales/zh_Hant.json                     |  21 +-
 .../match/MatchActionsConfirm.spec.ts         |  69 ++++-
 tests/utilities/matchAdminSteps.spec.ts       |  72 +++++
 utilities/matchAdminSteps.ts                  | 129 +++++++++
 25 files changed, 942 insertions(+), 130 deletions(-)
 create mode 100644 components/match/MatchAdminSteps.vue
 create mode 100644 tests/utilities/matchAdminSteps.spec.ts
 create mode 100644 utilities/matchAdminSteps.ts

diff --git a/components/match/MatchActions.vue b/components/match/MatchActions.vue
index 580ad1b79..5418ae26e 100644
--- a/components/match/MatchActions.vue
+++ b/components/match/MatchActions.vue
@@ -8,15 +8,19 @@ import {
   Radio,
   RefreshCw,
   Scissors,
+  Server,
   SlidersHorizontal,
   Square,
   Trash2,
+  Trophy,
   XCircle,
+  Zap,
 } from "lucide-vue-next";
 import MatchCameraStatus from "~/components/match/MatchCameraStatus.vue";
 import MatchSelectServer from "~/components/match/MatchSelectServer.vue";
 import MatchSelectWinner from "~/components/match/MatchSelectWinner.vue";
 import DropdownMenuItem from "~/components/ui/dropdown-menu/DropdownMenuItem.vue";
+import DropdownMenuLabel from "~/components/ui/dropdown-menu/DropdownMenuLabel.vue";
 import {
   DropdownMenuSub,
   DropdownMenuSubContent,
@@ -32,12 +36,32 @@ import {
   e_match_map_status_enum,
   e_player_roles_enum,
 } from "~/generated/zeus";
+
+// Dock controls share the admin bar's chip shape so the strip stays one short
+// row; the tone says what the button does.
+const dockChip =
+  "inline-flex items-center gap-2 whitespace-nowrap rounded-md border px-2.5 py-1 font-mono text-[0.62rem] font-bold uppercase tracking-[0.18em] transition-colors duration-200 ease-out disabled:pointer-events-none disabled:opacity-50";
+const dockPrimary = `${dockChip} border-[hsl(var(--tac-amber)/0.6)] bg-[hsl(var(--tac-amber)/0.12)] text-[hsl(var(--tac-amber))] hover:bg-[hsl(var(--tac-amber)/0.2)]`;
+const dockDanger = `${dockChip} border-[hsl(var(--destructive)/0.45)] text-destructive hover:bg-[hsl(var(--destructive)/0.12)]`;
+const dockNeutral = `${dockChip} border-border bg-background/60 text-muted-foreground hover:border-[hsl(var(--tac-amber)/0.4)] hover:text-foreground data-[state=open]:border-[hsl(var(--tac-amber)/0.4)] data-[state=open]:text-foreground`;
+
+const menuLabel =
+  "px-2 pb-1 pt-1.5 font-mono text-[0.58rem] font-semibold uppercase tracking-[0.16em] text-muted-foreground";
+
+const upcomingIcons = {
+  veto_override: Zap,
+  force_ready: CheckCheck,
+  pause: Pause,
+  live_stream: Radio,
+  highlights: Scissors,
+  reparse: RefreshCw,
+};
 </script>
 
 <template>
   <div
     class="flex gap-2 items-center"
-    v-if="dock ? hasOrganizerItems : canAct || canWatchCameras"
+    v-if="dock ? hasDockItems : canAct || canWatchCameras"
   >
     <MatchCameraStatus v-if="canWatchCameras && !dock" :match-id="match.id" />
 
@@ -87,14 +111,75 @@ import {
       </div>
     </Transition>
 
-    <DropdownMenu>
+    <!-- Admin dock: the current step's main action, then Cancel and Delete out
+         front. The veto step's main action, Veto Override, lives in the bar. -->
+    <template v-if="dock">
+      <button
+        v-if="primaryAction === 'start'"
+        type="button"
+        :class="dockPrimary"
+        :disabled="!hasMinimumLineupPlayers"
+        @click="startMatch"
+      >
+        <Play class="h-3 w-3 shrink-0" />
+        {{ startLabel }}
+      </button>
+      <button
+        v-else-if="primaryAction === 'force_ready'"
+        type="button"
+        :class="dockPrimary"
+        @click="forceReady"
+      >
+        <CheckCheck class="h-3 w-3 shrink-0" />
+        {{ $t("match.commands.force_ready") }}
+      </button>
+      <button
+        v-else-if="primaryAction === 'pause'"
+        type="button"
+        :class="dockPrimary"
+        :disabled="!match.is_server_online"
+        @click="togglePause"
+      >
+        <component :is="isPaused ? Play : Pause" class="h-3 w-3 shrink-0" />
+        {{ isPaused ? $t("match.actions.resume") : $t("match.actions.pause") }}
+      </button>
+      <button
+        v-else-if="primaryAction === 'winner'"
+        type="button"
+        :class="dockPrimary"
+        @click="openWinnerDialog"
+      >
+        <Trophy class="h-3 w-3 shrink-0" />
+        {{ $t("match.winner.set") }}
+      </button>
+
+      <button
+        v-if="match.can_cancel"
+        type="button"
+        :class="dockDanger"
+        @click="confirmCancel"
+      >
+        <XCircle class="h-3 w-3 shrink-0" />
+        <span class="sr-only sm:not-sr-only">
+          {{ $t("match.actions.cancel") }}
+        </span>
+      </button>
+      <button
+        v-if="canDeleteMatch"
+        type="button"
+        :class="dockDanger"
+        @click="confirmDelete"
+      >
+        <Trash2 class="h-3 w-3 shrink-0" />
+        <span class="sr-only sm:not-sr-only">
+          {{ $t("match.actions.delete") }}
+        </span>
+      </button>
+    </template>
+
+    <DropdownMenu v-if="!dock || hasMoreItems">
       <DropdownMenuTrigger as-child>
-        <!-- Admin dock: a chip matching its Veto Override toggle. -->
-        <button
-          v-if="dock"
-          type="button"
-          class="inline-flex items-center gap-2 whitespace-nowrap rounded-md border border-border bg-background/60 px-2.5 py-1 font-mono text-[0.62rem] font-bold uppercase tracking-[0.18em] text-muted-foreground transition-colors duration-200 ease-out hover:border-[hsl(var(--tac-amber)/0.4)] hover:text-foreground data-[state=open]:border-[hsl(var(--tac-amber)/0.4)] data-[state=open]:text-foreground"
-        >
+        <button v-if="dock" type="button" :class="dockNeutral">
           <SlidersHorizontal class="h-3 w-3 shrink-0" />
           <span class="sr-only sm:not-sr-only">
             {{ $t("match.admin_bar.actions") }}
@@ -105,7 +190,11 @@ import {
           <span class="sr-only">{{ $t("common.more") }}</span>
         </Button>
       </DropdownMenuTrigger>
-      <DropdownMenuContent align="end" :side="dock ? 'top' : 'bottom'">
+      <DropdownMenuContent
+        align="end"
+        :side="dock ? 'top' : 'bottom'"
+        :class="dock && 'min-w-60'"
+      >
         <template v-if="match.is_in_lineup && !dock">
           <DropdownMenuItem
             class="text-destructive"
@@ -120,12 +209,20 @@ import {
           />
         </template>
 
-        <DropdownMenuItem v-if="match.can_assign_server">
-          <MatchSelectServer :match="match" @select="confirmServer" />
+        <DropdownMenuItem
+          v-if="match.can_assign_server"
+          @click="openServerDialog"
+        >
+          <Server />
+          {{ $t("match.server.assign") }}…
         </DropdownMenuItem>
 
-        <DropdownMenuItem v-if="canSetMatchWinner">
-          <MatchSelectWinner :match="match" @select="confirmWinner" />
+        <DropdownMenuItem
+          v-if="canSetMatchWinner && primaryAction !== 'winner'"
+          @click="openWinnerDialog"
+        >
+          <Trophy />
+          {{ $t("match.winner.set") }}…
         </DropdownMenuItem>
 
         <template v-if="match.is_organizer && hasOrganizerLiveActions">
@@ -296,11 +393,10 @@ import {
 
         <DropdownMenuSeparator
           v-if="
-            match.can_start ||
-            match.can_cancel ||
-            canDeleteMatch ||
             canReparseDemos ||
-            canForceReady
+            showForceReadyItem ||
+            showStartItem ||
+            (!dock && (match.can_cancel || canDeleteMatch))
           "
           class="first:hidden"
         />
@@ -310,43 +406,57 @@ import {
           {{ $t("match.actions.reparse_demos") }}
         </DropdownMenuItem>
 
-        <DropdownMenuItem v-if="canForceReady" @click="forceReady">
+        <DropdownMenuItem v-if="showForceReadyItem" @click="forceReady">
           <CheckCheck />
           {{ $t("match.commands.force_ready") }}
         </DropdownMenuItem>
 
-        <template v-if="match.can_start">
+        <template v-if="showStartItem">
           <DropdownMenuItem
             @click.prevent.stop="startMatch"
             class="text-destructive"
             :disabled="!hasMinimumLineupPlayers"
           >
             <Play />
-            <template
-              v-if="
-                match.options.map_veto &&
-                match.options.best_of != match.match_maps.length
-              "
-            >
-              {{ $t("match.actions.start_veto") }}
-            </template>
-            <template v-else> {{ $t("match.actions.skip_checkin") }} </template>
+            {{ startLabel }}
           </DropdownMenuItem>
         </template>
 
-        <template v-if="match.can_cancel">
+        <template v-if="!dock && match.can_cancel">
           <DropdownMenuItem class="text-destructive" @click="confirmCancel">
             <XCircle />
             {{ $t("match.actions.cancel") }}
           </DropdownMenuItem>
         </template>
 
-        <template v-if="canDeleteMatch">
+        <template v-if="!dock && canDeleteMatch">
           <DropdownMenuItem class="text-destructive" @click="confirmDelete">
             <Trash2 />
             {{ $t("match.actions.delete") }}
           </DropdownMenuItem>
         </template>
+
+        <!-- What unlocks at later steps, limited to what this role can ever
+             use, so nothing shows up out of nowhere. -->
+        <template v-if="dock && upcoming.length">
+          <DropdownMenuSeparator class="first:hidden" />
+          <DropdownMenuLabel :class="menuLabel">
+            {{ $t("match.admin_bar.coming_up") }}
+          </DropdownMenuLabel>
+          <DropdownMenuItem
+            v-for="action of upcoming"
+            :key="action.key"
+            disabled
+          >
+            <component :is="upcomingIcons[action.key]" />
+            {{ $t(action.label) }}
+            <span
+              class="ml-auto rounded-sm border border-dashed border-border px-1.5 py-0.5 font-mono text-[0.55rem] uppercase tracking-[0.12em]"
+            >
+              {{ $t(`match.admin_bar.steps.${action.step}`) }}
+            </span>
+          </DropdownMenuItem>
+        </template>
       </DropdownMenuContent>
     </DropdownMenu>
 
@@ -363,6 +473,16 @@ import {
             {{ confirming?.description }}
           </AlertDialogDescription>
         </AlertDialogHeader>
+        <MatchSelectServer
+          v-if="confirming?.picker === 'server'"
+          :match="match"
+          @select="(choice) => (confirmChoice = choice)"
+        />
+        <MatchSelectWinner
+          v-else-if="confirming?.picker === 'winner'"
+          :match="match"
+          @select="(choice) => (confirmChoice = choice)"
+        />
         <AlertDialogFooter>
           <AlertDialogCancel :disabled="confirmBusy">
             {{ $t("common.cancel") }}
@@ -371,7 +491,7 @@ import {
                async click handler gets to run. -->
           <Button
             :variant="confirming?.destructive ? 'destructive' : 'default'"
-            :disabled="confirmBusy"
+            :disabled="confirmBusy || (!!confirming?.picker && !confirmChoice)"
             @click="runConfirm"
           >
             {{ confirming?.action }}
@@ -414,12 +534,20 @@ import {
   resolveRconCommand,
   effectivePluginRuntime,
 } from "~/constants/rconCommands";
+import {
+  currentMatchAdminStep,
+  upcomingAdminActions,
+} from "~/utilities/matchAdminSteps";
+type MatchActionChoice = { value: string; label: string };
+
 type MatchActionConfirm = {
   title: string;
   description: string;
   action: string;
   destructive?: boolean;
-  run: () => Promise<void>;
+  // Server and winner dialogs carry their picker; the action waits for a pick.
+  picker?: "server" | "winner";
+  run: (choice: MatchActionChoice | null) => Promise<void>;
 };
 
 export default {
@@ -446,6 +574,7 @@ export default {
       confirmOpen: false,
       confirmBusy: false,
       confirming: null as MatchActionConfirm | null,
+      confirmChoice: null as MatchActionChoice | null,
       rconUuid: undefined as string | undefined,
       rconSuccessTitle: "",
       switching: false,
@@ -483,6 +612,7 @@ export default {
   methods: {
     ask(confirming: MatchActionConfirm) {
       this.confirming = confirming;
+      this.confirmChoice = null;
       this.confirmOpen = true;
     },
     async runConfirm() {
@@ -491,7 +621,7 @@ export default {
       }
       this.confirmBusy = true;
       try {
-        await this.confirming.run();
+        await this.confirming.run(this.confirmChoice);
         this.confirmOpen = false;
       } finally {
         this.confirmBusy = false;
@@ -515,20 +645,30 @@ export default {
         run: this.deleteMatch,
       });
     },
-    confirmServer({ value, label }: { value: string; label: string }) {
+    openServerDialog() {
       this.ask({
         title: this.$t("match.server.assign"),
-        description: this.$t("match.server.assign_confirm", { server: label }),
+        description: this.$t("match.server.assign_hint"),
         action: this.$t("match.server.assign"),
-        run: () => this.assignServer(value),
+        picker: "server",
+        run: async (choice) => {
+          if (choice) {
+            await this.assignServer(choice.value);
+          }
+        },
       });
     },
-    confirmWinner({ value, label }: { value: string; label: string }) {
+    openWinnerDialog() {
       this.ask({
         title: this.$t("match.winner.set"),
-        description: this.$t("match.winner.set_confirm", { team: label }),
+        description: this.$t("match.winner.set_hint"),
         action: this.$t("match.winner.set"),
-        run: () => this.setWinner(value),
+        picker: "winner",
+        run: async (choice) => {
+          if (choice) {
+            await this.setWinner(choice.value);
+          }
+        },
       });
     },
     // "0:<region>" is an on-demand server in that region; anything else is a
@@ -945,15 +1085,61 @@ export default {
     hasOrganizerLiveActions() {
       return this.isLive || this.hasMatchDemos;
     },
-    hasOrganizerItems() {
+    // The dock's one main button for the current step. The veto step's,
+    // Veto Override, is rendered by the admin bar itself.
+    primaryAction() {
+      if (!this.dock) {
+        return null;
+      }
+      switch (currentMatchAdminStep(this.match)) {
+        case "check_in":
+          return this.match.can_start ? "start" : null;
+        case "warmup":
+          return this.canForceReady ? "force_ready" : null;
+        case "live":
+          return this.canPauseResume ? "pause" : null;
+        case "finished":
+          return this.canSetMatchWinner ? "winner" : null;
+      }
+      return null;
+    },
+    startLabel() {
+      return this.match.options?.map_veto &&
+        this.match.options.best_of != this.match.match_maps?.length
+        ? this.$t("match.actions.start_veto")
+        : this.$t("match.actions.skip_checkin");
+    },
+    showStartItem() {
+      return this.match.can_start && this.primaryAction !== "start";
+    },
+    showForceReadyItem() {
+      return this.canForceReady && this.primaryAction !== "force_ready";
+    },
+    upcoming() {
+      return this.dock
+        ? upcomingAdminActions(this.match, (role) =>
+            useAuthStore().isRoleAbove(role),
+          )
+        : [];
+    },
+    // Everything the dock's More actions menu would list.
+    hasMoreItems() {
       return (
         this.match.can_assign_server ||
-        this.canSetMatchWinner ||
+        (this.canSetMatchWinner && this.primaryAction !== "winner") ||
         (this.match.is_organizer && this.hasOrganizerLiveActions) ||
         this.canReparseDemos ||
-        this.match.can_start ||
+        this.showForceReadyItem ||
+        this.showStartItem ||
+        this.upcoming.length > 0
+      );
+    },
+    hasDockItems() {
+      return (
+        !!this.primaryAction ||
         this.match.can_cancel ||
-        this.canDeleteMatch
+        this.canDeleteMatch ||
+        this.hasMoreItems
       );
     },
     activeStreamElsewhere() {
diff --git a/components/match/MatchAdminBottomBar.vue b/components/match/MatchAdminBottomBar.vue
index 33d977397..124245a5a 100644
--- a/components/match/MatchAdminBottomBar.vue
+++ b/components/match/MatchAdminBottomBar.vue
@@ -11,6 +11,7 @@ import {
 } from "lucide-vue-next";
 import { useVetoOverride } from "~/composables/useVetoOverride";
 import MatchActions from "~/components/match/MatchActions.vue";
+import MatchAdminSteps from "~/components/match/MatchAdminSteps.vue";
 import MatchServerRebootControl from "~/components/match/MatchServerRebootControl.vue";
 import RconCommander from "~/components/servers/RconCommander.vue";
 import ServiceLogs from "~/components/ServiceLogs.vue";
@@ -242,16 +243,14 @@ function runCommand(
         />
       </div>
 
-      <!-- Split into three regions so the override toggle and the actions menu
-           can sit between the status and the expander without nesting a button
-           inside a button. The two expander halves shade off the shared `group`
-           rather than their own :hover, otherwise each lights up as its own
-           patch. -->
+      <!-- Three regions: where the match is (ADMIN + steps), what to do now
+           (Veto Override and the match actions), and the console expander.
+           Clicking the first region also opens the console; the chevron is the
+           labeled control, since the steps carry their own tooltips. All three
+           shade off the shared `group` rather than their own :hover. -->
       <div class="group flex items-stretch" :class="dragging && 'select-none'">
-        <button
-          type="button"
-          class="flex items-center gap-3 min-w-0 flex-1 pl-4 pr-2 py-2 group-hover:bg-muted/40 transition-colors duration-200 ease-out text-left"
-          :aria-expanded="open"
+        <div
+          class="flex items-center gap-3 min-w-0 flex-1 cursor-pointer pl-4 pr-2 py-2 group-hover:bg-muted/40 transition-colors duration-200 ease-out"
           @click="open = !open"
         >
           <div
@@ -263,9 +262,11 @@ function runCommand(
             "
           >
             <Shield class="w-3 h-3" />
-            {{ $t("match.admin") }}
+            <span class="sr-only sm:not-sr-only">{{ $t("match.admin") }}</span>
           </div>
-        </button>
+
+          <MatchAdminSteps :match="match" />
+        </div>
 
         <div
           class="flex shrink-0 items-center gap-2 px-2 group-hover:bg-muted/40 transition-colors duration-200 ease-out empty:hidden"
diff --git a/components/match/MatchAdminSteps.vue b/components/match/MatchAdminSteps.vue
new file mode 100644
index 000000000..a0c1e472b
--- /dev/null
+++ b/components/match/MatchAdminSteps.vue
@@ -0,0 +1,117 @@
+<script setup lang="ts">
+import { computed } from "vue";
+import { Check } from "lucide-vue-next";
+import FiveStackToolTip from "~/components/FiveStackToolTip.vue";
+import { useAuthStore } from "~/stores/AuthStore";
+import { e_match_map_status_enum, e_match_status_enum } from "~/generated/zeus";
+import {
+  type MatchAdminStep,
+  currentMatchAdminStep,
+  matchAdminSteps,
+  upcomingAdminActions,
+} from "~/utilities/matchAdminSteps";
+
+const props = defineProps<{
+  match: Record<string, any>;
+}>();
+
+const steps = computed(() => matchAdminSteps(props.match));
+const currentIndex = computed(() =>
+  steps.value.indexOf(currentMatchAdminStep(props.match)),
+);
+
+const upcoming = computed(() =>
+  upcomingAdminActions(props.match, (role) => useAuthStore().isRoleAbove(role)),
+);
+
+function labelKey(step: MatchAdminStep) {
+  if (
+    step === "live" &&
+    props.match.match_maps?.find((map: any) => map.is_current_map)?.status ===
+      e_match_map_status_enum.Paused
+  ) {
+    return "match.admin_bar.steps.paused";
+  }
+  if (
+    step === "finished" &&
+    props.match.status === e_match_status_enum.Canceled
+  ) {
+    return "match.admin_bar.steps.canceled";
+  }
+  return `match.admin_bar.steps.${step}`;
+}
+
+function unlocksAt(step: MatchAdminStep) {
+  return upcoming.value.filter((action) => action.step === step);
+}
+</script>
+
+<template>
+  <ol
+    class="flex min-w-0 items-center"
+    :aria-label="$t('match.admin_bar.steps.label')"
+  >
+    <li v-for="(step, index) of steps" :key="step" class="flex items-center">
+      <span
+        v-if="index > 0"
+        aria-hidden="true"
+        class="mx-1 h-px w-2 sm:w-3"
+        :class="index <= currentIndex ? 'bg-muted-foreground/60' : 'bg-border'"
+      ></span>
+      <FiveStackToolTip as-child side="top" :delay-duration="120">
+        <template #trigger>
+          <span
+            tabindex="0"
+            class="inline-flex items-center gap-1.5 rounded px-1 py-0.5 font-mono text-[0.6rem] font-bold uppercase tracking-[0.16em] outline-none focus-visible:ring-1 focus-visible:ring-[hsl(var(--tac-amber))]"
+            :class="
+              index === currentIndex
+                ? 'text-foreground'
+                : index < currentIndex
+                  ? 'text-muted-foreground'
+                  : 'text-muted-foreground/50'
+            "
+            :aria-current="index === currentIndex ? 'step' : undefined"
+          >
+            <span
+              class="grid size-2.5 shrink-0 place-items-center rounded-full border"
+              :class="
+                index === currentIndex
+                  ? 'border-[hsl(var(--tac-amber))] bg-[hsl(var(--tac-amber))] shadow-[0_0_0_3px_hsl(var(--tac-amber)/0.18)]'
+                  : index < currentIndex
+                    ? 'border-muted-foreground bg-muted-foreground text-background'
+                    : 'border-current'
+              "
+            >
+              <Check v-if="index < currentIndex" class="size-2" />
+            </span>
+            <span :class="index !== currentIndex && 'sr-only md:not-sr-only'">
+              {{ $t(labelKey(step)) }}
+            </span>
+          </span>
+        </template>
+
+        <template v-if="index < currentIndex">
+          {{ $t("match.admin_bar.steps.done") }}
+        </template>
+        <template v-else-if="index === currentIndex">
+          {{ $t("match.admin_bar.steps.now") }}
+        </template>
+        <template v-else-if="unlocksAt(step).length">
+          <span class="block font-semibold">
+            {{ $t("match.admin_bar.steps.unlocks") }}
+          </span>
+          <span
+            v-for="action of unlocksAt(step)"
+            :key="action.key"
+            class="block"
+          >
+            {{ $t(action.label) }}
+          </span>
+        </template>
+        <template v-else>
+          {{ $t("match.admin_bar.steps.nothing_new") }}
+        </template>
+      </FiveStackToolTip>
+    </li>
+  </ol>
+</template>
diff --git a/components/match/MatchSelectServer.vue b/components/match/MatchSelectServer.vue
index bf61c6276..22546a1fc 100644
--- a/components/match/MatchSelectServer.vue
+++ b/components/match/MatchSelectServer.vue
@@ -13,17 +13,15 @@ import {
   SelectTrigger,
   SelectValue,
 } from "~/components/ui/select";
-import SettingHeader from "~/components/match/SettingHeader.vue";
 </script>
 
 <template>
   <form class="space-y-8">
     <FormField v-slot="{ componentField }" name="server_id">
       <FormItem class="space-y-1.5">
-        <SettingHeader>{{ $t("match.server.assign") }}</SettingHeader>
         <Select v-bind="componentField" @update:modelValue="pick">
           <FormControl>
-            <SelectTrigger>
+            <SelectTrigger :aria-label="$t('match.server.assign')">
               <SelectValue :placeholder="$t('match.server.select')" />
             </SelectTrigger>
           </FormControl>
@@ -72,7 +70,7 @@ export default {
       required: true,
     },
   },
-  // The parent confirms and assigns; this only reports the pick.
+  // The parent's dialog assigns the server; this only reports the pick.
   emits: ["select"],
   apollo: {
     $subscribe: {
@@ -114,7 +112,9 @@ export default {
     };
   },
   watch: {
-    match: {
+    // Only a real server change resets the pick; the match object itself is
+    // replaced on every live update.
+    serverKey: {
       immediate: true,
       handler() {
         this.syncFromMatch();
@@ -133,17 +133,17 @@ export default {
         server_id,
       });
     },
-    // Snap back to the match's real server; the pick only takes effect once
-    // the parent's confirm runs.
     pick(value: string) {
       const option = [...this.availableServers, ...this.regionOptions].find(
         (option) => option.value === value,
       );
       this.$emit("select", { value, label: option?.display ?? value });
-      this.syncFromMatch();
     },
   },
   computed: {
+    serverKey() {
+      return `${this.match.server_id}:${this.match.server_type}:${this.match.region}`;
+    },
     regionOptions() {
       return useApplicationSettingsStore().availableRegions.map((region) => ({
         value: `0:${region.value}`,
diff --git a/components/match/MatchSelectWinner.vue b/components/match/MatchSelectWinner.vue
index a7a860e61..be1303f88 100644
--- a/components/match/MatchSelectWinner.vue
+++ b/components/match/MatchSelectWinner.vue
@@ -13,17 +13,15 @@ import {
   SelectTrigger,
   SelectValue,
 } from "~/components/ui/select";
-import SettingHeader from "~/components/match/SettingHeader.vue";
 </script>
 
 <template>
   <form class="space-y-8">
     <FormField v-slot="{ componentField }" name="lineup_id">
       <FormItem class="space-y-1.5">
-        <SettingHeader>{{ $t("match.winner.set") }}</SettingHeader>
         <Select v-bind="componentField" @update:modelValue="pick">
           <FormControl>
-            <SelectTrigger>
+            <SelectTrigger :aria-label="$t('match.winner.set')">
               <SelectValue :placeholder="$t('match.winner.select_lineup')" />
             </SelectTrigger>
           </FormControl>
@@ -57,7 +55,7 @@ export default {
       required: true,
     },
   },
-  // The parent confirms and sets the winner; this only reports the pick.
+  // The parent's dialog sets the winner; this only reports the pick.
   emits: ["select"],
   data() {
     return {
@@ -72,22 +70,21 @@ export default {
     };
   },
   watch: {
-    match: {
+    // Only a real winner change resets the pick; the match object itself is
+    // replaced on every live update.
+    "match.winning_lineup_id": {
       immediate: true,
-      handler() {
-        this.form.setFieldValue("lineup_id", this.match.winning_lineup_id);
+      handler(winningLineupId) {
+        this.form.setFieldValue("lineup_id", winningLineupId);
       },
     },
   },
   methods: {
-    // Snap back to the match's real winner; the pick only takes effect once
-    // the parent's confirm runs.
     pick(value: string) {
       const lineup = this.availableLineups.find(
         (lineup) => lineup.value === value,
       );
       this.$emit("select", { value, label: lineup?.display ?? value });
-      this.form.setFieldValue("lineup_id", this.match.winning_lineup_id);
     },
   },
   computed: {
diff --git a/i18n/locales/ar_SA.json b/i18n/locales/ar_SA.json
index 6ba302c83..538d25148 100644
--- a/i18n/locales/ar_SA.json
+++ b/i18n/locales/ar_SA.json
@@ -8508,7 +8508,7 @@
     },
     "winner": {
       "set": "حدّد الفائز بالمباراة",
-      "set_confirm": "هل تريد جعل {team} الفائز في هذه المباراة؟",
+      "set_hint": "اختر الفريق الفائز في هذه المباراة.",
       "set_failed": "تعذّر تحديد الفائز بالمباراة",
       "select_lineup": "اختر التشكيلة"
     },
@@ -8879,7 +8879,7 @@
       "dedicated": "السيرفرات المخصصة",
       "on_demand": "عند الطلب",
       "assigned": "سيرفر المباراة المعيّن",
-      "assign_confirm": "هل تريد تعيين {server} لهذه المباراة؟",
+      "assign_hint": "اختر الخادم الذي ستُلعب عليه هذه المباراة.",
       "reboot_label": "إعادة تشغيل السيرفر",
       "reboot": "أعد تشغيل السيرفر",
       "rebooting": "جارٍ إعادة التشغيل...",
@@ -9052,7 +9052,22 @@
       "rcon_unavailable": "RCON غير متاح",
       "not_controllable": "المباراة ليست في حالة تسمح بالتحكم.",
       "veto_override": "تجاوز الاستبعاد",
-      "actions": "الإجراءات"
+      "actions": "إجراءات أخرى",
+      "coming_up": "قادم",
+      "steps": {
+        "label": "مراحل المباراة",
+        "check_in": "تسجيل الحضور",
+        "veto": "الاستبعاد",
+        "warmup": "الإحماء",
+        "live": "مباشر",
+        "paused": "متوقفة",
+        "finished": "انتهت",
+        "canceled": "أُلغيت",
+        "done": "تم",
+        "now": "أنت هنا",
+        "unlocks": "يُفتح هنا",
+        "nothing_new": "لا جديد لك هنا"
+      }
     },
     "demo_processing_hint": "يجري رفع تسجيل المباراة من خادم اللعب. وستظهر الإحصاءات وإعادة العرض ثنائية الأبعاد وأبرز اللقطات بمجرد اكتماله.",
     "demo_playback": {
diff --git a/i18n/locales/da_DK.json b/i18n/locales/da_DK.json
index 9afa7272c..8d796da38 100644
--- a/i18n/locales/da_DK.json
+++ b/i18n/locales/da_DK.json
@@ -8508,7 +8508,7 @@
     },
     "winner": {
       "set": "Sæt kampvinder",
-      "set_confirm": "Gør {team} til vinder af denne kamp?",
+      "set_hint": "Vælg holdet, der vandt kampen.",
       "set_failed": "Kunne ikke angive kampens vinder",
       "select_lineup": "Vælg opstilling"
     },
@@ -8879,7 +8879,7 @@
       "dedicated": "Dedikerede servere",
       "on_demand": "On demand",
       "assigned": "Tildelt kampserver",
-      "assign_confirm": "Tildel {server} til denne kamp?",
+      "assign_hint": "Vælg den server, kampen skal køre på.",
       "reboot_label": "Genstart af server",
       "reboot": "Genstart server",
       "rebooting": "Genstarter...",
@@ -9052,7 +9052,22 @@
       "rcon_unavailable": "RCON utilgængelig",
       "not_controllable": "Kampen er ikke i en tilstand, der kan styres.",
       "veto_override": "Tilsidesæt veto",
-      "actions": "Handlinger"
+      "actions": "Flere handlinger",
+      "coming_up": "Kommer snart",
+      "steps": {
+        "label": "Kamptrin",
+        "check_in": "Check-in",
+        "veto": "Veto",
+        "warmup": "Opvarmning",
+        "live": "Live",
+        "paused": "Pauset",
+        "finished": "Afsluttet",
+        "canceled": "Annulleret",
+        "done": "Færdig",
+        "now": "Du er her",
+        "unlocks": "Låses op her",
+        "nothing_new": "Intet nyt for dig her"
+      }
     },
     "demo_processing_hint": "Kampens demo uploades fra spilserveren. Statistik, 2D-replay og højdepunkter kommer, når den er færdig.",
     "demo_playback": {
diff --git a/i18n/locales/de_DE.json b/i18n/locales/de_DE.json
index 1d45041de..c8c757495 100644
--- a/i18n/locales/de_DE.json
+++ b/i18n/locales/de_DE.json
@@ -8508,7 +8508,7 @@
     },
     "winner": {
       "set": "Match-Sieger festlegen",
-      "set_confirm": "{team} zum Sieger dieses Matches erklären?",
+      "set_hint": "Wähle das Team, das dieses Match gewonnen hat.",
       "set_failed": "Match-Sieger konnte nicht festgelegt werden",
       "select_lineup": "Lineup wählen"
     },
@@ -8879,7 +8879,7 @@
       "dedicated": "Dedicated Server",
       "on_demand": "On Demand",
       "assigned": "Zugewiesener Match-Server",
-      "assign_confirm": "{server} diesem Match zuweisen?",
+      "assign_hint": "Wähle den Server, auf dem dieses Match laufen soll.",
       "reboot_label": "Server-Neustart",
       "reboot": "Server neu starten",
       "rebooting": "Startet neu...",
@@ -9052,7 +9052,22 @@
       "rcon_unavailable": "RCON nicht verfügbar",
       "not_controllable": "Match ist in keinem steuerbaren Status.",
       "veto_override": "Veto überschreiben",
-      "actions": "Aktionen"
+      "actions": "Weitere Aktionen",
+      "coming_up": "Demnächst",
+      "steps": {
+        "label": "Match-Schritte",
+        "check_in": "Check-in",
+        "veto": "Veto",
+        "warmup": "Aufwärmen",
+        "live": "Live",
+        "paused": "Pausiert",
+        "finished": "Beendet",
+        "canceled": "Abgebrochen",
+        "done": "Erledigt",
+        "now": "Du bist hier",
+        "unlocks": "Wird hier freigeschaltet",
+        "nothing_new": "Hier kommt für dich nichts Neues"
+      }
     },
     "demo_processing_hint": "Die Match-Demo wird vom Gameserver hochgeladen. Statistiken, das 2D-Replay und Highlights folgen, sobald das abgeschlossen ist.",
     "demo_playback": {
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index 3490f5160..e68112273 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -8510,7 +8510,7 @@
     },
     "winner": {
       "set": "Set Match Winner",
-      "set_confirm": "Make {team} the winner of this match?",
+      "set_hint": "Pick the team that won this match.",
       "set_failed": "Could not set match winner",
       "select_lineup": "Select Lineup"
     },
@@ -8881,7 +8881,7 @@
       "dedicated": "Dedicated Servers",
       "on_demand": "On Demand",
       "assigned": "Assigned Match Server",
-      "assign_confirm": "Assign {server} to this match?",
+      "assign_hint": "Pick the server this match should run on.",
       "reboot_label": "Server Reboot",
       "reboot": "Reboot Server",
       "rebooting": "Rebooting...",
@@ -9054,7 +9054,22 @@
       "rcon_unavailable": "RCON unavailable",
       "not_controllable": "Match is not in a controllable state.",
       "veto_override": "Veto Override",
-      "actions": "Actions"
+      "actions": "More actions",
+      "coming_up": "Coming up",
+      "steps": {
+        "label": "Match steps",
+        "check_in": "Check-in",
+        "veto": "Veto",
+        "warmup": "Warmup",
+        "live": "Live",
+        "paused": "Paused",
+        "finished": "Finished",
+        "canceled": "Canceled",
+        "done": "Done",
+        "now": "You are here",
+        "unlocks": "Unlocks here",
+        "nothing_new": "Nothing new for you here"
+      }
     },
     "demo_processing_hint": "The match demo is uploading from the game server. Stats, the 2D replay and highlights land once it finishes.",
     "demo_playback": {
diff --git a/i18n/locales/es_ES.json b/i18n/locales/es_ES.json
index b8eafe0a3..80c4f052b 100644
--- a/i18n/locales/es_ES.json
+++ b/i18n/locales/es_ES.json
@@ -8508,7 +8508,7 @@
     },
     "winner": {
       "set": "Definir ganador de la partida",
-      "set_confirm": "¿Declarar a {team} ganador de esta partida?",
+      "set_hint": "Elige el equipo que ganó esta partida.",
       "set_failed": "No se pudo establecer el ganador de la partida",
       "select_lineup": "Seleccionar alineación"
     },
@@ -8879,7 +8879,7 @@
       "dedicated": "Servidores dedicados",
       "on_demand": "Bajo demanda",
       "assigned": "Servidor de partida asignado",
-      "assign_confirm": "¿Asignar {server} a esta partida?",
+      "assign_hint": "Elige el servidor en el que se jugará esta partida.",
       "reboot_label": "Reinicio del servidor",
       "reboot": "Reiniciar servidor",
       "rebooting": "Reiniciando...",
@@ -9052,7 +9052,22 @@
       "rcon_unavailable": "RCON no disponible",
       "not_controllable": "La partida no está en un estado controlable.",
       "veto_override": "Anular veto",
-      "actions": "Acciones"
+      "actions": "Más acciones",
+      "coming_up": "Próximamente",
+      "steps": {
+        "label": "Pasos de la partida",
+        "check_in": "Check-in",
+        "veto": "Veto",
+        "warmup": "Calentamiento",
+        "live": "En vivo",
+        "paused": "En pausa",
+        "finished": "Terminada",
+        "canceled": "Cancelada",
+        "done": "Hecho",
+        "now": "Estás aquí",
+        "unlocks": "Se desbloquea aquí",
+        "nothing_new": "Nada nuevo para ti aquí"
+      }
     },
     "demo_processing_hint": "La demo de la partida se está subiendo desde el servidor de juego. Las estadísticas, la repetición 2D y los momentos destacados llegan cuando termine.",
     "demo_playback": {
diff --git a/i18n/locales/fr_FR.json b/i18n/locales/fr_FR.json
index 29845496e..af605de12 100644
--- a/i18n/locales/fr_FR.json
+++ b/i18n/locales/fr_FR.json
@@ -8508,7 +8508,7 @@
     },
     "winner": {
       "set": "Définir le vainqueur du match",
-      "set_confirm": "Désigner {team} vainqueur de ce match ?",
+      "set_hint": "Choisissez l'équipe qui a gagné ce match.",
       "set_failed": "Impossible de définir le vainqueur du match",
       "select_lineup": "Choisir une composition"
     },
@@ -8879,7 +8879,7 @@
       "dedicated": "Serveurs dédiés",
       "on_demand": "À la demande",
       "assigned": "Serveur de match assigné",
-      "assign_confirm": "Attribuer {server} à ce match ?",
+      "assign_hint": "Choisissez le serveur sur lequel ce match doit se jouer.",
       "reboot_label": "Redémarrage du serveur",
       "reboot": "Redémarrer le serveur",
       "rebooting": "Redémarrage…",
@@ -9052,7 +9052,22 @@
       "rcon_unavailable": "RCON indisponible",
       "not_controllable": "Le match n'est pas dans un état contrôlable.",
       "veto_override": "Forcer le veto",
-      "actions": "Actions"
+      "actions": "Plus d'actions",
+      "coming_up": "À venir",
+      "steps": {
+        "label": "Étapes du match",
+        "check_in": "Check-in",
+        "veto": "Veto",
+        "warmup": "Échauffement",
+        "live": "En direct",
+        "paused": "En pause",
+        "finished": "Terminé",
+        "canceled": "Annulé",
+        "done": "Fait",
+        "now": "Vous êtes ici",
+        "unlocks": "Se débloque ici",
+        "nothing_new": "Rien de nouveau pour vous ici"
+      }
     },
     "demo_processing_hint": "La démo du match est en cours de téléversement depuis le serveur de jeu. Les statistiques, la rediffusion 2D et les temps forts arriveront une fois terminé.",
     "demo_playback": {
diff --git a/i18n/locales/it_IT.json b/i18n/locales/it_IT.json
index cbca2e1c9..2f6e384c3 100644
--- a/i18n/locales/it_IT.json
+++ b/i18n/locales/it_IT.json
@@ -8508,7 +8508,7 @@
     },
     "winner": {
       "set": "Imposta vincitore del match",
-      "set_confirm": "Rendere {team} vincitore di questo match?",
+      "set_hint": "Scegli la squadra che ha vinto questo match.",
       "set_failed": "Impossibile impostare il vincitore della partita",
       "select_lineup": "Seleziona lineup"
     },
@@ -8879,7 +8879,7 @@
       "dedicated": "Server dedicati",
       "on_demand": "On demand",
       "assigned": "Server match assegnato",
-      "assign_confirm": "Assegnare {server} a questo match?",
+      "assign_hint": "Scegli il server su cui si giocherà questo match.",
       "reboot_label": "Riavvio server",
       "reboot": "Riavvia server",
       "rebooting": "Riavvio in corso…",
@@ -9052,7 +9052,22 @@
       "rcon_unavailable": "RCON non disponibile",
       "not_controllable": "Il match non è in uno stato controllabile.",
       "veto_override": "Forza il veto",
-      "actions": "Azioni"
+      "actions": "Altre azioni",
+      "coming_up": "In arrivo",
+      "steps": {
+        "label": "Fasi del match",
+        "check_in": "Check-in",
+        "veto": "Veto",
+        "warmup": "Riscaldamento",
+        "live": "Live",
+        "paused": "In pausa",
+        "finished": "Terminato",
+        "canceled": "Annullato",
+        "done": "Fatto",
+        "now": "Sei qui",
+        "unlocks": "Si sblocca qui",
+        "nothing_new": "Niente di nuovo per te qui"
+      }
     },
     "demo_processing_hint": "La demo della partita è in caricamento dal server di gioco. Statistiche, replay 2D e highlight arriveranno al termine.",
     "demo_playback": {
diff --git a/i18n/locales/ja_JP.json b/i18n/locales/ja_JP.json
index 93ca4e0b1..8c32a5447 100644
--- a/i18n/locales/ja_JP.json
+++ b/i18n/locales/ja_JP.json
@@ -8508,7 +8508,7 @@
     },
     "winner": {
       "set": "試合の勝者を設定",
-      "set_confirm": "{team}をこの試合の勝者にしますか？",
+      "set_hint": "この試合に勝ったチームを選んでください。",
       "set_failed": "試合の勝者を設定できませんでした",
       "select_lineup": "出場メンバーを選択"
     },
@@ -8879,7 +8879,7 @@
       "dedicated": "専用サーバー",
       "on_demand": "オンデマンド",
       "assigned": "割り当て済みマッチサーバー",
-      "assign_confirm": "この試合に{server}を割り当てますか？",
+      "assign_hint": "この試合を行うサーバーを選んでください。",
       "reboot_label": "サーバー再起動",
       "reboot": "サーバーを再起動",
       "rebooting": "再起動中...",
@@ -9052,7 +9052,22 @@
       "rcon_unavailable": "RCON利用不可",
       "not_controllable": "試合は操作可能な状態ではありません。",
       "veto_override": "拒否を上書き",
-      "actions": "操作"
+      "actions": "その他の操作",
+      "coming_up": "この先",
+      "steps": {
+        "label": "試合の段階",
+        "check_in": "チェックイン",
+        "veto": "拒否",
+        "warmup": "ウォームアップ",
+        "live": "ライブ",
+        "paused": "一時停止中",
+        "finished": "終了",
+        "canceled": "キャンセル済み",
+        "done": "完了",
+        "now": "現在地",
+        "unlocks": "ここで解放",
+        "nothing_new": "ここでは新しい操作はありません"
+      }
     },
     "demo_processing_hint": "試合のデモをゲームサーバーからアップロードしています。完了すると統計、2Dリプレイ、ハイライトが表示されます。",
     "demo_playback": {
diff --git a/i18n/locales/ko_KR.json b/i18n/locales/ko_KR.json
index 3a9d921de..174c776c7 100644
--- a/i18n/locales/ko_KR.json
+++ b/i18n/locales/ko_KR.json
@@ -8508,7 +8508,7 @@
     },
     "winner": {
       "set": "매치 승자 지정",
-      "set_confirm": "{team}을(를) 이 매치의 승자로 지정하시겠습니까?",
+      "set_hint": "이 매치에서 이긴 팀을 선택하세요.",
       "set_failed": "경기 승자를 설정하지 못했습니다",
       "select_lineup": "라인업 선택"
     },
@@ -8879,7 +8879,7 @@
       "dedicated": "데디케이티드 서버",
       "on_demand": "온디맨드",
       "assigned": "지정된 매치 서버",
-      "assign_confirm": "이 매치에 {server}을(를) 할당하시겠습니까?",
+      "assign_hint": "이 매치를 진행할 서버를 선택하세요.",
       "reboot_label": "서버 재부팅",
       "reboot": "서버 재부팅",
       "rebooting": "재부팅 중...",
@@ -9052,7 +9052,22 @@
       "rcon_unavailable": "RCON 사용 불가",
       "not_controllable": "매치가 제어 가능한 상태가 아닙니다.",
       "veto_override": "거부 재정의",
-      "actions": "작업"
+      "actions": "추가 작업",
+      "coming_up": "다음 단계",
+      "steps": {
+        "label": "매치 단계",
+        "check_in": "체크인",
+        "veto": "거부",
+        "warmup": "워밍업",
+        "live": "라이브",
+        "paused": "일시 정지됨",
+        "finished": "종료",
+        "canceled": "취소됨",
+        "done": "완료",
+        "now": "현재 단계",
+        "unlocks": "여기서 열림",
+        "nothing_new": "여기서는 새로운 작업이 없습니다"
+      }
     },
     "demo_processing_hint": "경기 데모를 게임 서버에서 업로드하고 있습니다. 완료되면 통계, 2D 리플레이, 하이라이트가 표시됩니다.",
     "demo_playback": {
diff --git a/i18n/locales/pl_PL.json b/i18n/locales/pl_PL.json
index c16f2fc00..a7bcc4b47 100644
--- a/i18n/locales/pl_PL.json
+++ b/i18n/locales/pl_PL.json
@@ -8508,7 +8508,7 @@
     },
     "winner": {
       "set": "Ustaw zwycięzcę meczu",
-      "set_confirm": "Ustawić {team} jako zwycięzcę tego meczu?",
+      "set_hint": "Wybierz drużynę, która wygrała ten mecz.",
       "set_failed": "Nie udało się ustawić zwycięzcy meczu",
       "select_lineup": "Wybierz ustawienie"
     },
@@ -8879,7 +8879,7 @@
       "dedicated": "Serwery dedykowane",
       "on_demand": "On demand",
       "assigned": "Przypisany serwer meczu",
-      "assign_confirm": "Przypisać {server} do tego meczu?",
+      "assign_hint": "Wybierz serwer, na którym ma się odbyć ten mecz.",
       "reboot_label": "Restart serwera",
       "reboot": "Zrestartuj serwer",
       "rebooting": "Restartowanie…",
@@ -9052,7 +9052,22 @@
       "rcon_unavailable": "RCON niedostępne",
       "not_controllable": "Mecz nie jest w stanie umożliwiającym sterowanie",
       "veto_override": "Nadpisz veto",
-      "actions": "Akcje"
+      "actions": "Więcej akcji",
+      "coming_up": "Wkrótce",
+      "steps": {
+        "label": "Etapy meczu",
+        "check_in": "Check-in",
+        "veto": "Veto",
+        "warmup": "Rozgrzewka",
+        "live": "Na żywo",
+        "paused": "Wstrzymany",
+        "finished": "Zakończony",
+        "canceled": "Anulowany",
+        "done": "Gotowe",
+        "now": "Jesteś tutaj",
+        "unlocks": "Odblokowuje się tutaj",
+        "nothing_new": "Nic nowego dla ciebie"
+      }
     },
     "demo_processing_hint": "Demo meczu jest przesyłane z serwera gry. Statystyki, powtórka 2D i highlighty pojawią się po zakończeniu.",
     "demo_playback": {
diff --git a/i18n/locales/pt_BR.json b/i18n/locales/pt_BR.json
index faea069f5..1a8e27d57 100644
--- a/i18n/locales/pt_BR.json
+++ b/i18n/locales/pt_BR.json
@@ -8508,7 +8508,7 @@
     },
     "winner": {
       "set": "Definir Vencedor",
-      "set_confirm": "Definir {team} como vencedor desta partida?",
+      "set_hint": "Escolha o time que venceu esta partida.",
       "set_failed": "Não foi possível definir o vencedor",
       "select_lineup": "Selecionar escalação"
     },
@@ -8879,7 +8879,7 @@
       "dedicated": "Servidores Dedicados",
       "on_demand": "Sob Demanda",
       "assigned": "Servidor de Partida Atribuído",
-      "assign_confirm": "Atribuir {server} a esta partida?",
+      "assign_hint": "Escolha o servidor em que esta partida vai rodar.",
       "reboot_label": "Reiniciar Servidor",
       "reboot": "Reiniciar Servidor",
       "rebooting": "Reiniciando...",
@@ -9052,7 +9052,22 @@
       "rcon_unavailable": "RCON indisponível",
       "not_controllable": "A partida não está em um estado controlável.",
       "veto_override": "Veto Sobrescrito",
-      "actions": "Ações"
+      "actions": "Mais ações",
+      "coming_up": "Em seguida",
+      "steps": {
+        "label": "Etapas da partida",
+        "check_in": "Check-in",
+        "veto": "Veto",
+        "warmup": "Aquecimento",
+        "live": "Ao vivo",
+        "paused": "Pausada",
+        "finished": "Encerrada",
+        "canceled": "Cancelada",
+        "done": "Concluído",
+        "now": "Você está aqui",
+        "unlocks": "Desbloqueia aqui",
+        "nothing_new": "Nada novo para você aqui"
+      }
     },
     "demo_processing_hint": "A demo da partida está sendo enviada do servidor de jogo. Estatísticas, replay 2D e destaques ficam disponíveis quando terminar.",
     "demo_playback": {
diff --git a/i18n/locales/ru_RU.json b/i18n/locales/ru_RU.json
index b7551ba6e..b2820a656 100644
--- a/i18n/locales/ru_RU.json
+++ b/i18n/locales/ru_RU.json
@@ -8508,7 +8508,7 @@
     },
     "winner": {
       "set": "Указать победителя матча",
-      "set_confirm": "Сделать {team} победителем этого матча?",
+      "set_hint": "Выберите команду, которая выиграла этот матч.",
       "set_failed": "Не удалось назначить победителя матча",
       "select_lineup": "Выбрать состав"
     },
@@ -8879,7 +8879,7 @@
       "dedicated": "Выделенные серверы",
       "on_demand": "По требованию",
       "assigned": "Назначенный сервер матча",
-      "assign_confirm": "Назначить {server} для этого матча?",
+      "assign_hint": "Выберите сервер, на котором будет идти этот матч.",
       "reboot_label": "Перезагрузка сервера",
       "reboot": "Перезагрузить сервер",
       "rebooting": "Перезагрузка…",
@@ -9052,7 +9052,22 @@
       "rcon_unavailable": "RCON недоступен",
       "not_controllable": "Матч не в управляемом состоянии.",
       "veto_override": "Переопределить вето",
-      "actions": "Действия"
+      "actions": "Другие действия",
+      "coming_up": "Далее",
+      "steps": {
+        "label": "Этапы матча",
+        "check_in": "Чек-ин",
+        "veto": "Вето",
+        "warmup": "Разминка",
+        "live": "Идёт",
+        "paused": "Пауза",
+        "finished": "Завершён",
+        "canceled": "Отменён",
+        "done": "Готово",
+        "now": "Вы здесь",
+        "unlocks": "Открывается здесь",
+        "nothing_new": "Здесь для вас ничего нового"
+      }
     },
     "demo_processing_hint": "Демо матча загружается с игрового сервера. Статистика, 2D-повтор и хайлайты появятся, когда загрузка завершится.",
     "demo_playback": {
diff --git a/i18n/locales/sv_SE.json b/i18n/locales/sv_SE.json
index d92e3f0a8..626248587 100644
--- a/i18n/locales/sv_SE.json
+++ b/i18n/locales/sv_SE.json
@@ -8508,7 +8508,7 @@
     },
     "winner": {
       "set": "Sätt matchvinnare",
-      "set_confirm": "Gör {team} till vinnare av matchen?",
+      "set_hint": "Välj laget som vann matchen.",
       "set_failed": "Kunde inte ange matchens vinnare",
       "select_lineup": "Välj laguppställning"
     },
@@ -8879,7 +8879,7 @@
       "dedicated": "Dedikerade servrar",
       "on_demand": "On demand",
       "assigned": "Tilldelad matchserver",
-      "assign_confirm": "Tilldela {server} till matchen?",
+      "assign_hint": "Välj servern som matchen ska spelas på.",
       "reboot_label": "Serveromstart",
       "reboot": "Starta om server",
       "rebooting": "Startar om…",
@@ -9052,7 +9052,22 @@
       "rcon_unavailable": "RCON otillgängligt",
       "not_controllable": "Matchen kan inte styras i sitt nuvarande läge.",
       "veto_override": "Åsidosätt veto",
-      "actions": "Åtgärder"
+      "actions": "Fler åtgärder",
+      "coming_up": "Kommer härnäst",
+      "steps": {
+        "label": "Matchsteg",
+        "check_in": "Incheckning",
+        "veto": "Veto",
+        "warmup": "Uppvärmning",
+        "live": "Live",
+        "paused": "Pausad",
+        "finished": "Avslutad",
+        "canceled": "Avbruten",
+        "done": "Klart",
+        "now": "Du är här",
+        "unlocks": "Låses upp här",
+        "nothing_new": "Inget nytt för dig här"
+      }
     },
     "demo_processing_hint": "Matchens demo laddas upp från spelservern. Statistik, 2D-replay och höjdpunkter kommer när den är klar.",
     "demo_playback": {
diff --git a/i18n/locales/tr_TR.json b/i18n/locales/tr_TR.json
index eaf546de4..10b237499 100644
--- a/i18n/locales/tr_TR.json
+++ b/i18n/locales/tr_TR.json
@@ -8508,7 +8508,7 @@
     },
     "winner": {
       "set": "Maç Kazananını Belirle",
-      "set_confirm": "{team} bu maçın kazananı yapılsın mı?",
+      "set_hint": "Bu maçı kazanan takımı seç.",
       "set_failed": "Maçın galibi belirlenemedi",
       "select_lineup": "Diziliş Seç"
     },
@@ -8879,7 +8879,7 @@
       "dedicated": "Özel sunucular",
       "on_demand": "Talep üzerine",
       "assigned": "Atanan maç sunucusu",
-      "assign_confirm": "{server} bu maça atansın mı?",
+      "assign_hint": "Bu maçın oynanacağı sunucuyu seç.",
       "reboot_label": "Sunucu yeniden başlatma",
       "reboot": "Sunucuyu yeniden başlat",
       "rebooting": "Yeniden başlatılıyor...",
@@ -9052,7 +9052,22 @@
       "rcon_unavailable": "RCON kullanılamıyor",
       "not_controllable": "Maç kontrol edilebilir durumda değil.",
       "veto_override": "Vetoyu geçersiz kıl",
-      "actions": "İşlemler"
+      "actions": "Diğer işlemler",
+      "coming_up": "Sıradaki",
+      "steps": {
+        "label": "Maç adımları",
+        "check_in": "Check-in",
+        "veto": "Veto",
+        "warmup": "Isınma",
+        "live": "Canlı",
+        "paused": "Duraklatıldı",
+        "finished": "Bitti",
+        "canceled": "İptal edildi",
+        "done": "Tamam",
+        "now": "Buradasın",
+        "unlocks": "Burada açılır",
+        "nothing_new": "Burada senin için yeni bir şey yok"
+      }
     },
     "demo_processing_hint": "Maç demosu oyun sunucusundan yükleniyor. İstatistikler, 2B tekrar ve öne çıkanlar tamamlandığında gelir.",
     "demo_playback": {
diff --git a/i18n/locales/uk_UA.json b/i18n/locales/uk_UA.json
index ca57d4c86..71ac86cd8 100644
--- a/i18n/locales/uk_UA.json
+++ b/i18n/locales/uk_UA.json
@@ -8508,7 +8508,7 @@
     },
     "winner": {
       "set": "Встановити переможця матчу",
-      "set_confirm": "Зробити {team} переможцем цього матчу?",
+      "set_hint": "Виберіть команду, яка виграла цей матч.",
       "set_failed": "Не вдалося призначити переможця матчу",
       "select_lineup": "Обрати склад"
     },
@@ -8879,7 +8879,7 @@
       "dedicated": "Виділені сервери",
       "on_demand": "На вимогу",
       "assigned": "Призначений сервер матчу",
-      "assign_confirm": "Призначити {server} для цього матчу?",
+      "assign_hint": "Виберіть сервер, на якому відбуватиметься цей матч.",
       "reboot_label": "Перезавантаження сервера",
       "reboot": "Перезавантажити сервер",
       "rebooting": "Перезавантаження...",
@@ -9052,7 +9052,22 @@
       "rcon_unavailable": "RCON недоступний",
       "not_controllable": "Матч не в стані, що дозволяє керування.",
       "veto_override": "Перевизначити вето",
-      "actions": "Дії"
+      "actions": "Інші дії",
+      "coming_up": "Далі",
+      "steps": {
+        "label": "Етапи матчу",
+        "check_in": "Чек-ін",
+        "veto": "Вето",
+        "warmup": "Розминка",
+        "live": "Наживо",
+        "paused": "Пауза",
+        "finished": "Завершено",
+        "canceled": "Скасовано",
+        "done": "Готово",
+        "now": "Ви тут",
+        "unlocks": "Відкривається тут",
+        "nothing_new": "Тут для вас нічого нового"
+      }
     },
     "demo_processing_hint": "Демо матчу завантажується з ігрового сервера. Статистика, 2D-повтор і хайлайти з'являться, коли завантаження завершиться.",
     "demo_playback": {
diff --git a/i18n/locales/zh_Hans.json b/i18n/locales/zh_Hans.json
index 43cf4a54f..aa518b8c7 100644
--- a/i18n/locales/zh_Hans.json
+++ b/i18n/locales/zh_Hans.json
@@ -8508,7 +8508,7 @@
     },
     "winner": {
       "set": "设置比赛胜者",
-      "set_confirm": "将{team}设为这场比赛的胜者？",
+      "set_hint": "选择赢得这场比赛的队伍。",
       "set_failed": "无法设置比赛胜方",
       "select_lineup": "选择阵容"
     },
@@ -8879,7 +8879,7 @@
       "dedicated": "专用服务器",
       "on_demand": "按需",
       "assigned": "已分配比赛服务器",
-      "assign_confirm": "将{server}分配给这场比赛？",
+      "assign_hint": "选择这场比赛使用的服务器。",
       "reboot_label": "服务器重启",
       "reboot": "重启服务器",
       "rebooting": "重启中...",
@@ -9052,7 +9052,22 @@
       "rcon_unavailable": "RCON 不可用",
       "not_controllable": "比赛处于不可控状态。",
       "veto_override": "覆盖否决",
-      "actions": "操作"
+      "actions": "更多操作",
+      "coming_up": "即将开放",
+      "steps": {
+        "label": "比赛阶段",
+        "check_in": "签到",
+        "veto": "否决",
+        "warmup": "热身",
+        "live": "进行中",
+        "paused": "已暂停",
+        "finished": "已结束",
+        "canceled": "已取消",
+        "done": "已完成",
+        "now": "当前阶段",
+        "unlocks": "在此解锁",
+        "nothing_new": "此阶段没有新操作"
+      }
     },
     "demo_processing_hint": "比赛 demo 正从游戏服务器上传。完成后就会出现数据、2D 回放和集锦。",
     "demo_playback": {
diff --git a/i18n/locales/zh_Hant.json b/i18n/locales/zh_Hant.json
index 5c94e4c53..ed4f864e1 100644
--- a/i18n/locales/zh_Hant.json
+++ b/i18n/locales/zh_Hant.json
@@ -8508,7 +8508,7 @@
     },
     "winner": {
       "set": "設定比賽勝者",
-      "set_confirm": "將{team}設為這場比賽的勝者？",
+      "set_hint": "選擇贏得這場比賽的隊伍。",
       "set_failed": "無法設定比賽勝方",
       "select_lineup": "選擇陣容"
     },
@@ -8879,7 +8879,7 @@
       "dedicated": "專用伺服器",
       "on_demand": "隨選",
       "assigned": "已指派比賽伺服器",
-      "assign_confirm": "將{server}指派給這場比賽？",
+      "assign_hint": "選擇這場比賽使用的伺服器。",
       "reboot_label": "伺服器重新啟動",
       "reboot": "重新啟動伺服器",
       "rebooting": "重新啟動中...",
@@ -9052,7 +9052,22 @@
       "rcon_unavailable": "RCON 無法使用",
       "not_controllable": "比賽處於無法控制的狀態。",
       "veto_override": "覆寫否決",
-      "actions": "操作"
+      "actions": "更多操作",
+      "coming_up": "即將開放",
+      "steps": {
+        "label": "比賽階段",
+        "check_in": "報到",
+        "veto": "否決",
+        "warmup": "熱身",
+        "live": "進行中",
+        "paused": "已暫停",
+        "finished": "已結束",
+        "canceled": "已取消",
+        "done": "已完成",
+        "now": "目前階段",
+        "unlocks": "在此解鎖",
+        "nothing_new": "此階段沒有新操作"
+      }
     },
     "demo_processing_hint": "比賽 demo 正從遊戲伺服器上傳。完成後就會出現數據、2D 重播與精華片段。",
     "demo_playback": {
diff --git a/tests/components/match/MatchActionsConfirm.spec.ts b/tests/components/match/MatchActionsConfirm.spec.ts
index d2fb19f75..75f5f2540 100644
--- a/tests/components/match/MatchActionsConfirm.spec.ts
+++ b/tests/components/match/MatchActionsConfirm.spec.ts
@@ -12,7 +12,7 @@ let wrapper: Awaited<ReturnType<typeof mountSuspended>> | undefined;
 
 const sent = () => mutate.mock.calls.map(([{ mutation }]) => print(mutation));
 
-function match(mapStatus = "Live") {
+function match(mapStatus = "Live", overrides: Record<string, any> = {}) {
   return {
     id: "m-1",
     status: "Live",
@@ -20,14 +20,17 @@ function match(mapStatus = "Live") {
     is_in_lineup: false,
     is_server_online: true,
     can_cancel: true,
+    can_start: false,
     server_id: "server-1",
     server_plugin_runtime: null,
-    options: { type: "Competitive" },
+    min_players_per_lineup: 0,
+    options: { type: "Competitive", map_veto: false, best_of: 1 },
     match_maps: [{ id: "map-1", is_current_map: true, status: mapStatus }],
     streams: [],
     lineup_1: { id: "l-1", name: "Northwind", lineup_players: [] },
     lineup_2: { id: "l-2", name: "Ember Six", lineup_players: [] },
     winning_lineup_id: null,
+    ...overrides,
   };
 }
 
@@ -35,9 +38,12 @@ function signIn(role: e_player_roles_enum) {
   useAuthStore().me = { steam_id: "76561198000000001", role } as any;
 }
 
-async function mountActions(mapStatus = "Live") {
+async function mountActions(
+  mapStatus = "Live",
+  { dock = false, ...overrides }: Record<string, any> = {},
+) {
   wrapper = await mountSuspended(MatchActions, {
-    props: { match: match(mapStatus) },
+    props: { match: match(mapStatus, overrides), dock },
     global: { mixins: (useNuxtApp().vueApp as any)._context.mixins },
   });
   await flushPromises();
@@ -74,14 +80,17 @@ describe("match actions confirm before acting", () => {
     expect(actions.confirmOpen).toBe(false);
   });
 
-  it("names the picked server and assigns it only once confirmed", async () => {
+  it("assigns a server only after one is picked and confirmed", async () => {
     signIn(e_player_roles_enum.administrator);
     const actions = await mountActions();
 
-    actions.confirmServer({ value: "0:Dallas", label: "Dallas" });
-    expect(actions.confirming.description).toContain("Dallas");
+    actions.openServerDialog();
+    expect(actions.confirming.picker).toBe("server");
+
+    await actions.runConfirm();
     expect(mutate).not.toHaveBeenCalled();
 
+    actions.confirmChoice = { value: "0:Dallas", label: "Dallas" };
     await actions.runConfirm();
     expect(sent()[0]).toContain("update_matches_by_pk");
     expect(sent()[0]).toContain("Dallas");
@@ -126,3 +135,49 @@ describe("match actions force ready", () => {
     expect(actions.canForceReady).toBe(false);
   });
 });
+
+describe("admin dock main action", () => {
+  it("offers Skip Check In before the match starts", async () => {
+    signIn(e_player_roles_enum.user);
+    const actions = await mountActions("Scheduled", {
+      dock: true,
+      status: "WaitingForCheckIn",
+      can_start: true,
+    });
+
+    expect(actions.primaryAction).toBe("start");
+    expect(actions.showStartItem).toBe(false);
+  });
+
+  it("offers Force Ready in warmup to a moderator", async () => {
+    signIn(e_player_roles_enum.moderator);
+    const actions = await mountActions("Warmup", { dock: true });
+
+    expect(actions.primaryAction).toBe("force_ready");
+  });
+
+  it("shows no main action when the role can never use it", async () => {
+    signIn(e_player_roles_enum.user);
+    const actions = await mountActions("Warmup", { dock: true });
+
+    expect(actions.primaryAction).toBeNull();
+    expect(actions.upcoming.map((action: any) => action.key)).not.toContain(
+      "pause",
+    );
+  });
+
+  it("offers Pause while a map is live", async () => {
+    signIn(e_player_roles_enum.moderator);
+    const actions = await mountActions("Live", { dock: true });
+
+    expect(actions.primaryAction).toBe("pause");
+  });
+
+  it("keeps the header menu free of a main action", async () => {
+    signIn(e_player_roles_enum.moderator);
+    const actions = await mountActions("Warmup");
+
+    expect(actions.primaryAction).toBeNull();
+    expect(actions.showForceReadyItem).toBe(true);
+  });
+});
diff --git a/tests/utilities/matchAdminSteps.spec.ts b/tests/utilities/matchAdminSteps.spec.ts
new file mode 100644
index 000000000..3b7ccd6af
--- /dev/null
+++ b/tests/utilities/matchAdminSteps.spec.ts
@@ -0,0 +1,72 @@
+import { describe, expect, it } from "vitest";
+import { e_player_roles_enum } from "~/generated/zeus";
+import { roleOrder } from "~/stores/AuthStore";
+import {
+  currentMatchAdminStep,
+  matchAdminSteps,
+  upcomingAdminActions,
+} from "~/utilities/matchAdminSteps";
+
+const roleAtLeast =
+  (mine: e_player_roles_enum) => (needed: e_player_roles_enum) =>
+    roleOrder.indexOf(mine) >= roleOrder.indexOf(needed);
+
+function match(status: string, mapStatus?: string, mapVeto = true) {
+  return {
+    status,
+    options: { map_veto: mapVeto, region_veto: false },
+    match_maps: mapStatus ? [{ is_current_map: true, status: mapStatus }] : [],
+  };
+}
+
+describe("matchAdminSteps", () => {
+  it("drops the veto step when the match runs no veto", () => {
+    expect(
+      matchAdminSteps(match("WaitingForCheckIn", undefined, false)),
+    ).toEqual(["check_in", "warmup", "live", "finished"]);
+  });
+
+  it.each([
+    ["WaitingForCheckIn", undefined, "check_in"],
+    ["PickingPlayers", undefined, "check_in"],
+    ["Veto", undefined, "veto"],
+    ["WaitingForServer", undefined, "warmup"],
+    ["Live", "Warmup", "warmup"],
+    ["Live", "Scheduled", "warmup"],
+    ["Live", "Knife", "live"],
+    ["Live", "Paused", "live"],
+    ["Finished", "Finished", "finished"],
+    ["Canceled", undefined, "finished"],
+  ])("puts a %s match (map %s) on the %s step", (status, mapStatus, step) => {
+    expect(currentMatchAdminStep(match(status, mapStatus))).toBe(step);
+  });
+});
+
+describe("upcomingAdminActions", () => {
+  it("leaves out what a plain organizer can never use", () => {
+    const keys = upcomingAdminActions(
+      match("WaitingForCheckIn"),
+      roleAtLeast(e_player_roles_enum.user),
+    ).map((action) => action.key);
+
+    expect(keys).toEqual(["veto_override", "live_stream"]);
+  });
+
+  it("lists the later steps' tools for an administrator", () => {
+    const keys = upcomingAdminActions(
+      match("Live", "Warmup"),
+      roleAtLeast(e_player_roles_enum.administrator),
+    ).map((action) => action.key);
+
+    expect(keys).toEqual(["pause", "highlights", "reparse"]);
+  });
+
+  it("has nothing left once the match is finished", () => {
+    expect(
+      upcomingAdminActions(
+        match("Finished", "Finished"),
+        roleAtLeast(e_player_roles_enum.administrator),
+      ),
+    ).toEqual([]);
+  });
+});
diff --git a/utilities/matchAdminSteps.ts b/utilities/matchAdminSteps.ts
new file mode 100644
index 000000000..e3b45c3bc
--- /dev/null
+++ b/utilities/matchAdminSteps.ts
@@ -0,0 +1,129 @@
+import {
+  e_match_map_status_enum,
+  e_match_status_enum,
+  e_player_roles_enum,
+} from "~/generated/zeus";
+
+export type MatchAdminStep =
+  "check_in" | "veto" | "warmup" | "live" | "finished";
+
+type StepMatch = {
+  status?: string | null;
+  options?: { map_veto?: boolean; region_veto?: boolean } | null;
+  match_maps?: Array<{ is_current_map?: boolean; status?: string }> | null;
+};
+
+const ALL_STEPS: MatchAdminStep[] = [
+  "check_in",
+  "veto",
+  "warmup",
+  "live",
+  "finished",
+];
+
+const ENDED: string[] = [
+  e_match_status_enum.Finished,
+  e_match_status_enum.Tie,
+  e_match_status_enum.Forfeit,
+  e_match_status_enum.Surrendered,
+  e_match_status_enum.Canceled,
+];
+
+// The veto step only exists for matches that run one.
+export function matchAdminSteps(match: StepMatch): MatchAdminStep[] {
+  const hasVeto = !!(match.options?.map_veto || match.options?.region_veto);
+  return ALL_STEPS.filter((step) => step !== "veto" || hasVeto);
+}
+
+export function currentMatchAdminStep(match: StepMatch): MatchAdminStep {
+  const status = match.status ?? "";
+
+  if (ENDED.includes(status)) {
+    return "finished";
+  }
+  if (status === e_match_status_enum.Veto) {
+    return "veto";
+  }
+  if (status === e_match_status_enum.WaitingForServer) {
+    return "warmup";
+  }
+  if (status === e_match_status_enum.Live) {
+    const map = match.match_maps?.find((m) => m.is_current_map);
+    return !map ||
+      map.status === e_match_map_status_enum.Scheduled ||
+      map.status === e_match_map_status_enum.Warmup
+      ? "warmup"
+      : "live";
+  }
+  return "check_in";
+}
+
+export type UpcomingAdminAction = {
+  key:
+    | "veto_override"
+    | "force_ready"
+    | "pause"
+    | "live_stream"
+    | "highlights"
+    | "reparse";
+  step: MatchAdminStep;
+  label: string;
+  // Lowest role that can ever use it; none means any organizer.
+  role?: e_player_roles_enum;
+};
+
+// What unlocks at each later step, so organizers can see it coming. Actions
+// that are always available (server, winner, cancel) never appear here.
+export const UPCOMING_ADMIN_ACTIONS: UpcomingAdminAction[] = [
+  {
+    key: "veto_override",
+    step: "veto",
+    label: "match.admin_bar.veto_override",
+  },
+  {
+    key: "force_ready",
+    step: "warmup",
+    label: "match.commands.force_ready",
+    role: e_player_roles_enum.moderator,
+  },
+  // Streaming opens once the match goes live, which is the warmup step.
+  {
+    key: "live_stream",
+    step: "warmup",
+    label: "match.actions.start_live",
+  },
+  {
+    key: "pause",
+    step: "live",
+    label: "match.actions.pause",
+    role: e_player_roles_enum.moderator,
+  },
+  {
+    key: "highlights",
+    step: "finished",
+    label: "match.actions.create_clips",
+    role: e_player_roles_enum.administrator,
+  },
+  {
+    key: "reparse",
+    step: "finished",
+    label: "match.actions.reparse_demos",
+    role: e_player_roles_enum.administrator,
+  },
+];
+
+// Actions the viewer can use at a later step. Ones their role never reaches
+// are left out entirely rather than shown locked.
+export function upcomingAdminActions(
+  match: StepMatch,
+  canUseRole: (role: e_player_roles_enum) => boolean,
+): UpcomingAdminAction[] {
+  const steps = matchAdminSteps(match);
+  const current = steps.indexOf(currentMatchAdminStep(match));
+
+  return UPCOMING_ADMIN_ACTIONS.filter(
+    (action) =>
+      steps.indexOf(action.step) > current &&
+      (!action.role || canUseRole(action.role)),
+  );
+}

From b76f47226d18b4f3fa963645ea959042721db20e Mon Sep 17 00:00:00 2001
From: Luke Policinski <luke@lukepolo.com>
Date: Mon, 5 Oct 2026 10:25:17 -0400
Subject: [PATCH 3/3] feature: admin menu shows the current server and winner,
 team buttons for picking a winner, icons only on the actions that matter

---
 components/match/MatchActions.vue      | 64 +++++++++----------
 components/match/MatchSelectWinner.vue | 88 ++++++++++----------------
 i18n/locales/ar_SA.json                |  5 ++
 i18n/locales/da_DK.json                |  5 ++
 i18n/locales/de_DE.json                |  5 ++
 i18n/locales/en.json                   |  5 ++
 i18n/locales/es_ES.json                |  5 ++
 i18n/locales/fr_FR.json                |  5 ++
 i18n/locales/it_IT.json                |  5 ++
 i18n/locales/ja_JP.json                |  5 ++
 i18n/locales/ko_KR.json                |  5 ++
 i18n/locales/pl_PL.json                |  5 ++
 i18n/locales/pt_BR.json                |  5 ++
 i18n/locales/ru_RU.json                |  5 ++
 i18n/locales/sv_SE.json                |  5 ++
 i18n/locales/tr_TR.json                |  5 ++
 i18n/locales/uk_UA.json                |  5 ++
 i18n/locales/zh_Hans.json              |  5 ++
 i18n/locales/zh_Hant.json              |  5 ++
 19 files changed, 147 insertions(+), 90 deletions(-)

diff --git a/components/match/MatchActions.vue b/components/match/MatchActions.vue
index 5418ae26e..d49e33038 100644
--- a/components/match/MatchActions.vue
+++ b/components/match/MatchActions.vue
@@ -5,16 +5,10 @@ import {
   MoreVertical,
   Pause,
   Play,
-  Radio,
-  RefreshCw,
-  Scissors,
-  Server,
   SlidersHorizontal,
-  Square,
   Trash2,
   Trophy,
   XCircle,
-  Zap,
 } from "lucide-vue-next";
 import MatchCameraStatus from "~/components/match/MatchCameraStatus.vue";
 import MatchSelectServer from "~/components/match/MatchSelectServer.vue";
@@ -47,15 +41,6 @@ const dockNeutral = `${dockChip} border-border bg-background/60 text-muted-foreg
 
 const menuLabel =
   "px-2 pb-1 pt-1.5 font-mono text-[0.58rem] font-semibold uppercase tracking-[0.16em] text-muted-foreground";
-
-const upcomingIcons = {
-  veto_override: Zap,
-  force_ready: CheckCheck,
-  pause: Pause,
-  live_stream: Radio,
-  highlights: Scissors,
-  reparse: RefreshCw,
-};
 </script>
 
 <template>
@@ -209,20 +194,26 @@ const upcomingIcons = {
           />
         </template>
 
+        <!-- Settings read as label + current value, so the menu shows what the
+             match is set to before anyone opens a dialog. -->
         <DropdownMenuItem
           v-if="match.can_assign_server"
           @click="openServerDialog"
         >
-          <Server />
-          {{ $t("match.server.assign") }}…
+          {{ $t("match.admin_bar.server") }}
+          <span class="ml-auto pl-6 text-xs text-muted-foreground">
+            {{ serverLabel }}
+          </span>
         </DropdownMenuItem>
 
         <DropdownMenuItem
           v-if="canSetMatchWinner && primaryAction !== 'winner'"
           @click="openWinnerDialog"
         >
-          <Trophy />
-          {{ $t("match.winner.set") }}…
+          {{ $t("match.admin_bar.winner") }}
+          <span class="ml-auto pl-6 text-xs text-muted-foreground">
+            {{ winnerLabel }}
+          </span>
         </DropdownMenuItem>
 
         <template v-if="match.is_organizer && hasOrganizerLiveActions">
@@ -240,14 +231,12 @@ const upcomingIcons = {
             :disabled="switching || !match.is_server_online"
             @click="switchHere"
           >
-            <Radio class="text-muted-foreground" />
             <span>{{ $t("match.actions.switch_stream_here") }}</span>
           </DropdownMenuItem>
           <DropdownMenuSub v-else-if="gameStreamerStatus === 'off'">
             <Tooltip v-if="liveStartDisabledReason">
               <TooltipTrigger as-child>
                 <DropdownMenuSubTrigger disabled>
-                  <Radio class="text-muted-foreground" />
                   <span>{{ $t("match.actions.start_live") }}</span>
                 </DropdownMenuSubTrigger>
               </TooltipTrigger>
@@ -256,7 +245,6 @@ const upcomingIcons = {
               </TooltipContent>
             </Tooltip>
             <DropdownMenuSubTrigger v-else>
-              <Radio class="text-muted-foreground" />
               <span>{{
                 canPreemptHighlights
                   ? $t("match.actions.pause_highlights_and_start_live")
@@ -305,7 +293,6 @@ const upcomingIcons = {
             class="text-destructive"
             @click="stopLive"
           >
-            <Square />
             <template v-if="gameStreamerStatus === 'pending'">
               <div class="flex flex-col items-start leading-tight">
                 <span>{{ $t("match.actions.cancel_live_pending") }}</span>
@@ -337,7 +324,6 @@ const upcomingIcons = {
           <Tooltip v-if="canCreateClips && !hasRegisteredGpu">
             <TooltipTrigger as-child>
               <DropdownMenuItem disabled>
-                <Scissors />
                 {{ $t("match.actions.create_clips") }}
               </DropdownMenuItem>
             </TooltipTrigger>
@@ -349,13 +335,11 @@ const upcomingIcons = {
             v-else-if="canCreateClips"
             @click="createClipsForMatch"
           >
-            <Scissors />
             {{ $t("match.actions.create_clips") }}
           </DropdownMenuItem>
           <Tooltip v-if="hasPausedRenders && resumeRendersBlockedReason">
             <TooltipTrigger as-child>
               <DropdownMenuItem disabled>
-                <Play />
                 <div class="flex flex-col items-start leading-tight">
                   <span>{{ $t("match.actions.resume_renders") }}</span>
                   <span class="text-xs text-muted-foreground mt-0.5">
@@ -369,7 +353,6 @@ const upcomingIcons = {
             </TooltipContent>
           </Tooltip>
           <DropdownMenuItem v-else-if="hasPausedRenders" @click="resumeRenders">
-            <Play />
             <div class="flex flex-col items-start leading-tight">
               <span>{{ $t("match.actions.resume_renders") }}</span>
               <span class="text-xs text-muted-foreground mt-0.5">
@@ -381,7 +364,6 @@ const upcomingIcons = {
             v-else-if="hasInFlightRenders"
             @click="pauseRenders"
           >
-            <Pause />
             <div class="flex flex-col items-start leading-tight">
               <span>{{ $t("match.actions.pause_renders") }}</span>
               <span class="text-xs text-muted-foreground mt-0.5">
@@ -389,11 +371,13 @@ const upcomingIcons = {
               </span>
             </div>
           </DropdownMenuItem>
+          <DropdownMenuItem v-if="canReparseDemos" @click="reparseAllDemos">
+            {{ $t("match.actions.reparse_demos") }}
+          </DropdownMenuItem>
         </template>
 
         <DropdownMenuSeparator
           v-if="
-            canReparseDemos ||
             showForceReadyItem ||
             showStartItem ||
             (!dock && (match.can_cancel || canDeleteMatch))
@@ -401,11 +385,6 @@ const upcomingIcons = {
           class="first:hidden"
         />
 
-        <DropdownMenuItem v-if="canReparseDemos" @click="reparseAllDemos">
-          <RefreshCw />
-          {{ $t("match.actions.reparse_demos") }}
-        </DropdownMenuItem>
-
         <DropdownMenuItem v-if="showForceReadyItem" @click="forceReady">
           <CheckCheck />
           {{ $t("match.commands.force_ready") }}
@@ -448,7 +427,6 @@ const upcomingIcons = {
             :key="action.key"
             disabled
           >
-            <component :is="upcomingIcons[action.key]" />
             {{ $t(action.label) }}
             <span
               class="ml-auto rounded-sm border border-dashed border-border px-1.5 py-0.5 font-mono text-[0.55rem] uppercase tracking-[0.12em]"
@@ -1103,6 +1081,22 @@ export default {
       }
       return null;
     },
+    serverLabel() {
+      if (this.match.server_id && this.match.server_type !== "On Demand") {
+        return this.$t("match.admin_bar.dedicated");
+      }
+      return (
+        this.match.e_region?.description ||
+        this.match.region ||
+        this.$t("match.admin_bar.not_set")
+      );
+    },
+    winnerLabel() {
+      const winner = [this.match.lineup_1, this.match.lineup_2].find(
+        (lineup) => lineup?.id && lineup.id === this.match.winning_lineup_id,
+      );
+      return winner?.name ?? this.$t("match.admin_bar.not_set");
+    },
     startLabel() {
       return this.match.options?.map_veto &&
         this.match.options.best_of != this.match.match_maps?.length
diff --git a/components/match/MatchSelectWinner.vue b/components/match/MatchSelectWinner.vue
index be1303f88..39599d9d1 100644
--- a/components/match/MatchSelectWinner.vue
+++ b/components/match/MatchSelectWinner.vue
@@ -1,53 +1,37 @@
-<script lang="ts" setup>
-import {
-  FormControl,
-  FormField,
-  FormItem,
-  FormMessage,
-} from "~/components/ui/form";
-import {
-  Select,
-  SelectContent,
-  SelectGroup,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "~/components/ui/select";
-</script>
-
 <template>
-  <form class="space-y-8">
-    <FormField v-slot="{ componentField }" name="lineup_id">
-      <FormItem class="space-y-1.5">
-        <Select v-bind="componentField" @update:modelValue="pick">
-          <FormControl>
-            <SelectTrigger :aria-label="$t('match.winner.set')">
-              <SelectValue :placeholder="$t('match.winner.select_lineup')" />
-            </SelectTrigger>
-          </FormControl>
-          <SelectContent>
-            <SelectGroup>
-              <SelectItem
-                v-for="lineup in availableLineups"
-                :key="lineup.value"
-                :value="lineup.value"
-              >
-                {{ lineup.display }}
-              </SelectItem>
-            </SelectGroup>
-          </SelectContent>
-        </Select>
-        <FormMessage />
-      </FormItem>
-    </FormField>
-  </form>
+  <!-- Two teams, so two buttons instead of a dropdown; the current winner is
+       marked so the change being made is visible. -->
+  <div
+    class="grid grid-cols-2 gap-2"
+    role="radiogroup"
+    :aria-label="$t('match.winner.set')"
+  >
+    <button
+      v-for="lineup in availableLineups"
+      :key="lineup.value"
+      type="button"
+      role="radio"
+      :aria-checked="picked === lineup.value"
+      class="flex min-w-0 items-center justify-between gap-2 rounded-md border px-3 py-2.5 text-left text-sm font-semibold transition-colors duration-200 ease-out"
+      :class="
+        picked === lineup.value
+          ? 'border-[hsl(var(--tac-amber)/0.6)] bg-[hsl(var(--tac-amber)/0.12)] text-foreground'
+          : 'border-border text-muted-foreground hover:bg-muted/40 hover:text-foreground'
+      "
+      @click="pick(lineup.value)"
+    >
+      <span class="truncate">{{ lineup.display }}</span>
+      <span
+        v-if="lineup.value === match.winning_lineup_id"
+        class="shrink-0 rounded-sm border border-border px-1.5 py-0.5 font-mono text-[0.55rem] font-semibold uppercase tracking-[0.12em] text-muted-foreground"
+      >
+        {{ $t("match.admin_bar.current") }}
+      </span>
+    </button>
+  </div>
 </template>
 
 <script lang="ts">
-import * as z from "zod";
-import { useForm } from "vee-validate";
-import { toTypedSchema } from "~/utilities/vee-validate-zod";
-
 export default {
   props: {
     match: {
@@ -59,14 +43,7 @@ export default {
   emits: ["select"],
   data() {
     return {
-      servers: [],
-      form: useForm({
-        validationSchema: toTypedSchema(
-          z.object({
-            lineup_id: z.string().nullable(),
-          }),
-        ),
-      }),
+      picked: null as string | null,
     };
   },
   watch: {
@@ -75,12 +52,13 @@ export default {
     "match.winning_lineup_id": {
       immediate: true,
       handler(winningLineupId) {
-        this.form.setFieldValue("lineup_id", winningLineupId);
+        this.picked = winningLineupId;
       },
     },
   },
   methods: {
     pick(value: string) {
+      this.picked = value;
       const lineup = this.availableLineups.find(
         (lineup) => lineup.value === value,
       );
diff --git a/i18n/locales/ar_SA.json b/i18n/locales/ar_SA.json
index 538d25148..6eb4afc50 100644
--- a/i18n/locales/ar_SA.json
+++ b/i18n/locales/ar_SA.json
@@ -9054,6 +9054,11 @@
       "veto_override": "تجاوز الاستبعاد",
       "actions": "إجراءات أخرى",
       "coming_up": "قادم",
+      "server": "الخادم",
+      "winner": "الفائز",
+      "not_set": "غير محدد",
+      "dedicated": "خادم مخصص",
+      "current": "الحالي",
       "steps": {
         "label": "مراحل المباراة",
         "check_in": "تسجيل الحضور",
diff --git a/i18n/locales/da_DK.json b/i18n/locales/da_DK.json
index 8d796da38..60ff8d37c 100644
--- a/i18n/locales/da_DK.json
+++ b/i18n/locales/da_DK.json
@@ -9054,6 +9054,11 @@
       "veto_override": "Tilsidesæt veto",
       "actions": "Flere handlinger",
       "coming_up": "Kommer snart",
+      "server": "Server",
+      "winner": "Vinder",
+      "not_set": "Ikke valgt",
+      "dedicated": "Dedikeret",
+      "current": "Nuværende",
       "steps": {
         "label": "Kamptrin",
         "check_in": "Check-in",
diff --git a/i18n/locales/de_DE.json b/i18n/locales/de_DE.json
index c8c757495..b918f5ff7 100644
--- a/i18n/locales/de_DE.json
+++ b/i18n/locales/de_DE.json
@@ -9054,6 +9054,11 @@
       "veto_override": "Veto überschreiben",
       "actions": "Weitere Aktionen",
       "coming_up": "Demnächst",
+      "server": "Server",
+      "winner": "Sieger",
+      "not_set": "Nicht festgelegt",
+      "dedicated": "Dediziert",
+      "current": "Aktuell",
       "steps": {
         "label": "Match-Schritte",
         "check_in": "Check-in",
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index e68112273..16168b75b 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -9056,6 +9056,11 @@
       "veto_override": "Veto Override",
       "actions": "More actions",
       "coming_up": "Coming up",
+      "server": "Server",
+      "winner": "Winner",
+      "not_set": "Not set",
+      "dedicated": "Dedicated",
+      "current": "Current",
       "steps": {
         "label": "Match steps",
         "check_in": "Check-in",
diff --git a/i18n/locales/es_ES.json b/i18n/locales/es_ES.json
index 80c4f052b..4a5e58593 100644
--- a/i18n/locales/es_ES.json
+++ b/i18n/locales/es_ES.json
@@ -9054,6 +9054,11 @@
       "veto_override": "Anular veto",
       "actions": "Más acciones",
       "coming_up": "Próximamente",
+      "server": "Servidor",
+      "winner": "Ganador",
+      "not_set": "Sin definir",
+      "dedicated": "Dedicado",
+      "current": "Actual",
       "steps": {
         "label": "Pasos de la partida",
         "check_in": "Check-in",
diff --git a/i18n/locales/fr_FR.json b/i18n/locales/fr_FR.json
index af605de12..ce6c09a47 100644
--- a/i18n/locales/fr_FR.json
+++ b/i18n/locales/fr_FR.json
@@ -9054,6 +9054,11 @@
       "veto_override": "Forcer le veto",
       "actions": "Plus d'actions",
       "coming_up": "À venir",
+      "server": "Serveur",
+      "winner": "Vainqueur",
+      "not_set": "Non défini",
+      "dedicated": "Dédié",
+      "current": "Actuel",
       "steps": {
         "label": "Étapes du match",
         "check_in": "Check-in",
diff --git a/i18n/locales/it_IT.json b/i18n/locales/it_IT.json
index 2f6e384c3..c9d739786 100644
--- a/i18n/locales/it_IT.json
+++ b/i18n/locales/it_IT.json
@@ -9054,6 +9054,11 @@
       "veto_override": "Forza il veto",
       "actions": "Altre azioni",
       "coming_up": "In arrivo",
+      "server": "Server",
+      "winner": "Vincitore",
+      "not_set": "Non impostato",
+      "dedicated": "Dedicato",
+      "current": "Attuale",
       "steps": {
         "label": "Fasi del match",
         "check_in": "Check-in",
diff --git a/i18n/locales/ja_JP.json b/i18n/locales/ja_JP.json
index 8c32a5447..7ace381e4 100644
--- a/i18n/locales/ja_JP.json
+++ b/i18n/locales/ja_JP.json
@@ -9054,6 +9054,11 @@
       "veto_override": "拒否を上書き",
       "actions": "その他の操作",
       "coming_up": "この先",
+      "server": "サーバー",
+      "winner": "勝者",
+      "not_set": "未設定",
+      "dedicated": "専用",
+      "current": "現在",
       "steps": {
         "label": "試合の段階",
         "check_in": "チェックイン",
diff --git a/i18n/locales/ko_KR.json b/i18n/locales/ko_KR.json
index 174c776c7..715a531ce 100644
--- a/i18n/locales/ko_KR.json
+++ b/i18n/locales/ko_KR.json
@@ -9054,6 +9054,11 @@
       "veto_override": "거부 재정의",
       "actions": "추가 작업",
       "coming_up": "다음 단계",
+      "server": "서버",
+      "winner": "승자",
+      "not_set": "설정 안 됨",
+      "dedicated": "전용",
+      "current": "현재",
       "steps": {
         "label": "매치 단계",
         "check_in": "체크인",
diff --git a/i18n/locales/pl_PL.json b/i18n/locales/pl_PL.json
index a7bcc4b47..fab347ada 100644
--- a/i18n/locales/pl_PL.json
+++ b/i18n/locales/pl_PL.json
@@ -9054,6 +9054,11 @@
       "veto_override": "Nadpisz veto",
       "actions": "Więcej akcji",
       "coming_up": "Wkrótce",
+      "server": "Serwer",
+      "winner": "Zwycięzca",
+      "not_set": "Nie ustawiono",
+      "dedicated": "Dedykowany",
+      "current": "Obecny",
       "steps": {
         "label": "Etapy meczu",
         "check_in": "Check-in",
diff --git a/i18n/locales/pt_BR.json b/i18n/locales/pt_BR.json
index 1a8e27d57..d2a4a97a4 100644
--- a/i18n/locales/pt_BR.json
+++ b/i18n/locales/pt_BR.json
@@ -9054,6 +9054,11 @@
       "veto_override": "Veto Sobrescrito",
       "actions": "Mais ações",
       "coming_up": "Em seguida",
+      "server": "Servidor",
+      "winner": "Vencedor",
+      "not_set": "Não definido",
+      "dedicated": "Dedicado",
+      "current": "Atual",
       "steps": {
         "label": "Etapas da partida",
         "check_in": "Check-in",
diff --git a/i18n/locales/ru_RU.json b/i18n/locales/ru_RU.json
index b2820a656..e4e114ec5 100644
--- a/i18n/locales/ru_RU.json
+++ b/i18n/locales/ru_RU.json
@@ -9054,6 +9054,11 @@
       "veto_override": "Переопределить вето",
       "actions": "Другие действия",
       "coming_up": "Далее",
+      "server": "Сервер",
+      "winner": "Победитель",
+      "not_set": "Не задан",
+      "dedicated": "Выделенный",
+      "current": "Текущий",
       "steps": {
         "label": "Этапы матча",
         "check_in": "Чек-ин",
diff --git a/i18n/locales/sv_SE.json b/i18n/locales/sv_SE.json
index 626248587..85bdd8c84 100644
--- a/i18n/locales/sv_SE.json
+++ b/i18n/locales/sv_SE.json
@@ -9054,6 +9054,11 @@
       "veto_override": "Åsidosätt veto",
       "actions": "Fler åtgärder",
       "coming_up": "Kommer härnäst",
+      "server": "Server",
+      "winner": "Vinnare",
+      "not_set": "Inte vald",
+      "dedicated": "Dedikerad",
+      "current": "Nuvarande",
       "steps": {
         "label": "Matchsteg",
         "check_in": "Incheckning",
diff --git a/i18n/locales/tr_TR.json b/i18n/locales/tr_TR.json
index 10b237499..610cf4457 100644
--- a/i18n/locales/tr_TR.json
+++ b/i18n/locales/tr_TR.json
@@ -9054,6 +9054,11 @@
       "veto_override": "Vetoyu geçersiz kıl",
       "actions": "Diğer işlemler",
       "coming_up": "Sıradaki",
+      "server": "Sunucu",
+      "winner": "Kazanan",
+      "not_set": "Ayarlanmadı",
+      "dedicated": "Özel",
+      "current": "Mevcut",
       "steps": {
         "label": "Maç adımları",
         "check_in": "Check-in",
diff --git a/i18n/locales/uk_UA.json b/i18n/locales/uk_UA.json
index 71ac86cd8..285d75937 100644
--- a/i18n/locales/uk_UA.json
+++ b/i18n/locales/uk_UA.json
@@ -9054,6 +9054,11 @@
       "veto_override": "Перевизначити вето",
       "actions": "Інші дії",
       "coming_up": "Далі",
+      "server": "Сервер",
+      "winner": "Переможець",
+      "not_set": "Не задано",
+      "dedicated": "Виділений",
+      "current": "Поточний",
       "steps": {
         "label": "Етапи матчу",
         "check_in": "Чек-ін",
diff --git a/i18n/locales/zh_Hans.json b/i18n/locales/zh_Hans.json
index aa518b8c7..6eaf7ccdf 100644
--- a/i18n/locales/zh_Hans.json
+++ b/i18n/locales/zh_Hans.json
@@ -9054,6 +9054,11 @@
       "veto_override": "覆盖否决",
       "actions": "更多操作",
       "coming_up": "即将开放",
+      "server": "服务器",
+      "winner": "胜者",
+      "not_set": "未设置",
+      "dedicated": "独立服务器",
+      "current": "当前",
       "steps": {
         "label": "比赛阶段",
         "check_in": "签到",
diff --git a/i18n/locales/zh_Hant.json b/i18n/locales/zh_Hant.json
index ed4f864e1..ad04771a7 100644
--- a/i18n/locales/zh_Hant.json
+++ b/i18n/locales/zh_Hant.json
@@ -9054,6 +9054,11 @@
       "veto_override": "覆寫否決",
       "actions": "更多操作",
       "coming_up": "即將開放",
+      "server": "伺服器",
+      "winner": "勝者",
+      "not_set": "未設定",
+      "dedicated": "獨立伺服器",
+      "current": "目前",
       "steps": {
         "label": "比賽階段",
         "check_in": "報到",