From 819225d32b28d6165dce7a91fea0f8c54902b1ab Mon Sep 17 00:00:00 2001
From: Bram Kragten
Date: Fri, 28 Feb 2025 15:51:06 +0100
Subject: [PATCH] Align common dialog translations (#24450)
---
src/components/ha-dialog.ts | 2 +-
src/components/media-player/dialog-media-manage.ts | 2 +-
src/components/media-player/dialog-media-player-browse.ts | 2 +-
src/dialogs/generic/dialog-box.ts | 4 ++--
src/dialogs/restart/dialog-restart.ts | 2 +-
.../voice-assistant-setup/voice-assistant-setup-dialog.ts | 3 +--
src/panels/calendar/confirm-event-dialog-box.ts | 2 +-
.../automation-mode-dialog/dialog-automation-mode.ts | 2 +-
.../automation-save-dialog/dialog-automation-save.ts | 2 +-
.../config/backup/dialogs/dialog-backup-onboarding.ts | 4 +++-
.../backup/dialogs/dialog-change-backup-encryption-key.ts | 2 +-
.../backup/dialogs/dialog-download-decrypted-backup.ts | 2 +-
src/panels/config/backup/dialogs/dialog-generate-backup.ts | 2 +-
src/panels/config/backup/dialogs/dialog-restore-backup.ts | 2 +-
.../backup/dialogs/dialog-set-backup-encryption-key.ts | 2 +-
.../backup/dialogs/dialog-show-backup-encryption-key.ts | 4 ++--
src/panels/config/backup/dialogs/dialog-upload-backup.ts | 2 +-
.../mqtt/dialog-mqtt-device-debug-info.ts | 2 +-
src/panels/config/integrations/dialog-yaml-integration.ts | 4 ++--
.../integration-panels/zha/dialog-zha-change-channel.ts | 2 +-
.../integration-panels/zha/dialog-zha-reconfigure-device.ts | 6 +++---
.../lovelace/resources/dialog-lovelace-resource-detail.ts | 2 +-
src/panels/config/repairs/dialog-repairs-issue.ts | 2 +-
src/panels/config/users/dialog-admin-change-password.ts | 2 +-
src/panels/config/voice-assistants/dialog-expose-entity.ts | 2 +-
.../editor/select-dashboard/hui-dialog-select-dashboard.ts | 2 +-
src/translations/en.json | 5 +----
27 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/src/components/ha-dialog.ts b/src/components/ha-dialog.ts
index ee96bd0f52..e326e6b19b 100644
--- a/src/components/ha-dialog.ts
+++ b/src/components/ha-dialog.ts
@@ -16,7 +16,7 @@ export const createCloseHeading = (
) => html`
diff --git a/src/dialogs/restart/dialog-restart.ts b/src/dialogs/restart/dialog-restart.ts
index 5bb9627199..62526c5b53 100644
--- a/src/dialogs/restart/dialog-restart.ts
+++ b/src/dialogs/restart/dialog-restart.ts
@@ -93,7 +93,7 @@ class DialogRestart extends LitElement {
diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts
index 81ed1c1113..b278af890a 100644
--- 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``
diff --git a/src/panels/calendar/confirm-event-dialog-box.ts b/src/panels/calendar/confirm-event-dialog-box.ts
index b0c8ec2dda..bea8dc0b05 100644
--- 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 {
${this._params.text}
- ${this.hass.localize("ui.dialogs.generic.cancel")}
+ ${this.hass.localize("ui.common.cancel")}
- ${this.hass.localize("ui.dialogs.generic.cancel")}
+ ${this.hass.localize("ui.common.cancel")}
${this.hass.localize("ui.panel.config.automation.editor.change_mode")}
diff --git a/src/panels/config/automation/automation-save-dialog/dialog-automation-save.ts b/src/panels/config/automation/automation-save-dialog/dialog-automation-save.ts
index 6c1dc80ce9..60eb15cf25 100644
--- 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 {
- ${this.hass.localize("ui.dialogs.generic.cancel")}
+ ${this.hass.localize("ui.common.cancel")}
${this.hass.localize(
diff --git a/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts b/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts
index c9bc98845a..6b4e51fe06 100644
--- 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`
@@ -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 = {
diff --git a/src/panels/config/backup/dialogs/dialog-change-backup-encryption-key.ts b/src/panels/config/backup/dialogs/dialog-change-backup-encryption-key.ts
index 9c55bbfe6e..f8e7ee2f70 100644
--- 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`
diff --git a/src/panels/config/backup/dialogs/dialog-download-decrypted-backup.ts b/src/panels/config/backup/dialogs/dialog-download-decrypted-backup.ts
index a9ac25a9d1..8c82390142 100644
--- 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 {
- ${this.hass.localize("ui.dialogs.generic.cancel")}
+ ${this.hass.localize("ui.common.cancel")}
diff --git a/src/panels/config/backup/dialogs/dialog-generate-backup.ts b/src/panels/config/backup/dialogs/dialog-generate-backup.ts
index 076ca101b4..65d70784c3 100644
--- 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`
diff --git a/src/panels/config/backup/dialogs/dialog-restore-backup.ts b/src/panels/config/backup/dialogs/dialog-restore-backup.ts
index 5a7ad2cfd9..75371de173 100644
--- 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 {
diff --git a/src/panels/config/backup/dialogs/dialog-set-backup-encryption-key.ts b/src/panels/config/backup/dialogs/dialog-set-backup-encryption-key.ts
index de0c3e7004..748e8cc325 100644
--- 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 {
diff --git a/src/panels/config/backup/dialogs/dialog-show-backup-encryption-key.ts b/src/panels/config/backup/dialogs/dialog-show-backup-encryption-key.ts
index 9a5bda4bbf..15bb07096c 100644
--- 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 {
@@ -98,7 +98,7 @@ class DialogShowBackupEncryptionKey extends LitElement implements HassDialog {
- ${this.hass.localize("ui.dialogs.generic.close")}
+ ${this.hass.localize("ui.common.close")}
diff --git a/src/panels/config/backup/dialogs/dialog-upload-backup.ts b/src/panels/config/backup/dialogs/dialog-upload-backup.ts
index ab396fd4d1..4a2621b6fe 100644
--- 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
- ${this.hass!.localize("ui.dialogs.generic.close")}
+ ${this.hass!.localize("ui.common.close")}
`;
diff --git a/src/panels/config/integrations/dialog-yaml-integration.ts b/src/panels/config/integrations/dialog-yaml-integration.ts
index ca57b6dc07..953071c949 100644
--- 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 {
)}
- ${this.hass.localize("ui.dialogs.generic.cancel")}
+ ${this.hass.localize("ui.common.cancel")}
${docLink
? html`
`
: html`
- ${this.hass.localize("ui.dialogs.generic.ok")}
+ ${this.hass.localize("ui.common.ok")}
`}
`;
diff --git 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
index fe1980e466..e0833ebcc6 100644
--- 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")}${this.hass.localize("ui.common.cancel")}
`;
diff --git 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
index 1fd53ab466..635dc5a717 100644
--- 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 {
- ${this.hass.localize("ui.dialogs.generic.close")}
+ ${this.hass.localize("ui.common.close")}
${this._showDetails
@@ -154,7 +154,7 @@ class DialogZHAReconfigureDevice extends LitElement {
- ${this.hass.localize("ui.dialogs.generic.close")}
+ ${this.hass.localize("ui.common.close")}
${this._showDetails
@@ -183,7 +183,7 @@ class DialogZHAReconfigureDevice extends LitElement {
- ${this.hass.localize("ui.dialogs.generic.close")}
+ ${this.hass.localize("ui.common.close")}
${this._showDetails
diff --git a/src/panels/config/lovelace/resources/dialog-lovelace-resource-detail.ts b/src/panels/config/lovelace/resources/dialog-lovelace-resource-detail.ts
index 8614e8c8e8..0dee14c356 100644
--- 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 {
diff --git a/src/panels/config/repairs/dialog-repairs-issue.ts b/src/panels/config/repairs/dialog-repairs-issue.ts
index 95810186ba..179d3ac62a 100644
--- 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 {
diff --git a/src/panels/config/users/dialog-admin-change-password.ts b/src/panels/config/users/dialog-admin-change-password.ts
index b51ba5cde3..fe1c9cb29a 100644
--- 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 {
)}
- ${this.hass.localize("ui.dialogs.generic.ok")}
+ ${this.hass.localize("ui.common.ok")}
`
: html`
diff --git a/src/panels/config/voice-assistants/dialog-expose-entity.ts b/src/panels/config/voice-assistants/dialog-expose-entity.ts
index 6197fa0841..d8b523c7ef 100644
--- 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 {