deCONZ: Update ingress, docs and a few corrections [2] (#4161)

* Update deCONZ: Ingress, discovery, doc, translations and a few corrections

* Update for coderabbitai

* Update for coderabbitai_2

* Update for coderabbitai_3

* Added some suggestions from coderabbitai

* Update for coderabbitai_4

* Update for coderabbitai_5

* Update for coderabbitai_6

* Update for coderabbitai_7

* Update for coderabbitai_8

* Update ingress.html

* Update ingress_2

* Update ingress_3

* Change DOC.md and remove clean cache

* Revert to device

* Remove the constants

* Revert to net.wait_for

* Add --focus-color

* Revert ripple.remove

* Add var(--button-hover-color)

* Small correction in the DOC

* Spaces removed

* Update for coderabbitai_doc

* Bump deCONZ to v2.31.2

* Update discovery

* Revert otau-ledvance script

* Update CHANGELOG.md

* Remove German translation file

* Small correction in the otau-ledvance script

* Revert discovery

* Update CHANGELOG.md

* Remove deCONZ 2.31.2

* Update to TigerVNC link

* Update to version: 8.4.0

* Update CHANGELOG.md

Author: mattreim

README.md

@@ -19,7 +19,7 @@ systems that have installed Home Assistant.
 
 - **[deCONZ](/deconz/README.md)**
 
-    Control a Zigbee network using ConBee or RaspBee hardware by Dresden Elektronik.
+    Control a Zigbee network using ConBee or RaspBee hardware by dresden elektronik.
 
 - **[DHCP server](/dhcp_server/README.md)**
 

deconz/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 8.4.0
+
+- Ingress entry page revised (for example, light and dark mode)
+- Update DOCS.md and a few naming corrections
+- Expand English translation
+
 ## 8.3.0
 
 - Bump deCONZ to 2.31.2 [[CHANGELOG](https://github.com/dresden-elektronik/deconz-rest-plugin/releases/tag/v2.31.2)]

deconz/DOCS.md

@@ -28,20 +28,20 @@ The add-on needs to know where your ConBee/RaspBee can be found, and therefore,
 you'll need to configure the add-on to point to the right device.
 
 If you're using Home Assistant you may find the correct value for this on the
-`Settings -> System -> Hardware` page. It is recommended
+**Settings** -> **System** -> **Hardware** -> **All hardware** page. It is recommended
 to use a "by-id" path to the device if one exists, as it is not subject to
 change if other devices are added to the system.
 
 1. Replace `null` in the `device` option in the add-on configuration and specify
-   the device name in quotes: e.g. something like
+   the device name in quotes: e.g. something like <br>
    `"/dev/serial/by-id/usb-dresden_elektronik_ingenieurtechnik_GmbH_ConBee_II_XXXXXXXX-if00"`,
    `"/dev/ttyUSB0"`, `"/dev/ttyAMA0"`, or `"/dev/ttyACM0"`.
 2. Click on "SAVE" to save the add-on configuration.
 3. Toggle the "Show in sidebar" to add it to your Home Assistant side bar.
 4. Start the add-on.
 
-After installing and starting this add-on, access the deCONZ WebUI ("Phoscon")
-with "WEB UI" button.
+After installing and launching this add-on, you can select **deCONZ** under web UI to access
+the deCONZ GUI via VNC, or select **Phoscon** to configure the settings in the Phoscon App.
 
 ## Configuring the Home Assistant deCONZ integration
 
@@ -56,14 +56,14 @@ follow these instructions to configure the deCONZ integration:
 
 <https://www.home-assistant.io/integrations/deconz/>
 
-## Migrating to this Add-on
+## Migrating to this add-on
 
-To migrate deCONZ to Home Assistant and this add-on, backup your deCONZ config via the
-Phoscon WebUI, then restore that config after installing/reinstalling.
+To migrate deCONZ to Home Assistant and this add-on, back up your configuration via
+the Phoscon App and restore it after installation/reinstallation.
 
 **_You must perform these steps or your Light, Group names and other data will be lost!_**
 
-However, your Zigbee devices will still paired to your ConBee or RaspBee hardware.
+However, your Zigbee devices will still be paired to your ConBee or RaspBee hardware.
 
 ## Accessing the deCONZ application and viewing the mesh via VNC
 
@@ -89,10 +89,9 @@ settings.
 
 ## Upgrading RaspBee and ConBee firmware
 
-This add-on allows you to upgrade your firmware straight from the Phoscon
-web interface with ease.
+This add-on allows you to upgrade your firmware straight from the Phoscon App with ease.
 
-Go to "Settings -> Gateway" and click the upgrade button.
+In the Phoscon App, go to **Settings** -> **Gateway**, then select the upgrade button.
 
 However, some USB sticks (like the Aeotec Z-Wave sticks), can interfere with
 the upgrade process, causing the firmware upgrade to fail silently. If you end
@@ -107,17 +106,15 @@ Some add-ons are capable of consuming the deCONZ API directly. Node-RED is
 one of those applications, that is available as an add-on, that can
 consume the deCONZ API using the `node-red-contrib-deconz` node.
 
-**WARNING** Do not use the following settings to set up a integration manually
-from within Home Assistant!
+**WARNING:** Do not use these settings to set up an integration in Home Assistant.
 
 To allow these add-ons to connect to deCONZ, use the following settings:
 
 - **Host**: `core-deconz`
 - **(API) Port**: `40850`
 - **WebSocket Port**: `8081`
 
-_Please note: the above settings are likely to change in a future update
-of this add-on._
+_Note: The above settings are likely to change in a future update of this add-on._
 
 ## Advanced debug output control
 
@@ -154,13 +151,14 @@ device: /dev/ttyAMA0
 The device address of your ConBee/RaspBee.
 
 If you're using Home Assistant you may find the correct value for this on the
-`Supervisor -> System -> Host system -> Hardware` page. It is recommended
+**Settings** -> **System** -> **Hardware** -> **All hardware** page. It is recommended
 to use a "by-id" path to the device if one exists, as it is not subject to
 change if other devices are added to the system.
 
 In most cases this looks like one of the following:
 
-- `"/dev/serial/by-id/usb-dresden_elektronik_ingenieurtechnik_GmbH_ConBee_II_XXXXXXXX-if00"` (and similar for RaspBee and the original ConBee, replace `XXXXXXXX` with the value you see in your above mentioned hardware page)
+- `"/dev/serial/by-id/usb-dresden_elektronik_ingenieurtechnik_GmbH_ConBee_II_XXXXXXXX-if00"` <br> 
+   (and similar for RaspBee and the original ConBee, replace `XXXXXXXX` with the value you see in your above mentioned hardware page)
 - `"/dev/ttyUSB0"`
 - `"/dev/ttyAMA0"`
 - `"/dev/ttyACM0"`
@@ -179,15 +177,14 @@ fails to communicate new settings to Home Assistant.
 
 This can be solved by the following steps:
 
-1. Backup your deCONZ data, by going into the Web UI, from the menu choose:
-  **Settings** -> **Gateway** -> **Backup Option** button, next create
+1. Backup your deCONZ/Phoscon data, by going into the Phoscon App, from the menu choose:
+  **Settings** -> **Gateway** -> **Backup options**, then create
   a new backup and download it onto your computer.
 2. Uninstall the add-on.
 3. In Home Assistant, remove the current integration you have for deCONZ.
 4. Restart Home Assistant.
 5. Install the deCONZ add-on again, and configure it again according to the [instructions](#configure-the-add-on).
-6. Restore the backup you created at the first step at the same location
-   in the Web UI as before.
+6. Restore the backup you created at the first step at the same location in the Phoscon App as before.
 7. Restart the add-on and next, restart Home Assistant once more.
 8. Follow the instructions on [setting up the deCONZ integration](#configuring-the-home-assistant-deconz-integration).
 
@@ -235,5 +232,5 @@ In case you've found a bug, please [open an issue on our GitHub][issue].
 [issue]: https://github.com/home-assistant/addons/issues
 [manual-upgrade]: https://github.com/dresden-elektronik/deconz-rest-plugin/wiki/Update-deCONZ-manually
 [reddit]: https://reddit.com/r/homeassistant
-[vnc-viewer]: https://bintray.com/tigervnc/stable/tigervnc/
+[vnc-viewer]: https://tigervnc.org
 [vnc-service-url]: vnc://homeassistant.local:5900

deconz/README.md

@@ -2,7 +2,7 @@
 
 ![Supports aarch64 Architecture][aarch64-shield] ![Supports amd64 Architecture][amd64-shield] ![Supports armhf Architecture][armhf-shield] ![Supports armv7 Architecture][armv7-shield] ![Supports i386 Architecture][i386-shield]
 
-Control a Zigbee network using ConBee or RaspBee hardware by Dresden Elektronik.
+Control a Zigbee network using ConBee or RaspBee hardware by dresden elektronik.
 
 [aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg

deconz/config.yaml

@@ -1,9 +1,9 @@
 ---
-version: 8.3.0
+version: 8.4.0
 slug: deconz
 name: deCONZ
 description: >-
-  Control a Zigbee network with ConBee or RaspBee by Dresden Elektronik
+  Control a Zigbee network with ConBee or RaspBee by dresden elektronik
 url: https://github.com/home-assistant/addons/tree/master/deconz
 apparmor: false
 arch:

deconz/rootfs/etc/services.d/otau-ikea/run

@@ -12,7 +12,7 @@ mkdir -p "/data/otau"
 bashio::log.info "Running the IKEA OTA updater..."
 
 if ! IKEA_DATA="$(curl -sL ${URL_IKEA})"; then
-    bashio::log.info "Can't fetch data from ikea!"
+    bashio::log.info "Can't fetch data from IKEA!"
     exec sleep 18000
 fi
 

deconz/rootfs/etc/services.d/otau-ledvance/run

@@ -2,18 +2,18 @@
 # vim: ft=bash
 # shellcheck shell=bash
 # ==============================================================================
-# Download available firmware update for OSRAM Ledvance
+# Download available firmware update for OSRAM LEDVANCE
 # ==============================================================================
 readonly URL_OSRAM="https://api.update.ledvance.com/v1/zigbee/firmwares"
 
 # Ensure otau folder exists
 mkdir -p "/data/otau"
 
-bashio::log.info "Running the OSRAM LEdvance OTA updater..."
+bashio::log.info "Running the OSRAM LEDVANCE OTA updater..."
 
 # fetch data
 if ! OSRAM_DATA="$(curl -sL ${URL_OSRAM})"; then
-    bashio::log.info "Can't fetch data from osram!"
+    bashio::log.info "Can't fetch data from OSRAM!"
     exec sleep 18000
 fi