Align common dialog translations (#24450)

2025-07-26 10:46:35 +00:00 · 2025-02-28 15:51:06 +01:00 · 2025-02-28 15:51:06 +01:00 · 819225d32b
commit 819225d32b
parent 7f7575dcbc
27 changed files with 34 additions and 36 deletions
--- a/src/components/ha-dialog.ts
+++ b/src/components/ha-dialog.ts
@ -16,7 +16,7 @@ export const createCloseHeading = (
 ) => html`
  <div class="header_title">
    <ha-icon-button
-      .label=${hass?.localize("ui.dialogs.generic.close") ?? "Close"}
+      .label=${hass?.localize("ui.common.close") ?? "Close"}
      .path=${mdiClose}
      dialogAction="close"
      class="header_button"
--- a/src/components/media-player/dialog-media-manage.ts
+++ b/src/components/media-player/dialog-media-manage.ts
@ -106,7 +106,7 @@ class DialogMediaManage extends LitElement {
                  ? ""
                  : html`
                      <ha-icon-button
-                        .label=${this.hass.localize("ui.dialogs.generic.close")}
+                        .label=${this.hass.localize("ui.common.close")}
                        .path=${mdiClose}
                        dialogAction="close"
                        slot="navigationIcon"
--- a/src/components/media-player/dialog-media-player-browse.ts
+++ b/src/components/media-player/dialog-media-player-browse.ts
@ -150,7 +150,7 @@ class DialogMediaPlayerBrowse extends LitElement {
            </mwc-list-item>
          </ha-button-menu>
          <ha-icon-button
-            .label=${this.hass.localize("ui.dialogs.generic.close")}
+            .label=${this.hass.localize("ui.common.close")}
            .path=${mdiClose}
            dialogAction="close"
            slot="actionItems"
--- a/src/dialogs/generic/dialog-box.ts
+++ b/src/dialogs/generic/dialog-box.ts
@ -109,7 +109,7 @@ class DialogBox extends LitElement {
            >
              ${this._params.dismissText
                ? this._params.dismissText
-                : this.hass.localize("ui.dialogs.generic.cancel")}
+                : this.hass.localize("ui.common.cancel")}
            </ha-button>
          `}
          <ha-button
@ -120,7 +120,7 @@ class DialogBox extends LitElement {
          >
            ${this._params.confirmText
              ? this._params.confirmText
-              : this.hass.localize("ui.dialogs.generic.ok")}
+              : this.hass.localize("ui.common.ok")}
          </ha-button>
        </div>
      </ha-md-dialog>
--- a/src/dialogs/restart/dialog-restart.ts
+++ b/src/dialogs/restart/dialog-restart.ts
@ -93,7 +93,7 @@ class DialogRestart extends LitElement {
        <ha-dialog-header slot="headline">
          <ha-icon-button
            slot="navigationIcon"
-            .label=${this.hass.localize("ui.dialogs.generic.close") ?? "Close"}
+            .label=${this.hass.localize("ui.common.close") ?? "Close"}
            .path=${mdiClose}
            @click=${this.closeDialog}
          ></ha-icon-button>
--- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts
+++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts
@ -134,8 +134,7 @@ export class HaVoiceAssistantSetupDialog extends LitElement {
              : this._step !== STEP.UPDATE
                ? html`<ha-icon-button
                    slot="navigationIcon"
-                    .label=${this.hass.localize("ui.dialogs.generic.close") ??
-                    "Close"}
+                    .label=${this.hass.localize("ui.common.close") ?? "Close"}
                    .path=${mdiClose}
                    @click=${this.closeDialog}
                  ></ha-icon-button>`
--- a/src/panels/calendar/confirm-event-dialog-box.ts
+++ b/src/panels/calendar/confirm-event-dialog-box.ts
@ -41,7 +41,7 @@ class ConfirmEventDialogBox extends LitElement {
          <p>${this._params.text}</p>
        </div>
        <ha-button @click=${this._dismiss} slot="secondaryAction">
-          ${this.hass.localize("ui.dialogs.generic.cancel")}
+          ${this.hass.localize("ui.common.cancel")}
        </ha-button>
        <ha-button
          slot="primaryAction"
--- a/src/panels/config/automation/automation-mode-dialog/dialog-automation-mode.ts
+++ b/src/panels/config/automation/automation-mode-dialog/dialog-automation-mode.ts
@ -159,7 +159,7 @@ class DialogAutomationMode extends LitElement implements HassDialog {
          : nothing}

        <mwc-button @click=${this.closeDialog} slot="secondaryAction">
-          ${this.hass.localize("ui.dialogs.generic.cancel")}
+          ${this.hass.localize("ui.common.cancel")}
        </mwc-button>
        <mwc-button @click=${this._save} slot="primaryAction">
          ${this.hass.localize("ui.panel.config.automation.editor.change_mode")}
--- a/src/panels/config/automation/automation-save-dialog/dialog-automation-save.ts
+++ b/src/panels/config/automation/automation-save-dialog/dialog-automation-save.ts
@ -263,7 +263,7 @@ class DialogAutomationSave extends LitElement implements HassDialog {

        <div slot="primaryAction">
          <mwc-button @click=${this.closeDialog}>
-            ${this.hass.localize("ui.dialogs.generic.cancel")}
+            ${this.hass.localize("ui.common.cancel")}
          </mwc-button>
          <mwc-button @click=${this._save}>
            ${this.hass.localize(
--- a/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts
+++ b/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts
@ -216,7 +216,7 @@ class DialogBackupOnboarding extends LitElement implements HassDialog {
            ? html`
                <ha-icon-button
                  slot="navigationIcon"
-                  .label=${this.hass.localize("ui.dialogs.generic.close")}
+                  .label=${this.hass.localize("ui.common.close")}
                  .path=${mdiClose}
                  @click=${this.closeDialog}
                ></ha-icon-button>
@ -277,6 +277,8 @@ class DialogBackupOnboarding extends LitElement implements HassDialog {

  private _useRecommended() {
    if (!this._config?.create_backup.password) {
+      // this should not happen, if there is no password set, restart the wizard
+      this.showDialog(this._params!);
      return;
    }
    this._config = {
--- a/src/panels/config/backup/dialogs/dialog-change-backup-encryption-key.ts
+++ b/src/panels/config/backup/dialogs/dialog-change-backup-encryption-key.ts
@ -108,7 +108,7 @@ class DialogChangeBackupEncryptionKey extends LitElement implements HassDialog {
            : html`
                <ha-icon-button
                  slot="navigationIcon"
-                  .label=${this.hass.localize("ui.dialogs.generic.close")}
+                  .label=${this.hass.localize("ui.common.close")}
                  .path=${mdiClose}
                  @click=${this.closeDialog}
                ></ha-icon-button>
--- a/src/panels/config/backup/dialogs/dialog-download-decrypted-backup.ts
+++ b/src/panels/config/backup/dialogs/dialog-download-decrypted-backup.ts
@ -113,7 +113,7 @@ class DialogDownloadDecryptedBackup extends LitElement implements HassDialog {
        </div>
        <div slot="actions">
          <ha-button @click=${this._cancel}>
-            ${this.hass.localize("ui.dialogs.generic.cancel")}
+            ${this.hass.localize("ui.common.cancel")}
          </ha-button>

          <ha-button @click=${this._submit}>
--- a/src/panels/config/backup/dialogs/dialog-generate-backup.ts
+++ b/src/panels/config/backup/dialogs/dialog-generate-backup.ts
@ -185,7 +185,7 @@ class DialogGenerateBackup extends LitElement implements HassDialog {
            ? html`
                <ha-icon-button
                  slot="navigationIcon"
-                  .label=${this.hass.localize("ui.dialogs.generic.close")}
+                  .label=${this.hass.localize("ui.common.close")}
                  .path=${mdiClose}
                  @click=${this.closeDialog}
                ></ha-icon-button>
--- a/src/panels/config/backup/dialogs/dialog-restore-backup.ts
+++ b/src/panels/config/backup/dialogs/dialog-restore-backup.ts
@ -139,7 +139,7 @@ class DialogRestoreBackup extends LitElement implements HassDialog {
        <ha-dialog-header slot="headline">
          <ha-icon-button
            slot="navigationIcon"
-            .label=${this.hass.localize("ui.dialogs.generic.close")}
+            .label=${this.hass.localize("ui.common.close")}
            .path=${mdiClose}
            @click=${this.closeDialog}
          ></ha-icon-button>
--- a/src/panels/config/backup/dialogs/dialog-set-backup-encryption-key.ts
+++ b/src/panels/config/backup/dialogs/dialog-set-backup-encryption-key.ts
@ -92,7 +92,7 @@ class DialogSetBackupEncryptionKey extends LitElement implements HassDialog {
        <ha-dialog-header slot="headline">
          <ha-icon-button
            slot="navigationIcon"
-            .label=${this.hass.localize("ui.dialogs.generic.close")}
+            .label=${this.hass.localize("ui.common.close")}
            .path=${mdiClose}
            @click=${this.closeDialog}
          ></ha-icon-button>
--- a/src/panels/config/backup/dialogs/dialog-show-backup-encryption-key.ts
+++ b/src/panels/config/backup/dialogs/dialog-show-backup-encryption-key.ts
@ -52,7 +52,7 @@ class DialogShowBackupEncryptionKey extends LitElement implements HassDialog {
        <ha-dialog-header slot="headline">
          <ha-icon-button
            slot="navigationIcon"
-            .label=${this.hass.localize("ui.dialogs.generic.close")}
+            .label=${this.hass.localize("ui.common.close")}
            .path=${mdiClose}
            @click=${this._closeDialog}
          ></ha-icon-button>
@ -98,7 +98,7 @@ class DialogShowBackupEncryptionKey extends LitElement implements HassDialog {
        </div>
        <div slot="actions">
          <ha-button @click=${this._closeDialog}>
-            ${this.hass.localize("ui.dialogs.generic.close")}
+            ${this.hass.localize("ui.common.close")}
          </ha-button>
        </div>
      </ha-md-dialog>
--- a/src/panels/config/backup/dialogs/dialog-upload-backup.ts
+++ b/src/panels/config/backup/dialogs/dialog-upload-backup.ts
@ -82,7 +82,7 @@ export class DialogUploadBackup
        <ha-dialog-header slot="headline">
          <ha-icon-button
            slot="navigationIcon"
-            .label=${this.hass.localize("ui.dialogs.generic.close")}
+            .label=${this.hass.localize("ui.common.close")}
            .path=${mdiClose}
            @click=${this.closeDialog}
            .disabled=${this._uploading}
--- a/src/panels/config/devices/device-detail/integration-elements/mqtt/dialog-mqtt-device-debug-info.ts
+++ b/src/panels/config/devices/device-detail/integration-elements/mqtt/dialog-mqtt-device-debug-info.ts
@ -108,7 +108,7 @@ class DialogMQTTDeviceDebugInfo extends LitElement {
              `}
        </ul>
        <mwc-button slot="primaryAction" @click=${this._close}>
-          ${this.hass!.localize("ui.dialogs.generic.close")}
+          ${this.hass!.localize("ui.common.close")}
        </mwc-button>
      </ha-dialog>
    `;
--- a/src/panels/config/integrations/dialog-yaml-integration.ts
+++ b/src/panels/config/integrations/dialog-yaml-integration.ts
@ -44,7 +44,7 @@ export class DialogYamlIntegration extends LitElement {
          )}
        </p>
        <mwc-button @click=${this.closeDialog} slot="secondaryAction">
-          ${this.hass.localize("ui.dialogs.generic.cancel")}
+          ${this.hass.localize("ui.common.cancel")}
        </mwc-button>
        ${docLink
          ? html`<a
@ -60,7 +60,7 @@ export class DialogYamlIntegration extends LitElement {
              </mwc-button>
            </a>`
          : html`<mwc-button @click=${this.closeDialog} dialogInitialFocus>
-              ${this.hass.localize("ui.dialogs.generic.ok")}
+              ${this.hass.localize("ui.common.ok")}
            </mwc-button>`}
      </ha-dialog>
    `;
--- a/src/panels/config/integrations/integration-panels/zha/dialog-zha-change-channel.ts
+++ b/src/panels/config/integrations/integration-panels/zha/dialog-zha-change-channel.ts
@ -130,7 +130,7 @@ class DialogZHAChangeChannel extends LitElement implements HassDialog {
          slot="secondaryAction"
          @click=${this.closeDialog}
          .disabled=${this._migrationInProgress}
-          >${this.hass.localize("ui.dialogs.generic.cancel")}</ha-button
+          >${this.hass.localize("ui.common.cancel")}</ha-button
        >
      </ha-dialog>
    `;
--- a/src/panels/config/integrations/integration-panels/zha/dialog-zha-reconfigure-device.ts
+++ b/src/panels/config/integrations/integration-panels/zha/dialog-zha-reconfigure-device.ts
@ -125,7 +125,7 @@ class DialogZHAReconfigureDevice extends LitElement {
                </div>
              </div>
              <mwc-button slot="primaryAction" @click=${this.closeDialog}>
-                ${this.hass.localize("ui.dialogs.generic.close")}
+                ${this.hass.localize("ui.common.close")}
              </mwc-button>
              <mwc-button slot="secondaryAction" @click=${this._toggleDetails}>
                ${this._showDetails
@ -154,7 +154,7 @@ class DialogZHAReconfigureDevice extends LitElement {
                </div>
              </div>
              <mwc-button slot="primaryAction" @click=${this.closeDialog}>
-                ${this.hass.localize("ui.dialogs.generic.close")}
+                ${this.hass.localize("ui.common.close")}
              </mwc-button>
              <mwc-button slot="secondaryAction" @click=${this._toggleDetails}>
                ${this._showDetails
@ -183,7 +183,7 @@ class DialogZHAReconfigureDevice extends LitElement {
                </div>
              </div>
              <mwc-button slot="primaryAction" @click=${this.closeDialog}>
-                ${this.hass.localize("ui.dialogs.generic.close")}
+                ${this.hass.localize("ui.common.close")}
              </mwc-button>
              <mwc-button slot="secondaryAction" @click=${this._toggleDetails}>
                ${this._showDetails
--- a/src/panels/config/lovelace/resources/dialog-lovelace-resource-detail.ts
+++ b/src/panels/config/lovelace/resources/dialog-lovelace-resource-detail.ts
@ -99,7 +99,7 @@ export class DialogLovelaceResourceDetail extends LitElement {
        <ha-dialog-header slot="headline">
          <ha-icon-button
            slot="navigationIcon"
-            .label=${this.hass.localize("ui.dialogs.generic.close") ?? "Close"}
+            .label=${this.hass.localize("ui.common.close") ?? "Close"}
            .path=${mdiClose}
            @click=${this.closeDialog}
          ></ha-icon-button>
--- a/src/panels/config/repairs/dialog-repairs-issue.ts
+++ b/src/panels/config/repairs/dialog-repairs-issue.ts
@ -70,7 +70,7 @@ class DialogRepairsIssue extends LitElement {
        <ha-dialog-header slot="headline">
          <ha-icon-button
            slot="navigationIcon"
-            .label=${this.hass.localize("ui.dialogs.generic.close") ?? "Close"}
+            .label=${this.hass.localize("ui.common.close") ?? "Close"}
            .path=${mdiClose}
            @click=${this.closeDialog}
          ></ha-icon-button>
--- a/src/panels/config/users/dialog-admin-change-password.ts
+++ b/src/panels/config/users/dialog-admin-change-password.ts
@ -122,7 +122,7 @@ class DialogAdminChangePassword extends LitElement {
                )}
              </p>
              <mwc-button slot="primaryAction" @click=${this.closeDialog}>
-                ${this.hass.localize("ui.dialogs.generic.ok")}
+                ${this.hass.localize("ui.common.ok")}
              </mwc-button>
            `
          : html`
--- a/src/panels/config/voice-assistants/dialog-expose-entity.ts
+++ b/src/panels/config/voice-assistants/dialog-expose-entity.ts
@ -74,7 +74,7 @@ class DialogExposeEntity extends LitElement {
            </span>
          </h2>
          <ha-icon-button
-            .label=${this.hass.localize("ui.dialogs.generic.close")}
+            .label=${this.hass.localize("ui.common.close")}
            .path=${mdiClose}
            dialogAction="close"
            slot="navigationIcon"
--- a/src/panels/lovelace/editor/select-dashboard/hui-dialog-select-dashboard.ts
+++ b/src/panels/lovelace/editor/select-dashboard/hui-dialog-select-dashboard.ts
@ -74,7 +74,7 @@ export class HuiDialogSelectDashboard extends LitElement {
        <ha-dialog-header slot="headline">
          <ha-icon-button
            slot="navigationIcon"
-            .label=${this.hass.localize("ui.dialogs.generic.close")}
+            .label=${this.hass.localize("ui.common.close")}
            .path=${mdiClose}
            @click=${this.closeDialog}
            .disabled=${this._saving}
--- a/src/translations/en.json
+++ b/src/translations/en.json
@ -1241,10 +1241,7 @@
        "not_found_error_load_assist": "Cannot find the assist pipeline"
      },
      "generic": {
-        "cancel": "Cancel",
-        "ok": "OK",
-        "default_confirmation_title": "Are you sure?",
-        "close": "Close"
+        "default_confirmation_title": "Are you sure?"
      },
      "image_cropper": {
        "crop": "Crop",