diff --git a/homeassistant/components/bond/translations/es.json b/homeassistant/components/bond/translations/es.json
new file mode 100644
index 00000000000..9620672ccf0
--- /dev/null
+++ b/homeassistant/components/bond/translations/es.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "No se pudo conectar",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
+            "unknown": "Error inesperado"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "access_token": "Token de acceso",
+                    "host": "Host"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/bond/translations/zh-Hant.json b/homeassistant/components/bond/translations/zh-Hant.json
new file mode 100644
index 00000000000..0a4e3dc061e
--- /dev/null
+++ b/homeassistant/components/bond/translations/zh-Hant.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "access_token": "\u5b58\u53d6\u5bc6\u9470",
+                    "host": "\u4e3b\u6a5f\u7aef"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/demo/translations/ca.json b/homeassistant/components/demo/translations/ca.json
index 70d7f550d0b..dbccaaf24a2 100644
--- a/homeassistant/components/demo/translations/ca.json
+++ b/homeassistant/components/demo/translations/ca.json
@@ -4,6 +4,7 @@
             "options_1": {
                 "data": {
                     "bool": "Entrada booleana opcional",
+                    "constant": "Constant",
                     "int": "Entrada num\u00e8rica"
                 }
             },
diff --git a/homeassistant/components/demo/translations/en.json b/homeassistant/components/demo/translations/en.json
index 6c1d1c1b3e6..2e70c88962a 100644
--- a/homeassistant/components/demo/translations/en.json
+++ b/homeassistant/components/demo/translations/en.json
@@ -4,6 +4,7 @@
             "options_1": {
                 "data": {
                     "bool": "Optional boolean",
+                    "constant": "Constant",
                     "int": "Numeric input"
                 }
             },
diff --git a/homeassistant/components/demo/translations/es.json b/homeassistant/components/demo/translations/es.json
index a60aee6a42b..bcf9dbbcbcf 100644
--- a/homeassistant/components/demo/translations/es.json
+++ b/homeassistant/components/demo/translations/es.json
@@ -10,6 +10,7 @@
             "options_1": {
                 "data": {
                     "bool": "Booleano opcional",
+                    "constant": "Constante",
                     "int": "Entrada num\u00e9rica"
                 }
             },
diff --git a/homeassistant/components/demo/translations/ru.json b/homeassistant/components/demo/translations/ru.json
index a793985702f..e3bd96b880a 100644
--- a/homeassistant/components/demo/translations/ru.json
+++ b/homeassistant/components/demo/translations/ru.json
@@ -4,6 +4,7 @@
             "options_1": {
                 "data": {
                     "bool": "\u041b\u043e\u0433\u0438\u0447\u0435\u0441\u043a\u0438\u0439",
+                    "constant": "\u041f\u043e\u0441\u0442\u043e\u044f\u043d\u043d\u0430\u044f",
                     "int": "\u0427\u0438\u0441\u043b\u043e\u0432\u043e\u0439"
                 }
             },
diff --git a/homeassistant/components/demo/translations/zh-Hant.json b/homeassistant/components/demo/translations/zh-Hant.json
index 084db6adfa2..f9f798134ba 100644
--- a/homeassistant/components/demo/translations/zh-Hant.json
+++ b/homeassistant/components/demo/translations/zh-Hant.json
@@ -4,6 +4,7 @@
             "options_1": {
                 "data": {
                     "bool": "\u9078\u9805\u5e03\u6797",
+                    "constant": "\u4e0d\u8b8a",
                     "int": "\u6578\u503c\u8f38\u5165"
                 }
             },
diff --git a/homeassistant/components/denonavr/translations/zh-Hant.json b/homeassistant/components/denonavr/translations/zh-Hant.json
index 8dc32220d7c..6127d170305 100644
--- a/homeassistant/components/denonavr/translations/zh-Hant.json
+++ b/homeassistant/components/denonavr/translations/zh-Hant.json
@@ -3,7 +3,7 @@
         "abort": {
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "already_in_progress": "Denon AVR \u8a2d\u5099\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d\u3002",
-            "connection_error": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "connection_error": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21\u3002\u95dc\u9589\u4e3b\u96fb\u6e90\u3001\u5c07\u4e59\u592a\u7db2\u8def\u65b7\u7dda\u5f8c\u91cd\u65b0\u9023\u7dda\uff0c\u53ef\u80fd\u6703\u6709\u6240\u5e6b\u52a9",
             "not_denonavr_manufacturer": "\u4e26\u975e Denon AVR \u7db2\u8def\u63a5\u6536\u5668\uff0c\u6240\u63a2\u7d22\u4e4b\u88fd\u9020\u5ee0\u5546\u4e0d\u7b26\u5408",
             "not_denonavr_missing": "\u4e26\u975e Denon AVR \u7db2\u8def\u63a5\u6536\u5668\uff0c\u63a2\u7d22\u8cc7\u8a0a\u4e0d\u5b8c\u6574"
         },
