Audit of 2bfa624

mac/Sources/Byre/Chat.swift

@@ -1657,7 +1657,7 @@ struct NoteView: View {
     let cancelVisible: Bool
     @Environment(Store.self) private var store
     @Environment(Overlays.self) private var overlays
-    @ViewState private var cancelling = false
+    @ViewState private var canceling = false
 
     var body: some View {
         let color = switch note.style {
@@ -1679,18 +1679,18 @@ struct NoteView: View {
             }
             if let taskId = note.cancelMergeAfterReview, cancelVisible, store.findTask(taskId)?.mergeAfterReview == true {
                 Button("Cancel") {
-                    cancelling = true
+                    canceling = true
                     Task {
                         do {
                             _ = try await store.api.client.cancelMergeAfterReview(path: .init(taskId: taskId)).ok
                         } catch {
                             overlays.showAlert(errorText(error))
                         }
-                        cancelling = false
+                        canceling = false
                     }
                 }
                 .buttonStyle(SmallLinkButtonStyle())
-                .disabled(cancelling)
+                .disabled(canceling)
                 .help("Withdraw this request; nothing is merged")
             }
         }

mac/Sources/Byre/Settings.swift

@@ -22,8 +22,8 @@ struct SettingsView: View {
     var body: some View {
         ScrollView {
             VStack(alignment: .leading, spacing: 0) {
-                heading("Window colour")
-                Text("Windows for this server have a border in this colour, on every Mac you use.")
+                heading("Window color")
+                Text("Windows for this server have a border in this color, on every Mac you use.")
                     .foregroundStyle(Palette.muted)
                     .fixedSize(horizontal: false, vertical: true)
                 ServerColorPicker()
@@ -118,7 +118,7 @@ private struct SyncState: View {
         TimelineView(.periodic(from: .now, by: 30)) { _ in
             if let sync = Servers.shared.sync {
                 if sync.ok {
-                    Text("This Mac shares its servers, window colours, font size, drafts and task visits through iCloud. Last synced \(ago(sync.at)).")
+                    Text("This Mac shares its servers, window colors, font size, drafts and task visits through iCloud. Last synced \(ago(sync.at)).")
                         .fixedSize(horizontal: false, vertical: true)
                 } else {
                     Text("iCloud sync is failing on this Mac, so changes made here aren't reaching your other Macs. Failed \(ago(sync.at)): \(sync.error ?? "")")

mac/Sources/Byre/Terminal.swift

@@ -99,11 +99,11 @@ struct TerminalHost: NSViewRepresentable {
         }
         context.coordinator.scheme = scheme
         DispatchQueue.main.async {
-            colour(nsView)
+            color(nsView)
         }
     }
 
-    private func colour(_ t: TerminalView) {
+    private func color(_ t: TerminalView) {
         func resolved(_ c: SwiftUI.Color) -> NSColor {
             var out = NSColor(c)
             t.effectiveAppearance.performAsCurrentDrawingAppearance {

mac/Sources/Byre/TranscriptBuilder.swift

@@ -949,7 +949,7 @@ final class TranscriptBuilder {
             return Row(.note(n), taskId: rowTask)
 
         case "task.merge_after_review_cancelled":
-            return note([.text("\(ev.actor) cancelled the merge after review")])
+            return note([.text("\(ev.actor) canceled the merge after review")])
 
         case "task.merge_after_review_dropped":
             return note([.text("didn't merge after the review: \(jsString(p["reason"]))")])

mac/Sources/Byre/Workflow.swift

@@ -254,7 +254,7 @@ private struct AttemptRow: View {
             if let output = a.output {
                 DetailsBox(boxed: false) {
                     HStack(spacing: 0) {
-                        Text("finish_stage output").foregroundStyle(Palette.muted)
+                        Text("Stage output").foregroundStyle(Palette.muted)
                         if let commit = a.commit {
                             Text(" \(String(commit.prefix(10)))").foregroundStyle(Palette.muted)
                         }