From 8db215223024005fceedb078f801ca35305a5505 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 30 Jan 2019 17:37:56 -0800
Subject: [PATCH 01/45] Bumped version to 0.87.0b0

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 8701c682920..48253c2eb6e 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 87
-PATCH_VERSION = '0.dev0'
+PATCH_VERSION = '0b0'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From 0400e29f7a887be1e191f0c727f20eaaf3be6b3f Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Fri, 1 Feb 2019 12:50:48 -0800
Subject: [PATCH 02/45] Updated frontend to 20190201.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index 5613bdff3ff..8f3afef16cd 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -24,7 +24,7 @@ from homeassistant.core import callback
 from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 
-REQUIREMENTS = ['home-assistant-frontend==20190130.1']
+REQUIREMENTS = ['home-assistant-frontend==20190201.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index de8ad8c7914..4605eb7b870 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -526,7 +526,7 @@ hole==0.3.0
 holidays==0.9.9
 
 # homeassistant.components.frontend
-home-assistant-frontend==20190130.1
+home-assistant-frontend==20190201.0
 
 # homeassistant.components.zwave
 homeassistant-pyozw==0.1.2
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index a56626734eb..ec2c9153137 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -113,7 +113,7 @@ hdate==0.8.7
 holidays==0.9.9
 
 # homeassistant.components.frontend
-home-assistant-frontend==20190130.1
+home-assistant-frontend==20190201.0
 
 # homeassistant.components.homekit_controller
 homekit==0.12.2

From 557b745053a086f73643801708be6f6b0735be00 Mon Sep 17 00:00:00 2001
From: emkay82 <37954256+emkay82@users.noreply.github.com>
Date: Fri, 1 Feb 2019 14:53:40 +0100
Subject: [PATCH 03/45] Fix pjlink issue (#20510)

* Fix issue #16606

Some projectors do not respond to pjlink requests during a short period after the status changes or when its in standby, resulting in pypjlink2 throwing an error. This fix catches these errors. Furthermore, only the status 'on' and 'warm-up' is interpreted as switched on, because 'cooling' is actually a switched off status.

* Update pjlink.py

Improved error handling

* Update pjlink.py

Improved error handling

* Update pjlink.py

Clean up
---
 .../components/media_player/pjlink.py         | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/media_player/pjlink.py b/homeassistant/components/media_player/pjlink.py
index 168cde4a792..0609b75f98d 100644
--- a/homeassistant/components/media_player/pjlink.py
+++ b/homeassistant/components/media_player/pjlink.py
@@ -93,15 +93,31 @@ class PjLinkDevice(MediaPlayerDevice):
 
     def update(self):
         """Get the latest state from the device."""
+        from pypjlink.projector import ProjectorError
         with self.projector() as projector:
-            pwstate = projector.get_power()
-            if pwstate == 'off':
-                self._pwstate = STATE_OFF
-            else:
-                self._pwstate = STATE_ON
-            self._muted = projector.get_mute()[1]
-            self._current_source = \
-                format_input_source(*projector.get_input())
+            try:
+                pwstate = projector.get_power()
+                if pwstate in ('on', 'warm-up'):
+                    self._pwstate = STATE_ON
+                else:
+                    self._pwstate = STATE_OFF
+                self._muted = projector.get_mute()[1]
+                self._current_source = \
+                    format_input_source(*projector.get_input())
+            except KeyError as err:
+                if str(err) == "'OK'":
+                    self._pwstate = STATE_OFF
+                    self._muted = False
+                    self._current_source = None
+                else:
+                    raise
+            except ProjectorError as err:
+                if str(err) == 'unavailable time':
+                    self._pwstate = STATE_OFF
+                    self._muted = False
+                    self._current_source = None
+                else:
+                    raise
 
     @property
     def name(self):

From ca729b178bd893dbf4d8605c494cb2482e6c7322 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Fri, 1 Feb 2019 14:09:23 -0800
Subject: [PATCH 04/45] Fix geofency requiring a configuration.yaml entry
 (#20631)

---
 homeassistant/components/geofency/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/geofency/__init__.py b/homeassistant/components/geofency/__init__.py
index 239af14add8..f58580b83c7 100644
--- a/homeassistant/components/geofency/__init__.py
+++ b/homeassistant/components/geofency/__init__.py
@@ -68,8 +68,8 @@ WEBHOOK_SCHEMA = vol.Schema({
 
 async def async_setup(hass, hass_config):
     """Set up the Geofency component."""
-    config = hass_config[DOMAIN]
-    mobile_beacons = config[CONF_MOBILE_BEACONS]
+    config = hass_config.get(DOMAIN, {})
+    mobile_beacons = config.get(CONF_MOBILE_BEACONS, [])
     hass.data[DOMAIN] = [slugify(beacon) for beacon in mobile_beacons]
     return True
 

From 1a5028f56f91740a7f14e7522c2ecfdb6045926d Mon Sep 17 00:00:00 2001
From: Kevin Fronczak <kfronczak@gmail.com>
Date: Fri, 1 Feb 2019 00:52:30 -0800
Subject: [PATCH 05/45] Upgrade blinkpy to re-enable motion detection (#20651)

---
 homeassistant/components/blink/__init__.py | 2 +-
 requirements_all.txt                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/blink/__init__.py b/homeassistant/components/blink/__init__.py
index 57500fcc8a6..82815d11a6e 100644
--- a/homeassistant/components/blink/__init__.py
+++ b/homeassistant/components/blink/__init__.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
     CONF_BINARY_SENSORS, CONF_SENSORS, CONF_FILENAME,
     CONF_MONITORED_CONDITIONS, TEMP_FAHRENHEIT)
 
-REQUIREMENTS = ['blinkpy==0.11.2']
+REQUIREMENTS = ['blinkpy==0.12.1']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 4605eb7b870..22bed82f26b 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -199,7 +199,7 @@ bellows==0.7.0
 bimmer_connected==0.5.3
 
 # homeassistant.components.blink
-blinkpy==0.11.2
+blinkpy==0.12.1
 
 # homeassistant.components.light.blinksticklight
 blinkstick==1.1.8

From 47660f9312f8c4307f3f77144c89ebcf8992ba37 Mon Sep 17 00:00:00 2001
From: zewelor <zewelor@gmail.com>
Date: Fri, 1 Feb 2019 10:59:05 +0100
Subject: [PATCH 06/45] Fix parsing yeelight custom effects, when not present
 in config (#20658)

---
 homeassistant/components/light/yeelight.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/light/yeelight.py b/homeassistant/components/light/yeelight.py
index 249f542325f..b678fcd2799 100644
--- a/homeassistant/components/light/yeelight.py
+++ b/homeassistant/components/light/yeelight.py
@@ -193,8 +193,14 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
             name = device_config[CONF_NAME]
             _LOGGER.debug("Adding configured %s", name)
 
-            custom_effects = _parse_custom_effects(config[CONF_CUSTOM_EFFECTS])
             device = {'name': name, 'ipaddr': ipaddr}
+
+            if CONF_CUSTOM_EFFECTS in config:
+                custom_effects = \
+                    _parse_custom_effects(config[CONF_CUSTOM_EFFECTS])
+            else:
+                custom_effects = None
+
             light = YeelightLight(device, device_config,
                                   custom_effects=custom_effects)
             lights.append(light)

From c702e1e3c648c7c9d376e66e691a96f5ca89ec78 Mon Sep 17 00:00:00 2001
From: emontnemery <erik@montnemery.com>
Date: Fri, 1 Feb 2019 17:14:02 +0100
Subject: [PATCH 07/45] Add PLATFORM_SCHEMA_BASE support to check_config.py
 (#20663)

---
 homeassistant/scripts/check_config.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/homeassistant/scripts/check_config.py b/homeassistant/scripts/check_config.py
index 50463c28bd1..67bc97da992 100644
--- a/homeassistant/scripts/check_config.py
+++ b/homeassistant/scripts/check_config.py
@@ -345,14 +345,21 @@ def check_ha_config_file(hass):
                 _comp_error(ex, domain, config)
                 continue
 
-        if not hasattr(component, 'PLATFORM_SCHEMA'):
+        if (not hasattr(component, 'PLATFORM_SCHEMA') and
+                not hasattr(component, 'PLATFORM_SCHEMA_BASE')):
             continue
 
         platforms = []
         for p_name, p_config in config_per_platform(config, domain):
             # Validate component specific platform schema
             try:
-                p_validated = component.PLATFORM_SCHEMA(p_config)
+                if hasattr(component, 'PLATFORM_SCHEMA_BASE'):
+                    p_validated = \
+                        component.PLATFORM_SCHEMA_BASE(  # type: ignore
+                            p_config)
+                else:
+                    p_validated = component.PLATFORM_SCHEMA(  # type: ignore
+                        p_config)
             except vol.Invalid as ex:
                 _comp_error(ex, domain, config)
                 continue

From e4d76d5c4428715753fd1c127506e9aec0c2e889 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20V=C3=B6lker?= <oliver@voelker.me>
Date: Fri, 1 Feb 2019 18:35:49 +0100
Subject: [PATCH 08/45] InfluxDB - change connection test method (#20666)

---
 homeassistant/components/sensor/influxdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/influxdb.py b/homeassistant/components/sensor/influxdb.py
index 9f34580344c..35229c2a805 100644
--- a/homeassistant/components/sensor/influxdb.py
+++ b/homeassistant/components/sensor/influxdb.py
@@ -111,7 +111,7 @@ class InfluxSensor(Entity):
             database=database, ssl=influx_conf['ssl'],
             verify_ssl=influx_conf['verify_ssl'])
         try:
-            influx.query("SHOW DIAGNOSTICS;")
+            influx.query("SHOW SERIES LIMIT 1;")
             self.connected = True
             self.data = InfluxSensorData(
                 influx, query.get(CONF_GROUP_FUNCTION), query.get(CONF_FIELD),

From 224c2588762e067a6621486a2fa080012508906a Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Fri, 1 Feb 2019 14:35:23 -0800
Subject: [PATCH 09/45] Bumped version to 0.87.0b1

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 48253c2eb6e..5204d17f580 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 87
-PATCH_VERSION = '0b0'
+PATCH_VERSION = '0b1'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From 61b2f1bff0d79fd081f52935758003abc8d54f54 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sat, 2 Feb 2019 14:02:50 -0800
Subject: [PATCH 10/45] Update translations

---
 .../ambient_station/.translations/ca.json     | 19 ++++++++
 .../ambient_station/.translations/ko.json     | 19 ++++++++
 .../ambient_station/.translations/lb.json     | 19 ++++++++
 .../ambient_station/.translations/ru.json     | 19 ++++++++
 .../.translations/zh-Hant.json                | 19 ++++++++
 .../components/auth/.translations/pl.json     |  2 +-
 .../components/auth/.translations/sl.json     |  2 +-
 .../components/auth/.translations/uk.json     |  5 ++
 .../daikin/.translations/zh-Hans.json         | 19 ++++++++
 .../components/deconz/.translations/en.json   |  2 +-
 .../components/deconz/.translations/pl.json   |  4 +-
 .../dialogflow/.translations/sl.json          |  4 +-
 .../dialogflow/.translations/zh-Hans.json     |  5 ++
 .../emulated_roku/.translations/es.json       | 17 +++++++
 .../emulated_roku/.translations/ko.json       |  2 +-
 .../emulated_roku/.translations/lb.json       | 21 ++++++++
 .../emulated_roku/.translations/pl.json       | 21 ++++++++
 .../emulated_roku/.translations/sl.json       | 21 ++++++++
 .../emulated_roku/.translations/zh-Hans.json  | 17 +++++++
 .../emulated_roku/.translations/zh-Hant.json  | 21 ++++++++
 .../components/esphome/.translations/es.json  | 25 ++++++++++
 .../components/esphome/.translations/ko.json  |  2 +-
 .../components/esphome/.translations/pl.json  |  6 +--
 .../esphome/.translations/zh-Hans.json        | 27 +++++++++++
 .../components/geofency/.translations/es.json |  8 ++++
 .../components/geofency/.translations/pl.json | 18 +++++++
 .../components/geofency/.translations/sl.json | 18 +++++++
 .../geofency/.translations/zh-Hans.json       | 15 ++++++
 .../geofency/.translations/zh-Hant.json       | 18 +++++++
 .../gpslogger/.translations/ca.json           | 18 +++++++
 .../gpslogger/.translations/en.json           | 30 ++++++------
 .../gpslogger/.translations/es.json           |  8 ++++
 .../gpslogger/.translations/ko.json           | 18 +++++++
 .../gpslogger/.translations/lb.json           | 18 +++++++
 .../gpslogger/.translations/no.json           | 18 +++++++
 .../gpslogger/.translations/pl.json           | 18 +++++++
 .../gpslogger/.translations/ru.json           | 17 +++++++
 .../gpslogger/.translations/sl.json           | 18 +++++++
 .../gpslogger/.translations/zh-Hans.json      |  7 +++
 .../gpslogger/.translations/zh-Hant.json      | 18 +++++++
 .../homematicip_cloud/.translations/sl.json   |  6 +--
 .../.translations/zh-Hans.json                |  2 +-
 .../components/hue/.translations/pl.json      |  2 +-
 .../components/hue/.translations/sl.json      |  2 +-
 .../components/ifttt/.translations/sl.json    |  4 +-
 .../components/locative/.translations/ca.json | 18 +++++++
 .../components/locative/.translations/en.json | 30 ++++++------
 .../components/locative/.translations/ko.json | 18 +++++++
 .../components/locative/.translations/lb.json | 18 +++++++
 .../components/locative/.translations/no.json | 18 +++++++
 .../components/locative/.translations/pl.json | 18 +++++++
 .../components/locative/.translations/ru.json | 17 +++++++
 .../components/locative/.translations/sl.json | 18 +++++++
 .../locative/.translations/zh-Hans.json       | 15 ++++++
 .../locative/.translations/zh-Hant.json       | 18 +++++++
 .../components/mailgun/.translations/sl.json  |  4 +-
 .../mailgun/.translations/zh-Hans.json        |  9 +++-
 .../components/mqtt/.translations/sl.json     |  2 +-
 .../nest/.translations/zh-Hans.json           |  4 +-
 .../components/openuv/.translations/ca.json   |  4 +-
 .../point/.translations/zh-Hans.json          | 11 ++++-
 .../rainmachine/.translations/zh-Hans.json    |  4 +-
 .../simplisafe/.translations/zh-Hans.json     |  2 +-
 .../smartthings/.translations/ca.json         | 27 +++++++++++
 .../smartthings/.translations/en.json         | 48 +++++++++----------
 .../smartthings/.translations/lb.json         | 27 +++++++++++
 .../smartthings/.translations/pl.json         | 10 ++++
 .../smartthings/.translations/zh-Hant.json    | 27 +++++++++++
 .../tellduslive/.translations/ca.json         |  4 ++
 .../tellduslive/.translations/en.json         |  1 +
 .../tellduslive/.translations/es.json         | 10 ++++
 .../tellduslive/.translations/ko.json         |  4 ++
 .../tellduslive/.translations/lb.json         |  4 ++
 .../tellduslive/.translations/no.json         |  4 ++
 .../tellduslive/.translations/pl.json         |  4 ++
 .../tellduslive/.translations/ru.json         |  4 ++
 .../tellduslive/.translations/sl.json         |  4 ++
 .../tellduslive/.translations/zh-Hans.json    | 24 ++++++++++
 .../tellduslive/.translations/zh-Hant.json    |  4 ++
 .../components/twilio/.translations/sl.json   |  4 +-
 .../twilio/.translations/zh-Hans.json         | 13 ++++-
 .../components/upnp/.translations/sl.json     |  2 +-
 .../upnp/.translations/zh-Hans.json           |  8 +++-
 .../components/zha/.translations/zh-Hans.json | 13 ++++-
 84 files changed, 981 insertions(+), 92 deletions(-)
 create mode 100644 homeassistant/components/ambient_station/.translations/ca.json
 create mode 100644 homeassistant/components/ambient_station/.translations/ko.json
 create mode 100644 homeassistant/components/ambient_station/.translations/lb.json
 create mode 100644 homeassistant/components/ambient_station/.translations/ru.json
 create mode 100644 homeassistant/components/ambient_station/.translations/zh-Hant.json
 create mode 100644 homeassistant/components/daikin/.translations/zh-Hans.json
 create mode 100644 homeassistant/components/emulated_roku/.translations/es.json
 create mode 100644 homeassistant/components/emulated_roku/.translations/lb.json
 create mode 100644 homeassistant/components/emulated_roku/.translations/pl.json
 create mode 100644 homeassistant/components/emulated_roku/.translations/sl.json
 create mode 100644 homeassistant/components/emulated_roku/.translations/zh-Hans.json
 create mode 100644 homeassistant/components/emulated_roku/.translations/zh-Hant.json
 create mode 100644 homeassistant/components/esphome/.translations/es.json
 create mode 100644 homeassistant/components/esphome/.translations/zh-Hans.json
 create mode 100644 homeassistant/components/geofency/.translations/es.json
 create mode 100644 homeassistant/components/geofency/.translations/pl.json
 create mode 100644 homeassistant/components/geofency/.translations/sl.json
 create mode 100644 homeassistant/components/geofency/.translations/zh-Hans.json
 create mode 100644 homeassistant/components/geofency/.translations/zh-Hant.json
 create mode 100644 homeassistant/components/gpslogger/.translations/ca.json
 create mode 100644 homeassistant/components/gpslogger/.translations/es.json
 create mode 100644 homeassistant/components/gpslogger/.translations/ko.json
 create mode 100644 homeassistant/components/gpslogger/.translations/lb.json
 create mode 100644 homeassistant/components/gpslogger/.translations/no.json
 create mode 100644 homeassistant/components/gpslogger/.translations/pl.json
 create mode 100644 homeassistant/components/gpslogger/.translations/ru.json
 create mode 100644 homeassistant/components/gpslogger/.translations/sl.json
 create mode 100644 homeassistant/components/gpslogger/.translations/zh-Hans.json
 create mode 100644 homeassistant/components/gpslogger/.translations/zh-Hant.json
 create mode 100644 homeassistant/components/locative/.translations/ca.json
 create mode 100644 homeassistant/components/locative/.translations/ko.json
 create mode 100644 homeassistant/components/locative/.translations/lb.json
 create mode 100644 homeassistant/components/locative/.translations/no.json
 create mode 100644 homeassistant/components/locative/.translations/pl.json
 create mode 100644 homeassistant/components/locative/.translations/ru.json
 create mode 100644 homeassistant/components/locative/.translations/sl.json
 create mode 100644 homeassistant/components/locative/.translations/zh-Hans.json
 create mode 100644 homeassistant/components/locative/.translations/zh-Hant.json
 create mode 100644 homeassistant/components/smartthings/.translations/ca.json
 create mode 100644 homeassistant/components/smartthings/.translations/lb.json
 create mode 100644 homeassistant/components/smartthings/.translations/pl.json
 create mode 100644 homeassistant/components/smartthings/.translations/zh-Hant.json
 create mode 100644 homeassistant/components/tellduslive/.translations/es.json
 create mode 100644 homeassistant/components/tellduslive/.translations/zh-Hans.json

diff --git a/homeassistant/components/ambient_station/.translations/ca.json b/homeassistant/components/ambient_station/.translations/ca.json
new file mode 100644
index 00000000000..d3c451f3e3f
--- /dev/null
+++ b/homeassistant/components/ambient_station/.translations/ca.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Clau d'aplicaci\u00f3 i/o clau API ja registrada",
+            "invalid_key": "Clau API i/o clau d'aplicaci\u00f3 inv\u00e0lida/es",
+            "no_devices": "No s'ha trobat cap dispositiu al compte"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "Clau API",
+                    "app_key": "Clau d'aplicaci\u00f3"
+                },
+                "title": "Introdueix la teva informaci\u00f3"
+            }
+        },
+        "title": "Ambient PWS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ambient_station/.translations/ko.json b/homeassistant/components/ambient_station/.translations/ko.json
new file mode 100644
index 00000000000..51a09514159
--- /dev/null
+++ b/homeassistant/components/ambient_station/.translations/ko.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Application \ud0a4 \ud639\uc740 API \ud0a4\uac00 \uc774\ubbf8 \ub4f1\ub85d\ub418\uc5c8\uc2b5\ub2c8\ub2e4",
+            "invalid_key": "Application \ud0a4 \ud639\uc740 API \ud0a4\uac00 \uc798\ubabb\ub418\uc5c8\uc2b5\ub2c8\ub2e4",
+            "no_devices": "\uacc4\uc815\uc5d0 \uae30\uae30\uac00 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "API \ud0a4",
+                    "app_key": "Application \ud0a4"
+                },
+                "title": "\uc0ac\uc6a9\uc790 \uc815\ubcf4\ub97c \uc785\ub825\ud574 \uc8fc\uc138\uc694"
+            }
+        },
+        "title": "Ambient PWS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ambient_station/.translations/lb.json b/homeassistant/components/ambient_station/.translations/lb.json
new file mode 100644
index 00000000000..0f0d60d4458
--- /dev/null
+++ b/homeassistant/components/ambient_station/.translations/lb.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Applikatioun's Schl\u00ebssel an/oder API Schl\u00ebssel ass scho registr\u00e9iert",
+            "invalid_key": "Ong\u00ebltegen API Schl\u00ebssel an/oder Applikatioun's Schl\u00ebssel",
+            "no_devices": "Keng Apparater am Kont fonnt"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "API Schl\u00ebssel",
+                    "app_key": "Applikatioun's Schl\u00ebssel"
+                },
+                "title": "F\u00ebllt \u00e4r Informatiounen aus"
+            }
+        },
+        "title": "Ambient PWS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ambient_station/.translations/ru.json b/homeassistant/components/ambient_station/.translations/ru.json
new file mode 100644
index 00000000000..d1264010b75
--- /dev/null
+++ b/homeassistant/components/ambient_station/.translations/ru.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "\u041a\u043b\u044e\u0447 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0438/\u0438\u043b\u0438 \u043a\u043b\u044e\u0447 API \u0443\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d",
+            "invalid_key": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043a\u043b\u044e\u0447 API \u0438/\u0438\u043b\u0438 \u043a\u043b\u044e\u0447 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f",
+            "no_devices": "\u0412 \u0443\u0447\u0435\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "\u041a\u043b\u044e\u0447 API",
+                    "app_key": "\u041a\u043b\u044e\u0447 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f"
+                },
+                "title": "Ambient PWS"
+            }
+        },
+        "title": "Ambient PWS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ambient_station/.translations/zh-Hant.json b/homeassistant/components/ambient_station/.translations/zh-Hant.json
new file mode 100644
index 00000000000..7e3ed3ef888
--- /dev/null
+++ b/homeassistant/components/ambient_station/.translations/zh-Hant.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "API \u5bc6\u9470\u53ca/\u6216\u61c9\u7528\u5bc6\u9470\u5df2\u8a3b\u518a",
+            "invalid_key": "API \u5bc6\u9470\u53ca/\u6216\u61c9\u7528\u5bc6\u9470\u7121\u6548",
+            "no_devices": "\u5e33\u865f\u4e2d\u627e\u4e0d\u5230\u4efb\u4f55\u88dd\u7f6e"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "API \u5bc6\u9470",
+                    "app_key": "\u61c9\u7528\u5bc6\u9470"
+                },
+                "title": "\u586b\u5beb\u8cc7\u8a0a"
+            }
+        },
+        "title": "\u74b0\u5883 PWS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/auth/.translations/pl.json b/homeassistant/components/auth/.translations/pl.json
index 6adaaa019c5..f0e9f7b71ea 100644
--- a/homeassistant/components/auth/.translations/pl.json
+++ b/homeassistant/components/auth/.translations/pl.json
@@ -9,7 +9,7 @@
             },
             "step": {
                 "init": {
-                    "description": "Prosz\u0119 wybra\u0107 jedn\u0105 z us\u0142ugi powiadamiania:",
+                    "description": "Prosz\u0119 wybra\u0107 jedn\u0105 us\u0142ug\u0119 powiadamiania:",
                     "title": "Skonfiguruj has\u0142o jednorazowe dostarczone przez komponent powiadomie\u0144"
                 },
                 "setup": {
diff --git a/homeassistant/components/auth/.translations/sl.json b/homeassistant/components/auth/.translations/sl.json
index 223dc91a480..f70bb81e700 100644
--- a/homeassistant/components/auth/.translations/sl.json
+++ b/homeassistant/components/auth/.translations/sl.json
@@ -21,7 +21,7 @@
         },
         "totp": {
             "error": {
-                "invalid_code": "Neveljavna koda, prosimo, poskusite znova. \u010ce dobite to sporo\u010dilo ve\u010dkrat, prosimo poskrbite, da bo ura va\u0161ega Home Assistenta to\u010dna."
+                "invalid_code": "Neveljavna koda, prosimo, poskusite znova. \u010ce dobite to sporo\u010dilo ve\u010dkrat, prosimo poskrbite, da bo ura va\u0161ega Home Assistanta to\u010dna."
             },
             "step": {
                 "init": {
diff --git a/homeassistant/components/auth/.translations/uk.json b/homeassistant/components/auth/.translations/uk.json
index 3d4d9a5b151..f826075078e 100644
--- a/homeassistant/components/auth/.translations/uk.json
+++ b/homeassistant/components/auth/.translations/uk.json
@@ -3,6 +3,11 @@
         "notify": {
             "error": {
                 "invalid_code": "\u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043a\u043e\u0434, \u0441\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0449\u0435 \u0440\u0430\u0437."
+            },
+            "step": {
+                "setup": {
+                    "title": "\u041f\u0435\u0440\u0435\u0432\u0456\u0440\u0442\u0435 \u043d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f"
+                }
             }
         }
     }
diff --git a/homeassistant/components/daikin/.translations/zh-Hans.json b/homeassistant/components/daikin/.translations/zh-Hans.json
new file mode 100644
index 00000000000..1330e3a932d
--- /dev/null
+++ b/homeassistant/components/daikin/.translations/zh-Hans.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u8bbe\u5907\u5df2\u914d\u7f6e\u5b8c\u6210",
+            "device_fail": "\u521b\u5efa\u8bbe\u5907\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef\u3002",
+            "device_timeout": "\u8fde\u63a5\u8bbe\u5907\u8d85\u65f6\u3002"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "\u4e3b\u673a"
+                },
+                "description": "\u8f93\u5165\u60a8\u7684 Daikin \u7a7a\u8c03\u7684IP\u5730\u5740\u3002",
+                "title": "\u914d\u7f6e Daikin \u7a7a\u8c03"
+            }
+        },
+        "title": "Daikin \u7a7a\u8c03"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/deconz/.translations/en.json b/homeassistant/components/deconz/.translations/en.json
index 0c60953db56..d8bcc95a115 100644
--- a/homeassistant/components/deconz/.translations/en.json
+++ b/homeassistant/components/deconz/.translations/en.json
@@ -17,7 +17,7 @@
                 "title": "Define deCONZ gateway"
             },
             "link": {
-                "description": "Unlock your deCONZ gateway to register with Home Assistant.\n\n1. Go to deCONZ system settings\n2. Press \"Unlock Gateway\" button",
+                "description": "Unlock your deCONZ gateway to register with Home Assistant.\n\n1. Go to deCONZ Settings -> Gateway -> Advanced\n2. Press \"Authenticate app\" button",
                 "title": "Link with deCONZ"
             },
             "options": {
diff --git a/homeassistant/components/deconz/.translations/pl.json b/homeassistant/components/deconz/.translations/pl.json
index 5dd87d9e462..5a8b710c006 100644
--- a/homeassistant/components/deconz/.translations/pl.json
+++ b/homeassistant/components/deconz/.translations/pl.json
@@ -12,7 +12,7 @@
             "init": {
                 "data": {
                     "host": "Host",
-                    "port": "Port (warto\u015b\u0107 domy\u015blna: \"80\")"
+                    "port": "Port"
                 },
                 "title": "Zdefiniuj bramk\u0119 deCONZ"
             },
@@ -28,6 +28,6 @@
                 "title": "Dodatkowe opcje konfiguracji dla deCONZ"
             }
         },
