Revert accidental added draft changes

src/data/media-player.ts

@@ -51,6 +51,7 @@ interface MediaPlayerEntityAttributes extends HassEntityAttributeBase {
   media_duration?: number;
   media_position?: number;
   media_title?: string;
+  media_channel?: string;
   icon?: string;
   entity_picture_local?: string;
   is_volume_muted?: boolean;
@@ -235,6 +236,9 @@ export const computeMediaDescription = (
         }
       }
       break;
+    case "channel":
+      secondaryTitle = stateObj.attributes.media_channel!;
+      break;
     default:
       secondaryTitle = stateObj.attributes.app_name || "";
   }

src/dialogs/more-info/controls/more-info-media_player.ts

@@ -167,7 +167,8 @@ class MoreInfoMediaPlayer extends LitElement {
             </div>
           `
         : ""}
-      ${supportsFeature(stateObj, SUPPORT_SELECT_SOUND_MODE) &&
+      ${![UNAVAILABLE, UNKNOWN, "off"].includes(stateObj.state) &&
+      supportsFeature(stateObj, SUPPORT_SELECT_SOUND_MODE) &&
       stateObj.attributes.sound_mode_list?.length
         ? html`
             <div class="sound-input">

src/layouts/hass-subpage.ts

@@ -15,8 +15,6 @@ class HassSubpage extends LitElement {
 
   @property({ type: String, attribute: "back-path" }) public backPath?: string;
 
-  @property() public backCallback?: () => void;
-
   @property({ type: Boolean, reflect: true }) public narrow = false;
 
   @property({ type: Boolean }) public supervisor = false;
@@ -54,9 +52,6 @@ class HassSubpage extends LitElement {
         <slot name="toolbar-icon"></slot>
       </div>
       <div class="content" @scroll=${this._saveScrollPos}><slot></slot></div>
-      <div id="fab">
-        <slot name="fab"></slot>
-      </div>
     `;
   }
 
@@ -66,10 +61,6 @@ class HassSubpage extends LitElement {
   }
 
   private _backTapped(): void {
-    if (this.backCallback) {
-      this.backCallback();
-      return;
-    }
     history.back();
   }
 
@@ -125,29 +116,6 @@ class HassSubpage extends LitElement {
         overflow: auto;
         -webkit-overflow-scrolling: touch;
       }
-
-      #fab {
-        position: fixed;
-        right: calc(16px + env(safe-area-inset-right));
-        bottom: calc(16px + env(safe-area-inset-bottom));
-        z-index: 1;
-      }
-      :host([narrow]) #fab.tabs {
-        bottom: calc(84px + env(safe-area-inset-bottom));
-      }
-      #fab[is-wide] {
-        bottom: 24px;
-        right: 24px;
-      }
-      :host([rtl]) #fab {
-        right: auto;
-        left: calc(16px + env(safe-area-inset-left));
-      }
-      :host([rtl][is-wide]) #fab {
-        bottom: 24px;
-        left: 24px;
-        right: auto;
-      }
     `;
   }
 }

src/panels/config/automation/ha-automation-editor.ts

@@ -51,7 +51,7 @@ import {
   showPromptDialog,
 } from "../../../dialogs/generic/show-dialog-box";
 import "../../../layouts/ha-app-layout";
-import "../../../layouts/hass-subpage";
+import "../../../layouts/hass-tabs-subpage";
 import { KeyboardShortcutMixin } from "../../../mixins/keyboard-shortcut-mixin";
 import { haStyle } from "../../../resources/styles";
 import { HomeAssistant, Route } from "../../../types";
@@ -113,7 +113,7 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) {
       ? this.hass.states[this._entityId]
       : undefined;
     return html`
-      <hass-subpage
+      <hass-tabs-subpage
         .hass=${this.hass}
         .narrow=${this.narrow}
         .route=${this.route}
@@ -336,7 +336,7 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) {
         >
           <ha-svg-icon slot="icon" .path=${mdiContentSave}></ha-svg-icon>
         </ha-fab>
-      </hass-subpage>
+      </hass-tabs-subpage>
     `;
   }
 

src/panels/config/script/ha-script-editor.ts

@@ -192,7 +192,6 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
               "ui.panel.config.automation.editor.edit_ui"
             )}
             graphic="icon"
