Skip to content

Commit

Permalink
Merge branch 'master' into duckdb
Browse files Browse the repository at this point in the history
  • Loading branch information
Pierre-Gilles authored Jul 15, 2024
2 parents 6af8b39 + 41755fd commit 38c43fb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions front/src/config/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@
"modes": {
"local": {
"title": "Installation depuis Gladys",
"description": "Gladys va configurer deux containers Docker : MQTT and Zigbee2mqtt.",
"description": "Gladys va configurer deux containers Docker : MQTT et Zigbee2mqtt.",
"dockerInstallationRequirementLabel": "Gladys doit s'exécuter sous Docker",
"dockerNetworkHostRequirementLabel": "Le conteneur Docker de Gladys doit être démarré avec l'option \"network=host\"",
"usbDongleRequirementLabel": "Le dongle USB Zigbee doit être connecté",
Expand All @@ -875,7 +875,7 @@
"remote": {
"title": "Connexion à une installation existante",
"description": "Gladys va se connecter à une installation externe existante à travers MQTT.",
"z2mInstallationRequirementLabel": "Une application Zigbe2Mqtt autonome",
"z2mInstallationRequirementLabel": "Une application Zigbee2Mqtt autonome",
"mqttBrokerRequirementLabel": "Un broker MQTT connecté à l'application Zigbee2Mqtt",
"detailsDescription": "Avec ce mode de configuration, il est possible de se connecter à une installation Zigbee2Mqtt externe avec son broker MQTT.",
"mqttModeLabel": "Choix du broker MQTT",
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gladys",
"version": "4.43.0",
"version": "4.44.0",
"description": "A privacy-first, open-source home assistant",
"main": "index.js",
"engines": {
Expand Down

0 comments on commit 38c43fb

Please sign in to comment.