-        "title": "deCONZ"
+        "title": "Brama deCONZ Zigbee"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/dialogflow/.translations/sl.json b/homeassistant/components/dialogflow/.translations/sl.json
index 597e65a7658..18a476b6870 100644
--- a/homeassistant/components/dialogflow/.translations/sl.json
+++ b/homeassistant/components/dialogflow/.translations/sl.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": " \u010ce \u017eelite prejemati sporo\u010dila dialogflow, mora biti Home Assistent dostopen prek interneta.",
+            "not_internet_accessible": "\u010ce \u017eelite prejemati sporo\u010dila dialogflow, mora biti Home Assistant dostopen prek interneta.",
             "one_instance_allowed": "Potrebna je samo ena instanca."
         },
         "create_entry": {
-            "default": "Za po\u0161iljanje dogodkov Home Assistent-u, boste morali nastaviti [webhook z dialogflow]({twilio_url}).\n\nIzpolnite naslednje informacije:\n\n- URL: `{webhook_url}`\n- Metoda: POST\n- Vrsta vsebine: application/x-www-form-urlencoded\n\nGlej [dokumentacijo]({docs_url}) za nadaljna navodila."
+            "default": "Za po\u0161iljanje dogodkov Home Assistant-u, boste morali nastaviti [webhook z dialogflow]({twilio_url}).\n\nIzpolnite naslednje informacije:\n\n- URL: `{webhook_url}`\n- Metoda: POST\n- Vrsta vsebine: application/x-www-form-urlencoded\n\nGlej [dokumentacijo]({docs_url}) za nadaljna navodila."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/dialogflow/.translations/zh-Hans.json b/homeassistant/components/dialogflow/.translations/zh-Hans.json
index 6eecbed54ac..8a542dd0d62 100644
--- a/homeassistant/components/dialogflow/.translations/zh-Hans.json
+++ b/homeassistant/components/dialogflow/.translations/zh-Hans.json
@@ -1,10 +1,15 @@
 {
     "config": {
+        "abort": {
+            "not_internet_accessible": "\u60a8\u7684 Home Assistant \u5b9e\u4f8b\u9700\u8981\u63a5\u5165\u4e92\u8054\u7f51\u4ee5\u63a5\u6536 Dialogflow \u6d88\u606f\u3002",
+            "one_instance_allowed": "\u4ec5\u9700\u4e00\u4e2a\u5b9e\u4f8b"
+        },
         "create_entry": {
             "default": "\u8981\u5411 Home Assistant \u53d1\u9001\u4e8b\u4ef6\uff0c\u60a8\u9700\u8981\u914d\u7f6e [Dialogflow \u7684 Webhook \u96c6\u6210]({dialogflow_url})\u3002\n\n\u586b\u5199\u4ee5\u4e0b\u4fe1\u606f\uff1a\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\n\u8bf7\u53c2\u9605[\u6587\u6863]({docs_url})\u4ee5\u4e86\u89e3\u66f4\u591a\u4fe1\u606f\u3002"
         },
         "step": {
             "user": {
+                "description": "\u60a8\u786e\u5b9a\u8981\u8bbe\u7f6e Dialogflow \u5417?",
                 "title": "\u8bbe\u7f6e Dialogflow Webhook"
             }
         },
diff --git a/homeassistant/components/emulated_roku/.translations/es.json b/homeassistant/components/emulated_roku/.translations/es.json
new file mode 100644
index 00000000000..3491c784c19
--- /dev/null
+++ b/homeassistant/components/emulated_roku/.translations/es.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "abort": {
+            "name_exists": "El nombre ya existe"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host_ip": "IP del host",
+                    "listen_port": "Puerto de escucha",
+                    "name": "Nombre"
+                },
+                "title": "Definir la configuraci\u00f3n del servidor"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/emulated_roku/.translations/ko.json b/homeassistant/components/emulated_roku/.translations/ko.json
index 54c3e079386..ddee892039f 100644
--- a/homeassistant/components/emulated_roku/.translations/ko.json
+++ b/homeassistant/components/emulated_roku/.translations/ko.json
@@ -11,7 +11,7 @@
                     "host_ip": "\ud638\uc2a4\ud2b8 IP",
                     "listen_port": "\uc218\uc2e0 \ud3ec\ud2b8",
                     "name": "\uc774\ub984",
-                    "upnp_bind_multicast": "\uba40\ud2f0 \uce90\uc2a4\ud2b8 \ubc14\uc778\ub4dc (\ucc38/\uac70\uc9d3)"
+                    "upnp_bind_multicast": "\uba40\ud2f0 \uce90\uc2a4\ud2b8 \ud560\ub2f9 (\ucc38/\uac70\uc9d3)"
                 },
                 "title": "\uc11c\ubc84 \uad6c\uc131 \uc815\uc758"
             }
diff --git a/homeassistant/components/emulated_roku/.translations/lb.json b/homeassistant/components/emulated_roku/.translations/lb.json
new file mode 100644
index 00000000000..11d1aa3ff7a
--- /dev/null
+++ b/homeassistant/components/emulated_roku/.translations/lb.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "name_exists": "Numm g\u00ebtt et schonn"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "advertise_ip": "IP annonc\u00e9ieren",
+                    "advertise_port": "Port annonc\u00e9ieren",
+                    "host_ip": "IP vum Apparat",
+                    "listen_port": "Port lauschteren",
+                    "name": "Numm",
+                    "upnp_bind_multicast": "Multicast abannen (Richteg/Falsch)"
+                },
+                "title": "Server Konfiguratioun d\u00e9fin\u00e9ieren"
+            }
+        },
+        "title": "EmulatedRoku"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/emulated_roku/.translations/pl.json b/homeassistant/components/emulated_roku/.translations/pl.json
new file mode 100644
index 00000000000..0ed3cc3d14a
--- /dev/null
+++ b/homeassistant/components/emulated_roku/.translations/pl.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "name_exists": "Nazwa ju\u017c istnieje"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "advertise_ip": "IP rozg\u0142aszania",
+                    "advertise_port": "Port rozg\u0142aszania",
+                    "host_ip": "IP hosta",
+                    "listen_port": "Port nas\u0142uchu",
+                    "name": "Nazwa",
+                    "upnp_bind_multicast": "Powi\u0105\u017c multicast (prawda/fa\u0142sz)"
+                },
+                "title": "Zdefiniuj konfiguracj\u0119 serwera"
+            }
+        },
+        "title": "EmulatedRoku"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/emulated_roku/.translations/sl.json b/homeassistant/components/emulated_roku/.translations/sl.json
new file mode 100644
index 00000000000..768feb83747
--- /dev/null
+++ b/homeassistant/components/emulated_roku/.translations/sl.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "name_exists": "Ime \u017ee obstaja"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "advertise_ip": "Advertise IP",
+                    "advertise_port": "Advertise port",
+                    "host_ip": "IP gostitelja",
+                    "listen_port": "Vrata naprave",
+                    "name": "Ime",
+                    "upnp_bind_multicast": "Vezava multicasta (True / False)"
+                },
+                "title": "Dolo\u010dite konfiguracijo stre\u017enika"
+            }
+        },
+        "title": "EmulatedRoku"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/emulated_roku/.translations/zh-Hans.json b/homeassistant/components/emulated_roku/.translations/zh-Hans.json
new file mode 100644
index 00000000000..9cb4cc33431
--- /dev/null
+++ b/homeassistant/components/emulated_roku/.translations/zh-Hans.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "abort": {
+            "name_exists": "\u540d\u79f0\u5df2\u5b58\u5728"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host_ip": "\u4e3b\u673aIP",
+                    "listen_port": "\u76d1\u542c\u7aef\u53e3",
+                    "name": "\u59d3\u540d"
+                },
+                "title": "\u5b9a\u4e49\u670d\u52a1\u5668\u914d\u7f6e"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/emulated_roku/.translations/zh-Hant.json b/homeassistant/components/emulated_roku/.translations/zh-Hant.json
new file mode 100644
index 00000000000..40b4307ae02
--- /dev/null
+++ b/homeassistant/components/emulated_roku/.translations/zh-Hant.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "name_exists": "\u8a72\u540d\u7a31\u5df2\u5b58\u5728"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "advertise_ip": "\u5ee3\u64ad\u901a\u8a0a\u57e0",
+                    "advertise_port": "\u5ee3\u64ad\u901a\u8a0a\u57e0",
+                    "host_ip": "\u4e3b\u6a5f IP",
+                    "listen_port": "\u76e3\u807d\u901a\u8a0a\u57e0",
+                    "name": "\u540d\u7a31",
+                    "upnp_bind_multicast": "\u7d81\u5b9a\u7fa4\u64ad\uff08Multicast\uff09True/False"
+                },
+                "title": "\u5b9a\u7fa9\u4f3a\u670d\u5668\u8a2d\u5b9a"
+            }
+        },
+        "title": "EmulatedRoku"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/esphome/.translations/es.json b/homeassistant/components/esphome/.translations/es.json
new file mode 100644
index 00000000000..8010b330b88
--- /dev/null
+++ b/homeassistant/components/esphome/.translations/es.json
@@ -0,0 +1,25 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "ESP ya est\u00e1 configurado"
+        },
+        "error": {
+            "invalid_password": "\u00a1Contrase\u00f1a incorrecta!"
+        },
+        "step": {
+            "authenticate": {
+                "data": {
+                    "password": "Contrase\u00f1a"
+                },
+                "description": "Escribe la contrase\u00f1a que hayas establecido en tu configuraci\u00f3n.",
+                "title": "Escribe la contrase\u00f1a"
+            },
+            "user": {
+                "data": {
+                    "host": "Host",
+                    "port": "Puerto"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/esphome/.translations/ko.json b/homeassistant/components/esphome/.translations/ko.json
index 514acbbbf18..24f84851254 100644
--- a/homeassistant/components/esphome/.translations/ko.json
+++ b/homeassistant/components/esphome/.translations/ko.json
@@ -4,7 +4,7 @@
             "already_configured": "ESP \uac00 \uc774\ubbf8 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4"
         },
         "error": {
-            "connection_error": "ESP \uc5d0 \uc5f0\uacb0\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. YAML \ud30c\uc77c\uc5d0 'api :' \ub97c \uad6c\uc131\ud588\ub294\uc9c0 \ud655\uc778\ud574\uc8fc\uc138\uc694.",
+            "connection_error": "ESP \uc5d0 \uc5f0\uacb0\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. YAML \ud30c\uc77c\uc5d0 'api:' \ub97c \uad6c\uc131\ud588\ub294\uc9c0 \ud655\uc778\ud574\uc8fc\uc138\uc694.",
             "invalid_password": "\uc798\ubabb\ub41c \ube44\ubc00\ubc88\ud638",
             "resolve_error": "ESP \uc758 \uc8fc\uc18c\ub97c \ud655\uc778\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \uc774 \uc624\ub958\uac00 \uacc4\uc18d \ubc1c\uc0dd\ud558\uba74 \uace0\uc815 IP \uc8fc\uc18c (https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips)\ub97c \uc124\uc815\ud574\uc8fc\uc138\uc694"
         },
diff --git a/homeassistant/components/esphome/.translations/pl.json b/homeassistant/components/esphome/.translations/pl.json
index 4f2a8b0e1bb..19fb581eb3f 100644
--- a/homeassistant/components/esphome/.translations/pl.json
+++ b/homeassistant/components/esphome/.translations/pl.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "ESP jest ju\u017c skonfigurowany"
+            "already_configured": "ESP jest ju\u017c skonfigurowane"
         },
         "error": {
-            "connection_error": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z ESP. Upewnij si\u0119, \u017ce Tw\u00f3j plik YAML zawiera lini\u0119 \"api:\".",
+            "connection_error": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z ESP. Upewnij si\u0119, \u017ce Tw\u00f3j plik YAML zawiera lini\u0119 'api:'.",
             "invalid_password": "Nieprawid\u0142owe has\u0142o!",
             "resolve_error": "Nie mo\u017cna rozpozna\u0107 adresu ESP. Je\u015bli ten b\u0142\u0105d b\u0119dzie si\u0119 powtarza\u0142, nale\u017cy ustawi\u0107 statyczny adres IP: https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips"
         },
@@ -21,7 +21,7 @@
                     "host": "Host",
                     "port": "Port"
                 },
-                "description": "Wprowad\u017a ustawienia po\u0142\u0105czenia swojego [ESPHome] (https://esphomelib.com/) w\u0119z\u0142a.",
+                "description": "Wprowad\u017a ustawienia po\u0142\u0105czenia swojego [ESPHome](https://esphomelib.com/) w\u0119z\u0142a.",
                 "title": "ESPHome"
             }
         },
diff --git a/homeassistant/components/esphome/.translations/zh-Hans.json b/homeassistant/components/esphome/.translations/zh-Hans.json
new file mode 100644
index 00000000000..8e5ca59fcef
--- /dev/null
+++ b/homeassistant/components/esphome/.translations/zh-Hans.json
@@ -0,0 +1,27 @@
+{
+    "config": {
+        "error": {
+            "connection_error": "\u65e0\u6cd5\u8fde\u63a5\u5230ESP\u3002\u8bf7\u786e\u4fdd\u60a8\u7684YAML\u6587\u4ef6\u5305\u542b'api:'\u884c\u3002",
+            "invalid_password": "\u65e0\u6548\u7684\u5bc6\u7801\uff01",
+            "resolve_error": "\u65e0\u6cd5\u89e3\u6790ESP\u7684\u5730\u5740\u3002\u5982\u679c\u6b64\u9519\u8bef\u4ecd\u7136\u5b58\u5728\uff0c\u8bf7\u8bbe\u7f6e\u9759\u6001IP\u5730\u5740\uff1ahttps://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips"
+        },
+        "step": {
+            "authenticate": {
+                "data": {
+                    "password": "\u5bc6\u7801"
+                },
+                "description": "\u8bf7\u8f93\u5165\u60a8\u5728\u914d\u7f6e\u4e2d\u8bbe\u7f6e\u7684\u5bc6\u7801\u3002",
+                "title": "\u8f93\u5165\u5bc6\u7801"
+            },
+            "user": {
+                "data": {
+                    "host": "\u4e3b\u673a",
+                    "port": "\u7aef\u53e3"
+                },
+                "description": "\u8bf7\u8f93\u5165\u60a8\u7684 [ESPHome](https://esphomelib.com/) \u8282\u70b9\u7684\u8fde\u63a5\u8bbe\u7f6e\u3002",
+                "title": "ESPHome"
+            }
+        },
+        "title": "ESPHome"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/geofency/.translations/es.json b/homeassistant/components/geofency/.translations/es.json
new file mode 100644
index 00000000000..cd14e21db10
--- /dev/null
+++ b/homeassistant/components/geofency/.translations/es.json
@@ -0,0 +1,8 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "Tu Home Assistant debe ser accesible desde Internet para recibir mensajes de GPSLogger.",
+            "one_instance_allowed": "Solo se necesita una instancia."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/geofency/.translations/pl.json b/homeassistant/components/geofency/.translations/pl.json
new file mode 100644
index 00000000000..09d93e6911e
--- /dev/null
+++ b/homeassistant/components/geofency/.translations/pl.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "Tw\u00f3j Home Assistant musi by\u0107 dost\u0119pny z Internetu, aby odbiera\u0107 komunikaty z Geofency.",
+            "one_instance_allowed": "Wymagana jest tylko jedna instancja."
+        },
+        "create_entry": {
+            "default": "Aby wysy\u0142a\u0107 zdarzenia do Home Assistant'a, musisz skonfigurowa\u0107 webhook w Geofency. \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}` \n - Metoda: POST \n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}) by pozna\u0107 szczeg\u00f3\u0142y."
+        },
+        "step": {
+            "user": {
+                "description": "Czy chcesz skonfigurowa\u0107 Geofency?",
+                "title": "Konfiguracja Geofency Webhook"
+            }
+        },
+        "title": "Geofency Webhook"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/geofency/.translations/sl.json b/homeassistant/components/geofency/.translations/sl.json
new file mode 100644
index 00000000000..e56d41d4f1a
--- /dev/null
+++ b/homeassistant/components/geofency/.translations/sl.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "Va\u0161 Home Assistant mora biti dostopen prek interneta, da boste lahko prejemali Geofency sporo\u010dila.",
+            "one_instance_allowed": "Potrebna je samo ena instanca."
+        },
+        "create_entry": {
+            "default": "\u010ce \u017eelite dogodke poslati v Home Assistant, morate v Geofency-ju nastaviti funkcijo webhook. \n\n Izpolnite naslednje podatke: \n\n - URL: ` {webhook_url} ` \n - Metoda: POST \n\n Za ve\u010d podrobnosti si oglejte [dokumentacijo] ( {docs_url} )."
+        },
+        "step": {
+            "user": {
+                "description": "Ali ste prepri\u010dani, da \u017eelite nastaviti geofency webhook?",
+                "title": "Nastavite Geofency Webhook"
+            }
+        },
+        "title": "Geofency Webhook"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/geofency/.translations/zh-Hans.json b/homeassistant/components/geofency/.translations/zh-Hans.json
new file mode 100644
index 00000000000..7ab8a128980
--- /dev/null
+++ b/homeassistant/components/geofency/.translations/zh-Hans.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "\u60a8\u7684 Home Assistant \u5b9e\u4f8b\u9700\u8981\u63a5\u5165\u4e92\u8054\u7f51\u4ee5\u63a5\u6536 Geofency \u6d88\u606f\u3002",
+            "one_instance_allowed": "\u4ec5\u9700\u4e00\u4e2a\u5b9e\u4f8b"
+        },
+        "step": {
+            "user": {
+                "description": "\u60a8\u786e\u5b9a\u8981\u8bbe\u7f6e Geofency Webhook \u5417?",
+                "title": "\u8bbe\u7f6e Geofency Webhook"
+            }
+        },
+        "title": "Geofency Webhook"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/geofency/.translations/zh-Hant.json b/homeassistant/components/geofency/.translations/zh-Hant.json
new file mode 100644
index 00000000000..bec33c26d10
--- /dev/null
+++ b/homeassistant/components/geofency/.translations/zh-Hant.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "Home Assistant \u5be6\u4f8b\u5fc5\u9808\u80fd\u5920\u7531\u7db2\u969b\u7db2\u8def\u5b58\u53d6\uff0c\u65b9\u80fd\u63a5\u53d7 Geofency \u8a0a\u606f\u3002",
+            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u7269\u4ef6\u5373\u53ef\u3002"
+        },
+        "create_entry": {
+            "default": "\u6b32\u50b3\u9001\u4e8b\u4ef6\u81f3 Home Assistant\uff0c\u5c07\u9700\u65bc Geofency \u5167\u8a2d\u5b9a webhook \u529f\u80fd\u3002\n\n\u8acb\u586b\u5beb\u4e0b\u5217\u8cc7\u8a0a\uff1a\n\n- URL: `{webhook_url}`\n- Method: POST\n\n\u8acb\u53c3\u95b1 [\u6587\u4ef6]({docs_url})\u4ee5\u4e86\u89e3\u66f4\u8a73\u7d30\u8cc7\u6599\u3002"
+        },
+        "step": {
+            "user": {
+                "description": "\u662f\u5426\u8981\u8a2d\u5b9a Geofency Webhook\uff1f",
+                "title": "\u8a2d\u5b9a Geofency Webhook"
+            }
+        },
+        "title": "Geofency Webhook"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/gpslogger/.translations/ca.json b/homeassistant/components/gpslogger/.translations/ca.json
new file mode 100644
index 00000000000..2d3b08d236e
--- /dev/null
+++ b/homeassistant/components/gpslogger/.translations/ca.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "La inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de GPSLogger.",
+            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia."
+        },
+        "create_entry": {
+            "default": "Per enviar esdeveniments a Home Assistant, haur\u00e0s de configurar l'opci\u00f3 webhook de GPSLogger.\n\nCompleta la seg\u00fcent informaci\u00f3:\n\n- URL: `{webhook_url}` \n- M\u00e8tode: POST \n\nConsulta la [documentaci\u00f3]({docs_url}) per a m\u00e9s detalls."
+        },
+        "step": {
+            "user": {
+                "description": "Est\u00e0s segur que vols configurar el Webhook GPSLogger?",
+                "title": "Configuraci\u00f3 del Webhook GPSLogger"
+            }
+        },
+        "title": "Webhook GPSLogger"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/gpslogger/.translations/en.json b/homeassistant/components/gpslogger/.translations/en.json
index d5641ef5db8..ad8f978bc59 100644
--- a/homeassistant/components/gpslogger/.translations/en.json
+++ b/homeassistant/components/gpslogger/.translations/en.json
@@ -1,18 +1,18 @@
 {
-  "config": {
-    "title": "GPSLogger Webhook",
-    "step": {
-      "user": {
-        "title": "Set up the GPSLogger Webhook",
-        "description": "Are you sure you want to set up the GPSLogger Webhook?"
-      }
-    },
-    "abort": {
-      "one_instance_allowed": "Only a single instance is necessary.",
-      "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive messages from GPSLogger."
-    },
-    "create_entry": {
-      "default": "To send events to Home Assistant, you will need to setup the webhook feature in GPSLogger.\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n\nSee [the documentation]({docs_url}) for further details."
+    "config": {
+        "abort": {
+            "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive messages from GPSLogger.",
+            "one_instance_allowed": "Only a single instance is necessary."
+        },
+        "create_entry": {
+            "default": "To send events to Home Assistant, you will need to setup the webhook feature in GPSLogger.\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n\nSee [the documentation]({docs_url}) for further details."
+        },
+        "step": {
+            "user": {
+                "description": "Are you sure you want to set up the GPSLogger Webhook?",
+                "title": "Set up the GPSLogger Webhook"
+            }
+        },
+        "title": "GPSLogger Webhook"
     }
-  }
 }
\ No newline at end of file
diff --git a/homeassistant/components/gpslogger/.translations/es.json b/homeassistant/components/gpslogger/.translations/es.json
new file mode 100644
index 00000000000..cd14e21db10
--- /dev/null
+++ b/homeassistant/components/gpslogger/.translations/es.json
@@ -0,0 +1,8 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "Tu Home Assistant debe ser accesible desde Internet para recibir mensajes de GPSLogger.",
+            "one_instance_allowed": "Solo se necesita una instancia."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/gpslogger/.translations/ko.json b/homeassistant/components/gpslogger/.translations/ko.json
new file mode 100644
index 00000000000..a65e51d7cae
--- /dev/null
+++ b/homeassistant/components/gpslogger/.translations/ko.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "GPSLogger \uba54\uc2dc\uc9c0\ub97c \ubc1b\uc73c\ub824\uba74 \uc778\ud130\ub137\uc5d0\uc11c Home Assistant \uc778\uc2a4\ud134\uc2a4\uc5d0 \uc561\uc138\uc2a4 \ud560 \uc218 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4.",
+            "one_instance_allowed": "\ud558\ub098\uc758 \uc778\uc2a4\ud134\uc2a4\ub9cc \ud544\uc694\ud569\ub2c8\ub2e4."
+        },
+        "create_entry": {
+            "default": "Home Assistant \ub85c \uc774\ubca4\ud2b8\ub97c \ubcf4\ub0b4\ub824\uba74 GPSLogger \uc5d0\uc11c Webhook \uc744 \uc124\uc815\ud574\uc57c\ud569\ub2c8\ub2e4. \n\n\ub2e4\uc74c \uc815\ubcf4\ub97c \uc785\ub825\ud574 \uc8fc\uc138\uc694. \n\n - URL: `{webhook_url}`\n - Method: POST\n  \n \uc790\uc138\ud55c \uc815\ubcf4\ub294 [\uc548\ub0b4]({docs_url}) \ub97c \ucc38\uc870\ud574 \uc8fc\uc138\uc694."
+        },
+        "step": {
+            "user": {
+                "description": "GPSLogger Webhook \uc744 \uc124\uc815 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
+                "title": "GPSLogger Webhook \uc124\uc815"
+            }
+        },
+        "title": "GPSLogger Webhook"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/gpslogger/.translations/lb.json b/homeassistant/components/gpslogger/.translations/lb.json
new file mode 100644
index 00000000000..78df911c868
--- /dev/null
+++ b/homeassistant/components/gpslogger/.translations/lb.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "\u00c4r Home Assistant Instanz muss iwwert Internet accessibel si fir GPSLogger Noriichten z'empf\u00e4nken.",
+            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg."
+        },
+        "create_entry": {
+            "default": "Fir Evenementer un Home Assistant ze sch\u00e9cken, muss den Webhook Feature am GPSLogger ageriicht ginn.\n\nF\u00ebllt folgend Informatiounen aus:\n\n- URL: `{webhook_url}`\n- Method: POST\n\nLiest [Dokumentatioun]({docs_url}) fir w\u00e9ider D\u00e9tailer."
+        },
+        "step": {
+            "user": {
+                "description": "S\u00e9cher fir GPSLogger Webhook anzeriichten?",
+                "title": "GPSLogger Webhook ariichten"
+            }
+        },
+        "title": "GPSLogger Webhook"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/gpslogger/.translations/no.json b/homeassistant/components/gpslogger/.translations/no.json
new file mode 100644
index 00000000000..836b5c8bc68
--- /dev/null
+++ b/homeassistant/components/gpslogger/.translations/no.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "Home Assistant m\u00e5 v\u00e6re tilgjengelig fra internett for \u00e5 kunne motta meldinger fra GPSLogger.",
+            "one_instance_allowed": "Kun en enkelt forekomst er n\u00f8dvendig."
+        },
+        "create_entry": {
+            "default": "For \u00e5 sende hendelser til Home Assistant, m\u00e5 du sette opp webhook-funksjonen i GPSLogger. \n\n Fyll ut f\u00f8lgende informasjon: \n\n - URL: `{webhook_url}` \n - Metode: POST \n\n Se [dokumentasjonen]({docs_url}) for ytterligere detaljer."
+        },
+        "step": {
+            "user": {
+                "description": "Er du sikker p\u00e5 at du vil sette opp GPSLogger Webhook?",
+                "title": "Sett opp GPSLogger Webhook"
+            }
+        },
+        "title": "GPSLogger Webhook"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/gpslogger/.translations/pl.json b/homeassistant/components/gpslogger/.translations/pl.json
new file mode 100644
index 00000000000..3d82ac6fa5a
--- /dev/null
+++ b/homeassistant/components/gpslogger/.translations/pl.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "Twoja instancja Home Assistant musi by\u0107 dost\u0119pna z Internetu, aby otrzymywa\u0107 wiadomo\u015bci z GPSlogger.",
+            "one_instance_allowed": "Wymagana jest tylko jedna instancja."
+        },
+        "create_entry": {
+            "default": "Aby wysy\u0142a\u0107 lokalizacje do Home Assistant'a, musisz skonfigurowa\u0107 webhook w aplikacji GPSLogger. \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}` \n - Metoda: POST \n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}) by pozna\u0107 szczeg\u00f3\u0142y."
+        },
+        "step": {
+            "user": {
+                "description": "Czy chcesz skonfigurowa\u0107 Geofency?",
+                "title": "Konfiguracja Geofency Webhook"
+            }
+        },
+        "title": "Konfiguracja Geofency Webhook"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/gpslogger/.translations/ru.json b/homeassistant/components/gpslogger/.translations/ru.json
new file mode 100644
index 00000000000..34b7e907288
--- /dev/null
+++ b/homeassistant/components/gpslogger/.translations/ru.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "\u0412\u0430\u0448 Home Assistant \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d \u0438\u0437 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0430 \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 GPSLogger."
+        },
+        "create_entry": {
+            "default": "\u0414\u043b\u044f \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 \u0432 Home Assistant \u0432\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c webhooks \u0434\u043b\u044f GPSLogger.\n\n\u0414\u043b\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e:\n\n- URL: `{webhook_url}`\n- Method: POST\n\n\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u0435\u0439]({docs_url}) \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0431\u043e\u043b\u0435\u0435 \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438."
+        },
+        "step": {
+            "user": {
+                "description": "\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c GPSLogger?",
+                "title": "GPSLogger"
+            }
+        },
+        "title": "GPSLogger"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/gpslogger/.translations/sl.json b/homeassistant/components/gpslogger/.translations/sl.json
new file mode 100644
index 00000000000..8e205bef437
--- /dev/null
+++ b/homeassistant/components/gpslogger/.translations/sl.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "Va\u0161 Home Assistant mora biti dostopek prek interneta, da boste lahko prejemali GPSlogger sporo\u010dila.",
+            "one_instance_allowed": "Potrebna je samo ena instanca."
+        },
+        "create_entry": {
+            "default": "\u010ce \u017eelite dogodke poslati v Home Assistant, morate v GPSLoggerju nastaviti funkcijo webhook. \n\n Izpolnite naslednje podatke: \n\n - URL: ` {webhook_url} ` \n - Metoda: POST \n\n Za ve\u010d podrobnosti si oglejte [dokumentacijo] ( {docs_url} )."
+        },
+        "step": {
+            "user": {
+                "description": "Ali ste prepri\u010dani, da \u017eelite nastaviti GPSloggerWebhook?",
+                "title": "Nastavite GPSlogger Webhook"
+            }
+        },
+        "title": "GPSLogger Webhook"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/gpslogger/.translations/zh-Hans.json b/homeassistant/components/gpslogger/.translations/zh-Hans.json
new file mode 100644
index 00000000000..dd5db73f582
--- /dev/null
+++ b/homeassistant/components/gpslogger/.translations/zh-Hans.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "one_instance_allowed": "\u53ea\u6709\u4e00\u4e2a\u5b9e\u4f8b\u662f\u5fc5\u9700\u7684\u3002"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/gpslogger/.translations/zh-Hant.json b/homeassistant/components/gpslogger/.translations/zh-Hant.json
new file mode 100644
index 00000000000..c9d98da1afc
--- /dev/null
+++ b/homeassistant/components/gpslogger/.translations/zh-Hant.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "Home Assistant \u5be6\u4f8b\u5fc5\u9808\u80fd\u5920\u7531\u7db2\u969b\u7db2\u8def\u5b58\u53d6\uff0c\u65b9\u80fd\u63a5\u53d7 GPSLogger \u8a0a\u606f\u3002",
+            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u7269\u4ef6\u5373\u53ef\u3002"
+        },
+        "create_entry": {
+            "default": "\u6b32\u50b3\u9001\u4e8b\u4ef6\u81f3 Home Assistant\uff0c\u5c07\u9700\u65bc GPSLogger \u5167\u8a2d\u5b9a webhook \u529f\u80fd\u3002\n\n\u8acb\u586b\u5beb\u4e0b\u5217\u8cc7\u8a0a\uff1a\n\n- URL: `{webhook_url}`\n- Method: POST\n\n\u8acb\u53c3\u95b1 [\u6587\u4ef6]({docs_url})\u4ee5\u4e86\u89e3\u66f4\u8a73\u7d30\u8cc7\u6599\u3002"
+        },
+        "step": {
+            "user": {
+                "description": "\u662f\u5426\u8981\u8a2d\u5b9a GPSLogger Webhook\uff1f",
+                "title": "\u8a2d\u5b9a GPSLogger Webhook"
+            }
+        },
+        "title": "GPSLogger Webhook"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/homematicip_cloud/.translations/sl.json b/homeassistant/components/homematicip_cloud/.translations/sl.json
index eabb31ac833..cdde0f12d78 100644
--- a/homeassistant/components/homematicip_cloud/.translations/sl.json
+++ b/homeassistant/components/homematicip_cloud/.translations/sl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Dostopna to\u010dka je \u017ee konfigurirana",
+            "already_configured": "Dostopna to\u010dka je \u017ee nastavljena",
             "connection_aborted": "Povezava s stre\u017enikom HMIP ni bila mogo\u010da",
             "unknown": "Pri\u0161lo je do neznane napake"
         },
@@ -21,8 +21,8 @@
                 "title": "Izberite dostopno to\u010dko HomematicIP"
             },
             "link": {
-                "description": "Pritisnite modro tipko na dostopni to\u010dko in gumb po\u0161lji, da registrirate homematicIP s Home Assistentom. \n\n![Location of button on bridge](/static/images/config_flows/config_homematicip_cloud.png)",
-                "title": "Pove\u017eite dostopno to\u010dno"
+                "description": "Pritisnite modro tipko na dostopni to\u010dko in gumb po\u0161lji, da registrirate homematicIP s Home Assistantom. \n\n![Location of button on bridge](/static/images/config_flows/config_homematicip_cloud.png)",
+                "title": "Pove\u017eite dostopno to\u010dko"
             }
         },
         "title": "HomematicIP Cloud"
diff --git a/homeassistant/components/homematicip_cloud/.translations/zh-Hans.json b/homeassistant/components/homematicip_cloud/.translations/zh-Hans.json
index 629ee4347fe..4c2b6268eec 100644
--- a/homeassistant/components/homematicip_cloud/.translations/zh-Hans.json
+++ b/homeassistant/components/homematicip_cloud/.translations/zh-Hans.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u63a5\u5165\u70b9\u5df2\u7ecf\u914d\u7f6e\u5b8c\u6210",
+            "already_configured": "\u63a5\u5165\u70b9\u5df2\u914d\u7f6e",
             "connection_aborted": "\u65e0\u6cd5\u8fde\u63a5\u5230 HMIP \u670d\u52a1\u5668",
             "unknown": "\u53d1\u751f\u672a\u77e5\u9519\u8bef\u3002"
         },
diff --git a/homeassistant/components/hue/.translations/pl.json b/homeassistant/components/hue/.translations/pl.json
index 784fa0d99a6..63cbbe016a2 100644
--- a/homeassistant/components/hue/.translations/pl.json
+++ b/homeassistant/components/hue/.translations/pl.json
@@ -24,6 +24,6 @@
                 "title": "Hub Link"
             }
         },
-        "title": "Mostek Philips Hue"
+        "title": "Philips Hue"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/hue/.translations/sl.json b/homeassistant/components/hue/.translations/sl.json
index 05d52d5c37e..7ad7a2e6ade 100644
--- a/homeassistant/components/hue/.translations/sl.json
+++ b/homeassistant/components/hue/.translations/sl.json
@@ -20,7 +20,7 @@
                 "title": "Izberite Hue most"
             },
             "link": {
-                "description": "Pritisnite gumb na mostu, da registrirate Philips Hue s Home Assistentom. \n\n ! [Polo\u017eaj gumba na mostu] (/static/images/config_philips_hue.jpg)",
+                "description": "Pritisnite gumb na mostu, da registrirate Philips Hue s Home Assistantom. \n\n ! [Polo\u017eaj gumba na mostu] (/static/images/config_philips_hue.jpg)",
                 "title": "Link Hub"
             }
         },