diff --git a/homeassistant/components/harmony/translations/en.json b/homeassistant/components/harmony/translations/en.json
index ce13e79e279..d180ff4ba7d 100644
--- a/homeassistant/components/harmony/translations/en.json
+++ b/homeassistant/components/harmony/translations/en.json
@@ -27,6 +27,7 @@
             "init": {
                 "data": {
                     "activity": "The default activity to execute when none is specified.",
+                    "activity_notify": "Update current activity on start of activity switch.",
                     "delay_secs": "The delay between sending commands."
                 },
                 "description": "Adjust Harmony Hub Options"
diff --git a/homeassistant/components/hue/translations/ca.json b/homeassistant/components/hue/translations/ca.json
index 667c6e705cf..26fab369ad8 100644
--- a/homeassistant/components/hue/translations/ca.json
+++ b/homeassistant/components/hue/translations/ca.json
@@ -59,6 +59,7 @@
             "init": {
                 "data": {
                     "allow_how_groups": "Permet grups Hue",
+                    "allow_hue_groups": "Permet grups Hue",
                     "allow_unreachable": "Permet que bombetes no accessibles puguin informar del seu estat correctament"
                 }
             }
diff --git a/homeassistant/components/hue/translations/en.json b/homeassistant/components/hue/translations/en.json
index 3394c9e4971..82f6c1e74be 100644
--- a/homeassistant/components/hue/translations/en.json
+++ b/homeassistant/components/hue/translations/en.json
@@ -59,6 +59,7 @@
             "init": {
                 "data": {
                     "allow_how_groups": "Allow Hue groups",
+                    "allow_hue_groups": "Allow Hue groups",
                     "allow_unreachable": "Allow unreachable bulbs to report their state correctly"
                 }
             }
diff --git a/homeassistant/components/hue/translations/es.json b/homeassistant/components/hue/translations/es.json
index 08b7ed311c9..aa1fe26c775 100644
--- a/homeassistant/components/hue/translations/es.json
+++ b/homeassistant/components/hue/translations/es.json
@@ -24,6 +24,12 @@
             "link": {
                 "description": "Presione el bot\u00f3n en la pasarela para registrar Philips Hue con Home Assistant. \n\n![Ubicaci\u00f3n del bot\u00f3n en la pasarela](/static/images/config_philips_hue.jpg)",
                 "title": "Link Hub"
+            },
+            "manual": {
+                "data": {
+                    "host": "Host"
+                },
+                "title": "Configurar manualmente un puente Hue"
             }
         }
     },
@@ -47,5 +53,16 @@
             "remote_double_button_long_press": "Ambos \"{subtype}\" soltados despu\u00e9s de pulsaci\u00f3n larga",
             "remote_double_button_short_press": "Ambos \"{subtype}\" soltados"
         }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "allow_how_groups": "Permitir grupos de Hue",
+                    "allow_hue_groups": "Permitir grupos de Hue",
+                    "allow_unreachable": "Permitir que las bombillas inalcanzables informen su estado correctamente"
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/hue/translations/ru.json b/homeassistant/components/hue/translations/ru.json
index fbf00654567..f2a88637a62 100644
--- a/homeassistant/components/hue/translations/ru.json
+++ b/homeassistant/components/hue/translations/ru.json
@@ -59,6 +59,7 @@
             "init": {
                 "data": {
                     "allow_how_groups": "\u0420\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044c \u0433\u0440\u0443\u043f\u043f\u044b Hue",
+                    "allow_hue_groups": "\u0420\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044c \u0433\u0440\u0443\u043f\u043f\u044b Hue",
                     "allow_unreachable": "\u041f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e \u0441\u043e\u043e\u0431\u0449\u0430\u0442\u044c \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0445 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432"
                 }
             }