-            ?activated=${this._mode === "gui"}
           >
             ${this.hass.localize("ui.panel.config.automation.editor.edit_ui")}
             ${this._mode === "gui"
@@ -228,13 +227,11 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
           <mwc-list-item
             .disabled=${!this.scriptEntityId}
             .label=${this.hass.localize(
-              "ui.panel.config.script.picker.duplicate_script"
+              "ui.panel.config.script.picker.duplicate"
             )}
             graphic="icon"
           >
-            ${this.hass.localize(
-              "ui.panel.config.script.picker.duplicate_script"
-            )}
+            ${this.hass.localize("ui.panel.config.script.picker.duplicate")}
             <ha-svg-icon
               slot="graphic"
               .path=${mdiContentDuplicate}
@@ -244,12 +241,12 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
           <mwc-list-item
             .disabled=${!this.scriptEntityId}
             aria-label=${this.hass.localize(
-              "ui.panel.config.script.editor.delete_script"
+              "ui.panel.config.script.picker.delete"
             )}
             class=${classMap({ warning: Boolean(this.scriptEntityId) })}
             graphic="icon"
           >
-            ${this.hass.localize("ui.panel.config.script.editor.delete_script")}
+            ${this.hass.localize("ui.panel.config.script.picker.delete")}
             <ha-svg-icon
               class=${classMap({ warning: Boolean(this.scriptEntityId) })}
               slot="graphic"

src/translations/en.json

@@ -301,6 +301,7 @@
       "refresh": "Refresh",
       "cancel": "Cancel",
       "delete": "Delete",
+      "duplicate": "Duplicate",
       "remove": "Remove",
       "enable": "Enable",
       "disable": "Disable",
@@ -1790,9 +1791,9 @@
             "edit_automation": "Edit automation",
             "dev_automation": "Debug automation",
             "show_info_automation": "Show info about automation",
-            "delete": "Delete",
+            "delete": "[%key:ui::common::delete%]",
             "delete_confirm": "Are you sure you want to delete this automation?",
-            "duplicate": "Duplicate",
+            "duplicate": "[%key:ui::common::duplicate%]",
             "disabled": "Disabled",
             "headers": {
               "toggle": "Enable/disable",
@@ -1869,11 +1870,11 @@
               "add": "Add trigger",
               "id": "Trigger ID",
               "edit_id": "Edit ID",
-              "duplicate": "Duplicate",
+              "duplicate": "[%key:ui::common::duplicate%]",
               "rename": "Rename",
               "change_alias": "Rename trigger",
               "alias": "Trigger name",
-              "delete": "[%key:ui::panel::mailbox::delete_button%]",
+              "delete": "[%key:ui::common::delete%]",
               "delete_confirm": "Are you sure you want to delete this?",
               "unsupported_platform": "No visual editor support for platform: {platform}",
               "type_select": "Trigger type",
@@ -1989,11 +1990,11 @@
               "testing_pass": "Condition passes",
               "invalid_condition": "Invalid condition configuration",
               "test_failed": "Error occurred while testing condition",
-              "duplicate": "[%key:ui::panel::config::automation::editor::triggers::duplicate%]",
+              "duplicate": "[%key:ui::common::duplicate%]",
               "rename": "[%key:ui::panel::config::automation::editor::triggers::rename%]",
               "change_alias": "Rename condition",
               "alias": "Condition name",
-              "delete": "[%key:ui::panel::mailbox::delete_button%]",
+              "delete": "[%key:ui::common::delete%]",
               "delete_confirm": "[%key:ui::panel::config::automation::editor::triggers::delete_confirm%]",
               "unsupported_condition": "No visual editor support for condition: {condition}",
               "type_select": "Condition type",
@@ -2080,14 +2081,14 @@
               "run": "Run",
               "run_action_error": "Error running action",
               "run_action_success": "Action run successfully",
-              "duplicate": "[%key:ui::panel::config::automation::editor::triggers::duplicate%]",
+              "duplicate": "[%key:ui::common::duplicate%]",
               "rename": "[%key:ui::panel::config::automation::editor::triggers::rename%]",
               "change_alias": "Rename action",
               "alias": "Action name",
               "enable": "Enable",
               "disable": "Disable",
               "disabled": "Disabled",
-              "delete": "[%key:ui::panel::mailbox::delete_button%]",
+              "delete": "[%key:ui::common::delete%]",
               "delete_confirm": "[%key:ui::panel::config::automation::editor::triggers::delete_confirm%]",
               "unsupported_action": "No visual editor support for action: {action}",
               "type_select": "Action type",
@@ -2260,7 +2261,7 @@
             "header": "Script Editor",
             "introduction": "The script editor allows you to create and edit scripts. Please follow the link below to read the instructions to make sure that you have configured Home Assistant correctly.",
             "learn_more": "Learn more about scripts",
-            "no_scripts": "We couldn’t find any scripts",
+            "no_scripts": "We couldn't find any scripts",
             "add_script": "Add script",
             "show_info": "Show info about script",
             "run_script": "Run script",
@@ -2270,8 +2271,8 @@
               "name": "Name",
               "state": "State"
             },
-            "duplicate_script": "Duplicate script",
-            "duplicate": "[%key:ui::panel::config::automation::picker::duplicate%]"
+            "delete": "[%key:ui::common::delete%]",
+            "duplicate": "[%key:ui::common::duplicate%]"
           },
           "editor": {
             "alias": "Name",
@@ -2298,7 +2299,6 @@
             "load_error_not_editable": "Only scripts inside scripts.yaml are editable.",
             "load_error_unknown": "Error loading script ({err_no}).",
             "delete_confirm": "Are you sure you want to delete this script?",
-            "delete_script": "Delete script",
             "save_script": "Save script",
             "sequence": "Sequence",
             "sequence_sentence": "The sequence of actions of this script.",
@@ -2314,7 +2314,7 @@
             "introduction": "The scene editor allows you to create and edit scenes. Please follow the link below to read the instructions to make sure that you have configured Home Assistant correctly.",
             "learn_more": "Learn more about scenes",
             "pick_scene": "Pick scene to edit",
-            "no_scenes": "We couldn’t find any scenes",
+            "no_scenes": "We couldn't find any scenes",
             "add_scene": "Add scene",
             "only_editable": "Only scenes defined in scenes.yaml are editable.",
             "edit_scene": "Edit scene",
@@ -2322,7 +2322,7 @@
             "delete_scene": "Delete scene",
             "delete_confirm": "Are you sure you want to delete this scene?",
             "duplicate_scene": "Duplicate scene",
-            "duplicate": "Duplicate",
+            "duplicate": "[%key:ui::common::duplicate%]",
             "headers": {
               "activate": "Activate",
               "state": "State",
@@ -3855,7 +3855,7 @@
             },
             "entity": {
               "name": "Entity",
-              "description": "The Entity card gives you a quick overview of your entity’s state."
+              "description": "The Entity card gives you a quick overview of your entity's state."
             },
             "button": {
               "name": "Button",