diff --git a/homeassistant/components/ifttt/.translations/sl.json b/homeassistant/components/ifttt/.translations/sl.json
index f5cc1dc572e..efb966880eb 100644
--- a/homeassistant/components/ifttt/.translations/sl.json
+++ b/homeassistant/components/ifttt/.translations/sl.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "Va\u0161 Home Assistent mora biti dostopek prek interneta, da boste lahko prejemali IFTTT sporo\u010dila.",
+            "not_internet_accessible": "Va\u0161 Home Assistant mora biti dostopek prek interneta, da boste lahko prejemali IFTTT sporo\u010dila.",
             "one_instance_allowed": "Potrebna je samo ena instanca."
         },
         "create_entry": {
-            "default": "\u010ce \u017eelite poslati dogodke Home Assistent-u, boste morali uporabiti akcijo \u00bbNaredi spletno zahtevo\u00ab iz orodja [IFTTT Webhook applet] ( {applet_url} ). \n\n Izpolnite naslednje podatke: \n\n - URL: ` {webhook_url} ` \n - Metoda: POST \n - Vrsta vsebine: application/json \n\n Poglejte si [dokumentacijo] ( {docs_url} ) o tem, kako konfigurirati avtomatizacijo za obdelavo dohodnih podatkov."
+            "default": "\u010ce \u017eelite poslati dogodke Home Assistant-u, boste morali uporabiti akcijo \u00bbNaredi spletno zahtevo\u00ab iz orodja [IFTTT Webhook applet] ( {applet_url} ). \n\n Izpolnite naslednje podatke: \n\n - URL: ` {webhook_url} ` \n - Metoda: POST \n - Vrsta vsebine: application/json \n\n Poglejte si [dokumentacijo] ( {docs_url} ) o tem, kako konfigurirati avtomatizacijo za obdelavo dohodnih podatkov."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/locative/.translations/ca.json b/homeassistant/components/locative/.translations/ca.json
new file mode 100644
index 00000000000..a08907a51ef
--- /dev/null
+++ b/homeassistant/components/locative/.translations/ca.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "La inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de Geofency.",
+            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia."
+        },
+        "create_entry": {
+            "default": "Per enviar ubicacions a Home Assistant, haur\u00e0s de configurar l'opci\u00f3 webhook de l'aplicaci\u00f3 Locative.\n\nCompleta la seg\u00fcent informaci\u00f3:\n\n- URL: `{webhook_url}` \n- M\u00e8tode: POST \n\nConsulta la [documentaci\u00f3]({docs_url}) per a m\u00e9s detalls."
+        },
+        "step": {
+            "user": {
+                "description": "Est\u00e0s segur que vols configurar el Webhook Locative?",
+                "title": "Configuraci\u00f3 del Webhook Locative"
+            }
+        },
+        "title": "Webhook Locative"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/locative/.translations/en.json b/homeassistant/components/locative/.translations/en.json
index b2a538a0fa5..052557408d8 100644
--- a/homeassistant/components/locative/.translations/en.json
+++ b/homeassistant/components/locative/.translations/en.json
@@ -1,18 +1,18 @@
 {
-  "config": {
-    "title": "Locative Webhook",
-    "step": {
-      "user": {
-        "title": "Set up the Locative Webhook",
-        "description": "Are you sure you want to set up the Locative Webhook?"
-      }
-    },
-    "abort": {
-      "one_instance_allowed": "Only a single instance is necessary.",
-      "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive messages from Geofency."
-    },
-    "create_entry": {
-      "default": "To send locations to Home Assistant, you will need to setup the webhook feature in the Locative app.\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n\nSee [the documentation]({docs_url}) for further details."
+    "config": {
+        "abort": {
+            "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive messages from Geofency.",
+            "one_instance_allowed": "Only a single instance is necessary."
+        },
+        "create_entry": {
+            "default": "To send locations to Home Assistant, you will need to setup the webhook feature in the Locative app.\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n\nSee [the documentation]({docs_url}) for further details."
+        },
+        "step": {
+            "user": {
+                "description": "Are you sure you want to set up the Locative Webhook?",
+                "title": "Set up the Locative Webhook"
+            }
+        },
+        "title": "Locative Webhook"
     }
-  }
 }
\ No newline at end of file
diff --git a/homeassistant/components/locative/.translations/ko.json b/homeassistant/components/locative/.translations/ko.json
new file mode 100644
index 00000000000..a57b27cdd75
--- /dev/null
+++ b/homeassistant/components/locative/.translations/ko.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "Locative \uba54\uc2dc\uc9c0\ub97c \ubc1b\uc73c\ub824\uba74 \uc778\ud130\ub137\uc5d0\uc11c Home Assistant \uc778\uc2a4\ud134\uc2a4\uc5d0 \uc561\uc138\uc2a4 \ud560 \uc218 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4.",
+            "one_instance_allowed": "\ud558\ub098\uc758 \uc778\uc2a4\ud134\uc2a4\ub9cc \ud544\uc694\ud569\ub2c8\ub2e4."
+        },
+        "create_entry": {
+            "default": "Home Assistant \ub85c \uc774\ubca4\ud2b8\ub97c \ubcf4\ub0b4\ub824\uba74 Locative \uc571\uc5d0\uc11c Webhook \uc744 \uc124\uc815\ud574\uc57c\ud569\ub2c8\ub2e4. \n\n\ub2e4\uc74c \uc815\ubcf4\ub97c \uc785\ub825\ud574 \uc8fc\uc138\uc694. \n\n - URL: `{webhook_url}`\n - Method: POST\n  \n \uc790\uc138\ud55c \uc815\ubcf4\ub294 [\uc548\ub0b4]({docs_url}) \ub97c \ucc38\uc870\ud574 \uc8fc\uc138\uc694."
+        },
+        "step": {
+            "user": {
+                "description": "Locative Webhook \uc744 \uc124\uc815 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
+                "title": "Locative Webhook \uc124\uc815"
+            }
+        },
+        "title": "Locative Webhook"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/locative/.translations/lb.json b/homeassistant/components/locative/.translations/lb.json
new file mode 100644
index 00000000000..25db0ecef81
--- /dev/null
+++ b/homeassistant/components/locative/.translations/lb.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "\u00c4r Home Assistant Instanz muss iwwert Internet accessibel si fir Geofency Noriichten z'empf\u00e4nken.",
+            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg."
+        },
+        "create_entry": {
+            "default": "Fir Plazen un Home Assistant ze sch\u00e9cken, muss den Webhook Feature an der Locative App ageriicht ginn.\n\nF\u00ebllt folgend Informatiounen aus:\n\n- URL: `{webhook_url}`\n- Method: POST\n\nLiest [Dokumentatioun]({docs_url}) fir w\u00e9ider D\u00e9tailer."
+        },
+        "step": {
+            "user": {
+                "description": "S\u00e9cher fir Locative Webhook anzeriichten?",
+                "title": "Locative Webhook ariichten"
+            }
+        },
+        "title": "Locative Webhook"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/locative/.translations/no.json b/homeassistant/components/locative/.translations/no.json
new file mode 100644
index 00000000000..00e3337dfe1
--- /dev/null
+++ b/homeassistant/components/locative/.translations/no.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "Home Assistant m\u00e5 v\u00e6re tilgjengelig fra internett for \u00e5 kunne motta meldinger fra Geofency.",
+            "one_instance_allowed": "Kun en enkelt forekomst er n\u00f8dvendig."
+        },
+        "create_entry": {
+            "default": "For \u00e5 kunne sende steder til Home Assistant, m\u00e5 du sette opp webhook-funksjonen i Locative. \n\n Fyll ut f\u00f8lgende informasjon: \n\n - URL: `{webhook_url}` \n - Metode: POST \n\n Se [dokumentasjonen]({docs_url}) for ytterligere detaljer."
+        },
+        "step": {
+            "user": {
+                "description": "Er du sikker p\u00e5 at du vil sette opp Locative Webhook?",
+                "title": "Sett opp Lokative Webhook"
+            }
+        },
+        "title": "Lokative Webhook"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/locative/.translations/pl.json b/homeassistant/components/locative/.translations/pl.json
new file mode 100644
index 00000000000..89f6881593a
--- /dev/null
+++ b/homeassistant/components/locative/.translations/pl.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "Twoja instancja Home Assistant musi by\u0107 dost\u0119pna z Internetu, aby otrzymywa\u0107 wiadomo\u015bci z Geofency.",
+            "one_instance_allowed": "Wymagana jest tylko jedna instancja."
+        },
+        "create_entry": {
+            "default": "Aby wysy\u0142a\u0107 lokalizacje do Home Assistant'a, musisz skonfigurowa\u0107 webhook w aplikacji Locative. \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}` \n - Metoda: POST \n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}) by pozna\u0107 szczeg\u00f3\u0142y."
+        },
+        "step": {
+            "user": {
+                "description": "Czy na pewno chcesz skonfigurowa\u0107 Locative Webhook?",
+                "title": "Skonfiguruj Locative Webhook"
+            }
+        },
+        "title": "Locative Webhook"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/locative/.translations/ru.json b/homeassistant/components/locative/.translations/ru.json
new file mode 100644
index 00000000000..d8b8d55a608
--- /dev/null
+++ b/homeassistant/components/locative/.translations/ru.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "\u0412\u0430\u0448 Home Assistant \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d \u0438\u0437 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0430 \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 Locative."
+        },
+        "create_entry": {
+            "default": "\u0414\u043b\u044f \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 \u0432 Home Assistant \u0432\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c webhooks \u0434\u043b\u044f Locative.\n\n\u0414\u043b\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e:\n\n- URL: `{webhook_url}`\n- Method: POST\n\n\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u0435\u0439]({docs_url}) \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0431\u043e\u043b\u0435\u0435 \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438."
+        },
+        "step": {
+            "user": {
+                "description": "\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c Locative?",
+                "title": "Locative"
+            }
+        },
+        "title": "Locative"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/locative/.translations/sl.json b/homeassistant/components/locative/.translations/sl.json
new file mode 100644
index 00000000000..0b0bd45b7d6
--- /dev/null
+++ b/homeassistant/components/locative/.translations/sl.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "Va\u0161 Home Assistant mora biti dostopek prek interneta, da boste lahko prejemali Geofency sporo\u010dila.",
+            "one_instance_allowed": "Potrebna je samo ena instanca."
+        },
+        "create_entry": {
+            "default": "Za po\u0161iljanje lokacij v Home Assistant, morate namestiti funkcijo webhook v aplikaciji Locative. \n\n Izpolnite naslednje podatke: \n\n - URL: ` {webhook_url} ` \n - Metoda: POST \n\n Za ve\u010d podrobnosti si oglejte [dokumentacijo] ( {docs_url} )."
+        },
+        "step": {
+            "user": {
+                "description": "Ali ste prepri\u010dani, da \u017eelite nastaviti Locative Webhook?",
+                "title": "Nastavite Locative Webhook"
+            }
+        },
+        "title": "Locative Webhook"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/locative/.translations/zh-Hans.json b/homeassistant/components/locative/.translations/zh-Hans.json
new file mode 100644
index 00000000000..d98793d96e5
--- /dev/null
+++ b/homeassistant/components/locative/.translations/zh-Hans.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "\u60a8\u7684Home Assistant\u5b9e\u4f8b\u9700\u8981\u53ef\u4ee5\u4eceInternet\u8bbf\u95ee\u4ee5\u63a5\u6536\u6765\u81eaGeofency\u7684\u6d88\u606f\u3002",
+            "one_instance_allowed": "\u53ea\u9700\u8981\u4e00\u4e2a\u5b9e\u4f8b\u3002"
+        },
+        "step": {
+            "user": {
+                "description": "\u60a8\u786e\u5b9a\u8981\u8bbe\u7f6e\u5b9a\u4f4d Webhook\u5417\uff1f",
+                "title": "\u8bbe\u7f6e\u5b9a\u4f4d Webhook"
+            }
+        },
+        "title": "\u5b9a\u4f4d Webhook"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/locative/.translations/zh-Hant.json b/homeassistant/components/locative/.translations/zh-Hant.json
new file mode 100644
index 00000000000..62bb6bb9d96
--- /dev/null
+++ b/homeassistant/components/locative/.translations/zh-Hant.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "Home Assistant \u5be6\u4f8b\u5fc5\u9808\u80fd\u5920\u7531\u7db2\u969b\u7db2\u8def\u5b58\u53d6\uff0c\u65b9\u80fd\u63a5\u53d7 Locative \u8a0a\u606f\u3002",
+            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u7269\u4ef6\u5373\u53ef\u3002"
+        },
+        "create_entry": {
+            "default": "\u6b32\u50b3\u9001\u4f4d\u7f6e\u81f3 Home Assistant\uff0c\u5c07\u9700\u65bc Locative App \u5167\u8a2d\u5b9a webhook \u529f\u80fd\u3002\n\n\u8acb\u586b\u5beb\u4e0b\u5217\u8cc7\u8a0a\uff1a\n\n- URL: `{webhook_url}`\n- Method: POST\n\n\u8acb\u53c3\u95b1 [\u6587\u4ef6]({docs_url})\u4ee5\u4e86\u89e3\u66f4\u8a73\u7d30\u8cc7\u6599\u3002"
+        },
+        "step": {
+            "user": {
+                "description": "\u662f\u5426\u8981\u8a2d\u5b9a Locative Webhook\uff1f",
+                "title": "\u8a2d\u5b9a Locative Webhook"
+            }
+        },
+        "title": "Locative Webhook"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mailgun/.translations/sl.json b/homeassistant/components/mailgun/.translations/sl.json
index 4eb12d7343c..2f526826d31 100644
--- a/homeassistant/components/mailgun/.translations/sl.json
+++ b/homeassistant/components/mailgun/.translations/sl.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": " \u010ce \u017eelite prejemati sporo\u010dila Mailgun, mora biti Home Assistent dostopen prek interneta.",
+            "not_internet_accessible": "\u010ce \u017eelite prejemati sporo\u010dila Mailgun, mora biti Home Assistant dostopen prek interneta.",
             "one_instance_allowed": "Potrebna je samo ena instanca."
         },
         "create_entry": {
-            "default": "Za po\u0161iljanje dogodkov Home Assistentu boste morali nastaviti [Webhooks z Mailgun]({mailgun_url}).\n\nIzpolnite naslednje informacije:\n\n- URL: `{webhook_url}`\n- Metoda: POST\n- Vrsta vsebine: application/json\n\nGlej [dokumentacijo]({docs_url}) o tem, kako nastavite automations za obravnavo dohodnih podatkov."
+            "default": "Za po\u0161iljanje dogodkov Home Assistantu boste morali nastaviti [Webhooks z Mailgun]({mailgun_url}).\n\nIzpolnite naslednje informacije:\n\n- URL: `{webhook_url}`\n- Metoda: POST\n- Vrsta vsebine: application/json\n\nGlej [dokumentacijo]({docs_url}) o tem, kako nastavite automations za obravnavo dohodnih podatkov."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/mailgun/.translations/zh-Hans.json b/homeassistant/components/mailgun/.translations/zh-Hans.json
index 06c1d3624f4..5dd0a7aeabf 100644
--- a/homeassistant/components/mailgun/.translations/zh-Hans.json
+++ b/homeassistant/components/mailgun/.translations/zh-Hans.json
@@ -6,6 +6,13 @@
         },
         "create_entry": {
             "default": "\u8981\u5411 Home Assistant \u53d1\u9001\u4e8b\u4ef6\uff0c\u60a8\u9700\u8981\u914d\u7f6e [Mailgun \u7684 Webhook]({mailgun_url})\u3002\n\n\u586b\u5199\u4ee5\u4e0b\u4fe1\u606f\uff1a\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\n\u6709\u5173\u5982\u4f55\u914d\u7f6e\u81ea\u52a8\u5316\u4ee5\u5904\u7406\u4f20\u5165\u7684\u6570\u636e\uff0c\u8bf7\u53c2\u9605[\u6587\u6863]({docs_url})\u3002"
-        }
+        },
+        "step": {
+            "user": {
+                "description": "\u60a8\u786e\u5b9a\u8981\u8bbe\u7f6e Mailgun \u5417\uff1f",
+                "title": "\u8bbe\u7f6e Mailgun Webhook"
+            }
+        },
+        "title": "Mailgun"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/sl.json b/homeassistant/components/mqtt/.translations/sl.json
index d8d331449a2..0050d1b040d 100644
--- a/homeassistant/components/mqtt/.translations/sl.json
+++ b/homeassistant/components/mqtt/.translations/sl.json
@@ -22,7 +22,7 @@
                 "data": {
                     "discovery": "Omogo\u010di odkrivanje"
                 },
-                "description": "\u017delite konfigurirati Home Assistent-a za povezavo s posrednikom MQTT, ki ga ponuja hass.io add-on {addon} ?",
+                "description": "\u017delite konfigurirati Home Assistant-a za povezavo s posrednikom MQTT, ki ga ponuja hass.io add-on {addon} ?",
                 "title": "MQTT Broker prek dodatka Hass.io"
             }
         },
diff --git a/homeassistant/components/nest/.translations/zh-Hans.json b/homeassistant/components/nest/.translations/zh-Hans.json
index 05ba5bdf155..0b5cbc989fd 100644
--- a/homeassistant/components/nest/.translations/zh-Hans.json
+++ b/homeassistant/components/nest/.translations/zh-Hans.json
@@ -24,8 +24,8 @@
                 "data": {
                     "code": "PIN \u7801"
                 },
-                "description": "\u8981\u5173\u8054 Nest \u5e10\u6237\uff0c\u8bf7[\u6388\u6743\u5e10\u6237]({url})\u3002\n\n\u5b8c\u6210\u6388\u6743\u540e\uff0c\u5728\u4e0b\u9762\u7c98\u8d34\u83b7\u5f97\u7684 PIN \u7801\u3002",
-                "title": "\u5173\u8054 Nest \u5e10\u6237"
+                "description": "\u8981\u5173\u8054 Nest \u8d26\u6237\uff0c\u8bf7[\u6388\u6743\u8d26\u6237]({url})\u3002\n\n\u5b8c\u6210\u6388\u6743\u540e\uff0c\u5728\u4e0b\u9762\u7c98\u8d34\u83b7\u5f97\u7684 PIN \u7801\u3002",
+                "title": "\u5173\u8054 Nest \u8d26\u6237"
             }
         },
         "title": "Nest"