diff --git a/homeassistant/components/netatmo/translations/zh-Hant.json b/homeassistant/components/netatmo/translations/zh-Hant.json
index 21d2109bfb2..f6ac4b523bf 100644
--- a/homeassistant/components/netatmo/translations/zh-Hant.json
+++ b/homeassistant/components/netatmo/translations/zh-Hant.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_setup": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002",
-            "authorize_url_timeout": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u903e\u6642",
+            "authorize_url_timeout": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u903e\u6642\u3002",
             "missing_configuration": "\u5143\u4ef6\u5c1a\u672a\u8a2d\u7f6e\uff0c\u8acb\u53c3\u95b1\u6587\u4ef6\u8aaa\u660e\u3002"
         },
         "create_entry": {
diff --git a/homeassistant/components/plugwise/translations/es.json b/homeassistant/components/plugwise/translations/es.json
index c73deaf0853..31e876cfe3a 100644
--- a/homeassistant/components/plugwise/translations/es.json
+++ b/homeassistant/components/plugwise/translations/es.json
@@ -8,6 +8,7 @@
             "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida, comprueba los 8 caracteres de tu Smile ID",
             "unknown": "Error inesperado"
         },
+        "flow_title": "Smile: {name}",
         "step": {
             "user": {
                 "data": {
diff --git a/homeassistant/components/point/translations/ca.json b/homeassistant/components/point/translations/ca.json
index 85fffddaf36..184a7c9df58 100644
--- a/homeassistant/components/point/translations/ca.json
+++ b/homeassistant/components/point/translations/ca.json
@@ -3,7 +3,7 @@
         "abort": {
             "already_setup": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3.",
             "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 durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3.",
+            "authorize_url_timeout": "Temps d'espera durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3 esgotat.",
             "external_setup": "Point s'ha configurat correctament des d'un altre flux de dades.",
             "no_flows": "El component no est\u00e0 configurat. Mira'n la documentaci\u00f3."
         },
diff --git a/homeassistant/components/point/translations/zh-Hant.json b/homeassistant/components/point/translations/zh-Hant.json
index bd0532c1ae2..c4a58a064c4 100644
--- a/homeassistant/components/point/translations/zh-Hant.json
+++ b/homeassistant/components/point/translations/zh-Hant.json
@@ -3,7 +3,7 @@
         "abort": {
             "already_setup": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002",
             "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",
+            "authorize_url_timeout": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u903e\u6642\u3002",
             "external_setup": "\u5df2\u7531\u5176\u4ed6\u6d41\u7a0b\u6210\u529f\u8a2d\u5b9a Point\u3002",
             "no_flows": "\u5143\u4ef6\u5c1a\u672a\u8a2d\u7f6e\uff0c\u8acb\u53c3\u95b1\u6587\u4ef6\u8aaa\u660e\u3002"
         },
diff --git a/homeassistant/components/poolsense/translations/es.json b/homeassistant/components/poolsense/translations/es.json
index eed3f6e6992..97e714099e7 100644
--- a/homeassistant/components/poolsense/translations/es.json
+++ b/homeassistant/components/poolsense/translations/es.json
@@ -14,6 +14,7 @@
                     "email": "Correo electr\u00f3nico",
                     "password": "Contrase\u00f1a"
                 },
+                "description": "[%key:common::config_flow::description%]",
                 "title": "PoolSense"
             }
         }
