20240102.0 (#19234)

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name         = "home-assistant-frontend"
-version      = "20240101.0"
+version      = "20240102.0"
 license      = {text = "Apache-2.0"}
 description  = "The Home Assistant frontend"
 readme       = "README.md"

src/common/const.ts

@@ -29,6 +29,7 @@ import {
   mdiFlash,
   mdiFlower,
   mdiFormatListBulleted,
+  mdiFormatListCheckbox,
   mdiFormTextbox,
   mdiGauge,
   mdiGoogleAssistant,
@@ -64,6 +65,7 @@ import {
   mdiTransmissionTower,
   mdiWater,
   mdiWaterPercent,
+  mdiWeatherPartlyCloudy,
   mdiWeatherPouring,
   mdiWeatherRainy,
   mdiWeatherWindy,
@@ -128,6 +130,7 @@ export const FIXED_DOMAIN_ICONS = {
   updater: mdiCloudUpload,
   vacuum: mdiRobotVacuum,
   wake_word: mdiChatSleep,
+  weather: mdiWeatherPartlyCloudy,
   zone: mdiMapMarkerRadius,
 };
 
@@ -166,6 +169,7 @@ export const FIXED_DEVICE_CLASS_ICONS = {
   precipitation_intensity: mdiWeatherPouring,
   pressure: mdiGauge,
   reactive_power: mdiFlash,
+  shopping_List: mdiFormatListCheckbox,
   signal_strength: mdiWifi,
   sound_pressure: mdiEarHearing,
   speed: mdiSpeedometer,

src/components/ha-labeled-slider.ts

@@ -10,9 +10,9 @@ class HaLabeledSlider extends LitElement {
 
   @property() public caption?: string;
 
-  @property() public disabled?: boolean;
+  @property({ type: Boolean }) public disabled = false;
 
-  @property() public required?: boolean;
+  @property({ type: Boolean }) public required = true;
 
   @property() public min: number = 0;
 

src/components/ha-service-control.ts

@@ -4,7 +4,14 @@ import {
   HassServices,
   HassServiceTarget,
 } from "home-assistant-js-websocket";
-import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit";
+import {
+  css,
+  CSSResultGroup,
+  html,
+  LitElement,
+  PropertyValues,
+  nothing,
+} from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { ensureArray } from "../common/array/ensure-array";
@@ -83,6 +90,8 @@ export class HaServiceControl extends LitElement {
 
   @property({ type: Boolean }) public showAdvanced?: boolean;
 
+  @property({ type: Boolean, reflect: true }) public hidePicker?: boolean;
+
   @state() private _value!: this["value"];
 
   @state() private _checkedKeys = new Set();
@@ -363,12 +372,14 @@ export class HaServiceControl extends LitElement {
         )) ||
       serviceData?.description;
 
-    return html`<ha-service-picker
-        .hass=${this.hass}
-        .value=${this._value?.service}
-        .disabled=${this.disabled}
-        @value-changed=${this._serviceChanged}
-      ></ha-service-picker>
+    return html`${this.hidePicker
+        ? nothing
+        : html`<ha-service-picker
+            .hass=${this.hass}
+            .value=${this._value?.service}
+            .disabled=${this.disabled}
+            @value-changed=${this._serviceChanged}
+          ></ha-service-picker>`}
       <div class="description">
         ${description ? html`<p>${description}</p>` : ""}
         ${this._manifest
@@ -735,6 +746,9 @@ export class HaServiceControl extends LitElement {
         margin: var(--service-control-padding, 0 16px);
         padding: 16px 0;
       }
+      :host([hidePicker]) p {
+        padding-top: 0;
+      }
       .checkbox-spacer {
         width: 32px;
       }

src/data/condition.ts

@@ -46,7 +46,6 @@ export const CONDITION_GROUPS: AutomationElementGroup = {
     icon: mdiDotsHorizontal,
     members: {
       template: {},
-      trigger: {},
     },
   },
 } as const;

src/data/script.ts

@@ -52,6 +52,7 @@ export const serviceActionStruct: Describe<ServiceAction> = assign(
     target: optional(targetStruct),
     data: optional(object()),
     response_variable: optional(string()),
+    metadata: optional(object()),
   })
 );
 
@@ -133,6 +134,7 @@ export interface ServiceAction extends BaseAction {
   target?: HassServiceTarget;
   data?: Record<string, unknown>;
   response_variable?: string;
+  metadata?: Record<string, unknown>;
 }
 
 export interface DeviceAction extends BaseAction {

src/data/script_i18n.ts

@@ -168,6 +168,18 @@ const tryDescribeAction = <T extends ActionType>(
       const service =
         hass.localize(`component.${domain}.services.${serviceName}.name`) ||
         hass.services[domain][serviceName]?.name;
+
+      if (config.metadata) {
+        return hass.localize(
+          `${actionTranslationBaseKey}.service.description.service_name`,
+          {
+            domain: domainToName(hass.localize, domain),
+            name: service || config.service,
+            targets: formatListWithAnds(hass.locale, targets),
+          }
+        );
+      }
+
       return hass.localize(
         `${actionTranslationBaseKey}.service.description.service_based_on_name`,
         {
@@ -404,7 +416,9 @@ const tryDescribeAction = <T extends ActionType>(
   if (actionType === "device_action") {
     const config = action as DeviceAction;
     if (!config.device_id) {
-      return "Device action";
+      return hass.localize(
+        `${actionTranslationBaseKey}.device_id.description.no_device`
+      );
     }
     const localized = localizeDeviceAutomationAction(
       hass,

src/panels/calendar/dialog-calendar-event-editor.ts

@@ -144,9 +144,9 @@ class DialogCalendarEventEditor extends LitElement {
         escapeKeyAction
         .heading=${createCloseHeading(
           this.hass,
-          isCreate
-            ? this.hass.localize("ui.components.calendar.event.add")
-            : this._summary
+          this.hass.localize(
+            `ui.components.calendar.event.${isCreate ? "add" : "edit"}`
+          )
         )}
       >
         <div class="content">

src/panels/config/automation/action/ha-automation-action-row.ts

@@ -29,6 +29,8 @@ import { classMap } from "lit/directives/class-map";
 import { storage } from "../../../../common/decorators/storage";
 import { dynamicElement } from "../../../../common/dom/dynamic-element-directive";
 import { fireEvent } from "../../../../common/dom/fire_event";
+import { computeDomain } from "../../../../common/entity/compute_domain";
+import { domainIconWithoutDefault } from "../../../../common/entity/domain_icon";
 import { capitalizeFirstLetter } from "../../../../common/string/capitalize-first-letter";
 import { handleStructError } from "../../../../common/structs/handle-errors";
 import "../../../../components/ha-alert";
@@ -190,7 +192,13 @@ export default class HaAutomationActionRow extends LitElement {
           <h3 slot="header">
             <ha-svg-icon
               class="action-icon"
-              .path=${ACTION_ICONS[type!]}
+              .path=${type === "service" &&
+              "service" in this.action &&
+              this.action.service
+                ? domainIconWithoutDefault(
+                    computeDomain(this.action.service as string)
+                  ) || ACTION_ICONS[type!]
+                : ACTION_ICONS[type!]}
             ></ha-svg-icon>
             ${capitalizeFirstLetter(
               describeAction(this.hass, this._entityReg, this.action)

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

@@ -191,6 +191,7 @@ export default class HaAutomationAction extends LitElement {
     } else if (isService(action)) {
       actions = this.actions.concat({
         service: getService(action),
+        metadata: {},
       });
     } else {
       const elClass = customElements.get(

src/panels/config/automation/add-automation-element-dialog.ts

@@ -1,14 +1,21 @@
 import "@material/mwc-list/mwc-list";
 import { mdiClose, mdiContentPaste, mdiPlus } from "@mdi/js";
 import Fuse, { IFuseOptions } from "fuse.js";
-import { CSSResultGroup, LitElement, css, html, nothing } from "lit";
+import {
+  CSSResultGroup,
+  LitElement,
+  PropertyValues,
+  css,
+  html,
+  nothing,
+} from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
 import { repeat } from "lit/directives/repeat";
 import { styleMap } from "lit/directives/style-map";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../common/dom/fire_event";
-import { domainIcon } from "../../../common/entity/domain_icon";
+import { domainIconWithoutDefault } from "../../../common/entity/domain_icon";
 import { shouldHandleRequestSelectedEvent } from "../../../common/mwc/handle-request-selected-event";
 import { stringCompare } from "../../../common/string/compare";
 import { LocalizeFunc } from "../../../common/translations/localize";
@@ -38,10 +45,13 @@ import { TRIGGER_GROUPS, TRIGGER_ICONS } from "../../../data/trigger";
 import { HassDialog } from "../../../dialogs/make-dialog-manager";
 import { haStyle, haStyleDialog } from "../../../resources/styles";
 import { HomeAssistant } from "../../../types";
+import { brandsUrl } from "../../../util/brands-url";
 import {
   AddAutomationElementDialogParams,
   PASTE_VALUE,
 } from "./show-add-automation-element-dialog";
+import { computeDomain } from "../../../common/entity/compute_domain";
+import { deepEqual } from "../../../common/util/deep-equal";
 
 const TYPES = {
   trigger: { groups: TRIGGER_GROUPS, icons: TRIGGER_ICONS },
@@ -59,7 +69,8 @@ interface ListItem {
   key: string;
   name: string;
   description: string;
-  icon: string;
+  icon?: string;
+  image?: string;
   group: boolean;
 }
 
@@ -79,6 +90,8 @@ const ENTITY_DOMAINS_OTHER = new Set([
   "image_processing",
 ]);
 
+const ENTITY_DOMAINS_MAIN = new Set(["notify"]);
+
 @customElement("add-automation-element-dialog")
 class DialogAddAutomationElement extends LitElement implements HassDialog {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -93,13 +106,15 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
 
   @state() private _manifests?: DomainManifestLookup;
 
+  @state() private _domains?: Set<string>;
+
   @query("ha-dialog") private _dialog?: HaDialog;
 
   private _fullScreen = false;
 
-  private _width?: number;
+  @state() private _width?: number;
 
-  private _height?: number;
+  @state() private _height?: number;
 
   public showDialog(params): void {
     this._params = params;
@@ -124,6 +139,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
     this._prev = undefined;
     this._filter = "";
     this._manifests = undefined;
+    this._domains = undefined;
   }
 
   private _convertToItem = (
@@ -152,6 +168,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
   private _getFilteredItems = memoizeOne(
     (
       type: AddAutomationElementDialogParams["type"],
+      root: AddAutomationElementDialogParams["root"],
       group: string | undefined,
       filter: string,
       localize: LocalizeFunc,
@@ -164,6 +181,10 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
           : TYPES[type].groups[group].members!
         : TYPES[type].groups;
 
+      if (type === "condition" && group === "other" && !root) {
+        groups.trigger = {};
+      }
+
       const flattenGroups = (grp: AutomationElementGroup) =>
         Object.entries(grp).map(([key, options]) =>
           options.members
@@ -191,7 +212,9 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
   private _getGroupItems = memoizeOne(
     (
       type: AddAutomationElementDialogParams["type"],
+      root: AddAutomationElementDialogParams["root"],
       group: string | undefined,
+      domains: Set<string> | undefined,
       localize: LocalizeFunc,
       services: HomeAssistant["services"],
       manifests?: DomainManifestLookup
@@ -208,6 +231,10 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
         ? TYPES[type].groups[group].members!
         : TYPES[type].groups;
 
+      if (type === "condition" && group === "other" && !root) {
+        groups.trigger = {};
+      }
+
       const result = Object.entries(groups).map(([key, options]) =>
         this._convertToItem(key, options, type, localize)
       );
@@ -215,15 +242,33 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
       if (type === "action") {
         if (!this._group) {
           result.unshift(
-            ...this._serviceGroups(localize, services, manifests, undefined)
+            ...this._serviceGroups(
+              localize,
+              services,
+              manifests,
+              domains,
+              undefined
+            )
           );
         } else if (this._group === "helpers") {
           result.unshift(
-            ...this._serviceGroups(localize, services, manifests, "helper")
+            ...this._serviceGroups(
+              localize,
+              services,
+              manifests,
+              domains,
+              "helper"
+            )
           );
         } else if (this._group === "other") {
           result.unshift(
-            ...this._serviceGroups(localize, services, manifests, "other")
+            ...this._serviceGroups(
+              localize,
+              services,
+              manifests,
+              domains,
+              "other"
+            )
           );
         }
       }
@@ -243,42 +288,54 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
     }
   );
 
-  private _serviceGroups = memoizeOne(
-    (
-      localize: LocalizeFunc,
-      services: HomeAssistant["services"],
-      manifests: DomainManifestLookup | undefined,
-      type: "helper" | "other" | undefined
-    ): ListItem[] => {
-      if (!services || !manifests) {
-        return [];
-      }
-      const result: ListItem[] = [];
-      Object.keys(services).forEach((domain) => {
-        const manifest = manifests[domain];
-        if (
-          (type === undefined &&
-            manifest?.integration_type === "entity" &&
-            !ENTITY_DOMAINS_OTHER.has(domain)) ||
-          (type === "helper" && manifest?.integration_type === "helper") ||
-          (type === "other" &&
-            (ENTITY_DOMAINS_OTHER.has(domain) ||
-              !["helper", "entity"].includes(manifest?.integration_type || "")))
-        ) {
-          result.push({
-            group: true,
-            icon: domainIcon(domain),
-            key: `${SERVICE_PREFIX}${domain}`,
-            name: domainToName(localize, domain, manifest),
-            description: "",
-          });
-        }
-      });
-      return result.sort((a, b) =>
-        stringCompare(a.name, b.name, this.hass.locale.language)
-      );
+  private _serviceGroups = (
+    localize: LocalizeFunc,
+    services: HomeAssistant["services"],
+    manifests: DomainManifestLookup | undefined,
+    domains: Set<string> | undefined,
+    type: "helper" | "other" | undefined
+  ): ListItem[] => {
+    if (!services || !manifests) {
+      return [];
     }
-  );
+    const result: ListItem[] = [];
+    Object.keys(services).forEach((domain) => {
+      const manifest = manifests[domain];
+      const domainUsed = !domains ? true : domains.has(domain);
+      if (
+        (type === undefined &&
+          (ENTITY_DOMAINS_MAIN.has(domain) ||
+            (manifest?.integration_type === "entity" &&
+              domainUsed &&
+              !ENTITY_DOMAINS_OTHER.has(domain)))) ||
+        (type === "helper" && manifest?.integration_type === "helper") ||
+        (type === "other" &&
+          !ENTITY_DOMAINS_MAIN.has(domain) &&
+          (ENTITY_DOMAINS_OTHER.has(domain) ||
+            (!domainUsed && manifest?.integration_type === "entity") ||
+            !["helper", "entity"].includes(manifest?.integration_type || "")))
+      ) {
+        const icon = domainIconWithoutDefault(domain);
+        result.push({
+          group: true,
+          icon,
+          image: !icon
+            ? brandsUrl({
+                domain,
+                type: "icon",
+                darkOptimized: this.hass.themes?.darkMode,
+              })
+            : undefined,
+          key: `${SERVICE_PREFIX}${domain}`,
+          name: domainToName(localize, domain, manifest),
+          description: "",
+        });
+      }
+    });
+    return result.sort((a, b) =>
+      stringCompare(a.name, b.name, this.hass.locale.language)
+    );
+  };
 
   private _services = memoizeOne(
     (
@@ -302,9 +359,17 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
         const services_keys = Object.keys(services[dmn]);
 
         for (const service of services_keys) {
+          const icon = domainIconWithoutDefault(dmn);
           result.push({
             group: false,
-            icon: domainIcon(dmn),
+            icon,
+            image: !icon
+              ? brandsUrl({
+                  domain: dmn,
+                  type: "icon",
+                  darkOptimized: this.hass.themes?.darkMode,
+                })
+              : undefined,
             key: `${SERVICE_PREFIX}${dmn}.${service}`,
             name: `${domain ? "" : `${domainToName(localize, dmn)}: `}${
               this.hass.localize(`component.${dmn}.services.${service}.name`) ||
@@ -368,6 +433,19 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
     this._height = boundingRect?.height;
   }
 
+  protected willUpdate(changedProperties: PropertyValues): void {
+    if (
+      this._params?.type === "action" &&
+      changedProperties.has("hass") &&
+      changedProperties.get("hass")?.states !== this.hass.states
+    ) {
+      const domains = new Set(Object.keys(this.hass.states).map(computeDomain));
+      if (!deepEqual(domains, this._domains)) {
+        this._domains = domains;
+      }
+    }
+  }
+
   protected render() {
     if (!this._params) {
       return nothing;
@@ -376,6 +454,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
     const items = this._filter
       ? this._getFilteredItems(
           this._params.type,
+          this._params.root,
           this._group,
           this._filter,
           this.hass.localize,
@@ -384,7 +463,9 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
         )
       : this._getGroupItems(
           this._params.type,
+          this._params.root,
           this._group,
+          this._domains,
           this.hass.localize,
           this.hass.services,
           this._manifests
@@ -451,7 +532,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
           rootTabbable
           style=${styleMap({
             width: this._width ? `${this._width}px` : "auto",
-            height: this._height ? `${Math.min(468, this._height)}px` : "auto",
+            height: this._height ? `${Math.min(670, this._height)}px` : "auto",
           })}
         >
           ${this._params.clipboardItem &&
@@ -497,7 +578,18 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
               >
                 ${item.name}
                 <span slot="secondary">${item.description}</span>
-                <ha-svg-icon slot="graphic" .path=${item.icon}></ha-svg-icon>
+                ${item.icon
+                  ? html`<ha-svg-icon
+                      slot="graphic"
+                      .path=${item.icon}
+                    ></ha-svg-icon>`
+                  : html`<img
+                      alt=""
+                      slot="graphic"
+                      src=${item.image}
+                      crossorigin="anonymous"
+                      referrerpolicy="no-referrer"
+                    />`}
                 ${item.group
                   ? html`<ha-icon-next slot="meta"></ha-icon-next>`
                   : html`<ha-svg-icon
@@ -562,6 +654,10 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
         ha-icon-next {
           width: 24px;
         }
+        mwc-list {
+          max-height: 670px;
+          max-width: 100vw;
+        }
         search-input {
           display: block;
           margin: 0 16px;

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

@@ -203,6 +203,7 @@ export default class HaAutomationCondition extends LitElement {
     showAddAutomationElementDialog(this, {
       type: "condition",
       add: this._addCondition,
+      root: !this.nested,
       clipboardItem: this._clipboard?.condition?.condition,
     });
   }

src/panels/config/automation/condition/types/ha-automation-condition-device.ts

@@ -168,6 +168,7 @@ export class HaDeviceCondition extends LitElement {
     }
 
     ha-form {
+      display: block;
       margin-top: 24px;
     }
   `;

src/panels/config/automation/show-add-automation-element-dialog.ts

@@ -6,6 +6,7 @@ export interface AddAutomationElementDialogParams {
   type: "trigger" | "condition" | "action";
   add: (key: string) => void;
   clipboardItem: string | undefined;
+  root?: boolean;
   group?: string;
 }
 const loadDialog = () => import("./add-automation-element-dialog");

src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts

@@ -174,6 +174,7 @@ export class HaDeviceTrigger extends LitElement {
     }
 
     ha-form {
+      display: block;
       margin-top: 24px;
     }
   `;

src/panels/config/entities/entity-registry-settings-editor.ts

@@ -118,6 +118,8 @@ const OVERRIDE_DEVICE_CLASSES = {
       "carbon_monoxide",
       "moisture",
     ], // Alarm
+    ["connectivity"], // Connectivity
+    ["update"], // Update
   ],
 };
 

src/panels/todo/dialog-todo-item-editor.ts

@@ -101,9 +101,9 @@ class DialogTodoItemEditor extends LitElement {
         scrimClickAction
         .heading=${createCloseHeading(
           this.hass,
-          isCreate
-            ? this.hass.localize("ui.components.todo.item.add")
-            : this._summary
+          this.hass.localize(
+            `ui.components.todo.item.${isCreate ? "add" : "edit"}`
+          )
         )}
       >
         <div class="content">

src/translations/en.json

@@ -2492,13 +2492,13 @@
               "groups": {
                 "entity": {
                   "label": "Entity",
-                  "description": "When something happens to an entity"
+                  "description": "When something happens to an entity."
                 },
                 "time_location": {
                   "label": "Time and location",
                   "description": "When someone enters or leaves a zone, or at a specific time."
                 },
-                "other": { "label": "Other" }
+                "other": { "label": "Other triggers" }
               },
               "type": {
                 "calendar": {
@@ -2534,7 +2534,7 @@
                   "context_user_picked": "User firing event",
                   "context_user_pick": "Select user",
                   "description": {
-                    "picker": "When an event is being received (event is an advanced concept in Home Assistant)",
+                    "picker": "When an event is being received (event is an advanced concept in Home Assistant).",
                     "full": "When {eventTypes} event is fired"
                   }
                 },
@@ -2546,7 +2546,7 @@
                   "enter": "Enter",
                   "leave": "Leave",
                   "description": {
-                    "picker": "When an entity created by a geolocation platform appears in or disappears from a zone",
+                    "picker": "When an entity created by a geolocation platform appears in or disappears from a zone.",
                     "full": "When {source} {event, select, \n enter {enters}\n leave {leaves} other {} \n} {zone} {numberOfZones, plural,\n one {zone}\n other {zones}\n}"
                   }
                 },
@@ -2608,7 +2608,7 @@
                     "updated": "updated"
                   },
                   "description": {
-                    "picker": "When a persistent notification is added or removed",
+                    "picker": "When a persistent notification is added or removed.",
                     "full": "When a persistent notification is updated"
                   }
                 },
@@ -2619,7 +2619,7 @@
                   "sunset": "Sunset",
                   "offset": "Offset (optional)",
                   "description": {
-                    "picker": "When the sun sets or rises",
+                    "picker": "When the sun sets or rises.",
                     "sets": "When the sun sets{hasDuration, select, \n true { offset by {duration}} \n other {}\n }",
                     "rises": "When the sun rises{hasDuration, select, \n true { offset by {duration}} \n other {}\n }"
                   }
@@ -2648,7 +2648,7 @@
                   "value_template": "Value template",
                   "for": "For",
                   "description": {
-                    "picker": "When a template is evaluated to true.",
+                    "picker": "When a template evaluates to true.",
                     "full": "When a template changes from false to true{hasDuration, select, \n true { for {duration}} \n other {}\n }"
                   }
                 },
@@ -2669,7 +2669,7 @@
                   "minutes": "Minutes",
                   "seconds": "Seconds",
                   "description": {
-                    "picker": "Periodically, every defined interval of time."
+                    "picker": "Periodically, at a defined interval."
                   }
                 },
                 "webhook": {
@@ -2692,7 +2692,7 @@
                   "enter": "Enter",
                   "leave": "Leave",
                   "description": {
-                    "picker": "When someone (or something) enters or leaves a zone",
+                    "picker": "When someone (or something) enters or leaves a zone.",
                     "full": "When {entity} {event, select, \n enter {enters}\n leave {leaves} other {} \n} {zone} {numberOfZones, plural,\n one {zone} \n other {zones}\n}"
                   }
                 }
@@ -2734,7 +2734,7 @@
                   "label": "Time and location",
                   "description": "If someone is in a zone or if the current time is before or after a specified time."
                 },
-                "other": { "label": "Other" },
+                "other": { "label": "Other conditions" },
                 "building_blocks": {
                   "label": "Building blocks",
                   "description": "Build more complex conditions."
@@ -2760,13 +2760,13 @@
                     "preset_mode": "Preset mode"
                   },
                   "description": {
-                    "picker": "If a device is in a certain state. Great way to start."
+                    "picker": "Set of conditions provided by your device. Great way to start."
                   }
                 },
                 "not": {
                   "label": "Not",
                   "description": {
-                    "picker": "Test if a condition is not true",
+                    "picker": "Test if a condition is not true.",
                     "no_conditions": "Test if no condition matches",
                     "one_condition": "Test if 1 condition does not match",
                     "full": "Test if none of {count} conditions match"
@@ -2800,7 +2800,7 @@
                   "label": "[%key:ui::panel::config::automation::editor::triggers::type::state::label%]",
                   "state": "[%key:ui::panel::config::automation::editor::triggers::type::state::label%]",
                   "description": {
-                    "picker": "If an entity (or attribute) is in a specific state",
+                    "picker": "If an entity (or attribute) is in a specific state.",
                     "no_entity": "Confirm state",
                     "full": "Confirm{hasAttribute, select, \n true { {attribute} of}\n other {}\n} {numberOfEntities, plural,\n zero {an entity is}\n one {{entities} is}\n other {{entities} are}\n} {numberOfStates, plural,\n zero {a state}\n other {{states}}\n}{hasDuration, select, \n true { for {duration}} \n other {}\n }"
                   }
@@ -2821,7 +2821,7 @@
                   "label": "[%key:ui::panel::config::automation::editor::triggers::type::template::label%]",
                   "value_template": "[%key:ui::panel::config::automation::editor::triggers::type::template::value_template%]",
                   "description": {
-                    "picker": "If a template is evaluated to true.",
+                    "picker": "If a template evaluates to true.",
                     "full": "Test if template renders a value equal to true"
                   }
                 },
@@ -2844,7 +2844,7 @@
                     "sun": "Sunday"
                   },
                   "description": {
-                    "picker": "If the current time is before or after a specified time",
+                    "picker": "If the current time is before or after a specified time.",
                     "full": "Confirm the {hasTime, select, \n after {time is after {time_after}}\n before {time is before {time_before}}\n after_before {time is after {time_after} and before {time_before}} \n other {}\n }{hasTimeAndDay, select, \n true { and the }\n other {}\n}{hasDay, select, \n true { day is {day}}\n other {}\n}"
                   }
                 },
@@ -2862,7 +2862,7 @@
                   "entity": "[%key:ui::panel::config::automation::editor::triggers::type::zone::entity%]",
                   "zone": "[%key:ui::panel::config::automation::editor::triggers::type::zone::label%]",
                   "description": {
-                    "picker": "If someone (or something) is in a zone",
+                    "picker": "If someone (or something) is in a zone.",
                     "full": "Confirm {entity} {numberOfEntities, plural,\n one {is}\n other {are}\n} in {zone} {numberOfZones, plural,\n one {zone} \n other {zones}\n} "
                   }
                 }
@@ -2899,7 +2899,7 @@
               "continue_on_error": "Continue on error",
               "groups": {
                 "helpers": { "label": "Helpers" },
-                "other": { "label": "Other" },
+                "other": { "label": "Other actions" },
                 "building_blocks": {
                   "label": "Building blocks",
                   "description": "Build more complex sequences of actions."
@@ -2914,6 +2914,7 @@
                   "description": {
                     "service_based_on_template": "Call a service based on a template on {targets}",
                     "service_based_on_name": "Call a service ''{name}'' on {targets}",
+                    "service_name": "{domain} ''{name}'' on {targets}",
                     "service": "Call a service",
                     "target_template": "templated {name}",
                     "target_unknown_entity": "unknown entity",
@@ -2990,7 +2991,8 @@
                     "flash": "Flash"
                   },
                   "description": {
-                    "picker": "Do something on a device. Great way to start."
+                    "picker": "Do something on a device. Great way to start.",
+                    "no_device": "Device action"
                   }
                 },
                 "activate_scene": {
@@ -3069,14 +3071,14 @@
                   "response_variable": "The name of the variable to use as response",
                   "error": "Stop because of an unexpected error",
                   "description": {
-                    "picker": "Stop the sequence of actions",
+                    "picker": "Stop the sequence of actions.",
                     "full": "Stop {hasReason, select, \n true { because: {reason}} \n other {}\n }"
                   }
                 },
                 "parallel": {
                   "label": "Run in parallel",
                   "description": {
-                    "picker": "perform a sequence of actions in parallel.",
+                    "picker": "Perform a sequence of actions in parallel.",
                     "full": "Run {number} {number, plural,\n one {action}\n other {actions}\n} in parallel"
                   }
                 },