diff --git a/homeassistant/components/openuv/.translations/ca.json b/homeassistant/components/openuv/.translations/ca.json
index 5cb9a8ce5a5..ad2f391886a 100644
--- a/homeassistant/components/openuv/.translations/ca.json
+++ b/homeassistant/components/openuv/.translations/ca.json
@@ -2,12 +2,12 @@
     "config": {
         "error": {
             "identifier_exists": "Les coordenades ja estan registrades",
-            "invalid_api_key": "Contrasenya API no v\u00e0lida"
+            "invalid_api_key": "Clau API no v\u00e0lida"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Contrasenya API d'OpenUV",
+                    "api_key": "Clau API d'OpenUV",
                     "elevation": "Elevaci\u00f3",
                     "latitude": "Latitud",
                     "longitude": "Longitud"
diff --git a/homeassistant/components/point/.translations/zh-Hans.json b/homeassistant/components/point/.translations/zh-Hans.json
index 6b5cb91cfeb..ebd2b88b10e 100644
--- a/homeassistant/components/point/.translations/zh-Hans.json
+++ b/homeassistant/components/point/.translations/zh-Hans.json
@@ -1,8 +1,17 @@
 {
     "config": {
+        "abort": {
+            "authorize_url_fail": "\u751f\u6210\u6388\u6743URL\u65f6\u53d1\u751f\u672a\u77e5\u9519\u8bef\u3002",
+            "authorize_url_timeout": "\u751f\u6210\u6388\u6743URL\u8d85\u65f6"
+        },
+        "error": {
+            "follow_link": "\u8bf7\u5728\u70b9\u51fb\u63d0\u4ea4\u524d\u6309\u7167\u94fe\u63a5\u8fdb\u884c\u8eab\u4efd\u9a8c\u8bc1",
+            "no_token": "\u672a\u7ecfMinut\u9a8c\u8bc1"
+        },
         "step": {
             "auth": {
-                "description": "\u8bf7\u8bbf\u95ee\u4e0b\u65b9\u7684\u94fe\u63a5\u5e76<b>\u5141\u8bb8</b>\u8bbf\u95ee\u60a8\u7684 Minut \u8d26\u6237\uff0c\u7136\u540e\u56de\u6765\u70b9\u51fb\u4e0b\u9762\u7684<b>\u63d0\u4ea4</b>\u3002\n\n[\u94fe\u63a5]({authorization_url})"
+                "description": "\u8bf7\u8bbf\u95ee\u4e0b\u65b9\u7684\u94fe\u63a5\u5e76<b>\u5141\u8bb8</b>\u8bbf\u95ee\u60a8\u7684 Minut \u8d26\u6237\uff0c\u7136\u540e\u56de\u6765\u70b9\u51fb\u4e0b\u9762\u7684<b>\u63d0\u4ea4</b>\u3002\n\n[\u94fe\u63a5]({authorization_url})",
+                "title": "\u8ba4\u8bc1\u70b9"
             },
             "user": {
                 "data": {
diff --git a/homeassistant/components/rainmachine/.translations/zh-Hans.json b/homeassistant/components/rainmachine/.translations/zh-Hans.json
index 7c6f07a7edd..e7171ca2867 100644
--- a/homeassistant/components/rainmachine/.translations/zh-Hans.json
+++ b/homeassistant/components/rainmachine/.translations/zh-Hans.json
@@ -1,11 +1,13 @@
 {
     "config": {
         "error": {
-            "identifier_exists": "\u5e10\u6237\u5df2\u6ce8\u518c"
+            "identifier_exists": "\u8d26\u6237\u5df2\u6ce8\u518c",
+            "invalid_credentials": "\u65e0\u6548\u7684\u8eab\u4efd\u8ba4\u8bc1"
         },
         "step": {
             "user": {
                 "data": {
+                    "ip_address": "\u4e3b\u673a\u540d\u6216IP\u5730\u5740",
                     "password": "\u5bc6\u7801",
                     "port": "\u7aef\u53e3"
                 },
diff --git a/homeassistant/components/simplisafe/.translations/zh-Hans.json b/homeassistant/components/simplisafe/.translations/zh-Hans.json
index 2316f5c7454..4c57baea77f 100644
--- a/homeassistant/components/simplisafe/.translations/zh-Hans.json
+++ b/homeassistant/components/simplisafe/.translations/zh-Hans.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "error": {
-            "identifier_exists": "\u5e10\u6237\u5df2\u6ce8\u518c",
+            "identifier_exists": "\u8d26\u6237\u5df2\u6ce8\u518c",
             "invalid_credentials": "\u65e0\u6548\u7684\u8eab\u4efd\u8ba4\u8bc1"
         },
         "step": {
diff --git a/homeassistant/components/smartthings/.translations/ca.json b/homeassistant/components/smartthings/.translations/ca.json
new file mode 100644
index 00000000000..3c0ca05a8d5
--- /dev/null
+++ b/homeassistant/components/smartthings/.translations/ca.json
@@ -0,0 +1,27 @@
+{
+    "config": {
+        "error": {
+            "app_not_installed": "Assegura't que has instal\u00b7lat i autoritzat l'aplicaci\u00f3 SmartApp de Home Assistant i torna-ho a provar.",
+            "app_setup_error": "No s'ha pogut configurar SmartApp. Siusplau, torna-ho a provar.",
+            "base_url_not_https": "L'`base_url` per al component `http` ha d'estar configurat i comen\u00e7ar amb `https://`.",
+            "token_already_setup": "El testimoni d'autenticaci\u00f3 ja ha estat configurat.",
+            "token_forbidden": "El testimoni d'autenticaci\u00f3 no t\u00e9 cont\u00e9 els apartats OAuth obligatoris.",
+            "token_invalid_format": "El testimoni d'autenticaci\u00f3 ha d'estar en format UID/GUID",
+            "token_unauthorized": "El testimoni d'autenticaci\u00f3 no \u00e9s v\u00e0lid o ja no t\u00e9 autoritzaci\u00f3."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "access_token": "Testimoni d'acc\u00e9s"
+                },
+                "description": "Introdueix un [testimoni d'autenticaci\u00f3 d'acc\u00e9s personal] ({token_url}) de SmartThings que s'ha creat a trav\u00e9s les [instruccions] ({component_url}).",
+                "title": "Introdueix el testimoni d'autenticaci\u00f3 d'acc\u00e9s personal"
+            },
+            "wait_install": {
+                "description": "Instal\u00b7la l'SmartApp de Home Assistant en almenys una ubicaci\u00f3 i fes clic a Enviar.",
+                "title": "Instal\u00b7laci\u00f3 de SmartApp"
+            }
+        },
+        "title": "SmartThings"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/smartthings/.translations/en.json b/homeassistant/components/smartthings/.translations/en.json
index 1fb4e878cb4..f2775b30ae2 100644
--- a/homeassistant/components/smartthings/.translations/en.json
+++ b/homeassistant/components/smartthings/.translations/en.json
@@ -1,27 +1,27 @@
 {
-  "config": {
-    "title": "SmartThings",
-    "step": {
-      "user": {
-        "title": "Enter Personal Access Token",
-        "description": "Please enter a SmartThings [Personal Access Token]({token_url}) that has been created per the [instructions]({component_url}).",
-        "data": {
-          "access_token": "Access Token"
-        }
-      },
-      "wait_install": {
-        "title": "Install SmartApp",
-        "description": "Please install the Home Assistant SmartApp in at least one location and click submit."
-      }
-    },
-    "error": {
-        "token_invalid_format": "The token must be in the UID/GUID format",
-        "token_unauthorized": "The token is invalid or no longer authorized.",
-        "token_forbidden": "The token does not have the required OAuth scopes.",
-        "token_already_setup": "The token has already been setup.",
-        "app_setup_error": "Unable to setup the SmartApp.  Please try again.",
-        "app_not_installed": "Please ensure you have installed and authorized the Home Assistant SmartApp and try again.",
-        "base_url_not_https": "The `base_url` for the `http` component must be configured and start with `https://`."
+    "config": {
+        "error": {
+            "app_not_installed": "Please ensure you have installed and authorized the Home Assistant SmartApp and try again.",
+            "app_setup_error": "Unable to setup the SmartApp.  Please try again.",
+            "base_url_not_https": "The `base_url` for the `http` component must be configured and start with `https://`.",
+            "token_already_setup": "The token has already been setup.",
+            "token_forbidden": "The token does not have the required OAuth scopes.",
+            "token_invalid_format": "The token must be in the UID/GUID format",
+            "token_unauthorized": "The token is invalid or no longer authorized."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "access_token": "Access Token"
+                },
+                "description": "Please enter a SmartThings [Personal Access Token]({token_url}) that has been created per the [instructions]({component_url}).",
+                "title": "Enter Personal Access Token"
+            },
+            "wait_install": {
+                "description": "Please install the Home Assistant SmartApp in at least one location and click submit.",
+                "title": "Install SmartApp"
+            }
+        },
+        "title": "SmartThings"
     }
-  }
 }
\ No newline at end of file
diff --git a/homeassistant/components/smartthings/.translations/lb.json b/homeassistant/components/smartthings/.translations/lb.json
new file mode 100644
index 00000000000..fd59d187314
--- /dev/null
+++ b/homeassistant/components/smartthings/.translations/lb.json
@@ -0,0 +1,27 @@
+{
+    "config": {
+        "error": {
+            "app_not_installed": "Stellt w.e.g s\u00e9cher dass d'Home Assistant SmartApp install\u00e9iert an autoris\u00e9iert ass, a prob\u00e9iert nach emol.",
+            "app_setup_error": "Kann SmartApp net install\u00e9ieren. Prob\u00e9iert w.e.g. nach emol.",
+            "base_url_not_https": "`base_url` fir den `http` Komponent muss konfigur\u00e9iert sinn a mat `https://`uf\u00e4nken.",
+            "token_already_setup": "Den Jeton gouf schonn ageriicht.",
+            "token_forbidden": "De Jeton huet net d\u00e9i n\u00e9ideg OAuth M\u00e9iglechkeeten.",
+            "token_invalid_format": "De Jeton muss am UID/GUID Format sinn",
+            "token_unauthorized": "De Jeton ass ong\u00eblteg oder net m\u00e9i autoris\u00e9iert."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "access_token": "Acc\u00e8ss Jeton"
+                },
+                "description": "Gitt w.e.g. ee [Pers\u00e9inlechen Acc\u00e8s Jeton]({token_url}) vu SmartThings an dee via [d'Instruktiounen] ({component_url}) erstallt gouf.",
+                "title": "Pers\u00e9inlechen Acc\u00e8ss Jeton uginn"
+            },
+            "wait_install": {
+                "description": "Install\u00e9iert d'Home Assistant SmartApp op mannst ee mol a klickt op Ofsch\u00e9cken.",
+                "title": "SmartApp install\u00e9ieren"
+            }
+        },
+        "title": "SmartThings"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/smartthings/.translations/pl.json b/homeassistant/components/smartthings/.translations/pl.json
new file mode 100644
index 00000000000..379cdf699b7
--- /dev/null
+++ b/homeassistant/components/smartthings/.translations/pl.json
@@ -0,0 +1,10 @@
+{
+    "config": {
+        "step": {
+            "wait_install": {
+                "title": "Zainstaluj SmartApp"
+            }
+        },
+        "title": "SmartThings"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/smartthings/.translations/zh-Hant.json b/homeassistant/components/smartthings/.translations/zh-Hant.json
new file mode 100644
index 00000000000..952eafec60c
--- /dev/null
+++ b/homeassistant/components/smartthings/.translations/zh-Hant.json
@@ -0,0 +1,27 @@
+{
+    "config": {
+        "error": {
+            "app_not_installed": "\u8acb\u78ba\u8a8d\u5df2\u7d93\u5b89\u88dd\u4e26\u6388\u6b0a Home Assistant Smartapp \u5f8c\u518d\u8a66\u4e00\u6b21\u3002",
+            "app_setup_error": "\u7121\u6cd5\u8a2d\u5b9a SmartApp\uff0c\u8acb\u518d\u8a66\u4e00\u6b21\u3002",
+            "base_url_not_https": "\u5fc5\u9808\u8a2d\u5b9a\u300chttp\u300d\u5143\u4ef6\u4e4b\u300cbase_url\u300d\uff0c\u4e26\u4ee5\u300chttps://\u300d\u70ba\u958b\u982d\u3002",
+            "token_already_setup": "\u5bc6\u9470\u5df2\u8a2d\u5b9a\u904e\u3002",
+            "token_forbidden": "\u5bc6\u9470\u4e0d\u5177\u6240\u9700\u7684 OAuth \u7bc4\u570d\u3002",
+            "token_invalid_format": "\u5bc6\u9470\u5fc5\u9808\u70ba UID/GUID \u683c\u5f0f",
+            "token_unauthorized": "\u5bc6\u9470\u7121\u6548\u6216\u4e0d\u518d\u5177\u6709\u6388\u6b0a\u3002"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "access_token": "\u5b58\u53d6\u5bc6\u9470"
+                },
+                "description": "\u8acb\u8f38\u5165\u8ddf\u8457[ \u6307\u5f15]({component_url})\u6240\u7522\u751f\u7684 SmartThings [\u500b\u4eba\u5b58\u53d6\u5bc6\u9470]({token_url})\u3002",
+                "title": "\u8f38\u5165\u500b\u4eba\u5b58\u53d6\u5bc6\u9470"
+            },
+            "wait_install": {
+                "description": "\u8acb\u81f3\u5c11\u65bc\u4e00\u500b\u4f4d\u7f6e\u4e2d\u5b89\u88dd Home Assistant Smartapp\uff0c\u4e26\u9ede\u9078\u50b3\u9001\u3002",
+                "title": "\u5b89\u88dd SmartApp"
+            }
+        },
+        "title": "SmartThings"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tellduslive/.translations/ca.json b/homeassistant/components/tellduslive/.translations/ca.json
index db97b1ad6d8..75915735882 100644
--- a/homeassistant/components/tellduslive/.translations/ca.json
+++ b/homeassistant/components/tellduslive/.translations/ca.json
@@ -2,10 +2,14 @@
     "config": {
         "abort": {
             "all_configured": "TelldusLive ja est\u00e0 configurat",
+            "already_setup": "TelldusLive ja est\u00e0 configurat",
             "authorize_url_fail": "S'ha produ\u00eft un error desconegut al generar l'URL d'autoritzaci\u00f3.",
             "authorize_url_timeout": "S'ha acabat el temps d'espera mentre \u00e9s generava l'URL d'autoritzaci\u00f3.",
             "unknown": "S'ha produ\u00eft un error desconegut"
         },
+        "error": {
+            "auth_error": "Error d'autenticaci\u00f3, torna-ho a provar"
+        },
         "step": {
             "auth": {
                 "description": "Passos per enlla\u00e7ar el teu compte de TelldusLive:\n 1. Clica l'enlla\u00e7 de sota.\n 2. Inicia sessi\u00f3 a Telldus Live.\n 3. Autoritza **{app_name}** (clica **Yes**).\n 4. Torna aqu\u00ed i clica **SUBMIT**.\n \n [Enlla\u00e7 al compte de TelldusLive]({auth_url})",
diff --git a/homeassistant/components/tellduslive/.translations/en.json b/homeassistant/components/tellduslive/.translations/en.json
index 4ed9ef597f4..c2b00561858 100644
--- a/homeassistant/components/tellduslive/.translations/en.json
+++ b/homeassistant/components/tellduslive/.translations/en.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "abort": {
+            "all_configured": "TelldusLive is already configured",
             "already_setup": "TelldusLive is already configured",
             "authorize_url_fail": "Unknown error generating an authorize url.",
             "authorize_url_timeout": "Timeout generating authorize url.",
diff --git a/homeassistant/components/tellduslive/.translations/es.json b/homeassistant/components/tellduslive/.translations/es.json
new file mode 100644
index 00000000000..4e7de72edc4
--- /dev/null
+++ b/homeassistant/components/tellduslive/.translations/es.json
@@ -0,0 +1,10 @@
+{
+    "config": {
+        "abort": {
+            "already_setup": "TelldusLive ya est\u00e1 configurado"
+        },
+        "error": {
+            "auth_error": "Error de autenticaci\u00f3n, por favor int\u00e9ntalo de nuevo"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tellduslive/.translations/ko.json b/homeassistant/components/tellduslive/.translations/ko.json
index a7b68bbf8be..29f64a87cb3 100644
--- a/homeassistant/components/tellduslive/.translations/ko.json
+++ b/homeassistant/components/tellduslive/.translations/ko.json
@@ -2,10 +2,14 @@
     "config": {
         "abort": {
             "all_configured": "TelldusLive \uac00 \uc774\ubbf8 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4",
+            "already_setup": "TelldusLive \uac00 \uc774\ubbf8 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4",
             "authorize_url_fail": "\uc778\uc99d url \uc0dd\uc131\uc5d0 \uc54c \uc218 \uc5c6\ub294 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.",
             "authorize_url_timeout": "\uc778\uc99d url \uc0dd\uc131 \uc2dc\uac04\uc774 \ucd08\uacfc\ub418\uc5c8\uc2b5\ub2c8\ub2e4.",
             "unknown": "\uc54c \uc218\uc5c6\ub294 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4"
         },
+        "error": {
+            "auth_error": "\uc778\uc99d\uc774 \uc798\ubabb\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \ub2e4\uc2dc \uc2dc\ub3c4\ud574 \uc8fc\uc138\uc694."
+        },
         "step": {
             "auth": {
                 "description": "TelldusLive \uacc4\uc815\uc744 \uc5f0\uacb0\ud558\ub824\uba74:\n 1. \ud558\ub2e8\uc758 \ub9c1\ud06c\ub97c \ud074\ub9ad\ud574\uc8fc\uc138\uc694\n 2. Telldus Live \uc5d0 \ub85c\uadf8\uc778 \ud558\uc138\uc694\n 3. Authorize **{app_name}** (**Yes** \ub97c \ud074\ub9ad\ud558\uc138\uc694).\n 4. \ub2e4\uc2dc \uc5ec\uae30\ub85c \ub3cc\uc544\uc640\uc11c **SUBMIT** \uc744 \ud074\ub9ad\ud558\uc138\uc694.\n\n [TelldusLive \uacc4\uc815 \uc5f0\uacb0\ud558\uae30]({auth_url})",
diff --git a/homeassistant/components/tellduslive/.translations/lb.json b/homeassistant/components/tellduslive/.translations/lb.json
index 85de49776c1..5eb4d1b978a 100644
--- a/homeassistant/components/tellduslive/.translations/lb.json
+++ b/homeassistant/components/tellduslive/.translations/lb.json
@@ -2,10 +2,14 @@
     "config": {
         "abort": {
             "all_configured": "TelldusLive ass scho konfigur\u00e9iert",
+            "already_setup": "TelldusLive ass scho konfigur\u00e9iert",
             "authorize_url_fail": "Onbekannte Feeler beim gener\u00e9ieren vun der Autorisatiouns URL.",
             "authorize_url_timeout": "Z\u00e4it Iwwerschreidung beim gener\u00e9ieren vun der Autorisatiouns URL.",
             "unknown": "Onbekannten Fehler opgetrueden"
         },
+        "error": {
+            "auth_error": "Feeler bei der Authentifikatioun, prob\u00e9iert w.e.g. nach emol"
+        },
         "step": {
             "auth": {
                 "description": "Fir den TelldusLive Kont ze verbannen:\n1. Klickt op de Link \u00ebnnen\n2. Verbannt iech mat TelldusLive\n3. Autoris\u00e9iert **{app_name}** (klickt **Yes**)\n4. Kommt heihinner zer\u00e9ck a klickt **Ofsch\u00e9cken**\n\n[Tellduslive Kont verbannen]({auth_url})",
diff --git a/homeassistant/components/tellduslive/.translations/no.json b/homeassistant/components/tellduslive/.translations/no.json
index 5c3d343dd03..2c6439b364f 100644
--- a/homeassistant/components/tellduslive/.translations/no.json
+++ b/homeassistant/components/tellduslive/.translations/no.json
@@ -2,10 +2,14 @@
     "config": {
         "abort": {
             "all_configured": "TelldusLive er allerede konfigurert",
+            "already_setup": "TelldusLive er allerede konfigurert",
             "authorize_url_fail": "Ukjent feil ved generering av autoriseringsadresse.",
             "authorize_url_timeout": "Tidsavbrudd ved generering av autoriseringsadresse.",
             "unknown": "Ukjent feil oppstod"
         },
+        "error": {
+            "auth_error": "Autentiseringsfeil, vennligst pr\u00f8v igjen"
+        },
         "step": {
             "auth": {
                 "description": "For \u00e5 koble TelldusLive-kontoen din:\n 1. Klikk p\u00e5 linken under\n 2. Logg inn p\u00e5 Telldus Live \n 3. Tillat **{app_name}** (klikk**Ja**). \n 4. Kom tilbake hit og klikk **SUBMIT**. \n\n [Link TelldusLive-konto]({auth_url})",
diff --git a/homeassistant/components/tellduslive/.translations/pl.json b/homeassistant/components/tellduslive/.translations/pl.json
index 5ee9ac221a7..9d791e0e786 100644
--- a/homeassistant/components/tellduslive/.translations/pl.json
+++ b/homeassistant/components/tellduslive/.translations/pl.json
@@ -2,10 +2,14 @@
     "config": {
         "abort": {
             "all_configured": "TelldusLive jest ju\u017c skonfigurowany",
+            "already_setup": "TelldusLive jest ju\u017c skonfigurowany",
             "authorize_url_fail": "Nieznany b\u0142\u0105d podczas generowania url autoryzacji.",
             "authorize_url_timeout": "Min\u0105\u0142 limit czasu generowania url autoryzacji.",
             "unknown": "Wyst\u0105pi\u0142 nieznany b\u0142\u0105d"
         },
+        "error": {
+            "auth_error": "B\u0142\u0105d uwierzytelniania, spr\u00f3buj ponownie"
+        },
         "step": {
             "auth": {
                 "description": "Aby po\u0142\u0105czy\u0107 konto TelldusLive: \n 1. Kliknij poni\u017cszy link \n 2. Zaloguj si\u0119 do Telldus Live \n 3. Autoryzuj **{app_name}** (kliknij **Tak**). \n 4. Wr\u00f3\u0107 tutaj i kliknij **SUBMIT**. \n\n [Link do konta TelldusLive]({auth_url})",
diff --git a/homeassistant/components/tellduslive/.translations/ru.json b/homeassistant/components/tellduslive/.translations/ru.json
index 2e319b9400b..80dff6dc88a 100644
--- a/homeassistant/components/tellduslive/.translations/ru.json
+++ b/homeassistant/components/tellduslive/.translations/ru.json
@@ -2,10 +2,14 @@
     "config": {
         "abort": {
             "all_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "already_setup": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
             "authorize_url_fail": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438 \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
             "authorize_url_timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438 \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
             "unknown": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430"
         },
+        "error": {
+            "auth_error": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438, \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443"
+        },
         "step": {
             "auth": {
                 "description": "\u0414\u043b\u044f \u0442\u043e\u0433\u043e, \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u0438\u0432\u044f\u0437\u0430\u0442\u044c \u0430\u043a\u043a\u0430\u0443\u043d\u0442 TelldusLive:\n 1. \u041f\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u043f\u043e \u0441\u0441\u044b\u043b\u043a\u0435, \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0439 \u043d\u0438\u0436\u0435\n 2. \u0412\u043e\u0439\u0434\u0438\u0442\u0435 \u0432 Telldus Live\n 3. Authorize **{app_name}** (\u043d\u0430\u0436\u043c\u0438\u0442\u0435 **Yes**).\n 4. \u0412\u0435\u0440\u043d\u0438\u0442\u0435\u0441\u044c \u0441\u044e\u0434\u0430 \u0438 \u043d\u0430\u0436\u043c\u0438\u0442\u0435 **\u041f\u041e\u0414\u0422\u0412\u0415\u0420\u0414\u0418\u0422\u042c**.\n\n [\u0421\u0441\u044b\u043b\u043a\u0430 \u043d\u0430 TelldusLive]({auth_url})",
diff --git a/homeassistant/components/tellduslive/.translations/sl.json b/homeassistant/components/tellduslive/.translations/sl.json
index f4b9f0fda98..16e6ddcb5f4 100644
--- a/homeassistant/components/tellduslive/.translations/sl.json
+++ b/homeassistant/components/tellduslive/.translations/sl.json
@@ -2,10 +2,14 @@
     "config": {
         "abort": {
             "all_configured": "TelldusLive je \u017ee konfiguriran",
+            "already_setup": "TelldusLive je \u017ee konfiguriran",
             "authorize_url_fail": "Neznana napaka pri generiranju potrditvenega URL-ja.",
             "authorize_url_timeout": "\u010casovna omejitev za generiranje URL-ja je potekla.",
             "unknown": "Pri\u0161lo je do neznane napake"
         },
+        "error": {
+            "auth_error": "Napaka pri preverjanju pristnosti, poskusite znova"
+        },
         "step": {
             "auth": {
                 "description": "\u010ce \u017eelite povezati svoj ra\u010dun TelldusLive: \n 1. Kliknite spodnjo povezavo \n 2. Prijavite se v Telldus Live \n 3. Dovolite ** {app_name} ** (kliknite ** Da **). \n 4. Pridi nazaj in kliknite ** SUBMIT **. \n\n [Link TelldusLive ra\u010dun] ( {auth_url} )",
diff --git a/homeassistant/components/tellduslive/.translations/zh-Hans.json b/homeassistant/components/tellduslive/.translations/zh-Hans.json
new file mode 100644
index 00000000000..f707b1f15f8
--- /dev/null
+++ b/homeassistant/components/tellduslive/.translations/zh-Hans.json
@@ -0,0 +1,24 @@
+{
+    "config": {
+        "abort": {
+            "all_configured": "Tellduslive \u5df2\u914d\u7f6e\u5b8c\u6210",
+            "authorize_url_fail": "\u751f\u6210\u6388\u6743URL\u65f6\u53d1\u751f\u672a\u77e5\u9519\u8bef\u3002",
+            "authorize_url_timeout": "\u751f\u6210\u6388\u6743URL\u8d85\u65f6",
+            "unknown": "\u53d1\u751f\u672a\u77e5\u7684\u9519\u8bef"
+        },
+        "error": {
+            "auth_error": "\u53cc\u91cd\u8ba4\u8bc1\u5931\u8d25\uff0c\u8bf7\u91cd\u8bd5\u3002"
+        },
+        "step": {
+            "auth": {
+                "description": "\u8981\u94fe\u63a5\u60a8\u7684TelldusLive\u8d26\u6237\uff1a \n 1.\u5355\u51fb\u4e0b\u9762\u7684\u94fe\u63a5\n 2.\u767b\u5f55Telldus Live \n 3.\u6388\u6743 **{app_name}** (\u70b9\u51fb **\u662f**)\u3002 \n 4.\u56de\u5230\u8fd9\u91cc\uff0c\u7136\u540e\u70b9\u51fb**\u63d0\u4ea4**\u3002 \n\n [TelldusLive\u8d26\u6237\u94fe\u63a5]({auth_url})"
+            },
+            "user": {
+                "data": {
+                    "host": "\u4e3b\u673a"
+                },
+                "description": "\u7a7a\u767d"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tellduslive/.translations/zh-Hant.json b/homeassistant/components/tellduslive/.translations/zh-Hant.json
index a5e3c652c0c..c632b543634 100644
--- a/homeassistant/components/tellduslive/.translations/zh-Hant.json
+++ b/homeassistant/components/tellduslive/.translations/zh-Hant.json
@@ -2,10 +2,14 @@
     "config": {
         "abort": {
             "all_configured": "TelldusLive \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_setup": "TelldusLive \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "authorize_url_fail": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u767c\u751f\u672a\u77e5\u932f\u8aa4",
             "authorize_url_timeout": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u903e\u6642",
             "unknown": "\u767c\u751f\u672a\u77e5\u932f\u8aa4\u3002"
         },
+        "error": {
+            "auth_error": "\u8a8d\u8b49\u932f\u8aa4\uff0c\u8acb\u518d\u8a66\u4e00\u6b21\u3002"
+        },
         "step": {
             "auth": {
                 "description": "\u6b32\u9023\u7d50 TelldusLive \u5e33\u865f\uff1a\n 1. \u9ede\u9078\u4e0b\u65b9\u9023\u7d50\n 2. \u767b\u5165\u81f3 Telldus Live\n 3. \u5c0d **{app_name}** \u9032\u884c\u6388\u6b0a\uff08\u9ede\u9078 **Yes**\uff09\u3002\n 4. \u56de\u5230\u672c\u9801\u9762\u4e26\u9ede\u9078 **\u50b3\u9001**\u3002\n\n [Link TelldusLive account]({auth_url})",
diff --git a/homeassistant/components/twilio/.translations/sl.json b/homeassistant/components/twilio/.translations/sl.json
index 0321cb05452..86d2c44f11c 100644
--- a/homeassistant/components/twilio/.translations/sl.json
+++ b/homeassistant/components/twilio/.translations/sl.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": " \u010ce \u017eelite prejemati sporo\u010dila Twilio, mora biti Home Assistent dostopen prek interneta.",
+            "not_internet_accessible": "\u010ce \u017eelite prejemati sporo\u010dila Twilio, mora biti Home Assistant dostopen prek interneta.",
             "one_instance_allowed": "Potrebna je samo ena instanca."
         },
         "create_entry": {
-            "default": "Za po\u0161iljanje dogodkov Home Assistent-u, boste morali nastaviti [Webhooks z Twilio]({twilio_url}).\n\nIzpolnite naslednje informacije:\n\n- URL: `{webhook_url}`\n- Metoda: POST\n- Vrsta vsebine: application/x-www-form-urlencoded\n\nGlej [dokumentacijo]({docs_url}) o tem, kako nastavite avtomatizacijo za obravnavo dohodnih podatkov."
+            "default": "Za po\u0161iljanje dogodkov Home Assistant-u, boste morali nastaviti [Webhooks z Twilio]({twilio_url}).\n\nIzpolnite naslednje informacije:\n\n- URL: `{webhook_url}`\n- Metoda: POST\n- Vrsta vsebine: application/x-www-form-urlencoded\n\nGlej [dokumentacijo]({docs_url}) o tem, kako nastavite avtomatizacijo za obravnavo dohodnih podatkov."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/twilio/.translations/zh-Hans.json b/homeassistant/components/twilio/.translations/zh-Hans.json
index e108fe12498..6fda9f0143c 100644
--- a/homeassistant/components/twilio/.translations/zh-Hans.json
+++ b/homeassistant/components/twilio/.translations/zh-Hans.json
@@ -1,7 +1,18 @@
 {
     "config": {
+        "abort": {
+            "not_internet_accessible": "\u60a8\u7684 Home Assistant \u5b9e\u4f8b\u9700\u8981\u63a5\u5165\u4e92\u8054\u7f51\u4ee5\u63a5\u6536 Twilio \u6d88\u606f\u3002",
+            "one_instance_allowed": "\u4ec5\u9700\u4e00\u4e2a\u5b9e\u4f8b"
+        },
         "create_entry": {
             "default": "\u8981\u5411 Home Assistant \u53d1\u9001\u4e8b\u4ef6\uff0c\u60a8\u9700\u8981\u914d\u7f6e [Twilio \u7684 Webhook]({twilio_url})\u3002\n\n\u586b\u5199\u4ee5\u4e0b\u4fe1\u606f\uff1a\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\n\u6709\u5173\u5982\u4f55\u914d\u7f6e\u81ea\u52a8\u5316\u4ee5\u5904\u7406\u4f20\u5165\u7684\u6570\u636e\uff0c\u8bf7\u53c2\u9605[\u6587\u6863]({docs_url})\u3002"
-        }
+        },
+        "step": {
+            "user": {
+                "description": "\u60a8\u786e\u5b9a\u8981\u8bbe\u7f6e Twilio \u5417\uff1f",
+                "title": "\u8bbe\u7f6e Twilio Webhook"
+            }
+        },
+        "title": "Twilio"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/upnp/.translations/sl.json b/homeassistant/components/upnp/.translations/sl.json
index 4bf6501bd2a..4c019d8f207 100644
--- a/homeassistant/components/upnp/.translations/sl.json
+++ b/homeassistant/components/upnp/.translations/sl.json
@@ -24,7 +24,7 @@
             },
             "user": {
                 "data": {
-                    "enable_port_mapping": "Omogo\u010dajo preslikavo vrat (port mapping) za Home Assistent-a",
+                    "enable_port_mapping": "Omogo\u010dajo preslikavo vrat (port mapping) za Home Assistant-a",
                     "enable_sensors": "Dodaj prometne senzorje",
                     "igd": "UPnP/IGD"
                 },
diff --git a/homeassistant/components/upnp/.translations/zh-Hans.json b/homeassistant/components/upnp/.translations/zh-Hans.json
index b16172e97d7..2194a2dc264 100644
--- a/homeassistant/components/upnp/.translations/zh-Hans.json
+++ b/homeassistant/components/upnp/.translations/zh-Hans.json
@@ -4,9 +4,15 @@
             "already_configured": "UPnP/IGD \u5df2\u914d\u7f6e\u5b8c\u6210",
             "incomplete_device": "\u5ffd\u7565\u4e0d\u5b8c\u6574\u7684 UPnP \u8bbe\u5907",
             "no_devices_discovered": "\u672a\u53d1\u73b0 UPnP/IGD",
-            "no_sensors_or_port_mapping": "\u81f3\u5c11\u542f\u7528\u4f20\u611f\u5668\u6216\u7aef\u53e3\u6620\u5c04"
+            "no_devices_found": "\u6ca1\u6709\u5728\u7f51\u7edc\u4e0a\u627e\u5230 UPnP/IGD \u8bbe\u5907\u3002",
+            "no_sensors_or_port_mapping": "\u81f3\u5c11\u542f\u7528\u4f20\u611f\u5668\u6216\u7aef\u53e3\u6620\u5c04",
+            "single_instance_allowed": "UPnP/IGD \u53ea\u9700\u8981\u914d\u7f6e\u4e00\u6b21\u3002"
         },
         "step": {
+            "confirm": {
+                "description": "\u60a8\u60f3\u8981\u914d\u7f6e UPnP/IGD \u5417\uff1f",
+                "title": "UPnP/IGD"
+            },
             "init": {
                 "title": "UPnP/IGD"
             },
diff --git a/homeassistant/components/zha/.translations/zh-Hans.json b/homeassistant/components/zha/.translations/zh-Hans.json
index 8befb2ee114..ce458fa32f1 100644
--- a/homeassistant/components/zha/.translations/zh-Hans.json
+++ b/homeassistant/components/zha/.translations/zh-Hans.json
@@ -1,11 +1,20 @@
 {
     "config": {
+        "abort": {
+            "single_instance_allowed": "\u53ea\u5141\u8bb8\u4e00\u4e2a ZHA \u914d\u7f6e\u3002"
+        },
+        "error": {
+            "cannot_connect": "\u65e0\u6cd5\u8fde\u63a5\u5230 ZHA \u8bbe\u5907\u3002"
+        },
         "step": {
             "user": {
                 "data": {
                     "usb_path": "USB \u8bbe\u5907\u8def\u5f84"
-                }
+                },
+                "description": "\u7a7a\u767d",
+                "title": "ZHA"
             }
-        }
+        },
+        "title": "ZHA"
     }
 }
\ No newline at end of file

From 8988ee5b346652b4f93f97e39f9913052b12695c Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sat, 2 Feb 2019 14:03:13 -0800
Subject: [PATCH 11/45] Updated frontend to 20190202.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index 8f3afef16cd..b5836e67ffc 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -24,7 +24,7 @@ from homeassistant.core import callback
 from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 
-REQUIREMENTS = ['home-assistant-frontend==20190201.0']
+REQUIREMENTS = ['home-assistant-frontend==20190202.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index 22bed82f26b..ea8afeb6a09 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -526,7 +526,7 @@ hole==0.3.0
 holidays==0.9.9
 
 # homeassistant.components.frontend
-home-assistant-frontend==20190201.0
+home-assistant-frontend==20190202.0
 
 # homeassistant.components.zwave
 homeassistant-pyozw==0.1.2
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index ec2c9153137..4ebef8bc1e6 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -113,7 +113,7 @@ hdate==0.8.7
 holidays==0.9.9
 
 # homeassistant.components.frontend
-home-assistant-frontend==20190201.0
+home-assistant-frontend==20190202.0
 
 # homeassistant.components.homekit_controller
 homekit==0.12.2

From 785b42ecde6460ba0835b5cf3a01b898854764d9 Mon Sep 17 00:00:00 2001
From: Andrew Sayre <6730289+andrewsayre@users.noreply.github.com>
Date: Sat, 2 Feb 2019 09:12:24 -0600
Subject: [PATCH 12/45] Add SmartThings Light platform (#20652)

* Add SmartThings Light platform and tests

* Cleaned a few awk comments

* Updates per review feedback

* Switched to super

* Changes per review feedback
---
 homeassistant/components/smartthings/const.py |   1 +
 homeassistant/components/smartthings/light.py | 215 +++++++++++++
 tests/components/smartthings/test_light.py    | 293 ++++++++++++++++++
 tests/components/smartthings/test_switch.py   |  17 +-
 4 files changed, 518 insertions(+), 8 deletions(-)
 create mode 100644 homeassistant/components/smartthings/light.py
 create mode 100644 tests/components/smartthings/test_light.py

diff --git a/homeassistant/components/smartthings/const.py b/homeassistant/components/smartthings/const.py
index 9a6d96bfab9..a9f47fc7c72 100644
--- a/homeassistant/components/smartthings/const.py
+++ b/homeassistant/components/smartthings/const.py
@@ -18,6 +18,7 @@ SETTINGS_INSTANCE_ID = "hassInstanceId"
 STORAGE_KEY = DOMAIN
 STORAGE_VERSION = 1
 SUPPORTED_PLATFORMS = [
+    'light',
     'switch'
 ]
 SUPPORTED_CAPABILITIES = [
diff --git a/homeassistant/components/smartthings/light.py b/homeassistant/components/smartthings/light.py
new file mode 100644
index 00000000000..8495be62a73
--- /dev/null
+++ b/homeassistant/components/smartthings/light.py
@@ -0,0 +1,215 @@
+"""
+Support for lights through the SmartThings cloud API.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/smartthings.light/
+"""
+import asyncio
+
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_HS_COLOR, ATTR_TRANSITION,
+    SUPPORT_BRIGHTNESS, SUPPORT_COLOR, SUPPORT_COLOR_TEMP, SUPPORT_TRANSITION,
+    Light)
+import homeassistant.util.color as color_util
+
+from . import SmartThingsEntity
+from .const import DATA_BROKERS, DOMAIN
+
+DEPENDENCIES = ['smartthings']
+
+
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
+    """Platform uses config entry setup."""
+    pass
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Add lights for a config entry."""
+    broker = hass.data[DOMAIN][DATA_BROKERS][config_entry.entry_id]
+    async_add_entities(
+        [SmartThingsLight(device) for device in broker.devices.values()
+         if is_light(device)], True)
+
+
+def is_light(device):
+    """Determine if the device should be represented as a light."""
+    from pysmartthings import Capability
+
+    # Must be able to be turned on/off.
+    if Capability.switch not in device.capabilities:
+        return False
+    # Not a fan (which might also have switch_level)
+    if Capability.fan_speed in device.capabilities:
+        return False
+    # Must have one of these
+    light_capabilities = [
+        Capability.color_control,
+        Capability.color_temperature,
+        Capability.switch_level
+    ]
+    if any(capability in device.capabilities
+           for capability in light_capabilities):
+        return True
+    return False
+
+
+def convert_scale(value, value_scale, target_scale, round_digits=4):
+    """Convert a value to a different scale."""
+    return round(value * target_scale / value_scale, round_digits)
+
+
+class SmartThingsLight(SmartThingsEntity, Light):
+    """Define a SmartThings Light."""
+
+    def __init__(self, device):
+        """Initialize a SmartThingsLight."""
+        super().__init__(device)
+        self._brightness = None
+        self._color_temp = None
+        self._hs_color = None
+        self._supported_features = self._determine_features()
+
+    def _determine_features(self):
+        """Get features supported by the device."""
+        from pysmartthings.device import Capability
+
+        features = 0
+        # Brightness and transition
+        if Capability.switch_level in self._device.capabilities:
+            features |= \
+                SUPPORT_BRIGHTNESS | SUPPORT_TRANSITION
+        # Color Temperature
+        if Capability.color_temperature in self._device.capabilities:
+            features |= SUPPORT_COLOR_TEMP
+        # Color
+        if Capability.color_control in self._device.capabilities:
+            features |= SUPPORT_COLOR
+
+        return features
+
+    async def async_turn_on(self, **kwargs) -> None:
+        """Turn the light on."""
+        tasks = []
+        # Color temperature
+        if self._supported_features & SUPPORT_COLOR_TEMP \
+           and ATTR_COLOR_TEMP in kwargs:
+            tasks.append(self.async_set_color_temp(
+                kwargs[ATTR_COLOR_TEMP]))
+        # Color
+        if self._supported_features & SUPPORT_COLOR \
+           and ATTR_HS_COLOR in kwargs:
+            tasks.append(self.async_set_color(
+                kwargs[ATTR_HS_COLOR]))
+        if tasks:
+            # Set temp/color first
+            await asyncio.gather(*tasks)
+
+        # Switch/brightness/transition
+        if self._supported_features & SUPPORT_BRIGHTNESS \
+           and ATTR_BRIGHTNESS in kwargs:
+            await self.async_set_level(
+                kwargs[ATTR_BRIGHTNESS],
+                kwargs.get(ATTR_TRANSITION, 0))
+        else:
+            await self._device.switch_on(set_status=True)
+
+        # State is set optimistically in the commands above, therefore update
+        # the entity state ahead of receiving the confirming push updates
+        self.async_schedule_update_ha_state(True)
+
+    async def async_turn_off(self, **kwargs) -> None:
+        """Turn the light off."""
+        # Switch/transition
+        if self._supported_features & SUPPORT_TRANSITION \
+                and ATTR_TRANSITION in kwargs:
+            await self.async_set_level(0, int(kwargs[ATTR_TRANSITION]))
+        else:
+            await self._device.switch_off(set_status=True)
+
+        # State is set optimistically in the commands above, therefore update
+        # the entity state ahead of receiving the confirming push updates
+        self.async_schedule_update_ha_state(True)
+
+    async def async_update(self):
+        """Update entity attributes when the device status has changed."""
+        # Brightness and transition
+        if self._supported_features & SUPPORT_BRIGHTNESS:
+            self._brightness = convert_scale(
+                self._device.status.level, 100, 255)
+        # Color Temperature
+        if self._supported_features & SUPPORT_COLOR_TEMP:
+            self._color_temp = color_util.color_temperature_kelvin_to_mired(
+                self._device.status.color_temperature)
+        # Color
+        if self._supported_features & SUPPORT_COLOR:
+            self._hs_color = (
+                convert_scale(self._device.status.hue, 100, 360),
+                self._device.status.saturation
+            )
+
+    async def async_set_color(self, hs_color):
+        """Set the color of the device."""
+        hue = convert_scale(float(hs_color[0]), 360, 100)
+        hue = max(min(hue, 100.0), 0.0)
+        saturation = max(min(float(hs_color[1]), 100.0), 0.0)
+        await self._device.set_color(
+            hue, saturation, set_status=True)
+
+    async def async_set_color_temp(self, value: float):
+        """Set the color temperature of the device."""
+        kelvin = color_util.color_temperature_mired_to_kelvin(value)
+        kelvin = max(min(kelvin, 30000.0), 1.0)
+        await self._device.set_color_temperature(
+            kelvin, set_status=True)
+
+    async def async_set_level(self, brightness: int, transition: int):
+        """Set the brightness of the light over transition."""
+        level = int(convert_scale(brightness, 255, 100, 0))
+        # Due to rounding, set level to 1 (one) so we don't inadvertently
+        # turn off the light when a low brightness is set.
+        level = 1 if level == 0 and brightness > 0 else level
+        level = max(min(level, 100), 0)
+        duration = int(transition)
+        await self._device.set_level(level, duration, set_status=True)
+
+    @property
+    def brightness(self):
+        """Return the brightness of this light between 0..255."""
+        return self._brightness
+
+    @property
+    def color_temp(self):
+        """Return the CT color value in mireds."""
+        return self._color_temp
+
+    @property
+    def hs_color(self):
+        """Return the hue and saturation color value [float, float]."""
+        return self._hs_color
+
+    @property
+    def is_on(self) -> bool:
+        """Return true if light is on."""
+        return self._device.status.switch
+
+    @property
+    def max_mireds(self):
+        """Return the warmest color_temp that this light supports."""
+        # SmartThings does not expose this attribute, instead it's
+        # implemented within each device-type handler.  This value is the
+        # lowest kelvin found supported across 20+ handlers.
+        return 500  # 2000K
+
+    @property
+    def min_mireds(self):
+        """Return the coldest color_temp that this light supports."""
+        # SmartThings does not expose this attribute, instead it's
+        # implemented within each device-type handler.  This value is the
+        # highest kelvin found supported across 20+ handlers.
+        return 111  # 9000K
+
+    @property
+    def supported_features(self) -> int:
+        """Flag supported features."""
+        return self._supported_features
diff --git a/tests/components/smartthings/test_light.py b/tests/components/smartthings/test_light.py
new file mode 100644
index 00000000000..a4f1103f270
--- /dev/null
+++ b/tests/components/smartthings/test_light.py
@@ -0,0 +1,293 @@
+"""
+Test for the SmartThings light platform.
+
+The only mocking required is of the underlying SmartThings API object so
+real HTTP calls are not initiated during testing.
+"""
+from pysmartthings import Attribute, Capability
+import pytest
+
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_HS_COLOR, ATTR_TRANSITION,
+    SUPPORT_BRIGHTNESS, SUPPORT_COLOR, SUPPORT_COLOR_TEMP, SUPPORT_TRANSITION)
+from homeassistant.components.smartthings import DeviceBroker, light
+from homeassistant.components.smartthings.const import (
+    DATA_BROKERS, DOMAIN, SIGNAL_SMARTTHINGS_UPDATE)
+from homeassistant.config_entries import (
+    CONN_CLASS_CLOUD_PUSH, SOURCE_USER, ConfigEntry)
+from homeassistant.const import ATTR_ENTITY_ID, ATTR_SUPPORTED_FEATURES
+from homeassistant.helpers.dispatcher import async_dispatcher_send
+
+
+@pytest.fixture(name="light_devices")
+def light_devices_fixture(device_factory):
+    """Fixture returns a set of mock light devices."""
+    return [
+        device_factory(
+            "Dimmer 1",
+            capabilities=[Capability.switch, Capability.switch_level],
+            status={Attribute.switch: 'on', Attribute.level: 100}),
+        device_factory(
+            "Color Dimmer 1",
+            capabilities=[Capability.switch, Capability.switch_level,
+                          Capability.color_control],
+            status={Attribute.switch: 'off', Attribute.level: 0,
+                    Attribute.hue: 76.0, Attribute.saturation: 55.0}),
+        device_factory(
+            "Color Dimmer 2",
+            capabilities=[Capability.switch, Capability.switch_level,
+                          Capability.color_control,
+                          Capability.color_temperature],
+            status={Attribute.switch: 'on', Attribute.level: 100,
+                    Attribute.hue: 76.0, Attribute.saturation: 55.0,
+                    Attribute.color_temperature: 4500})
+    ]
+
+
+async def _setup_platform(hass, *devices):
+    """Set up the SmartThings light platform and prerequisites."""
+    hass.config.components.add(DOMAIN)
+    broker = DeviceBroker(hass, devices, '')
+    config_entry = ConfigEntry("1", DOMAIN, "Test", {},
+                               SOURCE_USER, CONN_CLASS_CLOUD_PUSH)
+    hass.data[DOMAIN] = {
+        DATA_BROKERS: {
+            config_entry.entry_id: broker
+        }
+    }
+    await hass.config_entries.async_forward_entry_setup(config_entry, 'light')
+    await hass.async_block_till_done()
+    return config_entry
+
+
+async def test_async_setup_platform():
+    """Test setup platform does nothing (it uses config entries)."""
+    await light.async_setup_platform(None, None, None)
+
+
+def test_is_light(device_factory, light_devices):
+    """Test lights are correctly identified."""
+    non_lights = [
+        device_factory('Unknown', ['Unknown']),
+        device_factory("Fan 1",
+                       [Capability.switch, Capability.switch_level,
+                        Capability.fan_speed]),
+        device_factory("Switch 1", [Capability.switch]),
+        device_factory("Can't be turned off",
+                       [Capability.switch_level, Capability.color_control,
+                        Capability.color_temperature])
+    ]
+
+    for device in light_devices:
+        assert light.is_light(device), device.name
+    for device in non_lights:
+        assert not light.is_light(device), device.name
+
+
+async def test_entity_state(hass, light_devices):
+    """Tests the state attributes properly match the light types."""
+    await _setup_platform(hass, *light_devices)
+
+    # Dimmer 1
+    state = hass.states.get('light.dimmer_1')
+    assert state.state == 'on'
+    assert state.attributes[ATTR_SUPPORTED_FEATURES] == \
+        SUPPORT_BRIGHTNESS | SUPPORT_TRANSITION
+    assert state.attributes[ATTR_BRIGHTNESS] == 255
+
+    # Color Dimmer 1
+    state = hass.states.get('light.color_dimmer_1')
+    assert state.state == 'off'
+    assert state.attributes[ATTR_SUPPORTED_FEATURES] == \
+        SUPPORT_BRIGHTNESS | SUPPORT_TRANSITION | SUPPORT_COLOR
+
+    # Color Dimmer 2
+    state = hass.states.get('light.color_dimmer_2')
+    assert state.state == 'on'
+    assert state.attributes[ATTR_SUPPORTED_FEATURES] == \
+        SUPPORT_BRIGHTNESS | SUPPORT_TRANSITION | SUPPORT_COLOR | \
+        SUPPORT_COLOR_TEMP
+    assert state.attributes[ATTR_BRIGHTNESS] == 255
+    assert state.attributes[ATTR_HS_COLOR] == (273.6, 55.0)
+    assert state.attributes[ATTR_COLOR_TEMP] == 222
+
+
+async def test_entity_and_device_attributes(hass, device_factory):
+    """Test the attributes of the entity are correct."""
+    # Arrange
+    device = device_factory(
+        "Light 1", [Capability.switch, Capability.switch_level])
+    entity_registry = await hass.helpers.entity_registry.async_get_registry()
+    device_registry = await hass.helpers.device_registry.async_get_registry()
+    # Act
+    await _setup_platform(hass, device)
+    # Assert
+    entry = entity_registry.async_get("light.light_1")
+    assert entry
+    assert entry.unique_id == device.device_id
+
+    entry = device_registry.async_get_device(
+        {(DOMAIN, device.device_id)}, [])
+    assert entry
+    assert entry.name == device.label
+    assert entry.model == device.device_type_name
+    assert entry.manufacturer == 'Unavailable'
+
+
+async def test_turn_off(hass, light_devices):
+    """Test the light turns of successfully."""
+    # Arrange
+    await _setup_platform(hass, *light_devices)
+    # Act
+    await hass.services.async_call(
+        'light', 'turn_off', {'entity_id': 'light.color_dimmer_2'},
+        blocking=True)
+    # Assert
+    state = hass.states.get('light.color_dimmer_2')
+    assert state is not None
+    assert state.state == 'off'
+
+
+async def test_turn_off_with_transition(hass, light_devices):
+    """Test the light turns of successfully with transition."""
+    # Arrange
+    await _setup_platform(hass, *light_devices)
+    # Act
+    await hass.services.async_call(
+        'light', 'turn_off',
+        {ATTR_ENTITY_ID: "light.color_dimmer_2", ATTR_TRANSITION: 2},
+        blocking=True)
+    # Assert
+    state = hass.states.get("light.color_dimmer_2")
+    assert state is not None
+    assert state.state == 'off'
+
+
+async def test_turn_on(hass, light_devices):
+    """Test the light turns of successfully."""
+    # Arrange
+    await _setup_platform(hass, *light_devices)
+    # Act
+    await hass.services.async_call(
+        'light', 'turn_on', {ATTR_ENTITY_ID: "light.color_dimmer_1"},
+        blocking=True)
+    # Assert
+    state = hass.states.get("light.color_dimmer_1")
+    assert state is not None
+    assert state.state == 'on'
+
+
+async def test_turn_on_with_brightness(hass, light_devices):
+    """Test the light turns on to the specified brightness."""
+    # Arrange
+    await _setup_platform(hass, *light_devices)
+    # Act
+    await hass.services.async_call(
+        'light', 'turn_on',
+        {ATTR_ENTITY_ID: "light.color_dimmer_1",
+         ATTR_BRIGHTNESS: 75, ATTR_TRANSITION: 2},
+        blocking=True)
+    # Assert
+    state = hass.states.get("light.color_dimmer_1")
+    assert state is not None
+    assert state.state == 'on'
+    # round-trip rounding error (expected)
+    assert state.attributes[ATTR_BRIGHTNESS] == 73.95
+
+
+async def test_turn_on_with_minimal_brightness(hass, light_devices):
+    """
+    Test lights set to lowest brightness when converted scale would be zero.
+
+    SmartThings light brightness is a percentage (0-100), but HASS uses a
+    0-255 scale.  This tests if a really low value (1-2) is passed, we don't
+    set the level to zero, which turns off the lights in SmartThings.
+    """
+    # Arrange
+    await _setup_platform(hass, *light_devices)
+    # Act
+    await hass.services.async_call(
+        'light', 'turn_on',
+        {ATTR_ENTITY_ID: "light.color_dimmer_1",
+         ATTR_BRIGHTNESS: 2},
+        blocking=True)
+    # Assert
+    state = hass.states.get("light.color_dimmer_1")
+    assert state is not None
+    assert state.state == 'on'
+    # round-trip rounding error (expected)
+    assert state.attributes[ATTR_BRIGHTNESS] == 2.55
+
+
+async def test_turn_on_with_color(hass, light_devices):
+    """Test the light turns on with color."""
+    # Arrange
+    await _setup_platform(hass, *light_devices)
+    # Act
+    await hass.services.async_call(
+        'light', 'turn_on',
+        {ATTR_ENTITY_ID: "light.color_dimmer_2",
+         ATTR_HS_COLOR: (180, 50)},
+        blocking=True)
+    # Assert
+    state = hass.states.get("light.color_dimmer_2")
+    assert state is not None
+    assert state.state == 'on'
+    assert state.attributes[ATTR_HS_COLOR] == (180, 50)
+
+
+async def test_turn_on_with_color_temp(hass, light_devices):
+    """Test the light turns on with color temp."""
+    # Arrange
+    await _setup_platform(hass, *light_devices)
+    # Act
+    await hass.services.async_call(
+        'light', 'turn_on',
+        {ATTR_ENTITY_ID: "light.color_dimmer_2",
+         ATTR_COLOR_TEMP: 300},
+        blocking=True)
+    # Assert
+    state = hass.states.get("light.color_dimmer_2")
+    assert state is not None
+    assert state.state == 'on'
+    assert state.attributes[ATTR_COLOR_TEMP] == 300
+
+
+async def test_update_from_signal(hass, device_factory):
+    """Test the light updates when receiving a signal."""
+    # Arrange
+    device = device_factory(
+        "Color Dimmer 2",
+        capabilities=[Capability.switch, Capability.switch_level,
+                      Capability.color_control, Capability.color_temperature],
+        status={Attribute.switch: 'off', Attribute.level: 100,
+                Attribute.hue: 76.0, Attribute.saturation: 55.0,
+                Attribute.color_temperature: 4500})
+    await _setup_platform(hass, device)
+    await device.switch_on(True)
+    # Act
+    async_dispatcher_send(hass, SIGNAL_SMARTTHINGS_UPDATE,
+                          [device.device_id])
+    # Assert
+    await hass.async_block_till_done()
+    state = hass.states.get('light.color_dimmer_2')
+    assert state is not None
+    assert state.state == 'on'
+
+
+async def test_unload_config_entry(hass, device_factory):
+    """Test the light is removed when the config entry is unloaded."""
+    # Arrange
+    device = device_factory(
+        "Color Dimmer 2",
+        capabilities=[Capability.switch, Capability.switch_level,
+                      Capability.color_control, Capability.color_temperature],
+        status={Attribute.switch: 'off', Attribute.level: 100,
+                Attribute.hue: 76.0, Attribute.saturation: 55.0,
+                Attribute.color_temperature: 4500})
+    config_entry = await _setup_platform(hass, device)
+    # Act
+    await hass.config_entries.async_forward_entry_unload(
+        config_entry, 'light')
+    # Assert
+    assert not hass.states.get('light.color_dimmer_2')
diff --git a/tests/components/smartthings/test_switch.py b/tests/components/smartthings/test_switch.py
index 7bf8b15af51..a8013105291 100644
--- a/tests/components/smartthings/test_switch.py
+++ b/tests/components/smartthings/test_switch.py
@@ -62,15 +62,16 @@ async def test_entity_and_device_attributes(hass, device_factory):
     # Act
     await _setup_platform(hass, device)
     # Assert
-    entity = entity_registry.async_get('switch.switch_1')
-    assert entity
-    assert entity.unique_id == device.device_id
-    device_entry = device_registry.async_get_device(
+    entry = entity_registry.async_get('switch.switch_1')
+    assert entry
+    assert entry.unique_id == device.device_id
+
+    entry = device_registry.async_get_device(
         {(DOMAIN, device.device_id)}, [])
-    assert device_entry
-    assert device_entry.name == device.label
-    assert device_entry.model == device.device_type_name
-    assert device_entry.manufacturer == 'Unavailable'
+    assert entry
+    assert entry.name == device.label
+    assert entry.model == device.device_type_name
+    assert entry.manufacturer == 'Unavailable'
 
 
 async def test_turn_off(hass, device_factory):

From c0fd22c2856d6015cef97b3d786b3a68116b53f0 Mon Sep 17 00:00:00 2001
From: Rohan Kapoor <rohan@rohankapoor.com>
Date: Fri, 1 Feb 2019 00:40:27 -0800
Subject: [PATCH 13/45] Fix allow extra in locative webhook schema validation
 (#20657)

* Allow extra in locative webhook schema validation (fixes #20566)

* Remove extra attribute
---
 homeassistant/components/locative/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/locative/__init__.py b/homeassistant/components/locative/__init__.py
index 195eacf17c2..1f7f9c3a686 100644
--- a/homeassistant/components/locative/__init__.py
+++ b/homeassistant/components/locative/__init__.py
@@ -48,8 +48,8 @@ WEBHOOK_SCHEMA = vol.All(
         vol.Required(ATTR_LONGITUDE): cv.longitude,
         vol.Required(ATTR_DEVICE_ID): cv.string,
         vol.Required(ATTR_TRIGGER): cv.string,
-        vol.Optional(ATTR_ID): vol.All(cv.string, _id)
-    }),
+        vol.Optional(ATTR_ID): vol.All(cv.string, _id),
+    }, extra=vol.ALLOW_EXTRA),
     _validate_test_mode
 )
 

From b669e1498a3060b35e3dc3fe7d1271ffb9a1aca9 Mon Sep 17 00:00:00 2001
From: Andrew Sayre <6730289+andrewsayre@users.noreply.github.com>
Date: Sat, 2 Feb 2019 16:04:29 -0600
Subject: [PATCH 14/45] Add SmartThings Fan platform (#20681)

* Add SmartThings fan

* Removed unnecessary update method

* Corrected usage of async_schedule_update_ha_state

* Clean-up/optimization
---
 homeassistant/components/smartthings/const.py |   2 +
 homeassistant/components/smartthings/fan.py   |  96 ++++++++
 tests/components/smartthings/test_fan.py      | 213 ++++++++++++++++++
 3 files changed, 311 insertions(+)
 create mode 100644 homeassistant/components/smartthings/fan.py
 create mode 100644 tests/components/smartthings/test_fan.py

diff --git a/homeassistant/components/smartthings/const.py b/homeassistant/components/smartthings/const.py
index a9f47fc7c72..2834de4dcf1 100644
--- a/homeassistant/components/smartthings/const.py
+++ b/homeassistant/components/smartthings/const.py
@@ -18,12 +18,14 @@ SETTINGS_INSTANCE_ID = "hassInstanceId"
 STORAGE_KEY = DOMAIN
 STORAGE_VERSION = 1
 SUPPORTED_PLATFORMS = [
+    'fan',
     'light',
     'switch'
 ]
 SUPPORTED_CAPABILITIES = [
     'colorControl',
     'colorTemperature',
+    'fanSpeed',
     'switch',
     'switchLevel'
 ]
diff --git a/homeassistant/components/smartthings/fan.py b/homeassistant/components/smartthings/fan.py
new file mode 100644
index 00000000000..7862736e60b
--- /dev/null
+++ b/homeassistant/components/smartthings/fan.py
@@ -0,0 +1,96 @@
+"""
+Support for fans through the SmartThings cloud API.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/smartthings.fan/
+"""
+
+from homeassistant.components.fan import (
+    SPEED_HIGH, SPEED_LOW, SPEED_MEDIUM, SPEED_OFF, SUPPORT_SET_SPEED,
+    FanEntity)
+
+from . import SmartThingsEntity
+from .const import DATA_BROKERS, DOMAIN
+
+DEPENDENCIES = ['smartthings']
+
+VALUE_TO_SPEED = {
+    0: SPEED_OFF,
+    1: SPEED_LOW,
+    2: SPEED_MEDIUM,
+    3: SPEED_HIGH,
+}
+SPEED_TO_VALUE = {
+    v: k for k, v in VALUE_TO_SPEED.items()}
+
+
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
+    """Platform uses config entry setup."""
+    pass
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Add fans for a config entry."""
+    broker = hass.data[DOMAIN][DATA_BROKERS][config_entry.entry_id]
+    async_add_entities(
+        [SmartThingsFan(device) for device in broker.devices.values()
+         if is_fan(device)])
+
+
+def is_fan(device):
+    """Determine if the device should be represented as a fan."""
+    from pysmartthings import Capability
+    # Must have switch and fan_speed
+    return all(capability in device.capabilities
+               for capability in [Capability.switch, Capability.fan_speed])
+
+
+class SmartThingsFan(SmartThingsEntity, FanEntity):
+    """Define a SmartThings Fan."""
+
+    async def async_set_speed(self, speed: str):
+        """Set the speed of the fan."""
+        value = SPEED_TO_VALUE[speed]
+        await self._device.set_fan_speed(value, set_status=True)
+        # State is set optimistically in the command above, therefore update
+        # the entity state ahead of receiving the confirming push updates
+        self.async_schedule_update_ha_state()
+
+    async def async_turn_on(self, speed: str = None, **kwargs) -> None:
+        """Turn the fan on."""
+        if speed is not None:
+            value = SPEED_TO_VALUE[speed]
+            await self._device.set_fan_speed(value, set_status=True)
+        else:
+            await self._device.switch_on(set_status=True)
+        # State is set optimistically in the commands above, therefore update
+        # the entity state ahead of receiving the confirming push updates
+        self.async_schedule_update_ha_state()
+
+    async def async_turn_off(self, **kwargs) -> None:
+        """Turn the fan off."""
+        await self._device.switch_off(set_status=True)
+        # State is set optimistically in the command above, therefore update
+        # the entity state ahead of receiving the confirming push updates
+        self.async_schedule_update_ha_state()
+
+    @property
+    def is_on(self) -> bool:
+        """Return true if fan is on."""
+        return self._device.status.switch
+
+    @property
+    def speed(self) -> str:
+        """Return the current speed."""
+        return VALUE_TO_SPEED[self._device.status.fan_speed]
+
+    @property
+    def speed_list(self) -> list:
+        """Get the list of available speeds."""
+        return [SPEED_OFF, SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH]
+
+    @property
+    def supported_features(self) -> int:
+        """Flag supported features."""
+        return SUPPORT_SET_SPEED
diff --git a/tests/components/smartthings/test_fan.py b/tests/components/smartthings/test_fan.py
new file mode 100644
index 00000000000..99627e866d9
--- /dev/null
+++ b/tests/components/smartthings/test_fan.py
@@ -0,0 +1,213 @@
+"""
+Test for the SmartThings fan platform.
+
+The only mocking required is of the underlying SmartThings API object so
+real HTTP calls are not initiated during testing.
+"""
+from pysmartthings import Attribute, Capability
+
+from homeassistant.components.fan import (
+    ATTR_SPEED, ATTR_SPEED_LIST, SPEED_HIGH, SPEED_LOW, SPEED_MEDIUM,
+    SPEED_OFF, SUPPORT_SET_SPEED)
+from homeassistant.components.smartthings import DeviceBroker, fan
+from homeassistant.components.smartthings.const import (
+    DATA_BROKERS, DOMAIN, SIGNAL_SMARTTHINGS_UPDATE)
+from homeassistant.config_entries import (
+    CONN_CLASS_CLOUD_PUSH, SOURCE_USER, ConfigEntry)
+from homeassistant.const import ATTR_ENTITY_ID, ATTR_SUPPORTED_FEATURES
+from homeassistant.helpers.dispatcher import async_dispatcher_send
+
+
+async def _setup_platform(hass, *devices):
+    """Set up the SmartThings fan platform and prerequisites."""
+    hass.config.components.add(DOMAIN)
+    broker = DeviceBroker(hass, devices, '')
+    config_entry = ConfigEntry("1", DOMAIN, "Test", {},
+                               SOURCE_USER, CONN_CLASS_CLOUD_PUSH)
+    hass.data[DOMAIN] = {
+        DATA_BROKERS: {
+            config_entry.entry_id: broker
+        }
+    }
+    await hass.config_entries.async_forward_entry_setup(config_entry, 'fan')
+    await hass.async_block_till_done()
+    return config_entry
+
+
+async def test_async_setup_platform():
+    """Test setup platform does nothing (it uses config entries)."""
+    await fan.async_setup_platform(None, None, None)
+
+
+def test_is_fan(device_factory):
+    """Test fans are correctly identified."""
+    non_fans = [
+        device_factory('Unknown', ['Unknown']),
+        device_factory("Switch 1", [Capability.switch]),
+        device_factory("Non-Switchable Fan", [Capability.fan_speed]),
+        device_factory("Color Light",
+                       [Capability.switch, Capability.switch_level,
+                        Capability.color_control,
+                        Capability.color_temperature])
+    ]
+    fan_device = device_factory(
+        "Fan 1", [Capability.switch, Capability.switch_level,
+                  Capability.fan_speed])
+
+    assert fan.is_fan(fan_device), fan_device.name
+    for device in non_fans:
+        assert not fan.is_fan(device), device.name
+
+
+async def test_entity_state(hass, device_factory):
+    """Tests the state attributes properly match the fan types."""
+    device = device_factory(
+        "Fan 1",
+        capabilities=[Capability.switch, Capability.fan_speed],
+        status={Attribute.switch: 'on', Attribute.fan_speed: 2})
+    await _setup_platform(hass, device)
+
+    # Dimmer 1
+    state = hass.states.get('fan.fan_1')
+    assert state.state == 'on'
+    assert state.attributes[ATTR_SUPPORTED_FEATURES] == SUPPORT_SET_SPEED
+    assert state.attributes[ATTR_SPEED] == SPEED_MEDIUM
+    assert state.attributes[ATTR_SPEED_LIST] == \
+        [SPEED_OFF, SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH]
+
+
+async def test_entity_and_device_attributes(hass, device_factory):
+    """Test the attributes of the entity are correct."""
+    # Arrange
+    device = device_factory(
+        "Fan 1",
+        capabilities=[Capability.switch, Capability.fan_speed],
+        status={Attribute.switch: 'on', Attribute.fan_speed: 2})
+    await _setup_platform(hass, device)
+    entity_registry = await hass.helpers.entity_registry.async_get_registry()
+    device_registry = await hass.helpers.device_registry.async_get_registry()
+    # Act
+    await _setup_platform(hass, device)
+    # Assert
+    entry = entity_registry.async_get("fan.fan_1")
+    assert entry
+    assert entry.unique_id == device.device_id
+
+    entry = device_registry.async_get_device(
+        {(DOMAIN, device.device_id)}, [])
+    assert entry
+    assert entry.name == device.label
+    assert entry.model == device.device_type_name
+    assert entry.manufacturer == 'Unavailable'
+
+
+async def test_turn_off(hass, device_factory):
+    """Test the fan turns of successfully."""
+    # Arrange
+    device = device_factory(
+        "Fan 1",
+        capabilities=[Capability.switch, Capability.fan_speed],
+        status={Attribute.switch: 'on', Attribute.fan_speed: 2})
+    await _setup_platform(hass, device)
+    # Act
+    await hass.services.async_call(
+        'fan', 'turn_off', {'entity_id': 'fan.fan_1'},
+        blocking=True)
+    # Assert
+    state = hass.states.get('fan.fan_1')
+    assert state is not None
+    assert state.state == 'off'
+
+
+async def test_turn_on(hass, device_factory):
+    """Test the fan turns of successfully."""
+    # Arrange
+    device = device_factory(
+        "Fan 1",
+        capabilities=[Capability.switch, Capability.fan_speed],
+        status={Attribute.switch: 'off', Attribute.fan_speed: 0})
+    await _setup_platform(hass, device)
+    # Act
+    await hass.services.async_call(
+        'fan', 'turn_on', {ATTR_ENTITY_ID: "fan.fan_1"},
+        blocking=True)
+    # Assert
+    state = hass.states.get("fan.fan_1")
+    assert state is not None
+    assert state.state == 'on'
+
+
+async def test_turn_on_with_speed(hass, device_factory):
+    """Test the fan turns on to the specified speed."""
+    # Arrange
+    device = device_factory(
+        "Fan 1",
+        capabilities=[Capability.switch, Capability.fan_speed],
+        status={Attribute.switch: 'off', Attribute.fan_speed: 0})
+    await _setup_platform(hass, device)
+    # Act
+    await hass.services.async_call(
+        'fan', 'turn_on',
+        {ATTR_ENTITY_ID: "fan.fan_1",
+         ATTR_SPEED: SPEED_HIGH},
+        blocking=True)
+    # Assert
+    state = hass.states.get("fan.fan_1")
+    assert state is not None
+    assert state.state == 'on'
+    assert state.attributes[ATTR_SPEED] == SPEED_HIGH
+
+
+async def test_set_speed(hass, device_factory):
+    """Test setting to specific fan speed."""
+    # Arrange
+    device = device_factory(
+        "Fan 1",
+        capabilities=[Capability.switch, Capability.fan_speed],
+        status={Attribute.switch: 'off', Attribute.fan_speed: 0})
+    await _setup_platform(hass, device)
+    # Act
+    await hass.services.async_call(
+        'fan', 'set_speed',
+        {ATTR_ENTITY_ID: "fan.fan_1",
+         ATTR_SPEED: SPEED_HIGH},
+        blocking=True)
+    # Assert
+    state = hass.states.get("fan.fan_1")
+    assert state is not None
+    assert state.state == 'on'
+    assert state.attributes[ATTR_SPEED] == SPEED_HIGH
+
+
+async def test_update_from_signal(hass, device_factory):
+    """Test the fan updates when receiving a signal."""
+    # Arrange
+    device = device_factory(
+        "Fan 1",
+        capabilities=[Capability.switch, Capability.fan_speed],
+        status={Attribute.switch: 'off', Attribute.fan_speed: 0})
+    await _setup_platform(hass, device)
+    await device.switch_on(True)
+    # Act
+    async_dispatcher_send(hass, SIGNAL_SMARTTHINGS_UPDATE,
+                          [device.device_id])
+    # Assert
+    await hass.async_block_till_done()
+    state = hass.states.get('fan.fan_1')
+    assert state is not None
+    assert state.state == 'on'
+
+
+async def test_unload_config_entry(hass, device_factory):
+    """Test the fan is removed when the config entry is unloaded."""
+    # Arrange
+    device = device_factory(
+        "Fan 1",
+        capabilities=[Capability.switch, Capability.fan_speed],
+        status={Attribute.switch: 'off', Attribute.fan_speed: 0})
+    config_entry = await _setup_platform(hass, device)
+    # Act
+    await hass.config_entries.async_forward_entry_unload(
+        config_entry, 'fan')
+    # Assert
+    assert not hass.states.get('fan.fan_1')

From 4255f2c62fe924f579f9971655c4eda5cdf89e80 Mon Sep 17 00:00:00 2001
From: emontnemery <erik@montnemery.com>
Date: Sat, 2 Feb 2019 18:31:28 +0100
Subject: [PATCH 15/45] Add entity_namespace to PLATFORM_SCHEMA (#20693)

* Add entity_namespace to base platform schema

* Add test

* Fix
---
 homeassistant/helpers/config_validation.py |  4 ++-
 tests/test_setup.py                        | 29 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py
index f3371a26725..b148a875398 100644
--- a/homeassistant/helpers/config_validation.py
+++ b/homeassistant/helpers/config_validation.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
     CONF_ALIAS, CONF_ENTITY_ID, CONF_VALUE_TEMPLATE, WEEKDAYS,
     CONF_CONDITION, CONF_BELOW, CONF_ABOVE, CONF_TIMEOUT, SUN_EVENT_SUNSET,
     SUN_EVENT_SUNRISE, CONF_UNIT_SYSTEM_IMPERIAL, CONF_UNIT_SYSTEM_METRIC,
-    ENTITY_MATCH_ALL)
+    ENTITY_MATCH_ALL, CONF_ENTITY_NAMESPACE)
 from homeassistant.core import valid_entity_id, split_entity_id
 from homeassistant.exceptions import TemplateError
 import homeassistant.util.dt as dt_util
@@ -554,12 +554,14 @@ def key_dependency(key, dependency):
 
 PLATFORM_SCHEMA = vol.Schema({
     vol.Required(CONF_PLATFORM): string,
+    vol.Optional(CONF_ENTITY_NAMESPACE): string,
     vol.Optional(CONF_SCAN_INTERVAL): time_period
 }, extra=vol.ALLOW_EXTRA)
 
 # This will replace PLATFORM_SCHEMA once all base components are updated
 PLATFORM_SCHEMA_2 = vol.Schema({
     vol.Required(CONF_PLATFORM): string,
+    vol.Optional(CONF_ENTITY_NAMESPACE): string,
     vol.Optional(CONF_SCAN_INTERVAL): time_period
 })
 
diff --git a/tests/test_setup.py b/tests/test_setup.py
index 6d2cc770013..6d0d2a35847 100644
--- a/tests/test_setup.py
+++ b/tests/test_setup.py
@@ -259,6 +259,7 @@ class TestSetup:
             assert setup.setup_component(self.hass, 'platform_conf', {
                 'platform_conf': {
                     # fail: no extra keys allowed
+                    'platform': 'whatever',
                     'hello': 'world',
                     'invalid': 'extra',
                 }
@@ -284,6 +285,34 @@ class TestSetup:
         self.hass.data.pop(setup.DATA_SETUP)
         self.hass.config.components.remove('platform_conf')
 
+    def test_validate_platform_config_4(self):
+        """Test entity_namespace in PLATFORM_SCHEMA."""
+        component_schema = PLATFORM_SCHEMA_BASE
+        platform_schema = PLATFORM_SCHEMA
+        loader.set_component(
+            self.hass,
+            'platform_conf',
+            MockModule('platform_conf',
+                       platform_schema_base=component_schema))
+
+        loader.set_component(
+            self.hass,
+            'platform_conf.whatever',
+            MockPlatform('whatever',
+                         platform_schema=platform_schema))
+
+        with assert_setup_component(1):
+            assert setup.setup_component(self.hass, 'platform_conf', {
+                'platform_conf': {
+                    # pass: entity_namespace accepted by PLATFORM_SCHEMA
+                    'platform': 'whatever',
+                    'entity_namespace': 'yummy',
+                }
+            })
+
+        self.hass.data.pop(setup.DATA_SETUP)
+        self.hass.config.components.remove('platform_conf')
+
     def test_component_not_found(self):
         """setup_component should not crash if component doesn't exist."""
         assert not setup.setup_component(self.hass, 'non_existing')

From d3e011ff505058ec569e00b39fff89f97e02f4ef Mon Sep 17 00:00:00 2001
From: Andrew Sayre <6730289+andrewsayre@users.noreply.github.com>
Date: Sat, 2 Feb 2019 16:06:30 -0600
Subject: [PATCH 16/45] Add SmartThings Binary Sensor platform (#20699)

* Add SmartThings binary_sensor platform

* Fixed comment typo.
---
 .../components/smartthings/binary_sensor.py   |  81 ++++++++++++++
 homeassistant/components/smartthings/const.py |  12 ++-
 .../smartthings/test_binary_sensor.py         | 100 ++++++++++++++++++
 3 files changed, 192 insertions(+), 1 deletion(-)
 create mode 100644 homeassistant/components/smartthings/binary_sensor.py
 create mode 100644 tests/components/smartthings/test_binary_sensor.py

diff --git a/homeassistant/components/smartthings/binary_sensor.py b/homeassistant/components/smartthings/binary_sensor.py
new file mode 100644
index 00000000000..045944ccfa9
--- /dev/null
+++ b/homeassistant/components/smartthings/binary_sensor.py
@@ -0,0 +1,81 @@
+"""
+Support for binary sensors through the SmartThings cloud API.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/smartthings.binary_sensor/
+"""
+from homeassistant.components.binary_sensor import BinarySensorDevice
+
+from . import SmartThingsEntity
+from .const import DATA_BROKERS, DOMAIN
+
+DEPENDENCIES = ['smartthings']
+
+CAPABILITY_TO_ATTRIB = {
+    'accelerationSensor': 'acceleration',
+    'contactSensor': 'contact',
+    'filterStatus': 'filterStatus',
+    'motionSensor': 'motion',
+    'presenceSensor': 'presence',
+    'soundSensor': 'sound',
+    'tamperAlert': 'tamper',
+    'valve': 'valve',
+    'waterSensor': 'water'
+}
+ATTRIB_TO_CLASS = {
+    'acceleration': 'moving',
+    'contact': 'opening',
+    'filterStatus': 'problem',
+    'motion': 'motion',
+    'presence': 'presence',
+    'sound': 'sound',
+    'tamper': 'problem',
+    'valve': 'opening',
+    'water': 'moisture'
+}
+
+
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Platform uses config entry setup."""
+    pass
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Add binary sensors for a config entry."""
+    broker = hass.data[DOMAIN][DATA_BROKERS][config_entry.entry_id]
+    sensors = []
+    for device in broker.devices.values():
+        for capability, attrib in CAPABILITY_TO_ATTRIB.items():
+            if capability in device.capabilities:
+                sensors.append(SmartThingsBinarySensor(device, attrib))
+    async_add_entities(sensors)
+
+
+class SmartThingsBinarySensor(SmartThingsEntity, BinarySensorDevice):
+    """Define a SmartThings Binary Sensor."""
+
+    def __init__(self, device, attribute):
+        """Init the class."""
+        super().__init__(device)
+        self._attribute = attribute
+
+    @property
+    def name(self) -> str:
+        """Return the name of the binary sensor."""
+        return '{} {}'.format(self._device.label, self._attribute)
+
+    @property
+    def unique_id(self) -> str:
+        """Return a unique ID."""
+        return '{}.{}'.format(self._device.device_id, self._attribute)
+
+    @property
+    def is_on(self):
+        """Return true if the binary sensor is on."""
+        return self._device.status.is_on(self._attribute)
+
+    @property
+    def device_class(self):
+        """Return the class of this device."""
+        return ATTRIB_TO_CLASS[self._attribute]
diff --git a/homeassistant/components/smartthings/const.py b/homeassistant/components/smartthings/const.py
index 2834de4dcf1..f545f84832d 100644
--- a/homeassistant/components/smartthings/const.py
+++ b/homeassistant/components/smartthings/const.py
@@ -18,16 +18,26 @@ SETTINGS_INSTANCE_ID = "hassInstanceId"
 STORAGE_KEY = DOMAIN
 STORAGE_VERSION = 1
 SUPPORTED_PLATFORMS = [
+    'binary_sensor',
     'fan',
     'light',
     'switch'
 ]
 SUPPORTED_CAPABILITIES = [
+    'accelerationSensor',
     'colorControl',
     'colorTemperature',
+    'contactSensor',
     'fanSpeed',
+    'filterStatus',
+    'motionSensor',
+    'presenceSensor',
+    'soundSensor',
     'switch',
-    'switchLevel'
+    'switchLevel',
+    'tamperAlert',
+    'valve',
+    'waterSensor'
 ]
 VAL_UID = "^(?:([0-9a-fA-F]{32})|([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]" \
           "{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}))$"
diff --git a/tests/components/smartthings/test_binary_sensor.py b/tests/components/smartthings/test_binary_sensor.py
new file mode 100644
index 00000000000..2e0c46842b0
--- /dev/null
+++ b/tests/components/smartthings/test_binary_sensor.py
@@ -0,0 +1,100 @@
+"""
+Test for the SmartThings binary_sensor platform.
+
+The only mocking required is of the underlying SmartThings API object so
+real HTTP calls are not initiated during testing.
+"""
+from pysmartthings import Attribute, Capability
+
+from homeassistant.components.smartthings import DeviceBroker, binary_sensor
+from homeassistant.components.smartthings.const import (
+    DATA_BROKERS, DOMAIN, SIGNAL_SMARTTHINGS_UPDATE)
+from homeassistant.config_entries import (
+    CONN_CLASS_CLOUD_PUSH, SOURCE_USER, ConfigEntry)
+from homeassistant.const import ATTR_FRIENDLY_NAME
+from homeassistant.helpers.dispatcher import async_dispatcher_send
+
+
+async def _setup_platform(hass, *devices):
+    """Set up the SmartThings binary_sensor platform and prerequisites."""
+    hass.config.components.add(DOMAIN)
+    broker = DeviceBroker(hass, devices, '')
+    config_entry = ConfigEntry("1", DOMAIN, "Test", {},
+                               SOURCE_USER, CONN_CLASS_CLOUD_PUSH)
+    hass.data[DOMAIN] = {
+        DATA_BROKERS: {
+            config_entry.entry_id: broker
+        }
+    }
+    await hass.config_entries.async_forward_entry_setup(
+        config_entry, 'binary_sensor')
+    await hass.async_block_till_done()
+    return config_entry
+
+
+async def test_async_setup_platform():
+    """Test setup platform does nothing (it uses config entries)."""
+    await binary_sensor.async_setup_platform(None, None, None)
+
+
+async def test_entity_state(hass, device_factory):
+    """Tests the state attributes properly match the light types."""
+    device = device_factory('Motion Sensor 1', [Capability.motion_sensor],
+                            {Attribute.motion: 'inactive'})
+    await _setup_platform(hass, device)
+    state = hass.states.get('binary_sensor.motion_sensor_1_motion')
+    assert state.state == 'off'
+    assert state.attributes[ATTR_FRIENDLY_NAME] ==\
+        device.label + ' ' + Attribute.motion
+
+
+async def test_entity_and_device_attributes(hass, device_factory):
+    """Test the attributes of the entity are correct."""
+    # Arrange
+    device = device_factory('Motion Sensor 1', [Capability.motion_sensor],
+                            {Attribute.motion: 'inactive'})
+    entity_registry = await hass.helpers.entity_registry.async_get_registry()
+    device_registry = await hass.helpers.device_registry.async_get_registry()
+    # Act
+    await _setup_platform(hass, device)
+    # Assert
+    entity = entity_registry.async_get('binary_sensor.motion_sensor_1_motion')
+    assert entity
+    assert entity.unique_id == device.device_id + '.' + Attribute.motion
+    device_entry = device_registry.async_get_device(
+        {(DOMAIN, device.device_id)}, [])
+    assert device_entry
+    assert device_entry.name == device.label
+    assert device_entry.model == device.device_type_name
+    assert device_entry.manufacturer == 'Unavailable'
+
+
+async def test_update_from_signal(hass, device_factory):
+    """Test the binary_sensor updates when receiving a signal."""
+    # Arrange
+    device = device_factory('Motion Sensor 1', [Capability.motion_sensor],
+                            {Attribute.motion: 'inactive'})
+    await _setup_platform(hass, device)
+    device.status.apply_attribute_update(
+        'main', Capability.motion_sensor, Attribute.motion, 'active')
+    # Act
+    async_dispatcher_send(hass, SIGNAL_SMARTTHINGS_UPDATE,
+                          [device.device_id])
+    # Assert
+    await hass.async_block_till_done()
+    state = hass.states.get('binary_sensor.motion_sensor_1_motion')
+    assert state is not None
+    assert state.state == 'on'
+
+
+async def test_unload_config_entry(hass, device_factory):
+    """Test the binary_sensor is removed when the config entry is unloaded."""
+    # Arrange
+    device = device_factory('Motion Sensor 1', [Capability.motion_sensor],
+                            {Attribute.motion: 'inactive'})
+    config_entry = await _setup_platform(hass, device)
+    # Act
+    await hass.config_entries.async_forward_entry_unload(
+        config_entry, 'binary_sensor')
+    # Assert
+    assert not hass.states.get('binary_sensor.motion_sensor_1_motion')

From f73cb0eba5319039c6792fda6aa400c550c06be2 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sat, 2 Feb 2019 14:09:55 -0800
Subject: [PATCH 17/45] Bumped version to 0.87.0b2

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 5204d17f580..c1c0451fc21 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 87
-PATCH_VERSION = '0b1'
+PATCH_VERSION = '0b2'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From e5835eb7c847a6e00f51c04840d59bc0ca2a2102 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Sat, 2 Feb 2019 02:52:34 -0800
Subject: [PATCH 18/45] Remove fingerprint middleware (#20682)

* Remove fingerprint middleware

* Lint
---
 homeassistant/components/http/__init__.py |  6 ++----
 homeassistant/components/http/static.py   | 23 +----------------------
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/homeassistant/components/http/__init__.py b/homeassistant/components/http/__init__.py
index d43ba989f28..02b9affefd4 100644
--- a/homeassistant/components/http/__init__.py
+++ b/homeassistant/components/http/__init__.py
@@ -25,8 +25,7 @@ from .auth import setup_auth
 from .ban import setup_bans
 from .cors import setup_cors
 from .real_ip import setup_real_ip
-from .static import (
-    CachingFileResponse, CachingStaticResource, staticresource_middleware)
+from .static import CachingFileResponse, CachingStaticResource
 
 # Import as alias
 from .const import KEY_AUTHENTICATED, KEY_REAL_IP  # noqa
@@ -192,8 +191,7 @@ class HomeAssistantHTTP:
                  use_x_forwarded_for, trusted_proxies, trusted_networks,
                  login_threshold, is_ban_enabled, ssl_profile):
         """Initialize the HTTP Home Assistant server."""
-        app = self.app = web.Application(
-            middlewares=[staticresource_middleware])
+        app = self.app = web.Application(middlewares=[])
 
         # This order matters
         setup_real_ip(app, use_x_forwarded_for, trusted_proxies)
diff --git a/homeassistant/components/http/static.py b/homeassistant/components/http/static.py
index 8b28a7cf288..54e72c88ff3 100644
--- a/homeassistant/components/http/static.py
+++ b/homeassistant/components/http/static.py
@@ -1,15 +1,10 @@
 """Static file handling for HTTP component."""
-
-import re
-
 from aiohttp import hdrs
-from aiohttp.web import FileResponse, middleware
+from aiohttp.web import FileResponse
 from aiohttp.web_exceptions import HTTPNotFound
 from aiohttp.web_urldispatcher import StaticResource
 from yarl import URL
 
-_FINGERPRINT = re.compile(r'^(.+)-[a-z0-9]{32}\.(\w+)$', re.IGNORECASE)
-
 
 class CachingStaticResource(StaticResource):
     """Static Resource handler that will add cache headers."""
@@ -56,19 +51,3 @@ class CachingFileResponse(FileResponse):
 
         # Overwriting like this because __init__ can change implementation.
         self._sendfile = sendfile
-
-
-@middleware
-async def staticresource_middleware(request, handler):
-    """Middleware to strip out fingerprint from fingerprinted assets."""
-    path = request.path
-    if not path.startswith('/static/') and not path.startswith('/frontend'):
-        return await handler(request)
-
-    fingerprinted = _FINGERPRINT.match(request.match_info['filename'])
-
-    if fingerprinted:
-        request.match_info['filename'] = \
-            '{}.{}'.format(*fingerprinted.groups())
-
-    return await handler(request)

From e98486876254aab7222669a15acf0553e75ed40e Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sat, 2 Feb 2019 16:32:26 -0800
Subject: [PATCH 19/45] Bumped version to 0.87.0b3

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index c1c0451fc21..9503aa9947d 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 87
-PATCH_VERSION = '0b2'
+PATCH_VERSION = '0b3'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From e4d45bf53a98ced7732bff516e1cced86917ce0e Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Fri, 1 Feb 2019 16:31:53 -0800
Subject: [PATCH 20/45] Test is broken

---
 tests/components/sensor/test_history_stats.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/components/sensor/test_history_stats.py b/tests/components/sensor/test_history_stats.py
index 67cacb29880..a739325847f 100644
--- a/tests/components/sensor/test_history_stats.py
+++ b/tests/components/sensor/test_history_stats.py
@@ -70,9 +70,9 @@ class TestHistoryStatsSensor(unittest.TestCase):
         assert sensor1_start.second == 0
 
         # End = 02:01:00
-        assert sensor1_end.hour == 2
-        assert sensor1_end.minute == 1
-        assert sensor1_end.second == 0
+        # assert sensor1_end.hour == 2
+        # assert sensor1_end.minute == 1
+        # assert sensor1_end.second == 0
 
         # Start = 21:59:00
         assert sensor2_start.hour == 21

From c9f64af85a41018d223aa16b9e81f586e39d5dce Mon Sep 17 00:00:00 2001
From: Diogo Gomes <diogogomes@gmail.com>
Date: Sat, 2 Feb 2019 06:11:50 +0000
Subject: [PATCH 21/45] fix test commented in #20678 (#20680)

---
 tests/components/sensor/test_history_stats.py | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/tests/components/sensor/test_history_stats.py b/tests/components/sensor/test_history_stats.py
index a739325847f..28d01de4b34 100644
--- a/tests/components/sensor/test_history_stats.py
+++ b/tests/components/sensor/test_history_stats.py
@@ -1,8 +1,11 @@
 """The test for the History Statistics sensor platform."""
 # pylint: disable=protected-access
-from datetime import timedelta
+from datetime import datetime, timedelta
 import unittest
 from unittest.mock import patch
+import pytest
+import pytz
+from homeassistant.helpers import template
 
 from homeassistant.const import STATE_UNKNOWN
 from homeassistant.setup import setup_component
@@ -12,7 +15,6 @@ from homeassistant.helpers.template import Template
 import homeassistant.util.dt as dt_util
 
 from tests.common import init_recorder_component, get_test_home_assistant
-import pytest
 
 
 class TestHistoryStatsSensor(unittest.TestCase):
@@ -50,19 +52,22 @@ class TestHistoryStatsSensor(unittest.TestCase):
 
     def test_period_parsing(self):
         """Test the conversion from templates to period."""
-        today = Template('{{ now().replace(hour=0).replace(minute=0)'
-                         '.replace(second=0) }}', self.hass)
-        duration = timedelta(hours=2, minutes=1)
+        now = datetime(2019, 1, 1, 23, 30, 0, tzinfo=pytz.utc)
+        with patch.dict(template.ENV.globals, {'now': lambda: now}):
+            print(dt_util.now())
+            today = Template('{{ now().replace(hour=0).replace(minute=0)'
+                             '.replace(second=0) }}', self.hass)
+            duration = timedelta(hours=2, minutes=1)
 
-        sensor1 = HistoryStatsSensor(
-            self.hass, 'test', 'on', today, None, duration, 'time', 'test')
-        sensor2 = HistoryStatsSensor(
-            self.hass, 'test', 'on', None, today, duration, 'time', 'test')
+            sensor1 = HistoryStatsSensor(
+                self.hass, 'test', 'on', today, None, duration, 'time', 'test')
+            sensor2 = HistoryStatsSensor(
+                self.hass, 'test', 'on', None, today, duration, 'time', 'test')
 
-        sensor1.update_period()
-        sensor1_start, sensor1_end = sensor1._period
-        sensor2.update_period()
-        sensor2_start, sensor2_end = sensor2._period
+            sensor1.update_period()
+            sensor1_start, sensor1_end = sensor1._period
+            sensor2.update_period()
+            sensor2_start, sensor2_end = sensor2._period
 
         # Start = 00:00:00
         assert sensor1_start.hour == 0
@@ -70,9 +75,9 @@ class TestHistoryStatsSensor(unittest.TestCase):
         assert sensor1_start.second == 0
 
         # End = 02:01:00
-        # assert sensor1_end.hour == 2
-        # assert sensor1_end.minute == 1
-        # assert sensor1_end.second == 0
+        assert sensor1_end.hour == 2
+        assert sensor1_end.minute == 1
+        assert sensor1_end.second == 0
 
         # Start = 21:59:00
         assert sensor2_start.hour == 21

From b0200cdbfe9524e26469e07927ef7d104b77c912 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sat, 2 Feb 2019 20:28:03 -0800
Subject: [PATCH 22/45] Bumped version to 0.87.0b4

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 9503aa9947d..0a57706c547 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 87
-PATCH_VERSION = '0b3'
+PATCH_VERSION = '0b4'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From 5f2d209decd5928240e870405d11bb79978d137f Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sun, 3 Feb 2019 11:32:15 -0800
Subject: [PATCH 23/45] Updated frontend to 20190203.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index b5836e67ffc..46652b4d7b0 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -24,7 +24,7 @@ from homeassistant.core import callback
 from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 
-REQUIREMENTS = ['home-assistant-frontend==20190202.0']
+REQUIREMENTS = ['home-assistant-frontend==20190203.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index ea8afeb6a09..bccd39d91f4 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -526,7 +526,7 @@ hole==0.3.0
 holidays==0.9.9
 
 # homeassistant.components.frontend
-home-assistant-frontend==20190202.0
+home-assistant-frontend==20190203.0
 
 # homeassistant.components.zwave
 homeassistant-pyozw==0.1.2
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 4ebef8bc1e6..df2d5496441 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -113,7 +113,7 @@ hdate==0.8.7
 holidays==0.9.9
 
 # homeassistant.components.frontend
-home-assistant-frontend==20190202.0
+home-assistant-frontend==20190203.0
 
 # homeassistant.components.homekit_controller
 homekit==0.12.2

From 9a13aafeea30a2836ee99d016f420ded753d3658 Mon Sep 17 00:00:00 2001
From: Andrew Sayre <6730289+andrewsayre@users.noreply.github.com>
Date: Sun, 3 Feb 2019 00:08:37 -0600
Subject: [PATCH 24/45] Add SmartThings button support via events (#20707)

* Add event support for buttons

* binary_sensor test clean-up
---
 .../components/smartthings/__init__.py        | 15 ++++++++-
 homeassistant/components/smartthings/const.py |  2 ++
 tests/components/smartthings/conftest.py      | 22 ++++++++-----
 .../smartthings/test_binary_sensor.py         | 31 +++++++++++++------
 tests/components/smartthings/test_init.py     | 31 ++++++++++++++++++-
 5 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/homeassistant/components/smartthings/__init__.py b/homeassistant/components/smartthings/__init__.py
index c705a3df73e..d86524ef62b 100644
--- a/homeassistant/components/smartthings/__init__.py
+++ b/homeassistant/components/smartthings/__init__.py
@@ -19,7 +19,7 @@ from homeassistant.helpers.typing import ConfigType, HomeAssistantType
 from .config_flow import SmartThingsFlowHandler  # noqa
 from .const import (
     CONF_APP_ID, CONF_INSTALLED_APP_ID, DATA_BROKERS, DATA_MANAGER, DOMAIN,
-    SIGNAL_SMARTTHINGS_UPDATE, SUPPORTED_PLATFORMS)
+    EVENT_BUTTON, SIGNAL_SMARTTHINGS_UPDATE, SUPPORTED_PLATFORMS)
 from .smartapp import (
     setup_smartapp, setup_smartapp_endpoint, validate_installed_app)
 
@@ -154,6 +154,19 @@ class DeviceBroker:
                 continue
             device.status.apply_attribute_update(
                 evt.component_id, evt.capability, evt.attribute, evt.value)
+
+            # Fire events for buttons
+            if evt.capability == 'button' and evt.attribute == 'button':
+                data = {
+                    'component_id': evt.component_id,
+                    'device_id': evt.device_id,
+                    'location_id': evt.location_id,
+                    'value': evt.value,
+                    'name': device.label
+                }
+                self._hass.bus.async_fire(EVENT_BUTTON, data)
+                _LOGGER.debug("Fired button event: %s", data)
+
             updated_devices.add(device.device_id)
         _LOGGER.debug("Update received with %s events and updated %s devices",
                       len(req.events), len(updated_devices))
diff --git a/homeassistant/components/smartthings/const.py b/homeassistant/components/smartthings/const.py
index f545f84832d..3d0e5cb95f8 100644
--- a/homeassistant/components/smartthings/const.py
+++ b/homeassistant/components/smartthings/const.py
@@ -12,6 +12,7 @@ CONF_LOCATION_ID = 'location_id'
 DATA_MANAGER = 'manager'
 DATA_BROKERS = 'brokers'
 DOMAIN = 'smartthings'
+EVENT_BUTTON = "smartthings.button"
 SIGNAL_SMARTTHINGS_UPDATE = 'smartthings_update'
 SIGNAL_SMARTAPP_PREFIX = 'smartthings_smartap_'
 SETTINGS_INSTANCE_ID = "hassInstanceId"
@@ -25,6 +26,7 @@ SUPPORTED_PLATFORMS = [
 ]
 SUPPORTED_CAPABILITIES = [
     'accelerationSensor',
+    'button',
     'colorControl',
     'colorTemperature',
     'contactSensor',
diff --git a/tests/components/smartthings/conftest.py b/tests/components/smartthings/conftest.py
index 56bb5a62888..7358e05f346 100644
--- a/tests/components/smartthings/conftest.py
+++ b/tests/components/smartthings/conftest.py
@@ -254,14 +254,16 @@ def device_factory_fixture():
 @pytest.fixture(name="event_factory")
 def event_factory_fixture():
     """Fixture for creating mock devices."""
-    def _factory(device_id, event_type="DEVICE_EVENT"):
+    def _factory(device_id, event_type="DEVICE_EVENT", capability='',
+                 attribute='Updated', value='Value'):
         event = Mock()
         event.event_type = event_type
         event.device_id = device_id
         event.component_id = 'main'
-        event.capability = ''
-        event.attribute = 'Updated'
-        event.value = 'Value'
+        event.capability = capability
+        event.attribute = attribute
+        event.value = value
+        event.location_id = str(uuid4())
         return event
     return _factory
 
@@ -269,11 +271,15 @@ def event_factory_fixture():
 @pytest.fixture(name="event_request_factory")
 def event_request_factory_fixture(event_factory):
     """Fixture for creating mock smartapp event requests."""
-    def _factory(device_ids):
+    def _factory(device_ids=None, events=None):
         request = Mock()
         request.installed_app_id = uuid4()
-        request.events = [event_factory(id) for id in device_ids]
-        request.events.append(event_factory(uuid4()))
-        request.events.append(event_factory(device_ids[0], event_type="OTHER"))
+        if events is None:
+            events = []
+        if device_ids:
+            events.extend([event_factory(id) for id in device_ids])
+            events.append(event_factory(uuid4()))
+            events.append(event_factory(device_ids[0], event_type="OTHER"))
+        request.events = events
         return request
     return _factory
diff --git a/tests/components/smartthings/test_binary_sensor.py b/tests/components/smartthings/test_binary_sensor.py
index 2e0c46842b0..92d891c06d6 100644
--- a/tests/components/smartthings/test_binary_sensor.py
+++ b/tests/components/smartthings/test_binary_sensor.py
@@ -6,9 +6,10 @@ real HTTP calls are not initiated during testing.
 """
 from pysmartthings import Attribute, Capability
 
+from homeassistant.components.binary_sensor import DEVICE_CLASSES
 from homeassistant.components.smartthings import DeviceBroker, binary_sensor
 from homeassistant.components.smartthings.const import (
-    DATA_BROKERS, DOMAIN, SIGNAL_SMARTTHINGS_UPDATE)
+    DATA_BROKERS, DOMAIN, SIGNAL_SMARTTHINGS_UPDATE, SUPPORTED_CAPABILITIES)
 from homeassistant.config_entries import (
     CONN_CLASS_CLOUD_PUSH, SOURCE_USER, ConfigEntry)
 from homeassistant.const import ATTR_FRIENDLY_NAME
@@ -32,6 +33,18 @@ async def _setup_platform(hass, *devices):
     return config_entry
 
 
+async def test_mapping_integrity():
+    """Test ensures the map dicts have proper integrity."""
+    # Ensure every CAPABILITY_TO_ATTRIB key is in SUPPORTED_CAPABILITIES
+    # Ensure every CAPABILITY_TO_ATTRIB value is in ATTRIB_TO_CLASS keys
+    for capability, attrib in binary_sensor.CAPABILITY_TO_ATTRIB.items():
+        assert capability in SUPPORTED_CAPABILITIES, capability
+        assert attrib in binary_sensor.ATTRIB_TO_CLASS.keys(), attrib
+    # Ensure every ATTRIB_TO_CLASS value is in DEVICE_CLASSES
+    for device_class in binary_sensor.ATTRIB_TO_CLASS.values():
+        assert device_class in DEVICE_CLASSES
+
+
 async def test_async_setup_platform():
     """Test setup platform does nothing (it uses config entries)."""
     await binary_sensor.async_setup_platform(None, None, None)
@@ -58,15 +71,15 @@ async def test_entity_and_device_attributes(hass, device_factory):
     # Act
     await _setup_platform(hass, device)
     # Assert
-    entity = entity_registry.async_get('binary_sensor.motion_sensor_1_motion')
-    assert entity
-    assert entity.unique_id == device.device_id + '.' + Attribute.motion
-    device_entry = device_registry.async_get_device(
+    entry = entity_registry.async_get('binary_sensor.motion_sensor_1_motion')
+    assert entry
+    assert entry.unique_id == device.device_id + '.' + Attribute.motion
+    entry = device_registry.async_get_device(
         {(DOMAIN, device.device_id)}, [])
-    assert device_entry
-    assert device_entry.name == device.label
-    assert device_entry.model == device.device_type_name
-    assert device_entry.manufacturer == 'Unavailable'
+    assert entry
+    assert entry.name == device.label
+    assert entry.model == device.device_type_name
+    assert entry.manufacturer == 'Unavailable'
 
 
 async def test_update_from_signal(hass, device_factory):
diff --git a/tests/components/smartthings/test_init.py b/tests/components/smartthings/test_init.py
index d20d2d4e047..4aef42c1b6f 100644
--- a/tests/components/smartthings/test_init.py
+++ b/tests/components/smartthings/test_init.py
@@ -8,7 +8,8 @@ import pytest
 
 from homeassistant.components import smartthings
 from homeassistant.components.smartthings.const import (
-    DATA_BROKERS, DOMAIN, SIGNAL_SMARTTHINGS_UPDATE, SUPPORTED_PLATFORMS)
+    DATA_BROKERS, DOMAIN, EVENT_BUTTON, SIGNAL_SMARTTHINGS_UPDATE,
+    SUPPORTED_PLATFORMS)
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
@@ -181,3 +182,31 @@ async def test_event_handler_ignores_other_installed_app(
     await hass.async_block_till_done()
 
     assert not called
+
+
+async def test_event_handler_fires_button_events(
+        hass, device_factory, event_factory, event_request_factory):
+    """Test the event handler fires button events."""
+    device = device_factory('Button 1', ['button'])
+    event = event_factory(device.device_id, capability='button',
+                          attribute='button', value='pushed')
+    request = event_request_factory(events=[event])
+    called = False
+
+    def handler(evt):
+        nonlocal called
+        called = True
+        assert evt.data == {
+            'component_id': 'main',
+            'device_id': device.device_id,
+            'location_id': event.location_id,
+            'value': 'pushed',
+            'name': device.label
+        }
+    hass.bus.async_listen(EVENT_BUTTON, handler)
+    broker = smartthings.DeviceBroker(
+        hass, [device], request.installed_app_id)
+    await broker.event_handler(request, None, None)
+    await hass.async_block_till_done()
+
+    assert called

From e1509bcc0c82e8a984481eba6cfcdf996d6c6dda Mon Sep 17 00:00:00 2001
From: Aaron Bach <bachya1208@gmail.com>
Date: Sun, 3 Feb 2019 16:23:30 -0700
Subject: [PATCH 25/45] Fix temperature unit conversion in Ambient PWS (#20723)

---
 .../components/ambient_station/__init__.py    | 75 +++++++++----------
 .../components/ambient_station/const.py       |  3 -
 .../components/ambient_station/sensor.py      | 21 +-----
 3 files changed, 38 insertions(+), 61 deletions(-)

diff --git a/homeassistant/components/ambient_station/__init__.py b/homeassistant/components/ambient_station/__init__.py
index 788927a2700..0991336f42a 100644
--- a/homeassistant/components/ambient_station/__init__.py
+++ b/homeassistant/components/ambient_station/__init__.py
@@ -11,7 +11,7 @@ import voluptuous as vol
 from homeassistant.config_entries import SOURCE_IMPORT
 from homeassistant.const import (
     ATTR_NAME, ATTR_LOCATION, CONF_API_KEY, CONF_MONITORED_CONDITIONS,
-    CONF_UNIT_SYSTEM, EVENT_HOMEASSISTANT_STOP)
+    EVENT_HOMEASSISTANT_STOP)
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import aiohttp_client, config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
@@ -19,8 +19,7 @@ from homeassistant.helpers.event import async_call_later
 
 from .config_flow import configured_instances
 from .const import (
-    ATTR_LAST_DATA, CONF_APP_KEY, DATA_CLIENT, DOMAIN, TOPIC_UPDATE, UNITS_SI,
-    UNITS_US)
+    ATTR_LAST_DATA, CONF_APP_KEY, DATA_CLIENT, DOMAIN, TOPIC_UPDATE)
 
 REQUIREMENTS = ['aioambient==0.1.0']
 _LOGGER = logging.getLogger(__name__)
@@ -28,36 +27,36 @@ _LOGGER = logging.getLogger(__name__)
 DEFAULT_SOCKET_MIN_RETRY = 15
 
 SENSOR_TYPES = {
-    '24hourrainin': ['24 Hr Rain', 'in'],
-    'baromabsin': ['Abs Pressure', 'inHg'],
-    'baromrelin': ['Rel Pressure', 'inHg'],
-    'battout': ['Battery', ''],
-    'co2': ['co2', 'ppm'],
-    'dailyrainin': ['Daily Rain', 'in'],
-    'dewPoint': ['Dew Point', ['°F', '°C']],
-    'eventrainin': ['Event Rain', 'in'],
-    'feelsLike': ['Feels Like', ['°F', '°C']],
-    'hourlyrainin': ['Hourly Rain Rate', 'in/hr'],
-    'humidity': ['Humidity', '%'],
-    'humidityin': ['Humidity In', '%'],
-    'lastRain': ['Last Rain', ''],
-    'maxdailygust': ['Max Gust', 'mph'],
-    'monthlyrainin': ['Monthly Rain', 'in'],
-    'solarradiation': ['Solar Rad', 'W/m^2'],
-    'tempf': ['Temp', ['°F', '°C']],
-    'tempinf': ['Inside Temp', ['°F', '°C']],
-    'totalrainin': ['Lifetime Rain', 'in'],
-    'uv': ['uv', 'Index'],
-    'weeklyrainin': ['Weekly Rain', 'in'],
-    'winddir': ['Wind Dir', '°'],
-    'winddir_avg10m': ['Wind Dir Avg 10m', '°'],
-    'winddir_avg2m': ['Wind Dir Avg 2m', 'mph'],
-    'windgustdir': ['Gust Dir', '°'],
-    'windgustmph': ['Wind Gust', 'mph'],
-    'windspdmph_avg10m': ['Wind Avg 10m', 'mph'],
-    'windspdmph_avg2m': ['Wind Avg 2m', 'mph'],
-    'windspeedmph': ['Wind Speed', 'mph'],
-    'yearlyrainin': ['Yearly Rain', 'in'],
+    '24hourrainin': ('24 Hr Rain', 'in'),
+    'baromabsin': ('Abs Pressure', 'inHg'),
+    'baromrelin': ('Rel Pressure', 'inHg'),
+    'battout': ('Battery', ''),
+    'co2': ('co2', 'ppm'),
+    'dailyrainin': ('Daily Rain', 'in'),
+    'dewPoint': ('Dew Point', '°F'),
+    'eventrainin': ('Event Rain', 'in'),
+    'feelsLike': ('Feels Like', '°F'),
+    'hourlyrainin': ('Hourly Rain Rate', 'in/hr'),
+    'humidity': ('Humidity', '%'),
+    'humidityin': ('Humidity In', '%'),
+    'lastRain': ('Last Rain', ''),
+    'maxdailygust': ('Max Gust', 'mph'),
+    'monthlyrainin': ('Monthly Rain', 'in'),
+    'solarradiation': ('Solar Rad', 'W/m^2'),
+    'tempf': ('Temp', '°F'),
+    'tempinf': ('Inside Temp', '°F'),
+    'totalrainin': ('Lifetime Rain', 'in'),
+    'uv': ('uv', 'Index'),
+    'weeklyrainin': ('Weekly Rain', 'in'),
+    'winddir': ('Wind Dir', '°'),
+    'winddir_avg10m': ('Wind Dir Avg 10m', '°'),
+    'winddir_avg2m': ('Wind Dir Avg 2m', 'mph'),
+    'windgustdir': ('Gust Dir', '°'),
+    'windgustmph': ('Wind Gust', 'mph'),
+    'windspdmph_avg10m': ('Wind Avg 10m', 'mph'),
+    'windspdmph_avg2m': ('Wind Avg 2m', 'mph'),
+    'windspeedmph': ('Wind Speed', 'mph'),
+    'yearlyrainin': ('Yearly Rain', 'in'),
 }
 
 CONFIG_SCHEMA = vol.Schema({
@@ -70,8 +69,6 @@ CONFIG_SCHEMA = vol.Schema({
             vol.Optional(
                 CONF_MONITORED_CONDITIONS, default=list(SENSOR_TYPES)):
                 vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)]),
-            vol.Optional(CONF_UNIT_SYSTEM):
-                vol.In([UNITS_SI, UNITS_US]),
         })
 }, extra=vol.ALLOW_EXTRA)
 
@@ -111,8 +108,7 @@ async def async_setup_entry(hass, config_entry):
                 config_entry.data[CONF_API_KEY],
                 config_entry.data[CONF_APP_KEY], session),
             config_entry.data.get(
-                CONF_MONITORED_CONDITIONS, list(SENSOR_TYPES)),
-            config_entry.data.get(CONF_UNIT_SYSTEM))
+                CONF_MONITORED_CONDITIONS, list(SENSOR_TYPES)))
         hass.loop.create_task(ambient.ws_connect())
         hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id] = ambient
     except WebsocketConnectionError as err:
@@ -139,9 +135,7 @@ async def async_unload_entry(hass, config_entry):
 class AmbientStation:
     """Define a class to handle the Ambient websocket."""
 
-    def __init__(
-            self, hass, config_entry, client, monitored_conditions,
-            unit_system):
+    def __init__(self, hass, config_entry, client, monitored_conditions):
         """Initialize."""
         self._config_entry = config_entry
         self._hass = hass
@@ -149,7 +143,6 @@ class AmbientStation:
         self.client = client
         self.monitored_conditions = monitored_conditions
         self.stations = {}
-        self.unit_system = unit_system
 
     async def ws_connect(self):
         """Register handlers and connect to the websocket."""
diff --git a/homeassistant/components/ambient_station/const.py b/homeassistant/components/ambient_station/const.py
index df2c5462e66..75606a1c699 100644
--- a/homeassistant/components/ambient_station/const.py
+++ b/homeassistant/components/ambient_station/const.py
@@ -8,6 +8,3 @@ CONF_APP_KEY = 'app_key'
 DATA_CLIENT = 'data_client'
 
 TOPIC_UPDATE = 'update'
-
-UNITS_SI = 'si'
-UNITS_US = 'us'
diff --git a/homeassistant/components/ambient_station/sensor.py b/homeassistant/components/ambient_station/sensor.py
index d2d89233472..9e0833e3441 100644
--- a/homeassistant/components/ambient_station/sensor.py
+++ b/homeassistant/components/ambient_station/sensor.py
@@ -12,14 +12,11 @@ from homeassistant.const import ATTR_NAME
 from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
-from .const import (
-    ATTR_LAST_DATA, DATA_CLIENT, DOMAIN, TOPIC_UPDATE, UNITS_SI, UNITS_US)
+from .const import ATTR_LAST_DATA, DATA_CLIENT, DOMAIN, TOPIC_UPDATE
 
 DEPENDENCIES = ['ambient_station']
 _LOGGER = logging.getLogger(__name__)
 
-UNIT_SYSTEM = {UNITS_US: 0, UNITS_SI: 1}
-
 
 async def async_setup_platform(
         hass, config, async_add_entities, discovery_info=None):
@@ -31,20 +28,10 @@ async def async_setup_entry(hass, entry, async_add_entities):
     """Set up an Ambient PWS sensor based on a config entry."""
     ambient = hass.data[DOMAIN][DATA_CLIENT][entry.entry_id]
 
-    if ambient.unit_system:
-        sys_units = ambient.unit_system
-    elif hass.config.units.is_metric:
-        sys_units = UNITS_SI
-    else:
-        sys_units = UNITS_US
-
     sensor_list = []
     for mac_address, station in ambient.stations.items():
         for condition in ambient.monitored_conditions:
             name, unit = SENSOR_TYPES[condition]
-            if isinstance(unit, list):
-                unit = unit[UNIT_SYSTEM[sys_units]]
-
             sensor_list.append(
                 AmbientWeatherSensor(
                     ambient, mac_address, station[ATTR_NAME], condition, name,
@@ -58,7 +45,7 @@ class AmbientWeatherSensor(Entity):
 
     def __init__(
             self, ambient, mac_address, station_name, sensor_type, sensor_name,
-            units):
+            unit):
         """Initialize the sensor."""
         self._ambient = ambient
         self._async_unsub_dispatcher_connect = None
@@ -67,7 +54,7 @@ class AmbientWeatherSensor(Entity):
         self._sensor_type = sensor_type
         self._state = None
         self._station_name = station_name
-        self._units = units
+        self._unit = unit
 
     @property
     def name(self):
@@ -87,7 +74,7 @@ class AmbientWeatherSensor(Entity):
     @property
     def unit_of_measurement(self):
         """Return the unit of measurement."""
-        return self._units
+        return self._unit
 
     @property
     def unique_id(self):

From 027fcf269b785f2ac473a309c776f1cd6907c9e6 Mon Sep 17 00:00:00 2001
From: David Lie <davidlie@users.noreply.github.com>
Date: Sun, 3 Feb 2019 17:47:38 -0500
Subject: [PATCH 26/45] Revert pyfoscam back to libpyfoscam (#20727)

* Change foscam python library to pyfoscam, which is more up to date and has several critical bug fixes.

* Update requirements_all.txt to match.

* Inserting automatically generated requirements.txt

* Revert changes until pyfoscam captures recent bug fixes. The pyfoscam version pulled by pip is currently broken.

* Updated requirements_all.txt based on changing pyfoscam back to libpyfoscam.
---
 homeassistant/components/camera/foscam.py | 4 ++--
 requirements_all.txt                      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/camera/foscam.py b/homeassistant/components/camera/foscam.py
index 173e115cbaf..ceec57f7755 100644
--- a/homeassistant/components/camera/foscam.py
+++ b/homeassistant/components/camera/foscam.py
@@ -15,7 +15,7 @@ from homeassistant.helpers import config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
-REQUIREMENTS = ['pyfoscam==1.2']
+REQUIREMENTS = ['libpyfoscam==1.0']
 
 CONF_IP = 'ip'
 
@@ -43,7 +43,7 @@ class FoscamCam(Camera):
 
     def __init__(self, device_info):
         """Initialize a Foscam camera."""
-        from foscam import FoscamCamera
+        from libpyfoscam import FoscamCamera
 
         super(FoscamCam, self).__init__()
 
diff --git a/requirements_all.txt b/requirements_all.txt
index bccd39d91f4..33216d7603e 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -605,6 +605,9 @@ libnacl==1.6.1
 # homeassistant.components.dyson
 libpurecoollink==0.4.2
 
+# homeassistant.components.camera.foscam
+libpyfoscam==1.0
+
 # homeassistant.components.device_tracker.mikrotik
 librouteros==2.2.0
 
@@ -1014,9 +1017,6 @@ pyflunearyou==1.0.1
 # homeassistant.components.light.futurenow
 pyfnip==0.2
 
-# homeassistant.components.camera.foscam
-pyfoscam==1.2
-
 # homeassistant.components.fritzbox
 pyfritzhome==0.4.0
 

From 7d334783de50d8ad0b40ad4baaac169e3e84092f Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sun, 3 Feb 2019 15:27:14 -0800
Subject: [PATCH 27/45] Bumped version to 0.87.0b5

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 0a57706c547..a44d90551cb 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 87
-PATCH_VERSION = '0b4'
+PATCH_VERSION = '0b5'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From 207a050dbaad95957a25752593b312081ea09fa2 Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Mon, 4 Feb 2019 09:57:22 -0800
Subject: [PATCH 28/45] Fix ffmpeg v4 stream issue (#20314)

* Add ffmpeg version

* Add ffmpeg stream content type

* Change ffmpeg camera stream content type

* Change ffmpeg stream content type

* Lint

* Add a none guard

* Fix

* Fix

* Update onvif.py

* Fix version match regrex

* Fix regrex

* Upgrade ha-ffmpeg to 1.11

* Lint

* Get ffmpeg version in ffmpeg component setup
---
 homeassistant/components/camera/amcrest.py |  2 +-
 homeassistant/components/camera/arlo.py    |  2 +-
 homeassistant/components/camera/canary.py  |  2 +-
 homeassistant/components/camera/ffmpeg.py  |  2 +-
 homeassistant/components/camera/onvif.py   |  5 ++--
 homeassistant/components/camera/ring.py    |  2 +-
 homeassistant/components/camera/xiaomi.py  |  2 +-
 homeassistant/components/camera/yi.py      |  2 +-
 homeassistant/components/ffmpeg.py         | 30 +++++++++++++++++++++-
 requirements_all.txt                       |  2 +-
 requirements_test_all.txt                  |  2 +-
 11 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/homeassistant/components/camera/amcrest.py b/homeassistant/components/camera/amcrest.py
index 4ba527b4805..3b3368c2f5c 100644
--- a/homeassistant/components/camera/amcrest.py
+++ b/homeassistant/components/camera/amcrest.py
@@ -82,7 +82,7 @@ class AmcrestCam(Camera):
         try:
             return await async_aiohttp_proxy_stream(
                 self.hass, request, stream,
-                'multipart/x-mixed-replace;boundary=ffserver')
+                self._ffmpeg.ffmpeg_stream_content_type)
         finally:
             await stream.close()
 
diff --git a/homeassistant/components/camera/arlo.py b/homeassistant/components/camera/arlo.py
index d56616218e7..7857995b4af 100644
--- a/homeassistant/components/camera/arlo.py
+++ b/homeassistant/components/camera/arlo.py
@@ -104,7 +104,7 @@ class ArloCam(Camera):
         try:
             return await async_aiohttp_proxy_stream(
                 self.hass, request, stream,
-                'multipart/x-mixed-replace;boundary=ffserver')
+                self._ffmpeg.ffmpeg_stream_content_type)
         finally:
             await stream.close()
 
diff --git a/homeassistant/components/camera/canary.py b/homeassistant/components/camera/canary.py
index 7a83e2da4d1..eb0c8f3fc6d 100644
--- a/homeassistant/components/camera/canary.py
+++ b/homeassistant/components/camera/canary.py
@@ -101,7 +101,7 @@ class CanaryCamera(Camera):
         try:
             return await async_aiohttp_proxy_stream(
                 self.hass, request, stream,
-                'multipart/x-mixed-replace;boundary=ffserver')
+                self._ffmpeg.ffmpeg_stream_content_type)
         finally:
             await stream.close()
 
diff --git a/homeassistant/components/camera/ffmpeg.py b/homeassistant/components/camera/ffmpeg.py
index 6bd68b05bb5..db9e73f3e1b 100644
--- a/homeassistant/components/camera/ffmpeg.py
+++ b/homeassistant/components/camera/ffmpeg.py
@@ -68,7 +68,7 @@ class FFmpegCamera(Camera):
         try:
             return await async_aiohttp_proxy_stream(
                 self.hass, request, stream,
-                'multipart/x-mixed-replace;boundary=ffserver')
+                self._manager.ffmpeg_stream_content_type)
         finally:
             await stream.close()
 
diff --git a/homeassistant/components/camera/onvif.py b/homeassistant/components/camera/onvif.py
index d1afd39ca7b..da0bae7c50b 100644
--- a/homeassistant/components/camera/onvif.py
+++ b/homeassistant/components/camera/onvif.py
@@ -213,7 +213,8 @@ class ONVIFHassCamera(Camera):
             if not self._input:
                 return None
 
-        stream = CameraMjpeg(self.hass.data[DATA_FFMPEG].binary,
+        ffmpeg_manager = self.hass.data[DATA_FFMPEG]
+        stream = CameraMjpeg(ffmpeg_manager.binary,
                              loop=self.hass.loop)
         await stream.open_camera(
             self._input, extra_cmd=self._ffmpeg_arguments)
@@ -221,7 +222,7 @@ class ONVIFHassCamera(Camera):
         try:
             return await async_aiohttp_proxy_stream(
                 self.hass, request, stream,
-                'multipart/x-mixed-replace;boundary=ffserver')
+                ffmpeg_manager.ffmpeg_stream_content_type)
         finally:
             await stream.close()
 
diff --git a/homeassistant/components/camera/ring.py b/homeassistant/components/camera/ring.py
index ad351fb59cf..da1119281b3 100644
--- a/homeassistant/components/camera/ring.py
+++ b/homeassistant/components/camera/ring.py
@@ -142,7 +142,7 @@ class RingCam(Camera):
         try:
             return await async_aiohttp_proxy_stream(
                 self.hass, request, stream,
-                'multipart/x-mixed-replace;boundary=ffserver')
+                self._ffmpeg.ffmpeg_stream_content_type)
         finally:
             await stream.close()
 
diff --git a/homeassistant/components/camera/xiaomi.py b/homeassistant/components/camera/xiaomi.py
index 207dd17ed9b..93e9dd4a07c 100644
--- a/homeassistant/components/camera/xiaomi.py
+++ b/homeassistant/components/camera/xiaomi.py
@@ -161,6 +161,6 @@ class XiaomiCamera(Camera):
         try:
             return await async_aiohttp_proxy_stream(
                 self.hass, request, stream,
-                'multipart/x-mixed-replace;boundary=ffserver')
+                self._manager.ffmpeg_stream_content_type)
         finally:
             await stream.close()
diff --git a/homeassistant/components/camera/yi.py b/homeassistant/components/camera/yi.py
index 8b5b865ee57..7d731d2a433 100644
--- a/homeassistant/components/camera/yi.py
+++ b/homeassistant/components/camera/yi.py
@@ -147,6 +147,6 @@ class YiCamera(Camera):
         try:
             return await async_aiohttp_proxy_stream(
                 self.hass, request, stream,
-                'multipart/x-mixed-replace;boundary=ffserver')
+                self._manager.ffmpeg_stream_content_type)
         finally:
             await stream.close()
diff --git a/homeassistant/components/ffmpeg.py b/homeassistant/components/ffmpeg.py
index a2f0ca19231..3184b5a5d54 100644
--- a/homeassistant/components/ffmpeg.py
+++ b/homeassistant/components/ffmpeg.py
@@ -5,6 +5,7 @@ For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/ffmpeg/
 """
 import logging
+import re
 
 import voluptuous as vol
 
@@ -16,7 +17,7 @@ from homeassistant.helpers.dispatcher import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-REQUIREMENTS = ['ha-ffmpeg==1.9']
+REQUIREMENTS = ['ha-ffmpeg==1.11']
 
 DOMAIN = 'ffmpeg'
 
@@ -60,6 +61,8 @@ async def async_setup(hass, config):
         conf.get(CONF_FFMPEG_BIN, DEFAULT_BINARY)
     )
 
+    await manager.async_get_version()
+
     # Register service
     async def async_service_handle(service):
         """Handle service ffmpeg process."""
@@ -96,12 +99,37 @@ class FFmpegManager:
         self.hass = hass
         self._cache = {}
         self._bin = ffmpeg_bin
+        self._version = None
+        self._major_version = None
 
     @property
     def binary(self):
         """Return ffmpeg binary from config."""
         return self._bin
 
+    async def async_get_version(self):
+        """Return ffmpeg version."""
+        from haffmpeg.tools import FFVersion
+
+        ffversion = FFVersion(self._bin, self.hass.loop)
+        self._version = await ffversion.get_version()
+
+        self._major_version = None
+        if self._version is not None:
+            result = re.search(r"(\d+)\.", self._version)
+            if result is not None:
+                self._major_version = int(result.group(1))
+
+        return self._version, self._major_version
+
+    @property
+    def ffmpeg_stream_content_type(self):
+        """Return HTTP content type for ffmpeg stream."""
+        if self._major_version is not None and self._major_version > 3:
+            return 'multipart/x-mixed-replace;boundary=ffmpeg'
+
+        return 'multipart/x-mixed-replace;boundary=ffserver'
+
 
 class FFmpegBase(Entity):
     """Interface object for FFmpeg."""
diff --git a/requirements_all.txt b/requirements_all.txt
index 33216d7603e..a7ea2f5d7d5 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -487,7 +487,7 @@ greenwavereality==0.5.1
 gstreamer-player==1.1.2
 
 # homeassistant.components.ffmpeg
-ha-ffmpeg==1.9
+ha-ffmpeg==1.11
 
 # homeassistant.components.media_player.philips_js
 ha-philipsjs==0.0.5
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index df2d5496441..ec1ece765f9 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -98,7 +98,7 @@ geojson_client==0.3
 georss_client==0.5
 
 # homeassistant.components.ffmpeg
-ha-ffmpeg==1.9
+ha-ffmpeg==1.11
 
 # homeassistant.components.hangouts
 hangups==0.4.6

From 94ab5dca7f0851a1d141186f84809d43f96278d9 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Mon, 4 Feb 2019 01:14:30 -0800
Subject: [PATCH 29/45] Improve cloud error handling (#20729)

* Improve cloud error handling

* Lint
---
 homeassistant/components/cloud/http_api.py |  9 ++++++---
 tests/components/cloud/test_http_api.py    | 12 ++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/cloud/http_api.py b/homeassistant/components/cloud/http_api.py
index 03a77c08d4b..a2825eb6d7b 100644
--- a/homeassistant/components/cloud/http_api.py
+++ b/homeassistant/components/cloud/http_api.py
@@ -107,13 +107,16 @@ def _handle_cloud_errors(handler):
             result = await handler(view, request, *args, **kwargs)
             return result
 
-        except (auth_api.CloudError, asyncio.TimeoutError) as err:
+        except Exception as err:  # pylint: disable=broad-except
             err_info = _CLOUD_ERRORS.get(err.__class__)
             if err_info is None:
+                _LOGGER.exception(
+                    "Unexpected error processing request for %s", request.path)
                 err_info = (502, 'Unexpected error: {}'.format(err))
             status, msg = err_info
-            return view.json_message(msg, status_code=status,
-                                     message_code=err.__class__.__name__)
+            return view.json_message(
+                msg, status_code=status,
+                message_code=err.__class__.__name__.lower())
 
     return error_handler
 
diff --git a/tests/components/cloud/test_http_api.py b/tests/components/cloud/test_http_api.py
index 84d35f4bdd8..06de6bf0b59 100644
--- a/tests/components/cloud/test_http_api.py
+++ b/tests/components/cloud/test_http_api.py
@@ -111,6 +111,18 @@ def test_login_view(hass, cloud_client, mock_cognito):
     assert result_pass == 'my_password'
 
 
+async def test_login_view_random_exception(cloud_client):
+    """Try logging in with invalid JSON."""
+    with patch('async_timeout.timeout', side_effect=ValueError('Boom')):
+        req = await cloud_client.post('/api/cloud/login', json={
+            'email': 'my_username',
+            'password': 'my_password'
+        })
+    assert req.status == 502
+    resp = await req.json()
+    assert resp == {'code': 'valueerror', 'message': 'Unexpected error: Boom'}
+
+
 @asyncio.coroutine
 def test_login_view_invalid_json(cloud_client):
     """Try logging in with invalid JSON."""

From cfa03a408e21ed7e3d5a6b32561dc8db2b47a245 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Mon, 4 Feb 2019 19:58:38 +0100
Subject: [PATCH 30/45] Fix cloud webhook body (#20739)

* Bugfix cloud webhooks text response

* address comments

* Fix lint
---
 homeassistant/components/cloud/iot.py   |  7 +++----
 homeassistant/components/cloud/utils.py | 13 +++++++++++++
 homeassistant/util/aiohttp.py           | 10 ----------
 tests/components/cloud/test_utils.py    | 24 ++++++++++++++++++++++++
 tests/util/test_aiohttp.py              | 21 ---------------------
 5 files changed, 40 insertions(+), 35 deletions(-)
 create mode 100644 homeassistant/components/cloud/utils.py
 create mode 100644 tests/components/cloud/test_utils.py

diff --git a/homeassistant/components/cloud/iot.py b/homeassistant/components/cloud/iot.py
index ed24fe48d40..d725cb309bc 100644
--- a/homeassistant/components/cloud/iot.py
+++ b/homeassistant/components/cloud/iot.py
@@ -12,9 +12,10 @@ from homeassistant.components.alexa import smart_home as alexa
 from homeassistant.components.google_assistant import smart_home as ga
 from homeassistant.core import callback
 from homeassistant.util.decorator import Registry
-from homeassistant.util.aiohttp import MockRequest, serialize_response
+from homeassistant.util.aiohttp import MockRequest
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from . import auth_api
+from . import utils
 from .const import MESSAGE_EXPIRATION, MESSAGE_AUTH_FAIL
 
 HANDLERS = Registry()
@@ -360,10 +361,8 @@ async def async_handle_webhook(hass, cloud, payload):
     response = await hass.components.webhook.async_handle_webhook(
         found['webhook_id'], request)
 
-    response_dict = serialize_response(response)
+    response_dict = utils.aiohttp_serialize_response(response)
     body = response_dict.get('body')
-    if body:
-        body = body.decode('utf-8')
 
     return {
         'body': body,
diff --git a/homeassistant/components/cloud/utils.py b/homeassistant/components/cloud/utils.py
new file mode 100644
index 00000000000..da1d3809989
--- /dev/null
+++ b/homeassistant/components/cloud/utils.py
@@ -0,0 +1,13 @@
+"""Helper functions for cloud components."""
+from typing import Any, Dict
+
+from aiohttp import web
+
+
+def aiohttp_serialize_response(response: web.Response) -> Dict[str, Any]:
+    """Serialize an aiohttp response to a dictionary."""
+    return {
+        'status': response.status,
+        'body': response.text,
+        'headers': dict(response.headers),
+    }
diff --git a/homeassistant/util/aiohttp.py b/homeassistant/util/aiohttp.py
index d648ed43110..16fea129573 100644
--- a/homeassistant/util/aiohttp.py
+++ b/homeassistant/util/aiohttp.py
@@ -3,7 +3,6 @@ import json
 from urllib.parse import parse_qsl
 from typing import Any, Dict, Optional
 
-from aiohttp import web
 from multidict import CIMultiDict, MultiDict
 
 
@@ -42,12 +41,3 @@ class MockRequest:
     async def text(self) -> str:
         """Return the body as text."""
         return self._text
-
-
-def serialize_response(response: web.Response) -> Dict[str, Any]:
-    """Serialize an aiohttp response to a dictionary."""
-    return {
-        'status': response.status,
-        'body': response.body,
-        'headers': dict(response.headers),
-    }
diff --git a/tests/components/cloud/test_utils.py b/tests/components/cloud/test_utils.py
new file mode 100644
index 00000000000..24de4ce6214
--- /dev/null
+++ b/tests/components/cloud/test_utils.py
@@ -0,0 +1,24 @@
+"""Test aiohttp request helper."""
+from aiohttp import web
+
+from homeassistant.components.cloud import utils
+
+
+def test_serialize_text():
+    """Test serializing a text response."""
+    response = web.Response(status=201, text='Hello')
+    assert utils.aiohttp_serialize_response(response) == {
+        'status': 201,
+        'body': 'Hello',
+        'headers': {'Content-Type': 'text/plain; charset=utf-8'},
+    }
+
+
+def test_serialize_json():
+    """Test serializing a JSON response."""
+    response = web.json_response({"how": "what"})
+    assert utils.aiohttp_serialize_response(response) == {
+        'status': 200,
+        'body': '{"how": "what"}',
+        'headers': {'Content-Type': 'application/json; charset=utf-8'},
+    }
diff --git a/tests/util/test_aiohttp.py b/tests/util/test_aiohttp.py
index 8f528376cce..5df1582da32 100644
--- a/tests/util/test_aiohttp.py
+++ b/tests/util/test_aiohttp.py
@@ -1,5 +1,4 @@
 """Test aiohttp request helper."""
-from aiohttp import web
 
 from homeassistant.util import aiohttp
 
@@ -32,23 +31,3 @@ async def test_request_post_query():
     assert request.query == {
         'get': 'true'
     }
-
-
-def test_serialize_text():
-    """Test serializing a text response."""
-    response = web.Response(status=201, text='Hello')
-    assert aiohttp.serialize_response(response) == {
-        'status': 201,
-        'body': b'Hello',
-        'headers': {'Content-Type': 'text/plain; charset=utf-8'},
-    }
-
-
-def test_serialize_json():
-    """Test serializing a JSON response."""
-    response = web.json_response({"how": "what"})
-    assert aiohttp.serialize_response(response) == {
-        'status': 200,
-        'body': b'{"how": "what"}',
-        'headers': {'Content-Type': 'application/json; charset=utf-8'},
-    }

From a8b4467763f116b7cdb35a1cc44f79451f4754ce Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Mon, 4 Feb 2019 10:58:06 -0800
Subject: [PATCH 31/45] Fix the line reference in config error message (#20743)

* Fix the line reference in config error message

* Fix platform config validation

* Fix test

* Handle error in error handling routine
---
 homeassistant/config.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/homeassistant/config.py b/homeassistant/config.py
index 2a9f8f64835..5dbf226ca25 100644
--- a/homeassistant/config.py
+++ b/homeassistant/config.py
@@ -446,7 +446,11 @@ def _format_config_error(ex: vol.Invalid, domain: str, config: Dict) -> str:
     else:
         message += '{}.'.format(humanize_error(config, ex))
 
-    domain_config = config.get(domain, config)
+    try:
+        domain_config = config.get(domain, config)
+    except AttributeError:
+        domain_config = config
+
     message += " (See {}, line {}). ".format(
         getattr(domain_config, '__config_file__', '?'),
         getattr(domain_config, '__line__', '?'))
@@ -759,7 +763,7 @@ def async_process_component_config(
                     p_validated = component.PLATFORM_SCHEMA(  # type: ignore
                         p_config)
             except vol.Invalid as ex:
-                async_log_exception(ex, domain, config, hass)
+                async_log_exception(ex, domain, p_config, hass)
                 continue
 
             # Not all platform components follow same pattern for platforms
@@ -779,10 +783,10 @@ def async_process_component_config(
                 # pylint: disable=no-member
                 try:
                     p_validated = platform.PLATFORM_SCHEMA(  # type: ignore
-                        p_validated)
+                        p_config)
                 except vol.Invalid as ex:
                     async_log_exception(ex, '{}.{}'.format(domain, p_name),
-                                        p_validated, hass)
+                                        p_config, hass)
                     continue
 
             platforms.append(p_validated)

From 7f762105497fa775df6620add5e74780591363a4 Mon Sep 17 00:00:00 2001
From: Steven Looman <steven.looman@gmail.com>
Date: Tue, 5 Feb 2019 01:36:25 +0100
Subject: [PATCH 32/45] Upgrade to async_upnp_client==0.14.4 (#20751)

---
 homeassistant/components/media_player/dlna_dmr.py | 2 +-
 homeassistant/components/upnp/__init__.py         | 2 +-
 requirements_all.txt                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/media_player/dlna_dmr.py b/homeassistant/components/media_player/dlna_dmr.py
index 0121f6e98d3..802b2b597fc 100644
--- a/homeassistant/components/media_player/dlna_dmr.py
+++ b/homeassistant/components/media_player/dlna_dmr.py
@@ -26,7 +26,7 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util import get_local_ip
 
-REQUIREMENTS = ['async-upnp-client==0.14.3']
+REQUIREMENTS = ['async-upnp-client==0.14.4']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/upnp/__init__.py b/homeassistant/components/upnp/__init__.py
index 494c39c06ba..2a1b8c52d79 100644
--- a/homeassistant/components/upnp/__init__.py
+++ b/homeassistant/components/upnp/__init__.py
@@ -29,7 +29,7 @@ from .const import LOGGER as _LOGGER
 from .device import Device
 
 
-REQUIREMENTS = ['async-upnp-client==0.14.3']
+REQUIREMENTS = ['async-upnp-client==0.14.4']
 
 NOTIFICATION_ID = 'upnp_notification'
 NOTIFICATION_TITLE = 'UPnP/IGD Setup'
diff --git a/requirements_all.txt b/requirements_all.txt
index a7ea2f5d7d5..80755957f17 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -167,7 +167,7 @@ asterisk_mbox==0.5.0
 
 # homeassistant.components.upnp
 # homeassistant.components.media_player.dlna_dmr
-async-upnp-client==0.14.3
+async-upnp-client==0.14.4
 
 # homeassistant.components.light.avion
 # avion==0.10

From 3d75e1c2994d2c23b4ae5c316d05e915c3211f00 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 5 Feb 2019 01:45:03 -0800
Subject: [PATCH 33/45] Keep cloud tokens always valid (#20762)

* Keep auth token always valid

* Remove unused refresh_auth message

* Capture EndpointConnectionError

* Lint
---
 homeassistant/components/cloud/__init__.py |  3 +-
 homeassistant/components/cloud/auth_api.py | 73 +++++++++++++++++++---
 homeassistant/components/cloud/iot.py      | 30 +++++++--
 tests/components/cloud/test_auth_api.py    | 29 +++++++++
 tests/components/cloud/test_iot.py         | 23 +------
 5 files changed, 122 insertions(+), 36 deletions(-)

diff --git a/homeassistant/components/cloud/__init__.py b/homeassistant/components/cloud/__init__.py
index d938dd20e67..98e649e1742 100644
--- a/homeassistant/components/cloud/__init__.py
+++ b/homeassistant/components/cloud/__init__.py
@@ -106,6 +106,7 @@ async def async_setup(hass, config):
     )
 
     cloud = hass.data[DOMAIN] = Cloud(hass, **kwargs)
+    await auth_api.async_setup(hass, cloud)
     hass.bus.async_listen_once(EVENT_HOMEASSISTANT_START, cloud.async_start)
     await http_api.async_setup(hass)
     return True
@@ -263,7 +264,7 @@ class Cloud:
         self.access_token = info['access_token']
         self.refresh_token = info['refresh_token']
 
-        self.hass.add_job(self.iot.connect())
+        self.hass.async_create_task(self.iot.connect())
 
     def _decode_claims(self, token):  # pylint: disable=no-self-use
         """Decode the claims in a token."""
diff --git a/homeassistant/components/cloud/auth_api.py b/homeassistant/components/cloud/auth_api.py
index 954d28b803f..6019dac87b9 100644
--- a/homeassistant/components/cloud/auth_api.py
+++ b/homeassistant/components/cloud/auth_api.py
@@ -1,4 +1,10 @@
 """Package to communicate with the authentication API."""
+import asyncio
+import logging
+import random
+
+
+_LOGGER = logging.getLogger(__name__)
 
 
 class CloudError(Exception):
@@ -39,6 +45,40 @@ AWS_EXCEPTIONS = {
 }
 
 
+async def async_setup(hass, cloud):
+    """Configure the auth api."""
+    refresh_task = None
+
+    async def handle_token_refresh():
+        """Handle Cloud access token refresh."""
+        sleep_time = 5
+        sleep_time = random.randint(2400, 3600)
+        while True:
+            try:
+                await asyncio.sleep(sleep_time)
+                await hass.async_add_executor_job(renew_access_token, cloud)
+            except CloudError as err:
+                _LOGGER.error("Can't refresh cloud token: %s", err)
+            except asyncio.CancelledError:
+                # Task is canceled, stop it.
+                break
+
+            sleep_time = random.randint(3100, 3600)
+
+    async def on_connect():
+        """When the instance is connected."""
+        nonlocal refresh_task
+        refresh_task = hass.async_create_task(handle_token_refresh())
+
+    async def on_disconnect():
+        """When the instance is disconnected."""
+        nonlocal refresh_task
+        refresh_task.cancel()
+
+    cloud.iot.register_on_connect(on_connect)
+    cloud.iot.register_on_disconnect(on_disconnect)
+
+
 def _map_aws_exception(err):
     """Map AWS exception to our exceptions."""
     ex = AWS_EXCEPTIONS.get(err.response['Error']['Code'], UnknownError)
@@ -47,7 +87,7 @@ def _map_aws_exception(err):
 
 def register(cloud, email, password):
     """Register a new account."""
-    from botocore.exceptions import ClientError
+    from botocore.exceptions import ClientError, EndpointConnectionError
 
     cognito = _cognito(cloud)
     # Workaround for bug in Warrant. PR with fix:
@@ -55,13 +95,16 @@ def register(cloud, email, password):
     cognito.add_base_attributes()
     try:
         cognito.register(email, password)
+
     except ClientError as err:
         raise _map_aws_exception(err)
+    except EndpointConnectionError:
+        raise UnknownError()
 
 
 def resend_email_confirm(cloud, email):
     """Resend email confirmation."""
-    from botocore.exceptions import ClientError
+    from botocore.exceptions import ClientError, EndpointConnectionError
 
     cognito = _cognito(cloud, username=email)
 
@@ -72,18 +115,23 @@ def resend_email_confirm(cloud, email):
         )
     except ClientError as err:
         raise _map_aws_exception(err)
+    except EndpointConnectionError:
+        raise UnknownError()
 
 
 def forgot_password(cloud, email):
     """Initialize forgotten password flow."""
-    from botocore.exceptions import ClientError
+    from botocore.exceptions import ClientError, EndpointConnectionError
 
     cognito = _cognito(cloud, username=email)
 
     try:
         cognito.initiate_forgot_password()
+
     except ClientError as err:
         raise _map_aws_exception(err)
+    except EndpointConnectionError:
+        raise UnknownError()
 
 
 def login(cloud, email, password):
@@ -97,7 +145,7 @@ def login(cloud, email, password):
 
 def check_token(cloud):
     """Check that the token is valid and verify if needed."""
-    from botocore.exceptions import ClientError
+    from botocore.exceptions import ClientError, EndpointConnectionError
 
     cognito = _cognito(
         cloud,
@@ -109,13 +157,17 @@ def check_token(cloud):
             cloud.id_token = cognito.id_token
             cloud.access_token = cognito.access_token
             cloud.write_user_info()
+
     except ClientError as err:
         raise _map_aws_exception(err)
 
+    except EndpointConnectionError:
+        raise UnknownError()
+
 
 def renew_access_token(cloud):
     """Renew access token."""
-    from botocore.exceptions import ClientError
+    from botocore.exceptions import ClientError, EndpointConnectionError
 
     cognito = _cognito(
         cloud,
@@ -127,13 +179,17 @@ def renew_access_token(cloud):
         cloud.id_token = cognito.id_token
         cloud.access_token = cognito.access_token
         cloud.write_user_info()
+
     except ClientError as err:
         raise _map_aws_exception(err)
 
+    except EndpointConnectionError:
+        raise UnknownError()
+
 
 def _authenticate(cloud, email, password):
     """Log in and return an authenticated Cognito instance."""
-    from botocore.exceptions import ClientError
+    from botocore.exceptions import ClientError, EndpointConnectionError
     from warrant.exceptions import ForceChangePasswordException
 
     assert not cloud.is_logged_in, 'Cannot login if already logged in.'
@@ -145,11 +201,14 @@ def _authenticate(cloud, email, password):
         return cognito
 
     except ForceChangePasswordException:
-        raise PasswordChangeRequired
+        raise PasswordChangeRequired()
 
     except ClientError as err:
         raise _map_aws_exception(err)
 
+    except EndpointConnectionError:
+        raise UnknownError()
+
 
 def _cognito(cloud, **kwargs):
     """Get the client credentials."""
diff --git a/homeassistant/components/cloud/iot.py b/homeassistant/components/cloud/iot.py
index d725cb309bc..055c4dbaa64 100644
--- a/homeassistant/components/cloud/iot.py
+++ b/homeassistant/components/cloud/iot.py
@@ -62,12 +62,18 @@ class CloudIoT:
         # Local code waiting for a response
         self._response_handler = {}
         self._on_connect = []
+        self._on_disconnect = []
 
     @callback
     def register_on_connect(self, on_connect_cb):
         """Register an async on_connect callback."""
         self._on_connect.append(on_connect_cb)
 
+    @callback
+    def register_on_disconnect(self, on_disconnect_cb):
+        """Register an async on_disconnect callback."""
+        self._on_disconnect.append(on_disconnect_cb)
+
     @property
     def connected(self):
         """Return if we're currently connected."""
@@ -102,6 +108,17 @@ class CloudIoT:
                 # Still adding it here to make sure we can always reconnect
                 _LOGGER.exception("Unexpected error")
 
+            if self.state == STATE_CONNECTED and self._on_disconnect:
+                try:
+                    yield from asyncio.wait([
+                        cb() for cb in self._on_disconnect
+                    ])
+                except Exception:  # pylint: disable=broad-except
+                    # Safety net. This should never hit.
+                    # Still adding it here to make sure we don't break the flow
+                    _LOGGER.exception(
+                        "Unexpected error in on_disconnect callbacks")
+
             if self.close_requested:
                 break
 
@@ -192,7 +209,13 @@ class CloudIoT:
             self.state = STATE_CONNECTED
 
             if self._on_connect:
-                yield from asyncio.wait([cb() for cb in self._on_connect])
+                try:
+                    yield from asyncio.wait([cb() for cb in self._on_connect])
+                except Exception:  # pylint: disable=broad-except
+                    # Safety net. This should never hit.
+                    # Still adding it here to make sure we don't break the flow
+                    _LOGGER.exception(
+                        "Unexpected error in on_connect callbacks")
 
             while not client.closed:
                 msg = yield from client.receive()
@@ -326,11 +349,6 @@ async def async_handle_cloud(hass, cloud, payload):
         await cloud.logout()
         _LOGGER.error("You have been logged out from Home Assistant cloud: %s",
                       payload['reason'])
-    elif action == 'refresh_auth':
-        # Refresh the auth token between now and payload['seconds']
-        hass.helpers.event.async_call_later(
-            random.randint(0, payload['seconds']),
-            lambda now: auth_api.check_token(cloud))
     else:
         _LOGGER.warning("Received unknown cloud action: %s", action)
 
diff --git a/tests/components/cloud/test_auth_api.py b/tests/components/cloud/test_auth_api.py
index a50a4d796aa..bdf9939cb2b 100644
--- a/tests/components/cloud/test_auth_api.py
+++ b/tests/components/cloud/test_auth_api.py
@@ -1,4 +1,5 @@
 """Tests for the tools to communicate with the cloud."""
+import asyncio
 from unittest.mock import MagicMock, patch
 
 from botocore.exceptions import ClientError
@@ -165,3 +166,31 @@ def test_check_token_raises(mock_cognito):
     assert cloud.id_token != mock_cognito.id_token
     assert cloud.access_token != mock_cognito.access_token
     assert len(cloud.write_user_info.mock_calls) == 0
+
+
+async def test_async_setup(hass):
+    """Test async setup."""
+    cloud = MagicMock()
+    await auth_api.async_setup(hass, cloud)
+    assert len(cloud.iot.mock_calls) == 2
+    on_connect = cloud.iot.mock_calls[0][1][0]
+    on_disconnect = cloud.iot.mock_calls[1][1][0]
+
+    with patch('random.randint', return_value=0), patch(
+            'homeassistant.components.cloud.auth_api.renew_access_token'
+    ) as mock_renew:
+        await on_connect()
+        # Let handle token sleep once
+        await asyncio.sleep(0)
+        # Let handle token refresh token
+        await asyncio.sleep(0)
+
+        assert len(mock_renew.mock_calls) == 1
+        assert mock_renew.mock_calls[0][1][0] is cloud
+
+        await on_disconnect()
+
+        # Make sure task is no longer being called
+        await asyncio.sleep(0)
+        await asyncio.sleep(0)
+        assert len(mock_renew.mock_calls) == 1
diff --git a/tests/components/cloud/test_iot.py b/tests/components/cloud/test_iot.py
index 1a528f8cedf..10a94f46833 100644
--- a/tests/components/cloud/test_iot.py
+++ b/tests/components/cloud/test_iot.py
@@ -10,9 +10,8 @@ from homeassistant.components.cloud import (
     Cloud, iot, auth_api, MODE_DEV)
 from homeassistant.components.cloud.const import (
     PREF_ENABLE_ALEXA, PREF_ENABLE_GOOGLE)
-from homeassistant.util import dt as dt_util
 from tests.components.alexa import test_smart_home as test_alexa
-from tests.common import mock_coro, async_fire_time_changed
+from tests.common import mock_coro
 
 from . import mock_cloud_prefs
 
@@ -158,26 +157,6 @@ async def test_handling_core_messages_logout(hass, mock_cloud):
     assert len(mock_cloud.logout.mock_calls) == 1
 
 
-async def test_handling_core_messages_refresh_auth(hass, mock_cloud):
-    """Test handling core messages."""
-    mock_cloud.hass = hass
-    with patch('random.randint', return_value=0) as mock_rand, patch(
-        'homeassistant.components.cloud.auth_api.check_token'
-    ) as mock_check:
-        await iot.async_handle_cloud(hass, mock_cloud, {
-            'action': 'refresh_auth',
-            'seconds': 230,
-        })
-        async_fire_time_changed(hass, dt_util.utcnow())
-        await hass.async_block_till_done()
-
-    assert len(mock_rand.mock_calls) == 1
-    assert mock_rand.mock_calls[0][1] == (0, 230)
-
-    assert len(mock_check.mock_calls) == 1
-    assert mock_check.mock_calls[0][1][0] is mock_cloud
-
-
 @asyncio.coroutine
 def test_cloud_getting_disconnected_by_server(mock_client, caplog, mock_cloud):
     """Test server disconnecting instance."""

From e8dfc326d3f4fa1749bc73fce7adbd245da81390 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Tue, 5 Feb 2019 08:04:49 -0800
Subject: [PATCH 34/45] Bumped version to 0.87.0b6

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index a44d90551cb..3549dee7fc6 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 87
-PATCH_VERSION = '0b5'
+PATCH_VERSION = '0b6'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From a6bcb515f93379e2827a9796004a6dba566009b0 Mon Sep 17 00:00:00 2001
From: Fredrik Erlandsson <fredrik.e@gmail.com>
Date: Wed, 6 Feb 2019 00:20:23 +0100
Subject: [PATCH 35/45] Fix tellduslive responsiveness (#20603)

* use async_call_later for update

* no need to timeout

* fixes

* move init tasks to hass.loop

* version bump of tellduslive

* fixes for @MartinHjelmare

* fixes task cancel

* don't return from new client
---
 .../components/tellduslive/__init__.py        | 65 ++++++++++---------
 requirements_all.txt                          |  2 +-
 2 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/homeassistant/components/tellduslive/__init__.py b/homeassistant/components/tellduslive/__init__.py
index d9cd1be59da..2a57a78ee9e 100644
--- a/homeassistant/components/tellduslive/__init__.py
+++ b/homeassistant/components/tellduslive/__init__.py
@@ -5,27 +5,26 @@ For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/tellduslive/
 """
 import asyncio
-from datetime import timedelta
 from functools import partial
 import logging
 
 import voluptuous as vol
 
 from homeassistant import config_entries
-import homeassistant.helpers.config_validation as cv
 from homeassistant.const import CONF_UPDATE_INTERVAL
+import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.helpers.event import async_track_time_interval
+from homeassistant.helpers.event import async_call_later
 
 from . import config_flow  # noqa  pylint_disable=unused-import
 from .const import (
-    CONF_HOST, DOMAIN, KEY_HOST, KEY_SCAN_INTERVAL,
-    KEY_SESSION, MIN_UPDATE_INTERVAL, NOT_SO_PRIVATE_KEY, PUBLIC_KEY,
-    SCAN_INTERVAL, SIGNAL_UPDATE_ENTITY, TELLDUS_DISCOVERY_NEW)
+    CONF_HOST, DOMAIN, KEY_HOST, KEY_SCAN_INTERVAL, KEY_SESSION,
+    MIN_UPDATE_INTERVAL, NOT_SO_PRIVATE_KEY, PUBLIC_KEY, SCAN_INTERVAL,
+    SIGNAL_UPDATE_ENTITY, TELLDUS_DISCOVERY_NEW)
 
 APPLICATION_NAME = 'Home Assistant'
 
-REQUIREMENTS = ['tellduslive==0.10.8']
+REQUIREMENTS = ['tellduslive==0.10.10']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -45,6 +44,7 @@ CONFIG_SCHEMA = vol.Schema(
 DATA_CONFIG_ENTRY_LOCK = 'tellduslive_config_entry_lock'
 CONFIG_ENTRY_IS_SETUP = 'telldus_config_entry_is_setup'
 
+NEW_CLIENT_TASK = 'telldus_new_client_task'
 INTERVAL_TRACKER = '{}_INTERVAL'.format(DOMAIN)
 
 
@@ -71,33 +71,30 @@ async def async_setup_entry(hass, entry):
 
     hass.data[DATA_CONFIG_ENTRY_LOCK] = asyncio.Lock()
     hass.data[CONFIG_ENTRY_IS_SETUP] = set()
-
-    client = TelldusLiveClient(hass, entry, session)
-    hass.data[DOMAIN] = client
-    await async_add_hubs(hass, client, entry.entry_id)
-    hass.async_create_task(client.update())
-
-    interval = timedelta(seconds=entry.data[KEY_SCAN_INTERVAL])
-    _LOGGER.debug('Update interval %s', interval)
-    hass.data[INTERVAL_TRACKER] = async_track_time_interval(
-        hass, client.update, interval)
+    hass.data[NEW_CLIENT_TASK] = hass.loop.create_task(
+        async_new_client(hass, session, entry))
 
     return True
 
 
-async def async_add_hubs(hass, client, entry_id):
+async def async_new_client(hass, session, entry):
     """Add the hubs associated with the current client to device_registry."""
+    interval = entry.data[KEY_SCAN_INTERVAL]
+    _LOGGER.debug('Update interval %s seconds.', interval)
+    client = TelldusLiveClient(hass, entry, session, interval)
+    hass.data[DOMAIN] = client
     dev_reg = await hass.helpers.device_registry.async_get_registry()
     for hub in await client.async_get_hubs():
         _LOGGER.debug("Connected hub %s", hub['name'])
         dev_reg.async_get_or_create(
-            config_entry_id=entry_id,
+            config_entry_id=entry.entry_id,
             identifiers={(DOMAIN, hub['id'])},
             manufacturer='Telldus',
             name=hub['name'],
             model=hub['type'],
             sw_version=hub['version'],
         )
+    await client.update()
 
 
 async def async_setup(hass, config):
@@ -118,6 +115,8 @@ async def async_setup(hass, config):
 
 async def async_unload_entry(hass, config_entry):
     """Unload a config entry."""
+    if not hass.data[NEW_CLIENT_TASK].done():
+        hass.data[NEW_CLIENT_TASK].cancel()
     interval_tracker = hass.data.pop(INTERVAL_TRACKER)
     interval_tracker()
     await asyncio.wait([
@@ -132,7 +131,7 @@ async def async_unload_entry(hass, config_entry):
 class TelldusLiveClient:
     """Get the latest data and update the states."""
 
-    def __init__(self, hass, config_entry, session):
+    def __init__(self, hass, config_entry, session, interval):
         """Initialize the Tellus data object."""
         self._known_devices = set()
         self._device_infos = {}
@@ -140,6 +139,7 @@ class TelldusLiveClient:
         self._hass = hass
         self._config_entry = config_entry
         self._client = session
+        self._interval = interval
 
     async def async_get_hubs(self):
         """Return hubs registered for the user."""
@@ -195,16 +195,21 @@ class TelldusLiveClient:
 
     async def update(self, *args):
         """Periodically poll the servers for current state."""
-        if not await self._hass.async_add_executor_job(self._client.update):
-            _LOGGER.warning('Failed request')
-
-        dev_ids = {dev.device_id for dev in self._client.devices}
-        new_devices = dev_ids - self._known_devices
-        # just await each discover as `gather` use up all HTTPAdapter pools
-        for d_id in new_devices:
-            await self._discover(d_id)
-        self._known_devices |= new_devices
-        async_dispatcher_send(self._hass, SIGNAL_UPDATE_ENTITY)
+        try:
+            if not await self._hass.async_add_executor_job(
+                    self._client.update):
+                _LOGGER.warning('Failed request')
+                return
+            dev_ids = {dev.device_id for dev in self._client.devices}
+            new_devices = dev_ids - self._known_devices
+            # just await each discover as `gather` use up all HTTPAdapter pools
+            for d_id in new_devices:
+                await self._discover(d_id)
+            self._known_devices |= new_devices
+            async_dispatcher_send(self._hass, SIGNAL_UPDATE_ENTITY)
+        finally:
+            self._hass.data[INTERVAL_TRACKER] = async_call_later(
+                self._hass, self._interval, self.update)
 
     def device(self, device_id):
         """Return device representation."""
diff --git a/requirements_all.txt b/requirements_all.txt
index 80755957f17..9e6fc503908 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1628,7 +1628,7 @@ tellcore-net==0.4
 tellcore-py==1.1.2
 
 # homeassistant.components.tellduslive
-tellduslive==0.10.8
+tellduslive==0.10.10
 
 # homeassistant.components.media_player.lg_soundbar
 temescal==0.1

From 58b7905276d7986bed4c90618574c851d77e9de5 Mon Sep 17 00:00:00 2001
From: Erik Hendrix <hendrix_erik@hotmail.com>
Date: Mon, 4 Feb 2019 16:48:35 -0700
Subject: [PATCH 36/45] Update version for pymyq to 1.1.0

Update version of pymyq to 1.1.0; this version brings improved functionality, reducing errors for retrieving current state for the MyQ covers.
---
 homeassistant/components/cover/myq.py | 2 +-
 requirements_all.txt                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/cover/myq.py b/homeassistant/components/cover/myq.py
index bdff232fec9..b2587c06512 100644
--- a/homeassistant/components/cover/myq.py
+++ b/homeassistant/components/cover/myq.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
     STATE_OPEN, STATE_OPENING)
 from homeassistant.helpers import aiohttp_client, config_validation as cv
 
-REQUIREMENTS = ['pymyq==1.0.0']
+REQUIREMENTS = ['pymyq==1.1.0']
 _LOGGER = logging.getLogger(__name__)
 
 MYQ_TO_HASS = {
diff --git a/requirements_all.txt b/requirements_all.txt
index 9e6fc503908..39015bfb972 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1131,7 +1131,7 @@ pymonoprice==0.3
 pymusiccast==0.1.6
 
 # homeassistant.components.cover.myq
-pymyq==1.0.0
+pymyq==1.1.0
 
 # homeassistant.components.mysensors
 pymysensors==0.18.0

From 9912e0fc48d3c0b2847898752522d8b153776021 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Wed, 6 Feb 2019 09:50:48 -0800
Subject: [PATCH 37/45] Make sure Locative doesn't submit invalid device IDs
 (#20784)

---
 homeassistant/components/locative/device_tracker.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/locative/device_tracker.py b/homeassistant/components/locative/device_tracker.py
index 20808c773f0..78090914b2c 100644
--- a/homeassistant/components/locative/device_tracker.py
+++ b/homeassistant/components/locative/device_tracker.py
@@ -11,6 +11,7 @@ from homeassistant.components.device_tracker import \
 from homeassistant.components.locative import DOMAIN as LOCATIVE_DOMAIN
 from homeassistant.components.locative import TRACKER_UPDATE
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.util import slugify
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -24,7 +25,7 @@ async def async_setup_entry(hass, entry, async_see):
     async def _set_location(device, gps_location, location_name):
         """Fire HA event to set location."""
         await async_see(
-            dev_id=device,
+            dev_id=slugify(device),
             gps=gps_location,
             location_name=location_name
         )

From 180689fb047f84a64f171c9683e29edadc7e8776 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 6 Feb 2019 11:49:56 -0800
Subject: [PATCH 38/45] Bumped version to 0.87.0

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 3549dee7fc6..3a260501e32 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 87
-PATCH_VERSION = '0b6'
+PATCH_VERSION = '0'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From b5e40669c9c205d049dd46be50b9895bdd14019f Mon Sep 17 00:00:00 2001
From: Eliran Turgeman <Eliran.Tur2@Gmail.com>
Date: Wed, 6 Feb 2019 12:42:11 +0200
Subject: [PATCH 39/45] Fix waze_travel_time component ERROR on startup
 (#20316)

* Fix waze_travel_time component ERROR on startup

Fix the unhandled exception with Waze Travel Time sensor upon startup,
by adding Throttle before update_interval are starting.

* add missing whitespace after ','

* fix line too long (80 > 79 characters)

* lint

* fix interval to use const

* Change to Throttle as a decorator to update

Change to Throttle as a decorator to update instead of self.update = Throttle(interval)(self.update)
remove unnecessary code.

* fix  indentations

* Update waze_travel_time.py

* Update waze_travel_time.py

* Update waze_travel_time.py
---
 homeassistant/components/sensor/waze_travel_time.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/waze_travel_time.py b/homeassistant/components/sensor/waze_travel_time.py
index c55c229f549..ae38c529fe2 100644
--- a/homeassistant/components/sensor/waze_travel_time.py
+++ b/homeassistant/components/sensor/waze_travel_time.py
@@ -16,6 +16,7 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers import location
 from homeassistant.helpers.entity import Entity
+from homeassistant.util import Throttle
 
 REQUIREMENTS = ['WazeRouteCalculator==0.6']
 
@@ -40,6 +41,7 @@ ICON = 'mdi:car'
 REGIONS = ['US', 'NA', 'EU', 'IL', 'AU']
 
 SCAN_INTERVAL = timedelta(minutes=5)
+MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=5)
 
 TRACKABLE_DOMAINS = ['device_tracker', 'sensor', 'zone']
 
@@ -67,7 +69,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     sensor = WazeTravelTime(name, origin, destination, region,
                             incl_filter, excl_filter, realtime)
 
-    add_entities([sensor])
+    add_entities([sensor], True)
 
     # Wait until start event is sent to load this component.
     hass.bus.listen_once(
@@ -182,6 +184,7 @@ class WazeTravelTime(Entity):
 
         return friendly_name
 
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
     def update(self):
         """Fetch new state data for the sensor."""
         import WazeRouteCalculator

From 21583d25e2be8f7a1c2ac432691849cea555da91 Mon Sep 17 00:00:00 2001
From: jonudewux <jonudewux@stromox.com>
Date: Mon, 4 Feb 2019 22:08:38 +0200
Subject: [PATCH 40/45] Add Transmission component 'scan_interval' option
 (#20575)

* Transmission component fix 'scan_interval' option

* Fix dict[key] comments

* Fix latest mess
---
 homeassistant/components/sensor/transmission.py |  6 +++++-
 homeassistant/components/switch/transmission.py |  6 +++++-
 homeassistant/components/transmission.py        | 16 ++++++++++------
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/sensor/transmission.py b/homeassistant/components/sensor/transmission.py
index efe32b07fc0..84c7d54306e 100644
--- a/homeassistant/components/sensor/transmission.py
+++ b/homeassistant/components/sensor/transmission.py
@@ -4,10 +4,12 @@ Support for monitoring the Transmission BitTorrent client API.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/sensor.transmission/
 """
+from datetime import timedelta
+
 import logging
 
 from homeassistant.components.transmission import (
-    DATA_TRANSMISSION, SENSOR_TYPES, SCAN_INTERVAL)
+    DATA_TRANSMISSION, SENSOR_TYPES)
 from homeassistant.const import STATE_IDLE
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import Throttle
@@ -18,6 +20,8 @@ _LOGGER = logging.getLogger(__name__)
 
 DEFAULT_NAME = 'Transmission'
 
+SCAN_INTERVAL = timedelta(seconds=120)
+
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Transmission sensors."""
diff --git a/homeassistant/components/switch/transmission.py b/homeassistant/components/switch/transmission.py
index 3ce3c7a98f9..8e6c0a8cb44 100644
--- a/homeassistant/components/switch/transmission.py
+++ b/homeassistant/components/switch/transmission.py
@@ -4,10 +4,12 @@ Support for setting the Transmission BitTorrent client Turtle Mode.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/switch.transmission/
 """
+from datetime import timedelta
+
 import logging
 
 from homeassistant.components.transmission import (
-    DATA_TRANSMISSION, SCAN_INTERVAL)
+    DATA_TRANSMISSION)
 from homeassistant.const import (
     STATE_OFF, STATE_ON)
 from homeassistant.helpers.entity import ToggleEntity
@@ -19,6 +21,8 @@ _LOGGING = logging.getLogger(__name__)
 
 DEFAULT_NAME = 'Transmission Turtle Mode'
 
+SCAN_INTERVAL = timedelta(seconds=120)
+
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Transmission switch."""
diff --git a/homeassistant/components/transmission.py b/homeassistant/components/transmission.py
index cdf55c8e049..b14881fccca 100644
--- a/homeassistant/components/transmission.py
+++ b/homeassistant/components/transmission.py
@@ -15,7 +15,8 @@ from homeassistant.const import (
     CONF_NAME,
     CONF_PASSWORD,
     CONF_PORT,
-    CONF_USERNAME
+    CONF_USERNAME,
+    CONF_SCAN_INTERVAL
 )
 from homeassistant.helpers import discovery, config_validation as cv
 from homeassistant.helpers.event import track_time_interval
@@ -42,6 +43,8 @@ SENSOR_TYPES = {
     'started_torrents': ['Started Torrents', None],
 }
 
+DEFAULT_SCAN_INTERVAL = timedelta(seconds=120)
+
 CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.Schema({
         vol.Required(CONF_HOST): cv.string,
@@ -50,20 +53,21 @@ CONFIG_SCHEMA = vol.Schema({
         vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
         vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
         vol.Optional(TURTLE_MODE, default=False): cv.boolean,
+        vol.Optional(CONF_SCAN_INTERVAL, default=DEFAULT_SCAN_INTERVAL):
+            cv.time_period,
         vol.Optional(CONF_MONITORED_CONDITIONS, default=['current_status']):
         vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)]),
     })
 }, extra=vol.ALLOW_EXTRA)
 
-SCAN_INTERVAL = timedelta(minutes=2)
-
 
 def setup(hass, config):
     """Set up the Transmission Component."""
     host = config[DOMAIN][CONF_HOST]
-    username = config[DOMAIN][CONF_USERNAME]
-    password = config[DOMAIN][CONF_PASSWORD]
+    username = config[DOMAIN].get(CONF_USERNAME)
+    password = config[DOMAIN].get(CONF_PASSWORD)
     port = config[DOMAIN][CONF_PORT]
+    scan_interval = config[DOMAIN][CONF_SCAN_INTERVAL]
 
     import transmissionrpc
     from transmissionrpc.error import TransmissionError
@@ -85,7 +89,7 @@ def setup(hass, config):
         """Get the latest data from Transmission."""
         tm_data.update()
 
-    track_time_interval(hass, refresh, SCAN_INTERVAL)
+    track_time_interval(hass, refresh, scan_interval)
 
     sensorconfig = {
         'sensors': config[DOMAIN][CONF_MONITORED_CONDITIONS],

From 5a762c74f45bb91e3d57af74151cdd9f87093a60 Mon Sep 17 00:00:00 2001
From: Jc2k <john.carr@unrouted.co.uk>
Date: Fri, 8 Feb 2019 10:00:51 +0000
Subject: [PATCH 41/45] Fix homekit_controller non-standard hk characteristics
 (#20824)

---
 homeassistant/components/homekit_controller/__init__.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/homekit_controller/__init__.py b/homeassistant/components/homekit_controller/__init__.py
index 72b7a502aa2..77d0825ef0b 100644
--- a/homeassistant/components/homekit_controller/__init__.py
+++ b/homeassistant/components/homekit_controller/__init__.py
@@ -224,7 +224,12 @@ class HomeKitEntity(Entity):
                 if service['iid'] != self._iid:
                     continue
                 for char in service['characteristics']:
-                    uuid = CharacteristicsTypes.get_uuid(char['type'])
+                    try:
+                        uuid = CharacteristicsTypes.get_uuid(char['type'])
+                    except KeyError:
+                        # If a KeyError is raised its a non-standard
+                        # characteristic. We must ignore it in this case.
+                        continue
                     if uuid not in characteristic_types:
                         continue
                     self._setup_characteristic(char)

From 81cad8cd526cb87b2a74f6a8650a4c355f6eac30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Fri, 8 Feb 2019 14:35:38 +0100
Subject: [PATCH 42/45] Fix STATE_UNLOCKED for verisure (#20858)

---
 homeassistant/components/lock/verisure.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/lock/verisure.py b/homeassistant/components/lock/verisure.py
index cf7d58b17a8..be9a0a24fee 100644
--- a/homeassistant/components/lock/verisure.py
+++ b/homeassistant/components/lock/verisure.py
@@ -80,7 +80,7 @@ class VerisureDoorlock(LockDevice):
             "$.doorLockStatusList[?(@.deviceLabel=='%s')].lockedState",
             self._device_label)
         if status == 'UNLOCKED':
-            self._state = None
+            self._state = STATE_UNLOCKED
         elif status == 'LOCKED':
             self._state = STATE_LOCKED
         elif status != 'PENDING':

From c66ec87b69abb4e8c580110f8dfede2a847c161f Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Fri, 8 Feb 2019 23:10:04 -0800
Subject: [PATCH 43/45] Use text= instead of body= for creating web responses
 (#20879)

---
 homeassistant/components/geofency/__init__.py  | 2 +-
 homeassistant/components/gpslogger/__init__.py | 4 ++--
 homeassistant/components/locative/__init__.py  | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/geofency/__init__.py b/homeassistant/components/geofency/__init__.py
index f58580b83c7..f265bd3492a 100644
--- a/homeassistant/components/geofency/__init__.py
+++ b/homeassistant/components/geofency/__init__.py
@@ -123,7 +123,7 @@ def _set_location(hass, data, location_name):
     )
 
     return web.Response(
-        body="Setting location for {}".format(device),
+        text="Setting location for {}".format(device),
         status=HTTP_OK
     )
 
diff --git a/homeassistant/components/gpslogger/__init__.py b/homeassistant/components/gpslogger/__init__.py
index d4150900223..39d795dcd25 100644
--- a/homeassistant/components/gpslogger/__init__.py
+++ b/homeassistant/components/gpslogger/__init__.py
@@ -66,7 +66,7 @@ async def handle_webhook(hass, webhook_id, request):
         data = WEBHOOK_SCHEMA(dict(await request.post()))
     except vol.MultipleInvalid as error:
         return web.Response(
-            body=error.error_message,
+            text=error.error_message,
             status=HTTP_UNPROCESSABLE_ENTITY
         )
 
@@ -91,7 +91,7 @@ async def handle_webhook(hass, webhook_id, request):
     )
 
     return web.Response(
-        body='Setting location for {}'.format(device),
+        text='Setting location for {}'.format(device),
         status=HTTP_OK
     )
 
diff --git a/homeassistant/components/locative/__init__.py b/homeassistant/components/locative/__init__.py
index 1f7f9c3a686..5a27fbaec63 100644
--- a/homeassistant/components/locative/__init__.py
+++ b/homeassistant/components/locative/__init__.py
@@ -101,7 +101,7 @@ async def handle_webhook(hass, webhook_id, request):
                 location_name
             )
             return web.Response(
-                body='Setting location to not home',
+                text='Setting location to not home',
                 status=HTTP_OK
             )
 
@@ -110,7 +110,7 @@ async def handle_webhook(hass, webhook_id, request):
         # before the previous zone was exited. The enter message will
         # be sent first, then the exit message will be sent second.
         return web.Response(
-            body='Ignoring exit from {} (already in {})'.format(
+            text='Ignoring exit from {} (already in {})'.format(
                 location_name, current_state
             ),
             status=HTTP_OK
@@ -120,14 +120,14 @@ async def handle_webhook(hass, webhook_id, request):
         # In the app, a test message can be sent. Just return something to
         # the user to let them know that it works.
         return web.Response(
-            body='Received test message.',
+            text='Received test message.',
             status=HTTP_OK
         )
 
     _LOGGER.error('Received unidentified message from Locative: %s',
                   direction)
     return web.Response(
-        body='Received unidentified message: {}'.format(direction),
+        text='Received unidentified message: {}'.format(direction),
         status=HTTP_UNPROCESSABLE_ENTITY
     )
 

From f601e9f774e203871948586defd26d1a5196776f Mon Sep 17 00:00:00 2001
From: Matt N <github@matthew.noorenberghe.com>
Date: Fri, 8 Feb 2019 21:44:33 -0800
Subject: [PATCH 44/45] Upgrade zm-py to 0.3.3 (#20886)

Fixes #20833
---
 homeassistant/components/zoneminder/__init__.py | 2 +-
 requirements_all.txt                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/zoneminder/__init__.py b/homeassistant/components/zoneminder/__init__.py
index 4591e14a006..2cefa2e1049 100644
--- a/homeassistant/components/zoneminder/__init__.py
+++ b/homeassistant/components/zoneminder/__init__.py
@@ -16,7 +16,7 @@ from homeassistant.helpers.discovery import async_load_platform
 
 _LOGGER = logging.getLogger(__name__)
 
-REQUIREMENTS = ['zm-py==0.3.1']
+REQUIREMENTS = ['zm-py==0.3.3']
 
 CONF_PATH_ZMS = 'path_zms'
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 39015bfb972..171be8718e0 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1792,4 +1792,4 @@ zigpy-xbee==0.1.1
 zigpy==0.2.0
 
 # homeassistant.components.zoneminder
-zm-py==0.3.1
+zm-py==0.3.3

From 3a4b3a2f81817e4d4677e601b35dc6c786b8d97b Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sat, 9 Feb 2019 22:48:17 -0800
Subject: [PATCH 45/45] Bumped version to 0.87.1

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 3a260501e32..c230a1c52d1 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 87
-PATCH_VERSION = '0'
+PATCH_VERSION = '1'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)