From a8d49c27c82fa2b4fe29f2468e717c86eb900070 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sat, 1 May 2021 01:48:36 +0000 Subject: [PATCH 01/13] Translation update --- translations/frontend/nl.json | 6 +++--- translations/frontend/pl.json | 8 ++++---- translations/frontend/ru.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/translations/frontend/nl.json b/translations/frontend/nl.json index aeaab58219..1a6d0fde8e 100644 --- a/translations/frontend/nl.json +++ b/translations/frontend/nl.json @@ -1209,7 +1209,7 @@ "heading": "Apparaat opnieuw configureren", "in_progress": "Het apparaat wordt opnieuw geconfigureerd. Dit kan wat tijd kosten.", "introduction": "Herconfigureer een apparaat op je Zigbee netwerk. Gebruik deze functie als uw apparaat niet correct functioneert.", - "min_max_change": "mix/max/verander", + "min_max_change": "min/max/verandering", "reporting_header": "Rapporteren", "run_in_background": "U kunt dit dialoogvenster sluiten en de herconfiguratie wordt op de achtergrond voortgezet.", "start_reconfiguration": "Start herconfiguratie" @@ -2249,7 +2249,7 @@ }, "configure": "Configureer", "configured": "Geconfigureerd", - "confirm_new": "Wil je {integration} instellen?", + "confirm_new": "Wilt u {integration} instellen?", "description": "Beheer integraties met services of apparaten", "details": "Integratiedetails", "disable": { @@ -2875,7 +2875,7 @@ "configured_in_yaml": "Zones die via configuration.yaml zijn geconfigureerd kunnen niet worden bewerkt in de gebruikers", "confirm_delete": "Weet je zeker dat je deze zone wilt verwijderen?", "create_zone": "Creëer Zone", - "description": "Beheer de zones waarin je personen wilt volgen", + "description": "Beheer de zones waarin u personen wilt volgen", "detail": { "create": "Aanmaken", "delete": "Verwijder", diff --git a/translations/frontend/pl.json b/translations/frontend/pl.json index 59c3f13de9..6a58c1c431 100644 --- a/translations/frontend/pl.json +++ b/translations/frontend/pl.json @@ -439,8 +439,8 @@ "used_space": "Zajęte miejsce" }, "log": { - "get_logs": "Nie udało się pobrać dzienników od {provider} {error}", - "log_provider": "Dostawca dziennika" + "get_logs": "Nie udało się pobrać logów od {provider} {error}", + "log_provider": "Dostawca logów" }, "supervisor": { "beta_backup": "Przed aktywacją tej funkcji upewnij się, że masz kopie zapasowe swoich danych.", @@ -2296,9 +2296,9 @@ "level": { "critical": "KRYTYCZNE", "debug": "DEBUG", - "error": "BŁĄD", + "error": "BŁĘDY", "info": "INFO", - "warning": "OSTRZEŻENIE" + "warning": "OSTRZEŻENIA" }, "load_full_log": "Wczytaj cały log Home Assistanta", "loading_log": "Wczytywanie loga błędów…", diff --git a/translations/frontend/ru.json b/translations/frontend/ru.json index 6f77229da4..0615cd3f73 100644 --- a/translations/frontend/ru.json +++ b/translations/frontend/ru.json @@ -459,7 +459,7 @@ "ram_usage": "Использование ОЗУ", "reload_supervisor": "Перезагрузить Supervisor", "share_diagnostics": "Отправлять данные для диагностики", - "share_diagnostics_description": "Автоматически отправлять отчеты о сбоях и диагностическую информацию", + "share_diagnostics_description": "Автоматически отправлять отчеты о сбоях и диагностическую информацию.", "share_diagonstics_description": "Хотели бы Вы автоматически отправлять отчеты о сбоях и другую диагностическую информацию, когда Supervisor обнаруживает неожиданные ошибки? {line_break} Это позволит разработчикам получать необходимые данные для решения проблем. Данные не будут содержать никакой личной или конфиденциальной информации и будут доступны только основной команде Home Assistant. {line_break} Вы сможете отменить отправку данных в настройках в любое время.", "share_diagonstics_title": "Помогите улучшить Home Assistant", "unhealthy_description": "Запуск неработоспособной системы может вызвать проблемы. Ниже приведен список проблем, обнаруженных при установке. Перейдите по ссылкам, чтобы узнать, как их решить.", From 13cc016b368556d2b8d8d57820720a375244b3e8 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sat, 1 May 2021 05:30:33 -0700 Subject: [PATCH 02/13] Fix some hassio things (#9059) --- hassio/src/addon-view/info/hassio-addon-info.ts | 10 +++------- .../repositories/dialog-hassio-repositories.ts | 13 ++++++++----- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/hassio/src/addon-view/info/hassio-addon-info.ts b/hassio/src/addon-view/info/hassio-addon-info.ts index 03d2c1bf65..20af66c7ce 100644 --- a/hassio/src/addon-view/info/hassio-addon-info.ts +++ b/hassio/src/addon-view/info/hassio-addon-info.ts @@ -261,13 +261,9 @@ class HassioAddonInfo extends LitElement { ${this.supervisor.localize( "addon.dashboard.visit_addon_page", "name", - html` - ${this.addon.name} - ` + html`${this.addon.name}` )}
diff --git a/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts b/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts index c762f25f59..0c91f31055 100644 --- a/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts +++ b/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts @@ -43,7 +43,7 @@ class HassioRepositoriesDialog extends LitElement { @internalProperty() private _opened = false; - @internalProperty() private _prosessing = false; + @internalProperty() private _processing = false; @internalProperty() private _error?: string; @@ -119,8 +119,11 @@ class HassioRepositoriesDialog extends LitElement { @keydown=${this._handleKeyAdd} > - ${this._prosessing - ? html`` + ${this._processing + ? html`` : this._dialogParams!.supervisor.localize( "dialog.repositories.add" )} @@ -201,7 +204,7 @@ class HassioRepositoriesDialog extends LitElement { if (!input || !input.value) { return; } - this._prosessing = true; + this._processing = true; const repositories = this._filteredRepositories(this._repositories!); const newRepositories = repositories.map((repo) => repo.source); newRepositories.push(input.value); @@ -216,7 +219,7 @@ class HassioRepositoriesDialog extends LitElement { } catch (err) { this._error = extractApiErrorMessage(err); } - this._prosessing = false; + this._processing = false; } private async _removeRepository(ev: Event) { From 2a5f94074429fd92d2c47c627f468aa4849b7e66 Mon Sep 17 00:00:00 2001 From: Philip Allgaier Date: Sat, 1 May 2021 14:31:01 +0200 Subject: [PATCH 03/13] Ensure weather icon is centered in forecast (#9065) --- src/panels/lovelace/cards/hui-weather-forecast-card.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/panels/lovelace/cards/hui-weather-forecast-card.ts b/src/panels/lovelace/cards/hui-weather-forecast-card.ts index 9d1a325759..af35cb18e3 100644 --- a/src/panels/lovelace/cards/hui-weather-forecast-card.ts +++ b/src/panels/lovelace/cards/hui-weather-forecast-card.ts @@ -502,6 +502,7 @@ class HuiWeatherForecastCard extends LitElement implements LovelaceCard { padding-top: 4px; padding-bottom: 4px; display: flex; + justify-content: center; } .forecast-image-icon > * { From 00d46424a3835ed28b798670a39e0ecd8a6fc8a3 Mon Sep 17 00:00:00 2001 From: Philip Allgaier Date: Sat, 1 May 2021 14:31:43 +0200 Subject: [PATCH 04/13] Translate new setup time info header + add blank before unit (#9067) --- src/panels/config/info/integrations-card.ts | 7 ++++--- src/translations/en.json | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/panels/config/info/integrations-card.ts b/src/panels/config/info/integrations-card.ts index 8a17a77b34..42287dda06 100644 --- a/src/panels/config/info/integrations-card.ts +++ b/src/panels/config/info/integrations-card.ts @@ -65,7 +65,7 @@ class IntegrationsCard extends LitElement { ` : ""} - Setup time + ${this.hass.localize("ui.panel.config.info.setup_time")} @@ -113,7 +113,7 @@ class IntegrationsCard extends LitElement { ${this.narrow ? html`
${docLink} ${issueLink}
- ${setupSeconds ? html`${setupSeconds}s` : ""} + ${setupSeconds ? html`${setupSeconds} s` : ""}
` : ""} @@ -123,7 +123,7 @@ class IntegrationsCard extends LitElement { ${docLink} ${issueLink} - ${setupSeconds ? html`${setupSeconds}s` : ""} + ${setupSeconds ? html`${setupSeconds} s` : ""} `} @@ -169,6 +169,7 @@ class IntegrationsCard extends LitElement { } td.setup { text-align: right; + white-space: nowrap; } th { text-align: right; diff --git a/src/translations/en.json b/src/translations/en.json index e5e0484d09..7471cf8938 100755 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -1039,6 +1039,7 @@ "integrations": "Integrations", "documentation": "Documentation", "issues": "Issues", + "setup_time": "Setup time", "system_health": { "manage": "Manage", "more_info": "more info" From 7b8cb16c127c71a53eee52d1ef14f57a3382153b Mon Sep 17 00:00:00 2001 From: Charles Garwood Date: Sat, 1 May 2021 08:31:59 -0400 Subject: [PATCH 05/13] Add "subscribed to log" message on Z-Wave JS log subscription (#9062) --- .../integration-panels/zwave_js/zwave_js-logs.ts | 5 +++++ src/translations/en.json | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-logs.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-logs.ts index 730f79b483..b51a9d8163 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-logs.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-logs.ts @@ -50,6 +50,11 @@ class ZWaveJSLogs extends SubscribeMixin(LitElement) { } else { this._textarea!.value += `${log.message}\n`; } + }).then((unsub) => { + this._textarea!.value += `${this.hass.localize( + "ui.panel.config.zwave_js.logs.subscribed_to_logs" + )}\n`; + return unsub; }), ]; } diff --git a/src/translations/en.json b/src/translations/en.json index 7471cf8938..011cbcdfa5 100755 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2649,7 +2649,8 @@ }, "logs": { "title": "Z-Wave JS Logs", - "log_level": "Log Level" + "log_level": "Log Level", + "subscribed_to_logs": "Subscribed to Z-Wave JS Log Messages..." } } }, From 716e100a2887ba7186b27c6fbdf1acef0d789808 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 2 May 2021 01:53:59 +0000 Subject: [PATCH 06/13] Translation update --- translations/frontend/ca.json | 2 + translations/frontend/en.json | 2 + translations/frontend/fr.json | 69 ++++++++++++++++++++++++++++++++++- translations/frontend/it.json | 5 +++ translations/frontend/pl.json | 2 + translations/frontend/ru.json | 4 +- 6 files changed, 80 insertions(+), 4 deletions(-) diff --git a/translations/frontend/ca.json b/translations/frontend/ca.json index 4211da2de6..369eb63c2b 100644 --- a/translations/frontend/ca.json +++ b/translations/frontend/ca.json @@ -2160,6 +2160,7 @@ "license": "Publicat amb la llicència Apache 2.0", "path_configuration": "Ruta al fitxer configuration.yaml: {path}", "server": "servidor", + "setup_time": "Temps de configuració", "source": "Font:", "system_health_error": "El component Estat del Sistema no està configurat. Afegeix 'system_health:' a configuration.yaml", "system_health": { @@ -2944,6 +2945,7 @@ }, "logs": { "log_level": "Nivell dels registres", + "subscribed_to_logs": "Subscrit a missatges de registre Z-Wave JS...", "title": "Registres de Z-Wave JS" }, "navigation": { diff --git a/translations/frontend/en.json b/translations/frontend/en.json index 2986af1fc8..7dec5be191 100644 --- a/translations/frontend/en.json +++ b/translations/frontend/en.json @@ -2160,6 +2160,7 @@ "license": "Published under the Apache 2.0 license", "path_configuration": "Path to configuration.yaml: {path}", "server": "server", + "setup_time": "Setup time", "source": "Source:", "system_health_error": "System Health component is not loaded. Add 'system_health:' to configuration.yaml", "system_health": { @@ -2944,6 +2945,7 @@ }, "logs": { "log_level": "Log Level", + "subscribed_to_logs": "Subscribed to Z-Wave JS Log Messages...", "title": "Z-Wave JS Logs" }, "navigation": { diff --git a/translations/frontend/fr.json b/translations/frontend/fr.json index 1fcbf8d6ab..74a105406a 100644 --- a/translations/frontend/fr.json +++ b/translations/frontend/fr.json @@ -561,8 +561,11 @@ }, "light": { "brightness": "Luminosité", + "cold_white_value": "Luminosité du blanc froid", + "color_brightness": "Luminosité de la couleur", "color_temperature": "Température de couleur", "effect": "Effet", + "warm_white_value": "Luminosité du blanc chaud", "white_value": "Niveau de blanc" }, "lock": { @@ -886,6 +889,7 @@ } }, "service-control": { + "integration_doc": "Documentation de l'intégration", "required": "Ce champ est obligatoire", "service_data": "Données de service", "target": "Cibles", @@ -1193,7 +1197,22 @@ } }, "zha_reconfigure_device": { - "heading": "Reconfigurer l'appareil" + "attribute": "Attribut", + "battery_device_warning": "Vous allez avoir besoin de réveiller les appareils sur batterie avant de commencer le processus de reconfiguration. Consultez le manuel de l'appareil pour connaître la procédure.", + "bind_header": "Liaison", + "button_hide": "Masquer les détails", + "button_show": "Afficher les détails", + "cluster_header": "Cluster", + "configuration_complete": "Reconfiguration de l'appareil complété.", + "configuration_failed": "La reconfiguration de l'appareil a échoué. Des informations additionnelles sont disponibles dans les journaux.", + "configuring_alt": "Configurer", + "heading": "Reconfigurer l'appareil", + "in_progress": "L'appareil est en cours de configuration. Cela peut prendre du temps.", + "introduction": "Reconfigure l'appareil sur votre réseau Zigbee. Utilisez cette fonctionnalité si votre appareil ne fonctionne pas correctement.", + "min_max_change": "min / max / changement", + "reporting_header": "Rapports", + "run_in_background": "Vous pouvez fermer cette fenêtre pendant que la reconfiguration se poursuivra en arrière-plan.", + "start_reconfiguration": "Démarrer la reconfiguration" } }, "duration": { @@ -1256,7 +1275,8 @@ "caption": "Pièces", "data_table": { "area": "Pièce", - "devices": "Appareils" + "devices": "Appareils", + "entities": "Entités" }, "delete": { "confirmation_text": "Tous les appareils de cette pièce ne seront plus attribués.", @@ -1268,8 +1288,10 @@ "create": "Créer", "default_name": "Nouvelle Pièce", "delete": "Supprimer", + "linked_entities_caption": "Entités", "name": "Nom", "name_required": "Le nom est requis", + "no_linked_entities": "Il n'y a pas d'entités liées à cette pièce", "unknown_error": "Erreur inconnue", "update": "Mise à jour" }, @@ -2138,6 +2160,7 @@ "license": "Publié sous la licence Apache 2.0", "path_configuration": "Chemin vers configuration.yaml : {path}", "server": "serveur", + "setup_time": "Temps de configuration", "source": "Source:", "system_health_error": "Le composant System Health n'est pas chargé. Ajouter 'system_health:' à configuration.yaml", "system_health": { @@ -2156,8 +2179,11 @@ "caption": "Intégrations", "config_entry": { "area": "Dans {area}", + "check_the_logs": "Vérifiez les journaux", + "configure": "Configurer", "delete": "Supprimer", "delete_confirm": "Êtes-vous sûr de vouloir supprimer cette intégration?", + "depends_on_cloud": "Dépend du cloud", "device_unavailable": "Appareil non disponible", "devices": "{count} {count, plural,\n one {appareil}\n other {appareils}\n}", "disable_restart_confirm": "Redémarrez Home Assistant pour terminer la désactivation de cette intégration", @@ -2182,12 +2208,21 @@ "no_area": "Pas de zone", "not_loaded": "Non chargé, vérifiez le {logs_link}", "options": "Options", + "provided_by_custom_integration": "Fourni par une intégration personnalisée", "reload": "Recharger", "reload_confirm": "L'intégration a été rechargée", "reload_restart_confirm": "Redémarrer Home Assistant pour finaliser le rechargement de cette intégration", "rename": "Renommer", "restart_confirm": "Redémarrer Home Assistant pour terminer la suppression de cette intégration", "services": "{count} {count, plural,\n one {service}\n other {services}\n}", + "state": { + "failed_unload": "Échec du déchargement", + "loaded": "Chargé", + "migration_error": "Erreur de migration", + "not_loaded": "Non chargé", + "setup_error": "Échec de la configuration", + "setup_retry": "Réessayer la configuration" + }, "system_options": "Options système", "unnamed_entry": "Entrée sans nom" }, @@ -2255,8 +2290,10 @@ "logs": { "caption": "Journaux", "clear": "Nettoyer", + "custom_integration": "intégration personnalisée", "description": "Afficher les journaux de Home Assistant", "details": "Détails du journal ( {level} )", + "error_from_custom_integration": "Cette erreur provient d'une intégration personnalisée", "level": { "critical": "CRITIQUE", "debug": "DEBUG", @@ -2773,6 +2810,15 @@ "manufacturer_code_override": "Code de remplacement du fabricant", "value": "Valeur" }, + "configuration_page": { + "shortcuts_title": "Raccourcis", + "update_button": "Configuration de mise à jour", + "zha_options": { + "default_light_transition": "Temps de transition de la lumière par défaut (en secondes)", + "enable_identify_on_join": "Activer l'effet d'identification quand les appareils rejoignent le réseau", + "title": "Options générales" + } + }, "device_pairing_card": { "CONFIGURED": "Configuration terminée", "CONFIGURED_status_text": "Initialisation", @@ -2897,7 +2943,13 @@ "node_status": "État du nœud", "zwave_info": "Informations Z-Wave" }, + "logs": { + "log_level": "Niveau du journal", + "subscribed_to_logs": "S'abonner aux messages du journal Z-Wave JS", + "title": "Journaux Z-Wave JS" + }, "navigation": { + "logs": "Journaux", "network": "Réseau" }, "network_status": { @@ -2912,6 +2964,9 @@ "header": "Configuration du périphérique Z-Wave", "introduction": "Gérer et ajuster les paramètres de configuration spécifiques au périphérique (nœud) pour le périphérique sélectionné", "parameter_is_read_only": "Ce paramètre est en lecture seule.", + "set_param_accepted": "Le paramètre a été mis à jour.", + "set_param_error": "Une erreur s'est produite.", + "set_param_queued": "La modification du paramètre a été mise en file d'attente et sera mise à jour lorsque l'appareil se réveillera.", "zwave_js_device_database": "Base de données de périphériques Z-Wave JS" }, "node_status": { @@ -2921,6 +2976,16 @@ "dead": "Mort", "unknown": "Inconnu" }, + "reinterview_node": { + "battery_device_warning": "Vous allez avoir besoin de réveiller les appareils sur batterie avant de commencer le processus de réinterrogation. Consultez le manuel de l'appareil pour connaître la procédure.", + "in_progress": "L'appareil est en cours d'interrogation. Cela peut prendre du temps.", + "interview_complete": "Processus d'interrogation de l'appareil terminé.", + "interview_failed": "L'interrogation de l'appareil a échoué. Des informations additionnelles peuvent être disponibles dans les journaux.", + "introduction": "Réinterroger un appareil sur votre réseau Z-Wave. Utilisez cette fonctionnalité si votre appareil a des fonctionnalités manquantes ou incorrectes.", + "run_in_background": "Vous pouvez fermer cette fenêtre pendant que le processus d'interrogation se poursuivra en arrière-plan.", + "start_reinterview": "Démarrer le processus de réinterrogation", + "title": "Réinterroger un appareil Z-Wave" + }, "remove_node": { "cancel_exclusion": "Annuler l'exclusion", "controller_in_exclusion_mode": "Votre contrôleur Z-Wave est maintenant en mode exclusion.", diff --git a/translations/frontend/it.json b/translations/frontend/it.json index 881eac9ebe..58a2214037 100644 --- a/translations/frontend/it.json +++ b/translations/frontend/it.json @@ -2942,7 +2942,12 @@ "node_status": "Stato del Nodo", "zwave_info": "Informazioni Z-Wave" }, + "logs": { + "log_level": "Livello di registro", + "title": "Registri Z-Wave JS" + }, "navigation": { + "logs": "Registri", "network": "Rete" }, "network_status": { diff --git a/translations/frontend/pl.json b/translations/frontend/pl.json index 6a58c1c431..e2c1ccefdc 100644 --- a/translations/frontend/pl.json +++ b/translations/frontend/pl.json @@ -2160,6 +2160,7 @@ "license": "Opublikowany na licencji Apache 2.0", "path_configuration": "Ścieżka do pliku configuration.yaml: {path}", "server": "serwer", + "setup_time": "Ustawienia czasu", "source": "Źródło:", "system_health_error": "Komponent kondycji systemu nie jest wczytany. Dodaj 'system_health:' do pliku configuration.yaml", "system_health": { @@ -2944,6 +2945,7 @@ }, "logs": { "log_level": "Poziom loga", + "subscribed_to_logs": "Zasubskrybowano komunikaty dziennika Z-Wave JS ...", "title": "Logi Z-Wave JS" }, "navigation": { diff --git a/translations/frontend/ru.json b/translations/frontend/ru.json index 0615cd3f73..9b0844d56b 100644 --- a/translations/frontend/ru.json +++ b/translations/frontend/ru.json @@ -1258,7 +1258,7 @@ "notification_toast": { "connection_lost": "Соединение потеряно. Повторное подключение...", "dismiss": "Закрыть", - "intergration_starting": "Запуск {integration}, пока что не всё может быть доступно.", + "intergration_starting": "{integration} загружается, пока что не всё может быть доступно.", "service_call_failed": "Не удалось вызвать службу {service}.", "started": "Home Assistant работает!", "starting": "Home Assistant запускается, пока что не всё может быть доступно.", @@ -2182,7 +2182,7 @@ "configure": "Настроить", "delete": "Удалить", "delete_confirm": "Вы уверены, что хотите удалить эту интеграцию?", - "depends_on_cloud": "Зависящие от облачных сервисов", + "depends_on_cloud": "Зависит от облачных сервисов", "device_unavailable": "Устройство недоступно", "devices": "{count, plural,\n one {устройств:}\n other {устройств:}\n} {count}", "disable_restart_confirm": "Перезапустите Home Assistant, чтобы завершить деактивацию этой интеграции.", From ac5f85820f9a5db809309a66a1987a527b42742d Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 2 May 2021 01:54:40 -0700 Subject: [PATCH 07/13] Integration Card: Fix Safari header break and deal with long errors (#9070) --- gallery/src/demos/demo-integration-card.ts | 3 ++- src/panels/config/integrations/ha-integration-card.ts | 6 ++++++ src/panels/config/integrations/ha-integration-header.ts | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gallery/src/demos/demo-integration-card.ts b/gallery/src/demos/demo-integration-card.ts index 2c9039b7b3..7fb8607930 100644 --- a/gallery/src/demos/demo-integration-card.ts +++ b/gallery/src/demos/demo-integration-card.ts @@ -86,7 +86,8 @@ const setupRetryReasonEntry = createConfigEntry("Setup Retry", { }); const setupRetryReasonMissingKeyEntry = createConfigEntry("Setup Retry", { state: "setup_retry", - reason: "resolve_error", + reason: + "HTTPSConnectionpool: Max retries exceeded with NewConnectionError(': Failed to establish a new connection: [Errno 113] Host is unreachable')", }); const failedUnloadEntry = createConfigEntry("Failed Unload", { state: "failed_unload", diff --git a/src/panels/config/integrations/ha-integration-card.ts b/src/panels/config/integrations/ha-integration-card.ts index 6b90bdd396..6616241710 100644 --- a/src/panels/config/integrations/ha-integration-card.ts +++ b/src/panels/config/integrations/ha-integration-card.ts @@ -640,6 +640,12 @@ export class HaIntegrationCard extends LitElement { margin-left: 8px; padding-top: 2px; padding-right: 2px; + word-wrap: break-word; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 7; + overflow: hidden; + text-overflow: ellipsis; } .content { diff --git a/src/panels/config/integrations/ha-integration-header.ts b/src/panels/config/integrations/ha-integration-header.ts index d4d9c64ffb..3e49fe81d4 100644 --- a/src/panels/config/integrations/ha-integration-header.ts +++ b/src/panels/config/integrations/ha-integration-header.ts @@ -131,6 +131,7 @@ export class HaIntegrationHeader extends LitElement { height: 40px; } .header .info { + flex: 1; align-self: center; } .header .info div { From 5d946778cb8ef3412c7d58e1f12ca29c25de35d2 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 2 May 2021 05:45:53 -0700 Subject: [PATCH 08/13] Show setting for auto connect seperately if currently connected (#9072) Co-authored-by: Philip Allgaier Co-authored-by: Bram Kragten --- .../config/cloud/account/cloud-remote-pref.ts | 85 ++++++++++++++----- src/translations/en.json | 8 +- 2 files changed, 70 insertions(+), 23 deletions(-) diff --git a/src/panels/config/cloud/account/cloud-remote-pref.ts b/src/panels/config/cloud/account/cloud-remote-pref.ts index dbc31c7a94..223f58dd1a 100644 --- a/src/panels/config/cloud/account/cloud-remote-pref.ts +++ b/src/panels/config/cloud/account/cloud-remote-pref.ts @@ -24,7 +24,7 @@ import { showCloudCertificateDialog } from "../dialog-cloud-certificate/show-dia @customElement("cloud-remote-pref") export class CloudRemotePref extends LitElement { - @property({ attribute: false }) public hass?: HomeAssistant; + @property({ attribute: false }) public hass!: HomeAssistant; @property() public cloudStatus?: CloudStatusLoggedIn; @@ -33,6 +33,8 @@ export class CloudRemotePref extends LitElement { return html``; } + const { remote_enabled } = this.cloudStatus.prefs; + const { remote_connected, remote_domain, @@ -42,12 +44,12 @@ export class CloudRemotePref extends LitElement { if (!remote_certificate) { return html`
- ${this.hass!.localize( + ${this.hass.localize( "ui.panel.config.cloud.account.remote.access_is_being_prepared" )}
@@ -57,25 +59,26 @@ export class CloudRemotePref extends LitElement { return html` -
- +
+ ${this.hass.localize( + `ui.panel.config.cloud.account.remote.${ + remote_connected ? "connected" : "not_connected" + }` + )}
- ${this.hass!.localize("ui.panel.config.cloud.account.remote.info")} - ${remote_connected - ? this.hass!.localize( - "ui.panel.config.cloud.account.remote.instance_is_available" - ) - : this.hass!.localize( - "ui.panel.config.cloud.account.remote.instance_will_be_available" - )} + ${this.hass.localize("ui.panel.config.cloud.account.remote.info")} + ${this.hass.localize( + `ui.panel.config.cloud.account.remote.${ + remote_connected + ? "instance_is_available" + : "instance_will_be_available" + }` + )} https://${remote_domain}. + +
+

+ ${this.hass.localize( + "ui.panel.config.cloud.account.remote.remote_enabled.caption" + )} +

+
+ +
+
+

+ ${this.hass.localize( + "ui.panel.config.cloud.account.remote.remote_enabled.description" + )} +

${this.hass!.localize( + >${this.hass.localize( "ui.panel.config.cloud.account.remote.link_learn_how_it_works" )} @@ -101,7 +123,7 @@ export class CloudRemotePref extends LitElement { ? html`
- ${this.hass!.localize( + ${this.hass.localize( "ui.panel.config.cloud.account.remote.certificate_info" )} @@ -123,9 +145,9 @@ export class CloudRemotePref extends LitElement { try { if (toggle.checked) { - await connectCloudRemote(this.hass!); + await connectCloudRemote(this.hass); } else { - await disconnectCloudRemote(this.hass!); + await disconnectCloudRemote(this.hass); } fireEvent(this, "ha-refresh-cloud-status"); } catch (err) { @@ -145,7 +167,7 @@ export class CloudRemotePref extends LitElement { .break-word { overflow-wrap: break-word; } - .switch { + .connection-status { position: absolute; right: 24px; top: 24px; @@ -163,6 +185,25 @@ export class CloudRemotePref extends LitElement { .spacer { flex-grow: 1; } + .remote-enabled { + display: flex; + margin-top: 1.5em; + } + .remote-enabled + p { + margin-top: 0.5em; + } + h3 { + margin: 0 0 8px 0; + } + .remote-enabled h3 { + flex-grow: 1; + margin: 0; + } + .remote-enabled-switch { + margin-top: 0.25em; + margin-right: 7px; + margin-left: 0.5em; + } `; } } diff --git a/src/translations/en.json b/src/translations/en.json index 011cbcdfa5..108f4cf94f 100755 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -1794,10 +1794,16 @@ }, "remote": { "title": "Remote Control", - "access_is_being_prepared": "Remote access is being prepared. We will notify you when it's ready.", + "connected": "Connected", + "not_connected": "Not Connected", + "access_is_being_prepared": "Remote control is being prepared. We will notify you when it's ready.", "info": "Home Assistant Cloud provides a secure remote connection to your instance while away from home.", "instance_is_available": "Your instance is available at", "instance_will_be_available": "Your instance will be available at", + "remote_enabled": { + "caption": "Automatically connect", + "description": "Enable this option to make sure that your Home Assistant instance is always remotely accessible." + }, "link_learn_how_it_works": "Learn how it works", "certificate_info": "Certificate Info" }, From 1a60a3c7280e6587fb74b02fdd53803b463233b3 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 3 May 2021 01:49:21 +0000 Subject: [PATCH 09/13] Translation update --- translations/frontend/ca.json | 8 +++- translations/frontend/de.json | 67 +++++++++++++++++++++++++++++- translations/frontend/en.json | 8 +++- translations/frontend/es.json | 8 ++++ translations/frontend/et.json | 10 ++++- translations/frontend/nb.json | 22 ++++++++-- translations/frontend/nl.json | 7 ++++ translations/frontend/ru.json | 16 +++++-- translations/frontend/zh-Hans.json | 8 ++++ translations/frontend/zh-Hant.json | 2 + 10 files changed, 143 insertions(+), 13 deletions(-) diff --git a/translations/frontend/ca.json b/translations/frontend/ca.json index 369eb63c2b..2d476a09ea 100644 --- a/translations/frontend/ca.json +++ b/translations/frontend/ca.json @@ -1744,12 +1744,18 @@ "nabu_casa_account": "Compte Nabu Casa", "not_connected": "No connectat", "remote": { - "access_is_being_prepared": "S'està preparant l'accés remot. T'avisarem quan estigui a punt.", + "access_is_being_prepared": "S'està preparant el control remot. T'avisarem quan estigui a punt.", "certificate_info": "Informació del certificat", + "connected": "Connectat", "info": "Home Assistant Cloud t'ofereix una connexió remota i segura amb la teva instància mentre siguis fora de casa", "instance_is_available": "La teva instància està disponible a", "instance_will_be_available": "La teva instància estarà disponible a", "link_learn_how_it_works": "Informació sobre com funciona", + "not_connected": "No connectat", + "remote_enabled": { + "caption": "Connexió automàtica", + "description": "Activa aquesta opció per assegurar-te que la teva instància de Home Assistant sempre sigui accessible de forma remota." + }, "title": "Control remot" }, "sign_out": "Tanca sessió", diff --git a/translations/frontend/de.json b/translations/frontend/de.json index a36dc90fed..db5e23f2e8 100644 --- a/translations/frontend/de.json +++ b/translations/frontend/de.json @@ -561,8 +561,11 @@ }, "light": { "brightness": "Helligkeit", + "cold_white_value": "Kaltweiße Helligkeit", + "color_brightness": "Farbhelligkeit", "color_temperature": "Farbtemperatur", "effect": "Effekt", + "warm_white_value": "Warmweiße Helligkeit", "white_value": "Weißwert" }, "lock": { @@ -886,6 +889,7 @@ } }, "service-control": { + "integration_doc": "Integrationsdokumentation", "required": "Dieses Feld ist erforderlich", "service_data": "Dienstdaten", "target": "Ziele", @@ -1193,7 +1197,22 @@ } }, "zha_reconfigure_device": { - "heading": "Gerät neu konfigurieren" + "attribute": "Attribut", + "battery_device_warning": "Sie müssen batteriebetriebene Geräte aktivieren, bevor Sie den Neukonfigurationsvorgang starten. Anweisungen zum Aktivieren des Geräts finden Sie im Handbuch Ihres Geräts.", + "bind_header": "Bindung", + "button_hide": "Details ausblenden", + "button_show": "Details anzeigen", + "cluster_header": "Cluster", + "configuration_complete": "Geräteneukonfiguration abgeschlossen.", + "configuration_failed": "Die Neukonfiguration des Geräts ist fehlgeschlagen. Weitere Informationen sind möglicherweise in den Protokollen verfügbar.", + "configuring_alt": "Konfigurieren", + "heading": "Gerät neu konfigurieren", + "in_progress": "Das Gerät wird neu konfiguriert. Dies könnte eine Weile dauern.", + "introduction": "Konfigurieren Sie ein Gerät in Ihrem Zigbee-Netzwerk neu. Verwenden Sie diese Funktion, wenn Ihr Gerät nicht ordnungsgemäß funktioniert.", + "min_max_change": "min/max/change", + "reporting_header": "Reporting", + "run_in_background": "Sie können diesen Dialog schließen und die Neukonfiguration wird im Hintergrund fortgesetzt.", + "start_reconfiguration": "Neukonfiguration starten" } }, "duration": { @@ -1256,7 +1275,8 @@ "caption": "Bereiche", "data_table": { "area": "Bereich", - "devices": "Geräte" + "devices": "Geräte", + "entities": "Entitäten" }, "delete": { "confirmation_text": "Die Zuordnung aller Geräte zu diesem Bereich wird aufgelöst.", @@ -1268,8 +1288,10 @@ "create": "Erstellen", "default_name": "Neuer Bereich", "delete": "Löschen", + "linked_entities_caption": "Entitäten", "name": "Name", "name_required": "Name erforderlich", + "no_linked_entities": "Es sind keine Entitäten mit diesem Bereich verknüpft.", "unknown_error": "Unbekannter Fehler", "update": "Aktualisieren" }, @@ -2138,6 +2160,7 @@ "license": "Veröffentlicht unter der Apache 2.0 Lizenz", "path_configuration": "Pfad zu configuration.yaml: {path}", "server": "Server", + "setup_time": "Installationszeit", "source": "Quelle:", "system_health_error": "System Health-Komponente wird nicht geladen. Füge 'system_health:' zu configuration.yaml hinzu", "system_health": { @@ -2156,8 +2179,11 @@ "caption": "Integrationen", "config_entry": { "area": "In {area}", + "check_the_logs": "Prüfen Sie die Protokolle", + "configure": "Konfigurieren", "delete": "Löschen", "delete_confirm": "Möchtest du diese Integration wirklich löschen?", + "depends_on_cloud": "Abhängig von der Cloud", "device_unavailable": "Gerät nicht verfügbar", "devices": "{count} {count, plural,\n one {Gerät}\n other {Geräte}\n}", "disable_restart_confirm": "Home Assistant neu starten, um das Deaktivieren dieser Integration abzuschließen", @@ -2182,12 +2208,21 @@ "no_area": "Kein Bereich", "not_loaded": "Nicht geladen, prüfe die {logs_link}", "options": "Optionen", + "provided_by_custom_integration": "Bereitgestellt durch eine benutzerdefinierte Integration", "reload": "Neu laden", "reload_confirm": "Die Integration wurde neu geladen", "reload_restart_confirm": "Home Assistant neu starten, um das Neuladen dieser Integration abzuschließen", "rename": "Umbenennen", "restart_confirm": "Starte Home Assistant neu, um das Entfernen dieser Integration abzuschließen", "services": "{count} {count, plural,\n one {Dienst}\n other {Dienste}\n}", + "state": { + "failed_unload": "Entladen fehlgeschlagen", + "loaded": "Geladen", + "migration_error": "Migrationsfehler", + "not_loaded": "Nicht geladen", + "setup_error": "Fehler beim Einrichten", + "setup_retry": "Setup erneut versuchen" + }, "system_options": "Systemoptionen", "unnamed_entry": "Unbenannter Eintrag" }, @@ -2775,6 +2810,15 @@ "manufacturer_code_override": "Hersteller-Code Überschreiben", "value": "Wert" }, + "configuration_page": { + "shortcuts_title": "Verknüpfungen", + "update_button": "Konfiguration aktualisieren", + "zha_options": { + "default_light_transition": "Standard-Lichtübergangszeit (Sekunden)", + "enable_identify_on_join": "Aktivieren Sie den Identifikationseffekt, wenn Geräte dem Netzwerk beitreten", + "title": "Globale Optionen" + } + }, "device_pairing_card": { "CONFIGURED": "Konfiguration abgeschlossen", "CONFIGURED_status_text": "Initialisieren", @@ -2899,7 +2943,13 @@ "node_status": "Node Status", "zwave_info": "Z-Wave Info" }, + "logs": { + "log_level": "Protokollstufe", + "subscribed_to_logs": "Abonniert Z-Wave JS-Protokollnachrichten ...", + "title": "Z-Wave JS Protokolle" + }, "navigation": { + "logs": "Protokolle", "network": "Netzwerk" }, "network_status": { @@ -2914,6 +2964,9 @@ "header": "Z-Wave Gerätekonfiguration", "introduction": "Verwalten und Anpassen von gerätespezifischen Konfigurationsparametern (Knoten) für das ausgewählte Gerät", "parameter_is_read_only": "Dieser Parameter ist schreibgeschützt.", + "set_param_accepted": "Der Parameter wurde aktualisiert.", + "set_param_error": "Ein Fehler ist aufgetreten.", + "set_param_queued": "Die Parameteränderung wurde in die Warteschlange gestellt und wird beim Aufwachen des Geräts aktualisiert.", "zwave_js_device_database": "Z-Wave JS Gerätedatenbank" }, "node_status": { @@ -2923,6 +2976,16 @@ "dead": "Tot", "unknown": "Unbekannt" }, + "reinterview_node": { + "battery_device_warning": "Sie müssen batteriebetriebene Geräte aktivieren, bevor Sie den Neukonfigurationsvorgang starten. Anweisungen zum Aktivieren des Geräts finden Sie im Handbuch Ihres Geräts.", + "in_progress": "Das Gerät wird interviewt. Dies könnte eine Weile dauern.", + "interview_complete": "Geräteinterview abgeschlossen.", + "interview_failed": "Das Geräteinterview ist fehlgeschlagen. Zusätzliche Informationen sind möglicherweise in den Logs verfügbar.", + "introduction": "Starten Sie ein erneutes Geräteinterview auf Ihrem Z-Wave-Netzwerk. Verwenden Sie diese Funktion, wenn Ihr Gerät fehlende oder falsche Funktionen anzeigt.", + "run_in_background": "Sie können diesen Dialog schließen und das Interview wird im Hintergrund fortgesetzt.", + "start_reinterview": "Neues Interview starten", + "title": "Ein Z-Wave-Gerät erneut interviewen" + }, "remove_node": { "cancel_exclusion": "Entfernung von Geräten abbrechen", "controller_in_exclusion_mode": "Dein Z-Wave Controller befindet sich jetzt im Ausschluss-Modus", diff --git a/translations/frontend/en.json b/translations/frontend/en.json index 7dec5be191..fcbce548ea 100644 --- a/translations/frontend/en.json +++ b/translations/frontend/en.json @@ -1744,12 +1744,18 @@ "nabu_casa_account": "Nabu Casa Account", "not_connected": "Not Connected", "remote": { - "access_is_being_prepared": "Remote access is being prepared. We will notify you when it's ready.", + "access_is_being_prepared": "Remote control is being prepared. We will notify you when it's ready.", "certificate_info": "Certificate Info", + "connected": "Connected", "info": "Home Assistant Cloud provides a secure remote connection to your instance while away from home.", "instance_is_available": "Your instance is available at", "instance_will_be_available": "Your instance will be available at", "link_learn_how_it_works": "Learn how it works", + "not_connected": "Not Connected", + "remote_enabled": { + "caption": "Automatically connect", + "description": "Enable this option to make sure that your Home Assistant instance is always remotely accessible." + }, "title": "Remote Control" }, "sign_out": "Sign out", diff --git a/translations/frontend/es.json b/translations/frontend/es.json index 311e8ee226..e38c8bb6d5 100644 --- a/translations/frontend/es.json +++ b/translations/frontend/es.json @@ -1746,10 +1746,16 @@ "remote": { "access_is_being_prepared": "Se está preparando el acceso remoto. Te avisaremos cuando esté listo.", "certificate_info": "Información del certificado", + "connected": "Conectado", "info": "Home Assistant Cloud proporciona una conexión remota segura a tu instancia mientras estás fuera de casa.", "instance_is_available": "Tu instancia está disponible en", "instance_will_be_available": "Tu instancia estará disponible en", "link_learn_how_it_works": "Aprende cómo funciona", + "not_connected": "No conectado", + "remote_enabled": { + "caption": "Conectar automáticamente", + "description": "Habilite esta opción para asegurarse de que la instancia de Home Assistant siempre es accesible de forma remota." + }, "title": "Control remoto" }, "sign_out": "Cerrar sesión", @@ -2160,6 +2166,7 @@ "license": "Publicado bajo la licencia Apache 2.0", "path_configuration": "Ruta a configuration.yaml: {path}", "server": "servidor", + "setup_time": "Tiempo de configuración", "source": "Fuente:", "system_health_error": "El componente Estado del Sistema no está cargado. Añade 'system_health:' a configuration.yaml", "system_health": { @@ -2944,6 +2951,7 @@ }, "logs": { "log_level": "Nivel de registro", + "subscribed_to_logs": "Suscrito a los mensajes de registro de Z-Wave JS...", "title": "Registros de Z-Wave JS" }, "navigation": { diff --git a/translations/frontend/et.json b/translations/frontend/et.json index 8f900572ef..10c1342c9f 100644 --- a/translations/frontend/et.json +++ b/translations/frontend/et.json @@ -1744,12 +1744,18 @@ "nabu_casa_account": "Nabu Casa konto", "not_connected": "Pole ühendatud", "remote": { - "access_is_being_prepared": "Kaugjuurdepääs on ettevalmistamisel. Teavitame teid, kui see on valmis.", + "access_is_being_prepared": "Kaugjuurdepääsu seadistatakse. Teavitame kui see on saadaval.", "certificate_info": "Sertifikaadi teave", + "connected": "Ühendatud", "info": "Home Assistant Cloud pakub turvalist kaugühendust Home Assistantiga kodust eemal olles.", "instance_is_available": "Teie Home Assistant on saadaval aadressil", "instance_will_be_available": "Teie Home Assistanti aadressiks saab", "link_learn_how_it_works": "Loe kuidas see töötab", + "not_connected": "Ühendus puudub", + "remote_enabled": { + "caption": "Ühendu automaatselt", + "description": "Lubage see valik, et Home Assistantt oleks alati eemalt kättesaadav." + }, "title": "Kaugjuhtimine" }, "sign_out": "Logi välja", @@ -2160,6 +2166,7 @@ "license": "Avaldatud Apache 2.0 litsentsi alusel", "path_configuration": "configuration.yaml asukoht: {path}", "server": "server", + "setup_time": "Kellaaja suvandid", "source": "Allikas:", "system_health_error": "Süsteemi seisundi komponenti ei laadita. Lisage \"system_health:\" configuration.yaml", "system_health": { @@ -2944,6 +2951,7 @@ }, "logs": { "log_level": "Logimise tase", + "subscribed_to_logs": "Z-Wave JS Logi sõnumite tellimine...", "title": "Z-Wave JS logid" }, "navigation": { diff --git a/translations/frontend/nb.json b/translations/frontend/nb.json index 8be096c657..b4bb7eb2fc 100644 --- a/translations/frontend/nb.json +++ b/translations/frontend/nb.json @@ -1129,7 +1129,7 @@ "input_text": "Inngangstekster", "min_max": "Min/maks enheter", "mqtt": "Manuelt konfigurerte MQTT-enheter", - "person": "Mennesker", + "person": "Personer", "ping": "Ping binære sensorenheter", "reload": "{domain}", "rest": "Rest enheter og varsle tjenester", @@ -1197,7 +1197,13 @@ } }, "zha_reconfigure_device": { - "heading": "Konfigurerer enheten på nytt" + "attribute": "Attributt", + "button_hide": "Skjul detaljer", + "button_show": "Vis detaljer", + "configuring_alt": "Konfigurerer", + "heading": "Konfigurerer enheten på nytt", + "reporting_header": "Rapportering", + "start_reconfiguration": "Start rekonfigurasjon" } }, "duration": { @@ -1260,7 +1266,8 @@ "caption": "Områder", "data_table": { "area": "Område", - "devices": "Enheter" + "devices": "Enheter", + "entities": "Entiteter" }, "delete": { "confirmation_text": "Alle enheter som tilhører dette området vil ikke bli tildelt.", @@ -1272,6 +1279,7 @@ "create": "Opprett", "default_name": "Nytt område", "delete": "Slett", + "linked_entities_caption": "Entiteter", "name": "Navn", "name_required": "Navn er påkrevd", "unknown_error": "Ukjent feil", @@ -1728,10 +1736,15 @@ "remote": { "access_is_being_prepared": "Ekstern tilgang forberedes. Vi vil varsle deg når den er klar.", "certificate_info": "Sertifikatinformasjon", + "connected": "Tilkoblet", "info": "Home Assistant Cloud gir en sikker ekstern tilkobling til forekomsten din mens du er borte fra hjemmet.", "instance_is_available": "Din forekomst er tilgjengelig på", "instance_will_be_available": "Din forekomst vil være tilgjengelig på", "link_learn_how_it_works": "Lær hvordan det fungerer", + "not_connected": "Ikke tilkoblet", + "remote_enabled": { + "caption": "Koble til automatisk" + }, "title": "Fjernkontroll" }, "sign_out": "Logg ut", @@ -2645,7 +2658,7 @@ "introduction": "Noen deler av Home Assistant kan laste inn uten å kreve omstart. Hvis du trykker last på nytt, vil du bytte den nåværende konfigurasjonen med den nye.", "min_max": "Min/maks enheter", "mqtt": "Manuelt konfigurerte MQTT-enheter", - "person": "Mennesker", + "person": "Personer", "ping": "Ping binære sensorenheter", "reload": "{domain}", "rest": "Rest enheter og varsle tjenester", @@ -2925,6 +2938,7 @@ "zwave_info": "Z-Wave Informasjon" }, "navigation": { + "logs": "Logger", "network": "Nettverk" }, "network_status": { diff --git a/translations/frontend/nl.json b/translations/frontend/nl.json index 1a6d0fde8e..7fd95893b4 100644 --- a/translations/frontend/nl.json +++ b/translations/frontend/nl.json @@ -2160,6 +2160,7 @@ "license": "Gepubliceerd onder de Apache 2.0-licentie", "path_configuration": "Pad naar configuration.yaml: {path}", "server": "Server", + "setup_time": "Setup tijd", "source": "Bron:", "system_health_error": "De systeemstatus component is niet geladen. Voeg ' system_health: ' toe aan het configuratiebestand.", "system_health": { @@ -2942,7 +2943,13 @@ "node_status": "Knooppuntstatus", "zwave_info": "Z-Wave info" }, + "logs": { + "log_level": "Log niveau", + "subscribed_to_logs": "Geabonneerd op Z-Wave JS log berichten ...", + "title": "Z-Wave JS Logs" + }, "navigation": { + "logs": "Logs", "network": "Netwerk" }, "network_status": { diff --git a/translations/frontend/ru.json b/translations/frontend/ru.json index 9b0844d56b..99fcc62c57 100644 --- a/translations/frontend/ru.json +++ b/translations/frontend/ru.json @@ -1258,7 +1258,7 @@ "notification_toast": { "connection_lost": "Соединение потеряно. Повторное подключение...", "dismiss": "Закрыть", - "intergration_starting": "{integration} загружается, пока что не всё может быть доступно.", + "intergration_starting": "{integration} запускается, пока что не всё может быть доступно.", "service_call_failed": "Не удалось вызвать службу {service}.", "started": "Home Assistant работает!", "starting": "Home Assistant запускается, пока что не всё может быть доступно.", @@ -1510,7 +1510,7 @@ }, "modes": { "description": "Режим управляет тем, что происходит при срабатывании автоматизации, когда действия еще выполняются с предыдущего триггера. Ознакомьтесь с {documentation_link} для получения дополнительной информации.", - "documentation": "инструкциями", + "documentation": "документацией", "label": "Режим", "parallel": "Параллельный", "queued": "Очередь", @@ -1746,10 +1746,16 @@ "remote": { "access_is_being_prepared": "Удалённый доступ подготавливается. Мы сообщим Вам, когда он будет готов.", "certificate_info": "Информация о сертификате", + "connected": "Подключено", "info": "Home Assistant Cloud обеспечивает безопасное подключение к Вашему серверу, даже если Вы находитесь вдали от дома.", "instance_is_available": "Ваш Home Assistant доступен по адресу", "instance_will_be_available": "Ваш Home Assistant будет доступен по адресу", "link_learn_how_it_works": "Узнайте, как это работает", + "not_connected": "Не подключено", + "remote_enabled": { + "caption": "Подключаться автоматически", + "description": "Включите этот параметр, чтобы всегда иметь удалённый доступ к Вашему Home Assistant." + }, "title": "Удалённый доступ" }, "sign_out": "Выйти", @@ -1813,7 +1819,7 @@ "info_disable_webhook": "Если Вы больше не хотите использовать этот Webhook, Вы можете", "link_disable_webhook": "отключить его.", "managed_by_integration": "Этот Webhook управляется интеграцией и не может быть отключен.", - "view_documentation": "Инструкции", + "view_documentation": "Документация", "webhook_for": "Webhook для {name}" }, "forgot_password": { @@ -2160,6 +2166,7 @@ "license": "Опубликовано под лицензией Apache 2.0", "path_configuration": "Путь к configuration.yaml: {path}", "server": "сервер", + "setup_time": "Время запуска", "source": "Исходный код:", "system_health_error": "Компонент System Health не загружен. Добавьте 'system_health:' в файл configuration.yaml.", "system_health": { @@ -2612,7 +2619,7 @@ }, "modes": { "description": "Режим управляет тем, что происходит при выполнении скрипта, когда он всё ещё выполняются с предыдущего вызова. Ознакомьтесь с {documentation_link} для получения дополнительной информации.", - "documentation": "инструкциями", + "documentation": "документацией", "label": "Режим", "parallel": "Параллельный", "queued": "Очередь", @@ -2944,6 +2951,7 @@ }, "logs": { "log_level": "Уровень", + "subscribed_to_logs": "Подписано на сообщения журнала Z-Wave JS...", "title": "Журналы Z-Wave JS" }, "navigation": { diff --git a/translations/frontend/zh-Hans.json b/translations/frontend/zh-Hans.json index 10d2e71e6b..f7ab7ec2fb 100644 --- a/translations/frontend/zh-Hans.json +++ b/translations/frontend/zh-Hans.json @@ -1746,10 +1746,16 @@ "remote": { "access_is_being_prepared": "正在准备远程访问。准备就绪后，我们会通知您。", "certificate_info": "证书信息", + "connected": "已连接", "info": "Home Assistant Cloud可以在您不在家时为您的实例提供安全的远程连接。", "instance_is_available": "您的实例在以下位置可用", "instance_will_be_available": "您的实例将在以下位置可用", "link_learn_how_it_works": "了解其工作原理", + "not_connected": "未连接", + "remote_enabled": { + "caption": "自动连接", + "description": "要使 Home Assistant 始终可以远程访问，请启用此选项。" + }, "title": "远程控制" }, "sign_out": "退出", @@ -2160,6 +2166,7 @@ "license": "根据 Apache 2.0 许可发布", "path_configuration": "configuration.yaml 路径：{path}", "server": "服务器", + "setup_time": "安装时间", "source": "源：", "system_health_error": "未加载系统健康组件。请将 'system_health:' 添加到 configuration.yaml", "system_health": { @@ -2944,6 +2951,7 @@ }, "logs": { "log_level": "日志级别", + "subscribed_to_logs": "已订阅 Z-Wave JS 日志消息...", "title": "Z-Wave JS 日志" }, "navigation": { diff --git a/translations/frontend/zh-Hant.json b/translations/frontend/zh-Hant.json index cdde3715a2..c5d1f936d8 100644 --- a/translations/frontend/zh-Hant.json +++ b/translations/frontend/zh-Hant.json @@ -2160,6 +2160,7 @@ "license": "依據 Apache 2.0 授權許可發行", "path_configuration": "configuration.yaml 路徑：{path}", "server": "伺服器", + "setup_time": "設定時間", "source": "來源：", "system_health_error": "系統健康元件未載入。請於 configuration.yaml 內加入「system_health:」", "system_health": { @@ -2944,6 +2945,7 @@ }, "logs": { "log_level": "日誌記錄等級", + "subscribed_to_logs": "訂閱 Z-Wave JS 日誌訊息...", "title": "Z-Wave JS 日誌" }, "navigation": { From cee166839aaca7686e82353c955aaadebe9b870d Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 3 May 2021 05:41:00 +0200 Subject: [PATCH 10/13] Bump Lit element (#9068) --- package.json | 4 ++-- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index ca749272ae..3a3708fa12 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "js-yaml": "^3.13.1", "leaflet": "^1.4.0", "leaflet-draw": "^1.0.4", - "lit-element": "^2.4.0", + "lit-element": "^2.5.0", "lit-html": "^1.4.0", "lit-virtualizer": "^0.4.2", "marked": "2.0.0", @@ -242,7 +242,7 @@ "@webcomponents/webcomponentsjs": "^2.2.10", "@polymer/polymer": "3.1.0", "lit-html": "1.4.0", - "lit-element": "2.4.0" + "lit-element": "2.5.0" }, "main": "src/home-assistant.js", "husky": { diff --git a/yarn.lock b/yarn.lock index cc2393bca3..113e25d4c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8739,10 +8739,10 @@ lit-analyzer@1.2.1, lit-analyzer@^1.2.1: vscode-html-languageservice "3.1.0" web-component-analyzer "~1.1.1" -lit-element@2.4.0, lit-element@^2.0.0, lit-element@^2.2.1, lit-element@^2.3.0, lit-element@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-2.4.0.tgz#b22607a037a8fc08f5a80736dddf7f3f5d401452" - integrity sha512-pBGLglxyhq/Prk2H91nA0KByq/hx/wssJBQFiYqXhGDvEnY31PRGYf1RglVzyLeRysu0IHm2K0P196uLLWmwFg== +lit-element@2.5.0, lit-element@^2.0.0, lit-element@^2.2.1, lit-element@^2.3.0, lit-element@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-2.5.0.tgz#218773185d30cab8cb7baabcddd9182f6e7bc14b" + integrity sha512-SS6Bmm7FYw/RVeD6YD3gAjrT0ss6rOQHaacUnDCyVE3sDuUpEmr+Gjl0QUHnD8+0mM5apBbnA60NkFJ2kqcOMA== dependencies: lit-html "^1.1.1" From 9dc864d486b72ac0051f70244e831c93b2e05417 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 3 May 2021 05:42:04 +0200 Subject: [PATCH 11/13] Break word if possible instead if break anywhere (#9076) --- src/panels/config/integrations/ha-integration-card.ts | 2 +- src/panels/config/integrations/ha-integration-header.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/panels/config/integrations/ha-integration-card.ts b/src/panels/config/integrations/ha-integration-card.ts index 6616241710..44cd2866c7 100644 --- a/src/panels/config/integrations/ha-integration-card.ts +++ b/src/panels/config/integrations/ha-integration-card.ts @@ -640,7 +640,7 @@ export class HaIntegrationCard extends LitElement { margin-left: 8px; padding-top: 2px; padding-right: 2px; - word-wrap: break-word; + overflow-wrap: break-word; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 7; diff --git a/src/panels/config/integrations/ha-integration-header.ts b/src/panels/config/integrations/ha-integration-header.ts index 3e49fe81d4..29cf8d3544 100644 --- a/src/panels/config/integrations/ha-integration-header.ts +++ b/src/panels/config/integrations/ha-integration-header.ts @@ -147,7 +147,7 @@ export class HaIntegrationHeader extends LitElement { margin-top: 16px; margin-right: 2px; font-weight: 400; - line-break: anywhere; + word-break: break-word; color: var(--primary-text-color); } .secondary { From 193cb46d6007d544fa37febb8887026046010173 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 3 May 2021 15:47:03 +0200 Subject: [PATCH 12/13] Config flow: Show next when not last step (#9078) --- src/dialogs/config-flow/step-flow-form.ts | 4 +++- src/translations/en.json | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/dialogs/config-flow/step-flow-form.ts b/src/dialogs/config-flow/step-flow-form.ts index 75aeb92d0b..5c569873d6 100644 --- a/src/dialogs/config-flow/step-flow-form.ts +++ b/src/dialogs/config-flow/step-flow-form.ts @@ -83,7 +83,9 @@ class StepFlowForm extends LitElement { @click=${this._submitStep} .disabled=${!allRequiredInfoFilledIn} >${this.hass.localize( - "ui.panel.config.integrations.config_flow.submit" + `ui.panel.config.integrations.config_flow.${ + this.step.last_step === false ? "next" : "submit" + }` )} diff --git a/src/translations/en.json b/src/translations/en.json index 108f4cf94f..ff075ced07 100755 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2191,6 +2191,7 @@ "dismiss": "Dismiss dialog", "finish": "Finish", "submit": "Submit", + "next": "Next", "not_all_required_fields": "Not all required fields are filled in.", "error_saving_area": "Error saving area: {error}", "created_config": "Created configuration for {name}.", From c29cf7f77c797dc47e6e3f0cf03fc667bf893c29 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 3 May 2021 15:47:44 +0200 Subject: [PATCH 13/13] Bumped version to 20210503.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 295dc3cd1f..a47250acad 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name="home-assistant-frontend", - version="20210430.0", + version="20210503.0", description="The Home Assistant frontend", url="https://github.com/home-assistant/home-assistant-polymer", author="The Home Assistant Authors",