diff --git a/homeassistant/components/smarthab/translations/es.json b/homeassistant/components/smarthab/translations/es.json
new file mode 100644
index 00000000000..473e1945f74
--- /dev/null
+++ b/homeassistant/components/smarthab/translations/es.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "error": {
+            "service": "Error al intentar contactar con SmartHab. El servicio podr\u00eda estar ca\u00eddo. Verifica tu conexi\u00f3n.",
+            "unknown_error": "Error inesperado",
+            "wrong_login": "Autenticaci\u00f3n no v\u00e1lida"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "email": "Correo electr\u00f3nico",
+                    "password": "Contrase\u00f1a"
+                },
+                "description": "Por razones t\u00e9cnicas, aseg\u00farate de usar una cuenta secundaria espec\u00edfica para su configuraci\u00f3n de Home Assistant. Puedes crear una desde la aplicaci\u00f3n SmartHab.",
+                "title": "Configurar SmartHab"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/smarthab/translations/fr.json b/homeassistant/components/smarthab/translations/fr.json
new file mode 100644
index 00000000000..79ea03e0afa
--- /dev/null
+++ b/homeassistant/components/smarthab/translations/fr.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "error": {
+            "service": "Erreur de connexion \u00e0 SmartHab. V\u00e9rifiez votre connexion. Le service peut \u00eatre indisponible."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "email": "Adresse email",
+                    "password": "Mot de passe"
+                },
+                "description": "Pour des raisons techniques, utilisez un compte sp\u00e9cifique \u00e0 Home Assistant. Vous pouvez cr\u00e9er un compte secondaire depuis l'application SmartHab.",
+                "title": "Configurer SmartHab"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/smarthab/translations/zh-Hant.json b/homeassistant/components/smarthab/translations/zh-Hant.json
new file mode 100644
index 00000000000..2706a473cef
--- /dev/null
+++ b/homeassistant/components/smarthab/translations/zh-Hant.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "error": {
+            "service": "\u5617\u8a66\u8a2a\u554f Smarthab \u6642\u767c\u751f\u932f\u8aa4\uff0c\u670d\u52d9\u53ef\u4ee5\u5df2\u7d93\u5931\u6548\uff0c\u8acb\u6aa2\u67e5\u9023\u7dda\u3002",
+            "unknown_error": "\u672a\u9810\u671f\u932f\u8aa4",
+            "wrong_login": "\u9a57\u8b49\u78bc\u7121\u6548"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "email": "\u96fb\u5b50\u90f5\u4ef6",
+                    "password": "\u5bc6\u78bc"
+                },
+                "description": "\u7531\u65bc\u6280\u8853\u539f\u56e0\u3001\u8acb\u78ba\u5b9a\u6307\u5b9a Home Assistant \u8a2d\u5b9a\u5099\u7528\u5e33\u6236\u3002\u53ef\u4ee5\u900f\u904e Smarthab \u61c9\u7528\u7a0b\u5f0f\u5275\u5efa\u3002",
+                "title": "\u8a2d\u5b9a SmartHab"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/toon/translations/ca.json b/homeassistant/components/toon/translations/ca.json
index f9f1723575e..8b424b3d647 100644
--- a/homeassistant/components/toon/translations/ca.json
+++ b/homeassistant/components/toon/translations/ca.json
@@ -3,7 +3,7 @@
         "abort": {
             "already_configured": "L\u2019acord seleccionat 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 durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3.",
+            "authorize_url_timeout": "Temps d'espera durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3 esgotat.",
             "client_id": "L'identificador de client de la configuraci\u00f3 no \u00e9s v\u00e0lid.",
             "client_secret": "El codi secret de client de la configuraci\u00f3 no \u00e9s v\u00e0lid.",
             "missing_configuration": "El component no est\u00e0 configurat. Mira'n la documentaci\u00f3.",
diff --git a/homeassistant/components/toon/translations/zh-Hant.json b/homeassistant/components/toon/translations/zh-Hant.json
index d827f288732..e9aa599f079 100644
--- a/homeassistant/components/toon/translations/zh-Hant.json
+++ b/homeassistant/components/toon/translations/zh-Hant.json
@@ -3,7 +3,7 @@
         "abort": {
             "already_configured": "\u6240\u9078\u64c7\u7684\u5354\u8b70\u5730\u5740\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002",
             "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",
+            "authorize_url_timeout": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u903e\u6642\u3002",
             "client_id": "\u8a2d\u5b9a\u5167\u7528\u6236\u7aef ID \u7121\u6548\u3002",
             "client_secret": "\u8a2d\u5b9a\u5167\u5ba2\u6236\u7aef\u5bc6\u78bc\u7121\u6548\u3002",
             "missing_configuration": "\u5143\u4ef6\u5c1a\u672a\u8a2d\u7f6e\uff0c\u8acb\u53c3\u95b1\u6587\u4ef6\u8aaa\u660e\u3002",
diff --git a/homeassistant/components/xiaomi_miio/translations/ru.json b/homeassistant/components/xiaomi_miio/translations/ru.json
index b1b014b6de7..d8c1d84e2b6 100644
--- a/homeassistant/components/xiaomi_miio/translations/ru.json
+++ b/homeassistant/components/xiaomi_miio/translations/ru.json
@@ -21,7 +21,7 @@
             },
             "user": {
                 "data": {
-                    "gateway": "\u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043a \u0448\u043b\u044e\u0437\u0443 Xiaomi"
+                    "gateway": "\u0428\u043b\u044e\u0437 Xiaomi"
                 },
                 "description": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e, \u043a\u043e\u0442\u043e\u0440\u043e\u0435 \u0412\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c.",
                 "title": "Xiaomi Miio"