diff --git a/homeassistant/components/alarm_control_panel/.translations/zh-Hant.json b/homeassistant/components/alarm_control_panel/.translations/zh-Hant.json
index 1d3a7a1efaa..47f90b022fb 100644
--- a/homeassistant/components/alarm_control_panel/.translations/zh-Hant.json
+++ b/homeassistant/components/alarm_control_panel/.translations/zh-Hant.json
@@ -22,5 +22,5 @@
             "triggered": "{entity_name}\u5df2\u89f8\u767c"
         }
     },
-    "title": "\u8b66\u6212\u6a21\u5f0f\u63a7\u5236\u9762\u677f"
+    "title": "\u8b66\u6212\u63a7\u5236\u9762\u677f"
 }
\ No newline at end of file
diff --git a/homeassistant/components/braviatv/.translations/es.json b/homeassistant/components/braviatv/.translations/es.json
new file mode 100644
index 00000000000..fa858a73079
--- /dev/null
+++ b/homeassistant/components/braviatv/.translations/es.json
@@ -0,0 +1,38 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Este televisor ya est\u00e1 configurado."
+        },
+        "error": {
+            "cannot_connect": "No se pudo conectar, host o c\u00f3digo PIN no v\u00e1lido.",
+            "invalid_host": "Nombre del host o direcci\u00f3n IP no v\u00e1lidos.",
+            "unsupported_model": "Tu modelo de televisor no es compatible."
+        },
+        "step": {
+            "authorize": {
+                "data": {
+                    "pin": "C\u00f3digo PIN"
+                },
+                "description": "Introduce el c\u00f3digo PIN que se muestra en el televisor Sony Bravia.\n\nSi no se muestra ning\u00fan c\u00f3digo PIN, necesitas eliminar el registro de Home Assistant de tu televisor, ve a: Configuraci\u00f3n -> Red -> Configuraci\u00f3n del dispositivo remoto -> Eliminar el dispositivo remoto.",
+                "title": "Autorizar televisor Sony Bravia"
+            },
+            "user": {
+                "data": {
+                    "host": "Nombre host del televisor o direcci\u00f3n IP"
+                },
+                "description": "Configura la integraci\u00f3n del televisor Sony Bravia. Si tienes problemas con la configuraci\u00f3n, ve a: https://www.home-assistant.io/integrations/braviatv\n\nAseg\u00farate de que tu televisor est\u00e1 encendido.",
+                "title": "Televisor Sony Bravia"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "user": {
+                "data": {
+                    "ignored_sources": "Lista de fuentes ignoradas"
+                },
+                "title": "Opciones para el televisor Sony Bravia"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/braviatv/.translations/fr.json b/homeassistant/components/braviatv/.translations/fr.json
new file mode 100644
index 00000000000..787d53b90a3
--- /dev/null
+++ b/homeassistant/components/braviatv/.translations/fr.json
@@ -0,0 +1,38 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Ce t\u00e9l\u00e9viseur est d\u00e9j\u00e0 configur\u00e9."
+        },
+        "error": {
+            "cannot_connect": "\u00c9chec de connexion, h\u00f4te ou code PIN non valide.",
+            "invalid_host": "Nom d'h\u00f4te ou adresse IP invalide.",
+            "unsupported_model": "Votre mod\u00e8le de t\u00e9l\u00e9viseur n'est pas pris en charge."
+        },
+        "step": {
+            "authorize": {
+                "data": {
+                    "pin": "Code PIN"
+                },
+                "description": "Saisissez le code PIN affich\u00e9 sur le t\u00e9l\u00e9viseur Sony Bravia. \n\nSi le code PIN n'est pas affich\u00e9, vous devez d\u00e9senregistrer Home Assistant de votre t\u00e9l\u00e9viseur, allez dans: Param\u00e8tres - > R\u00e9seau - > Param\u00e8tres de l'appareil distant - > Annuler l'enregistrement de l'appareil distant.",
+                "title": "Autoriser Sony Bravia TV"
+            },
+            "user": {
+                "data": {
+                    "host": "Nom d'h\u00f4te ou adresse IP du t\u00e9l\u00e9viseur"
+                },
+                "description": "Configurez l'int\u00e9gration du t\u00e9l\u00e9viseur Sony Bravia. Si vous rencontrez des probl\u00e8mes de configuration, rendez-vous sur: https://www.home-assistant.io/integrations/braviatv \n\n Assurez-vous que votre t\u00e9l\u00e9viseur est allum\u00e9.",
+                "title": "Sony Bravia TV"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "user": {
+                "data": {
+                    "ignored_sources": "Liste des sources ignor\u00e9es"
+                },
+                "title": "Options pour Sony Bravia TV"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/brother/.translations/es.json b/homeassistant/components/brother/.translations/es.json
index 7773a02d0b6..ffd0bd9c7a0 100644
--- a/homeassistant/components/brother/.translations/es.json
+++ b/homeassistant/components/brother/.translations/es.json
@@ -16,14 +16,14 @@
                     "host": "Nombre del host o direcci\u00f3n IP de la impresora",
                     "type": "Tipo de impresora"
                 },
-                "description": "Configure la integraci\u00f3n de impresoras Brother. Si tiene problemas con la configuraci\u00f3n, vaya a: https://www.home-assistant.io/integrations/brother",
+                "description": "Configura la integraci\u00f3n de impresoras Brother. Si tienes problemas con la configuraci\u00f3n, ve a: https://www.home-assistant.io/integrations/brother",
                 "title": "Impresora Brother"
             },
             "zeroconf_confirm": {
                 "data": {
                     "type": "Tipo de impresora"
                 },
-                "description": "\u00bfQuiere a\u00f1adir la Impresora Brother {model} con el n\u00famero de serie `{serial_number}` a Home Assistant?",
+                "description": "\u00bfQuieres a\u00f1adir la Impresora Brother {model} con el n\u00famero de serie `{serial_number}` a Home Assistant?",
                 "title": "Impresora Brother encontrada"
             }
         }
diff --git a/homeassistant/components/cover/.translations/ru.json b/homeassistant/components/cover/.translations/ru.json
index 32073d7c3ee..2ade16ee77f 100644
--- a/homeassistant/components/cover/.translations/ru.json
+++ b/homeassistant/components/cover/.translations/ru.json
@@ -23,5 +23,5 @@
             "tilt_position": "{entity_name} \u0438\u0437\u043c\u0435\u043d\u044f\u0435\u0442 \u043d\u0430\u043a\u043b\u043e\u043d"
         }
     },
-    "title": "\u0428\u0442\u043e\u0440\u044b"
+    "title": "\u0416\u0430\u043b\u044e\u0437\u0438"
 }
\ No newline at end of file
diff --git a/homeassistant/components/deconz/.translations/bg.json b/homeassistant/components/deconz/.translations/bg.json
index 97b44175a23..ad79cb9d584 100644
--- a/homeassistant/components/deconz/.translations/bg.json
+++ b/homeassistant/components/deconz/.translations/bg.json
@@ -18,15 +18,17 @@
                 "title": "deCONZ Zigbee \u0431\u0430\u0437\u043e\u0432\u0430 \u0441\u0442\u0430\u043d\u0446\u0438\u044f \u0447\u0440\u0435\u0437 Hass.io \u0434\u043e\u0431\u0430\u0432\u043a\u0430"
             },
             "init": {
-                "data": {
-                    "host": "\u0410\u0434\u0440\u0435\u0441",
-                    "port": "\u041f\u043e\u0440\u0442"
-                },
                 "title": "\u0414\u0435\u0444\u0438\u043d\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 deCONZ \u0448\u043b\u044e\u0437"
             },
             "link": {
                 "description": "\u041e\u0442\u043a\u043b\u044e\u0447\u0438 deCONZ \u0448\u043b\u044e\u0437\u0430 \u0437\u0430 \u0434\u0430 \u0441\u0435 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u0430 \u0441 Home Assistant.\n\n1. \u041e\u0442\u0438\u0434\u0435\u0442\u0435 \u043d\u0430 deCONZ Settings -> Gateway -> Advanced\n2. \u041d\u0430\u0442\u0438\u0441\u043d\u0435\u0442\u0435 \u0431\u0443\u0442\u043e\u043d\u0430 \"Authenticate app\"",
                 "title": "\u0412\u0440\u044a\u0437\u043a\u0430 \u0441 deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "\u0410\u0434\u0440\u0435\u0441",
+                    "port": "\u041f\u043e\u0440\u0442"
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/ca.json b/homeassistant/components/deconz/.translations/ca.json
index 2e91223b27e..95bcc9949f8 100644
--- a/homeassistant/components/deconz/.translations/ca.json
+++ b/homeassistant/components/deconz/.translations/ca.json
@@ -18,15 +18,17 @@
                 "title": "Passarel\u00b7la d'enlla\u00e7 deCONZ Zigbee (complement de Hass.io)"
             },
             "init": {
-                "data": {
-                    "host": "Amfitri\u00f3",
-                    "port": "Port"
-                },
                 "title": "Definici\u00f3 de la passarel\u00b7la deCONZ"
             },
             "link": {
                 "description": "Desbloqueja la teva passarel\u00b7la d'enlla\u00e7 deCONZ per a registrar-te amb Home Assistant.\n\n1. V\u00e9s a la configuraci\u00f3 del sistema deCONZ -> Passarel\u00b7la -> Avan\u00e7at\n2. Prem el bot\u00f3 \"Autenticar applicaci\u00f3\"",
                 "title": "Vincular amb deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "Amfitri\u00f3",
+                    "port": "Port"
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/cs.json b/homeassistant/components/deconz/.translations/cs.json
index 9cdeb87ef0e..360cc9e113f 100644
--- a/homeassistant/components/deconz/.translations/cs.json
+++ b/homeassistant/components/deconz/.translations/cs.json
@@ -15,15 +15,17 @@
                 "title": "deCONZ Zigbee br\u00e1na prost\u0159ednictv\u00edm dopl\u0148ku Hass.io"
             },
             "init": {
-                "data": {
-                    "host": "Hostitel",
-                    "port": "Port"
-                },
                 "title": "Definujte br\u00e1nu deCONZ"
             },
             "link": {
                 "description": "Odemkn\u011bte br\u00e1nu deCONZ, pro registraci v Home Assistant. \n\n 1. P\u0159ejd\u011bte do nastaven\u00ed syst\u00e9mu deCONZ \n 2. Stiskn\u011bte tla\u010d\u00edtko \"Unlock Gateway\"",
                 "title": "Propojit s deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "Hostitel",
+                    "port": "Port"
+                }
             }
         }
     }
diff --git a/homeassistant/components/deconz/.translations/cy.json b/homeassistant/components/deconz/.translations/cy.json
index 07f0e91489e..594ea26ee6f 100644
--- a/homeassistant/components/deconz/.translations/cy.json
+++ b/homeassistant/components/deconz/.translations/cy.json
@@ -10,15 +10,17 @@
         },
         "step": {
             "init": {
-                "data": {
-                    "host": "Gwesteiwr",
-                    "port": "Port (gwerth diofyn: '80')"
-                },
                 "title": "Diffiniwch porth dad-adeiladu"
             },
             "link": {
                 "description": "Datgloi eich porth deCONZ i gofrestru gyda Cynorthwydd Cartref.\n\n1. Ewch i osodiadau system deCONZ \n2. Bwyso botwm \"Datgloi porth\"",
                 "title": "Cysylltu \u00e2 deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "Gwesteiwr",
+                    "port": "Port (gwerth diofyn: '80')"
+                }
             }
         }
     }
diff --git a/homeassistant/components/deconz/.translations/da.json b/homeassistant/components/deconz/.translations/da.json
index bfa31d93987..348eba18ae3 100644
--- a/homeassistant/components/deconz/.translations/da.json
+++ b/homeassistant/components/deconz/.translations/da.json
@@ -18,15 +18,17 @@
                 "title": "deCONZ Zigbee-gateway via Hass.io-tilf\u00f8jelse"
             },
             "init": {
-                "data": {
-                    "host": "V\u00e6rt",
-                    "port": "Port"
-                },
                 "title": "Definer deCONZ-gateway"
             },
             "link": {
                 "description": "L\u00e5s din deCONZ-gateway op for at registrere dig med Home Assistant. \n\n 1. G\u00e5 til deCONZ settings -> Gateway -> Advanced\n 2. Tryk p\u00e5 knappen \"Authenticate app\"",
                 "title": "Forbind med deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "V\u00e6rt",
+                    "port": "Port"
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/de.json b/homeassistant/components/deconz/.translations/de.json
index 9fbf86780b5..209f5c8999a 100644
--- a/homeassistant/components/deconz/.translations/de.json
+++ b/homeassistant/components/deconz/.translations/de.json
@@ -18,15 +18,17 @@
                 "title": "deCONZ Zigbee Gateway \u00fcber das Hass.io Add-on"
             },
             "init": {
-                "data": {
-                    "host": "Host",
-                    "port": "Port"
-                },
                 "title": "Definiere das deCONZ-Gateway"
             },
             "link": {
                 "description": "Entsperre dein deCONZ-Gateway, um es bei Home Assistant zu registrieren. \n\n 1. Gehe in die deCONZ-Systemeinstellungen \n 2. Dr\u00fccke die Taste \"Gateway entsperren\"",
                 "title": "Mit deCONZ verbinden"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "Host",
+                    "port": "Port"
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/en.json b/homeassistant/components/deconz/.translations/en.json
index 57c77e18bb0..159171a65d2 100644
--- a/homeassistant/components/deconz/.translations/en.json
+++ b/homeassistant/components/deconz/.translations/en.json
@@ -17,22 +17,31 @@
                 "description": "Do you want to configure Home Assistant to connect to the deCONZ gateway provided by the Hass.io add-on {addon}?",
                 "title": "deCONZ Zigbee gateway via Hass.io add-on"
             },
-            "user": {
-                "data": {
-                    "host": "Select discovered deCONZ gateway"
-                },
-                "title": "Select deCONZ gateway"
+            "init": {
+                "title": "Define deCONZ gateway"
             },
             "link": {
                 "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"
             },
+            "manual_confirm": {
+                "data": {
+                    "host": "Host",
+                    "port": "Port"
+                }
+            },
             "manual_input": {
                 "data": {
                     "host": "Host",
                     "port": "Port"
                 },
                 "title": "Configure deCONZ gateway"
+            },
+            "user": {
+                "data": {
+                    "host": "Select discovered deCONZ gateway"
+                },
+                "title": "Select deCONZ gateway"
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/es-419.json b/homeassistant/components/deconz/.translations/es-419.json
index 3f26699635e..9d867b0c8e7 100644
--- a/homeassistant/components/deconz/.translations/es-419.json
+++ b/homeassistant/components/deconz/.translations/es-419.json
@@ -17,15 +17,17 @@
                 "title": "deCONZ Zigbee gateway a trav\u00e9s del complemento Hass.io"
             },
             "init": {
-                "data": {
-                    "host": "Host",
-                    "port": "Puerto"
-                },
                 "title": "Definir el gateway deCONZ"
             },
             "link": {
                 "description": "Desbloquee su puerta de enlace deCONZ para registrarse con Home Assistant. \n\n 1. Vaya a Configuraci\u00f3n deCONZ - > Gateway - > Avanzado \n 2. Presione el bot\u00f3n \"Autenticar aplicaci\u00f3n\"",
                 "title": "Enlazar con deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "Host",
+                    "port": "Puerto"
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/es.json b/homeassistant/components/deconz/.translations/es.json
index ed756dbc2be..4a42c5b5d00 100644
--- a/homeassistant/components/deconz/.translations/es.json
+++ b/homeassistant/components/deconz/.translations/es.json
@@ -18,15 +18,17 @@
                 "title": "Add-on deCONZ Zigbee v\u00eda Hass.io"
             },
             "init": {
-                "data": {
-                    "host": "Host",
-                    "port": "Puerto"
-                },
                 "title": "Definir pasarela deCONZ"
             },
             "link": {
                 "description": "Desbloquea tu gateway de deCONZ para registrarte con Home Assistant.\n\n1. Dir\u00edgete a deCONZ Settings -> Gateway -> Advanced\n2. Pulsa el bot\u00f3n \"Authenticate app\"",
                 "title": "Enlazar con deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "Host",
+                    "port": "Puerto"
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/et.json b/homeassistant/components/deconz/.translations/et.json
index 60772a762ad..45bb3967060 100644
--- a/homeassistant/components/deconz/.translations/et.json
+++ b/homeassistant/components/deconz/.translations/et.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "step": {
-            "init": {
+            "manual_confirm": {
                 "data": {
                     "host": "",
                     "port": ""
diff --git a/homeassistant/components/deconz/.translations/fr.json b/homeassistant/components/deconz/.translations/fr.json
index d14cf775ad4..f82a7f2e90a 100644
--- a/homeassistant/components/deconz/.translations/fr.json
+++ b/homeassistant/components/deconz/.translations/fr.json
@@ -18,15 +18,17 @@
                 "title": "Passerelle deCONZ Zigbee via l'add-on Hass.io"
             },
             "init": {
-                "data": {
-                    "host": "H\u00f4te",
-                    "port": "Port"
-                },
                 "title": "Initialiser la passerelle deCONZ"
             },
             "link": {
                 "description": "D\u00e9verrouillez votre passerelle deCONZ pour vous enregistrer avec Home Assistant. \n\n 1. Acc\u00e9dez aux param\u00e8tres avanc\u00e9s du syst\u00e8me deCONZ \n 2. Cliquez sur \"D\u00e9verrouiller la passerelle\"",
                 "title": "Lien vers deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "H\u00f4te",
+                    "port": "Port"
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/he.json b/homeassistant/components/deconz/.translations/he.json
index 9dd6fc8f831..3a6dff48933 100644
--- a/homeassistant/components/deconz/.translations/he.json
+++ b/homeassistant/components/deconz/.translations/he.json
@@ -10,15 +10,17 @@
         },
         "step": {
             "init": {
-                "data": {
-                    "host": "\u05de\u05d0\u05e8\u05d7",
-                    "port": "\u05e4\u05d5\u05e8\u05d8 (\u05d1\u05e8\u05d9\u05e8\u05ea \u05de\u05d7\u05d3\u05dc: '80')"
-                },
                 "title": "\u05d4\u05d2\u05d3\u05e8 \u05de\u05d2\u05e9\u05e8 deCONZ Zigbee"
             },
             "link": {
                 "description": "\u05d1\u05d8\u05dc \u05d0\u05ea \u05e0\u05e2\u05d9\u05dc\u05ea \u05d4\u05de\u05e9\u05e8 deCONZ \u05e9\u05dc\u05da \u05db\u05d3\u05d9 \u05dc\u05d4\u05ea\u05d7\u05d1\u05e8 \u05e2\u05dd Home Assistant.\n\n 1. \u05e2\u05d1\u05d5\u05e8 \u05d0\u05dc \u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05de\u05e2\u05e8\u05db\u05ea deCONZ \n .2 \u05dc\u05d7\u05e5 \u05e2\u05dc \"Unlock Gateway\"",
                 "title": "\u05e7\u05e9\u05e8 \u05e2\u05dd deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "\u05de\u05d0\u05e8\u05d7",
+                    "port": "\u05e4\u05d5\u05e8\u05d8 (\u05d1\u05e8\u05d9\u05e8\u05ea \u05de\u05d7\u05d3\u05dc: '80')"
+                }
             }
         }
     }
diff --git a/homeassistant/components/deconz/.translations/hr.json b/homeassistant/components/deconz/.translations/hr.json
index 1700ec050bf..50fec879cb6 100644
--- a/homeassistant/components/deconz/.translations/hr.json
+++ b/homeassistant/components/deconz/.translations/hr.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "step": {
-            "init": {
+            "manual_confirm": {
                 "data": {
                     "host": "Host",
                     "port": "Port"
diff --git a/homeassistant/components/deconz/.translations/hu.json b/homeassistant/components/deconz/.translations/hu.json
index 4f2e6e8d261..216d7ddf1a0 100644
--- a/homeassistant/components/deconz/.translations/hu.json
+++ b/homeassistant/components/deconz/.translations/hu.json
@@ -17,15 +17,17 @@
                 "title": "deCONZ Zigbee \u00e1tj\u00e1r\u00f3 a Hass.io kieg\u00e9sz\u00edt\u0151 seg\u00edts\u00e9g\u00e9vel"
             },
             "init": {
-                "data": {
-                    "host": "Hoszt",
-                    "port": "Port"
-                },
                 "title": "deCONZ \u00e1tj\u00e1r\u00f3 megad\u00e1sa"
             },
             "link": {
                 "description": "Oldja fel a deCONZ \u00e1tj\u00e1r\u00f3t a Home Assistant-ban val\u00f3 regisztr\u00e1l\u00e1shoz.\n\n1. Menjen a deCONZ rendszer be\u00e1ll\u00edt\u00e1sokhoz\n2. Nyomja meg az \"\u00c1tj\u00e1r\u00f3 felold\u00e1sa\" gombot",
                 "title": "Kapcsol\u00f3d\u00e1s a deCONZ-hoz"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "Hoszt",
+                    "port": "Port"
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/id.json b/homeassistant/components/deconz/.translations/id.json
index ef2688f413d..ba8b5d76869 100644
--- a/homeassistant/components/deconz/.translations/id.json
+++ b/homeassistant/components/deconz/.translations/id.json
@@ -10,15 +10,17 @@
         },
         "step": {
             "init": {
-                "data": {
-                    "host": "Host",
-                    "port": "Port (nilai default: '80')"
-                },
                 "title": "Tentukan deCONZ gateway"
             },
             "link": {
                 "description": "Buka gerbang deCONZ Anda untuk mendaftar dengan Home Assistant. \n\n 1. Pergi ke pengaturan sistem deCONZ \n 2. Tekan tombol \"Buka Kunci Gateway\"",
                 "title": "Tautan dengan deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "Host",
+                    "port": "Port (nilai default: '80')"
+                }
             }
         }
     }
diff --git a/homeassistant/components/deconz/.translations/it.json b/homeassistant/components/deconz/.translations/it.json
index 4ff508451d8..8d7ece7bea3 100644
--- a/homeassistant/components/deconz/.translations/it.json
+++ b/homeassistant/components/deconz/.translations/it.json
@@ -18,15 +18,17 @@
                 "title": "Gateway Pigmee deCONZ tramite il componente aggiuntivo di Hass.io"
             },
             "init": {
-                "data": {
-                    "host": "Host",
-                    "port": "Porta"
-                },
                 "title": "Definisci il gateway deCONZ"
             },
             "link": {
                 "description": "Sblocca il tuo gateway deCONZ per registrarti con Home Assistant.\n\n1. Vai a Impostazioni deCONZ -> Gateway -> Avanzate\n2. Premere il pulsante \"Autentica app\"",
                 "title": "Collega con deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "Host",
+                    "port": "Porta"
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/ja.json b/homeassistant/components/deconz/.translations/ja.json
index 5148ebeaa86..a1d40f49d34 100644
--- a/homeassistant/components/deconz/.translations/ja.json
+++ b/homeassistant/components/deconz/.translations/ja.json
@@ -4,7 +4,7 @@
             "no_key": "API\u30ad\u30fc\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f"
         },
         "step": {
-            "init": {
+            "manual_confirm": {
                 "data": {
                     "host": "\u30db\u30b9\u30c8",
                     "port": "\u30dd\u30fc\u30c8\uff08\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\uff1a'80'\uff09"
diff --git a/homeassistant/components/deconz/.translations/ko.json b/homeassistant/components/deconz/.translations/ko.json
index d2c55261aeb..c3704326d33 100644
--- a/homeassistant/components/deconz/.translations/ko.json
+++ b/homeassistant/components/deconz/.translations/ko.json
@@ -18,15 +18,17 @@
                 "title": "Hass.io \uc560\ub4dc\uc628\uc758 deCONZ Zigbee \uac8c\uc774\ud2b8\uc6e8\uc774"
             },
             "init": {
-                "data": {
-                    "host": "\ud638\uc2a4\ud2b8",
-                    "port": "\ud3ec\ud2b8"
-                },
                 "title": "deCONZ \uac8c\uc774\ud2b8\uc6e8\uc774 \uc815\uc758"
             },
             "link": {
                 "description": "deCONZ \uac8c\uc774\ud2b8\uc6e8\uc774\ub97c \uc5b8\ub77d\ud558\uc5ec Home Assistant \uc5d0 \uc5f0\uacb0\ud558\uae30.\n\n1. deCONZ \uc2dc\uc2a4\ud15c \uc124\uc815\uc73c\ub85c \uc774\ub3d9\ud558\uc138\uc694\n2. \"Authenticate app\" \ubc84\ud2bc\uc744 \ub20c\ub7ec\uc8fc\uc138\uc694",
                 "title": "deCONZ\uc640 \uc5f0\uacb0"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "\ud638\uc2a4\ud2b8",
+                    "port": "\ud3ec\ud2b8"
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/lb.json b/homeassistant/components/deconz/.translations/lb.json
index 4007c23d2a5..9a5aff2778f 100644
--- a/homeassistant/components/deconz/.translations/lb.json
+++ b/homeassistant/components/deconz/.translations/lb.json
@@ -18,15 +18,17 @@
                 "title": "deCONZ Zigbee gateway via Hass.io add-on"
             },
             "init": {
-                "data": {
-                    "host": "Host",
-                    "port": "Port"
-                },
                 "title": "deCONZ gateway d\u00e9fin\u00e9ieren"
             },
             "link": {
                 "description": "Entsperrt \u00e4r deCONZ gateway fir se mat Home Assistant ze registr\u00e9ieren.\n\n1. Gidd op deCONZ System Astellungen\n2. Dr\u00e9ckt \"Unlock\" Gateway Kn\u00e4ppchen",
                 "title": "Link mat deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "Host",
+                    "port": "Port"
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/nl.json b/homeassistant/components/deconz/.translations/nl.json
index 193ad115b00..a139a4b9975 100644
--- a/homeassistant/components/deconz/.translations/nl.json
+++ b/homeassistant/components/deconz/.translations/nl.json
@@ -18,15 +18,17 @@
                 "title": "deCONZ Zigbee Gateway via Hass.io add-on"
             },
             "init": {
-                "data": {
-                    "host": "Host",
-                    "port": "Poort"
-                },
                 "title": "Definieer deCONZ gateway"
             },
             "link": {
                 "description": "Ontgrendel je deCONZ gateway om te registreren met Home Assistant.\n\n1. Ga naar deCONZ systeeminstellingen (Instellingen -> Gateway -> Geavanceerd)\n2. Druk op de knop \"Gateway ontgrendelen\"",
                 "title": "Koppel met deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "Host",
+                    "port": "Poort"
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/nn.json b/homeassistant/components/deconz/.translations/nn.json
index bea2f2e0092..d6d73478a0b 100644
--- a/homeassistant/components/deconz/.translations/nn.json
+++ b/homeassistant/components/deconz/.translations/nn.json
@@ -10,15 +10,17 @@
         },
         "step": {
             "init": {
-                "data": {
-                    "host": "Vert",
-                    "port": "Port (standardverdi: '80')"
-                },
                 "title": "Definer deCONZ-gateway"
             },
             "link": {
                 "description": "L\u00e5s opp deCONZ-gatewayen din for \u00e5 registrere den med Home Assistant.\n\n1. G\u00e5 til systeminnstillingane til deCONZ\n2. Trykk p\u00e5 \"L\u00e5s opp gateway\"-knappen",
                 "title": "Link med deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "Vert",
+                    "port": "Port (standardverdi: '80')"
+                }
             }
         }
     }
diff --git a/homeassistant/components/deconz/.translations/no.json b/homeassistant/components/deconz/.translations/no.json
index b521fdc0401..d44c9e350b3 100644
--- a/homeassistant/components/deconz/.translations/no.json
+++ b/homeassistant/components/deconz/.translations/no.json
@@ -18,15 +18,17 @@
                 "title": "deCONZ Zigbee gateway via Hass.io tillegg"
             },
             "init": {
-                "data": {
-                    "host": "Vert",
-                    "port": ""
-                },
                 "title": "Definer deCONZ-gatewayen"
             },
             "link": {
                 "description": "L\u00e5s opp deCONZ-gatewayen din for \u00e5 registrere deg med Home Assistant. \n\n 1. G\u00e5 til deCONZ-systeminnstillinger -> Gateway -> Avansert \n 2. Trykk p\u00e5 \"L\u00e5s opp gateway\" knappen",
                 "title": "Koble til deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "Vert",
+                    "port": ""
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/pl.json b/homeassistant/components/deconz/.translations/pl.json
index d48c695a340..0b9f336e9cd 100644
--- a/homeassistant/components/deconz/.translations/pl.json
+++ b/homeassistant/components/deconz/.translations/pl.json
@@ -18,15 +18,17 @@
                 "title": "Bramka deCONZ Zigbee przez dodatek Hass.io"
             },
             "init": {
-                "data": {
-                    "host": "Host",
-                    "port": "Port"
-                },
                 "title": "Zdefiniuj bramk\u0119 deCONZ"
             },
             "link": {
                 "description": "Odblokuj bramk\u0119 deCONZ, aby zarejestrowa\u0107 j\u0105 w Home Assistant. \n\n 1. Przejd\u017a do ustawienia deCONZ > bramka > Zaawansowane\n 2. Naci\u015bnij przycisk \"Uwierzytelnij aplikacj\u0119\"",
                 "title": "Po\u0142\u0105cz z deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "Host",
+                    "port": "Port"
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/pt-BR.json b/homeassistant/components/deconz/.translations/pt-BR.json
index 84a4389657a..f548b187103 100644
--- a/homeassistant/components/deconz/.translations/pt-BR.json
+++ b/homeassistant/components/deconz/.translations/pt-BR.json
@@ -17,15 +17,17 @@
                 "title": "Gateway deCONZ Zigbee via add-on Hass.io"
             },
             "init": {
-                "data": {
-                    "host": "Hospedeiro",
-                    "port": "Porta (valor padr\u00e3o: '80')"
-                },
                 "title": "Defina o gateway deCONZ"
             },
             "link": {
                 "description": "Desbloqueie o seu gateway deCONZ para se registar no Home Assistant. \n\n 1. V\u00e1 para as configura\u00e7\u00f5es do sistema deCONZ \n 2. Pressione o bot\u00e3o \"Desbloquear Gateway\"",
                 "title": "Linkar com deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "Hospedeiro",
+                    "port": "Porta (valor padr\u00e3o: '80')"
+                }
             }
         }
     }
diff --git a/homeassistant/components/deconz/.translations/pt.json b/homeassistant/components/deconz/.translations/pt.json
index 759e6340edd..0cd41e650f9 100644
--- a/homeassistant/components/deconz/.translations/pt.json
+++ b/homeassistant/components/deconz/.translations/pt.json
@@ -10,15 +10,17 @@
         },
         "step": {
             "init": {
-                "data": {
-                    "host": "Servidor",
-                    "port": "Porta"
-                },
                 "title": "Defina o gateway deCONZ"
             },
             "link": {
                 "description": "Desbloqueie o seu gateway deCONZ para se registar no Home Assistant. \n\n 1. V\u00e1 para as configura\u00e7\u00f5es do sistema deCONZ \n 2. Pressione o bot\u00e3o \"Desbloquear Gateway\"",
                 "title": "Liga\u00e7\u00e3o com deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "Servidor",
+                    "port": "Porta"
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/ro.json b/homeassistant/components/deconz/.translations/ro.json
index 2d6fc6a39fb..a997db44380 100644
--- a/homeassistant/components/deconz/.translations/ro.json
+++ b/homeassistant/components/deconz/.translations/ro.json
@@ -1,13 +1,13 @@
 {
     "config": {
         "step": {
-            "init": {
+            "link": {
+                "description": "Debloca\u021bi gateway-ul DECONZ pentru a v\u0103 \u00eenregistra la Home Assistant. \n\n 1. Accesa\u021bi Set\u0103rile deCONZ - > Gateway - > Avansat \n 2. Ap\u0103sa\u021bi butonul \u201eAutentifica\u021bi aplica\u021bia\u201d"
+            },
+            "manual_confirm": {
                 "data": {
                     "port": "Port"
                 }
-            },
-            "link": {
-                "description": "Debloca\u021bi gateway-ul DECONZ pentru a v\u0103 \u00eenregistra la Home Assistant. \n\n 1. Accesa\u021bi Set\u0103rile deCONZ - > Gateway - > Avansat \n 2. Ap\u0103sa\u021bi butonul \u201eAutentifica\u021bi aplica\u021bia\u201d"
             }
         }
     }
diff --git a/homeassistant/components/deconz/.translations/ru.json b/homeassistant/components/deconz/.translations/ru.json
index 1cf09bf8c0c..3f9299a9eb0 100644
--- a/homeassistant/components/deconz/.translations/ru.json
+++ b/homeassistant/components/deconz/.translations/ru.json
@@ -18,15 +18,17 @@
                 "title": "Zigbee \u0448\u043b\u044e\u0437 deCONZ (\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435 \u0434\u043b\u044f Hass.io)"
             },
             "init": {
-                "data": {
-                    "host": "\u0425\u043e\u0441\u0442",
-                    "port": "\u041f\u043e\u0440\u0442"
-                },
                 "title": "deCONZ"
             },
             "link": {
                 "description": "\u0420\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u0443\u0439\u0442\u0435 \u0448\u043b\u044e\u0437 deCONZ \u0434\u043b\u044f \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0432 Home Assistant:\n\n1. \u041f\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u043a \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430\u043c \u0441\u0438\u0441\u0442\u0435\u043c\u044b deCONZ -> Gateway -> Advanced.\n2. \u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u043a\u043d\u043e\u043f\u043a\u0443 \u00abAuthenticate app\u00bb.",
                 "title": "\u0421\u0432\u044f\u0437\u044c \u0441 deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "\u0425\u043e\u0441\u0442",
+                    "port": "\u041f\u043e\u0440\u0442"
+                }
             }
         }
     },
@@ -56,30 +58,30 @@
         },
         "trigger_type": {
             "remote_awakened": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0440\u0430\u0437\u0431\u0443\u0434\u0438\u043b\u0438",
-            "remote_button_double_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430 \u0434\u0432\u0430 \u0440\u0430\u0437\u0430",
-            "remote_button_long_press": "\"{subtype}\" \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e \u043d\u0430\u0436\u0430\u0442\u0430",
-            "remote_button_long_release": "\"{subtype}\" \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430 \u043f\u043e\u0441\u043b\u0435 \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e\u0433\u043e \u043d\u0430\u0436\u0430\u0442\u0438\u044f",
-            "remote_button_quadruple_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430 \u0447\u0435\u0442\u044b\u0440\u0435 \u0440\u0430\u0437\u0430",
-            "remote_button_quintuple_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430 \u043f\u044f\u0442\u044c \u0440\u0430\u0437",
-            "remote_button_rotated": "\"{subtype}\" \u0432\u0440\u0430\u0449\u0430\u0435\u0442\u0441\u044f",
-            "remote_button_rotation_stopped": "\"{subtype}\" \u043f\u0440\u0435\u043a\u0440\u0430\u0442\u0438\u043b\u0430 \u0432\u0440\u0430\u0449\u0435\u043d\u0438\u0435",
-            "remote_button_short_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430",
-            "remote_button_short_release": "\"{subtype}\" \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430",
-            "remote_button_triple_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430 \u0442\u0440\u0438 \u0440\u0430\u0437\u0430",
-            "remote_double_tap": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e\u043c \"{subtype}\" \u043f\u043e\u0441\u0442\u0443\u0447\u0430\u043b\u0438 \u0434\u0432\u0430\u0436\u0434\u044b",
+            "remote_button_double_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u0434\u0432\u0430 \u0440\u0430\u0437\u0430",
+            "remote_button_long_press": "{subtype} \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e \u043d\u0430\u0436\u0430\u0442\u0430",
+            "remote_button_long_release": "{subtype} \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430 \u043f\u043e\u0441\u043b\u0435 \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e\u0433\u043e \u043d\u0430\u0436\u0430\u0442\u0438\u044f",
+            "remote_button_quadruple_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u0447\u0435\u0442\u044b\u0440\u0435 \u0440\u0430\u0437\u0430",
+            "remote_button_quintuple_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u043f\u044f\u0442\u044c \u0440\u0430\u0437",
+            "remote_button_rotated": "{subtype} \u0432\u0440\u0430\u0449\u0430\u0435\u0442\u0441\u044f",
+            "remote_button_rotation_stopped": "{subtype} \u043f\u0440\u0435\u043a\u0440\u0430\u0442\u0438\u043b\u0430 \u0432\u0440\u0430\u0449\u0435\u043d\u0438\u0435",
+            "remote_button_short_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430",
+            "remote_button_short_release": "{subtype} \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430",
+            "remote_button_triple_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u0442\u0440\u0438 \u0440\u0430\u0437\u0430",
+            "remote_double_tap": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e\u043c {subtype} \u043f\u043e\u0441\u0442\u0443\u0447\u0430\u043b\u0438 \u0434\u0432\u0430\u0436\u0434\u044b",
             "remote_double_tap_any_side": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e\u043c \u043f\u043e\u0441\u0442\u0443\u0447\u0430\u043b\u0438 \u0434\u0432\u0430\u0436\u0434\u044b",
             "remote_falling": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0432 \u0441\u0432\u043e\u0431\u043e\u0434\u043d\u043e\u043c \u043f\u0430\u0434\u0435\u043d\u0438\u0438",
             "remote_flip_180_degrees": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0435\u0440\u0435\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \u043d\u0430 180 \u0433\u0440\u0430\u0434\u0443\u0441\u043e\u0432",
             "remote_flip_90_degrees": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0435\u0440\u0435\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \u043d\u0430 90 \u0433\u0440\u0430\u0434\u0443\u0441\u043e\u0432",
-            "remote_gyro_activated": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0432\u0441\u0442\u0440\u044f\u0445\u043d\u0443\u043b\u0438",
-            "remote_moved": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0441\u0434\u0432\u0438\u043d\u0443\u043b\u0438, \u043a\u043e\u0433\u0434\u0430 \"{subtype}\" \u0441\u0432\u0435\u0440\u0445\u0443",
+            "remote_gyro_activated": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u043e\u0442\u0440\u044f\u0441\u043b\u0438",
+            "remote_moved": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0441\u0434\u0432\u0438\u043d\u0443\u043b\u0438, \u043a\u043e\u0433\u0434\u0430 {subtype} \u0441\u0432\u0435\u0440\u0445\u0443",
             "remote_moved_any_side": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0441\u0434\u0432\u0438\u043d\u0443\u043b\u0438",
-            "remote_rotate_from_side_1": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0435\u0440\u0435\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \u0441 \u0413\u0440\u0430\u043d\u0438 1 \u043d\u0430 \"{subtype}\"",
-            "remote_rotate_from_side_2": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0435\u0440\u0435\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \u0441 \u0413\u0440\u0430\u043d\u0438 2 \u043d\u0430 \"{subtype}\"",
-            "remote_rotate_from_side_3": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0435\u0440\u0435\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \u0441 \u0413\u0440\u0430\u043d\u0438 3 \u043d\u0430 \"{subtype}\"",
-            "remote_rotate_from_side_4": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0435\u0440\u0435\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \u0441 \u0413\u0440\u0430\u043d\u0438 4 \u043d\u0430 \"{subtype}\"",
-            "remote_rotate_from_side_5": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0435\u0440\u0435\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \u0441 \u0413\u0440\u0430\u043d\u0438 5 \u043d\u0430 \"{subtype}\"",
-            "remote_rotate_from_side_6": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0435\u0440\u0435\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \u0441 \u0413\u0440\u0430\u043d\u0438 6 \u043d\u0430 \"{subtype}\"",
+            "remote_rotate_from_side_1": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0435\u0440\u0435\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \u0441 \u0413\u0440\u0430\u043d\u0438 1 \u043d\u0430 {subtype}",
+            "remote_rotate_from_side_2": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0435\u0440\u0435\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \u0441 \u0413\u0440\u0430\u043d\u0438 2 \u043d\u0430 {subtype}",
+            "remote_rotate_from_side_3": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0435\u0440\u0435\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \u0441 \u0413\u0440\u0430\u043d\u0438 3 \u043d\u0430 {subtype}",
+            "remote_rotate_from_side_4": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0435\u0440\u0435\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \u0441 \u0413\u0440\u0430\u043d\u0438 4 \u043d\u0430 {subtype}",
+            "remote_rotate_from_side_5": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0435\u0440\u0435\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \u0441 \u0413\u0440\u0430\u043d\u0438 5 \u043d\u0430 {subtype}",
+            "remote_rotate_from_side_6": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0435\u0440\u0435\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \u0441 \u0413\u0440\u0430\u043d\u0438 6 \u043d\u0430 {subtype}",
             "remote_turned_clockwise": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u043e\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \u043f\u043e \u0447\u0430\u0441\u043e\u0432\u043e\u0439 \u0441\u0442\u0440\u0435\u043b\u043a\u0435",
             "remote_turned_counter_clockwise": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u043e\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \u043f\u0440\u043e\u0442\u0438\u0432 \u0447\u0430\u0441\u043e\u0432\u043e\u0439 \u0441\u0442\u0440\u0435\u043b\u043a\u0438"
         }
diff --git a/homeassistant/components/deconz/.translations/sl.json b/homeassistant/components/deconz/.translations/sl.json
index 7d7ab2ac675..3d7902ef1a0 100644
--- a/homeassistant/components/deconz/.translations/sl.json
+++ b/homeassistant/components/deconz/.translations/sl.json
@@ -18,15 +18,17 @@
                 "title": "deCONZ Zigbee prehod preko dodatka Hass.io"
             },
             "init": {
-                "data": {
-                    "host": "Gostitelj",
-                    "port": "Vrata"
-                },
                 "title": "Dolo\u010dite deCONZ prehod"
             },
             "link": {
                 "description": "Odklenite va\u0161 deCONZ gateway za registracijo s Home Assistant-om. \n1. Pojdite v deCONZ sistemske nastavitve\n2. Pritisnite tipko \"odkleni prehod\"",
                 "title": "Povezava z deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "Gostitelj",
+                    "port": "Vrata"
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/sv.json b/homeassistant/components/deconz/.translations/sv.json
index 933b48ca730..559581b8ad8 100644
--- a/homeassistant/components/deconz/.translations/sv.json
+++ b/homeassistant/components/deconz/.translations/sv.json
@@ -18,15 +18,17 @@
                 "title": "deCONZ Zigbee gateway via Hass.io till\u00e4gg"
             },
             "init": {
-                "data": {
-                    "host": "V\u00e4rd",
-                    "port": "Port (standardv\u00e4rde: '80')"
-                },
                 "title": "Definiera deCONZ-gatewaye"
             },
             "link": {
                 "description": "L\u00e5s upp din deCONZ-gateway f\u00f6r att registrera dig med Home Assistant. \n\n 1. G\u00e5 till deCONZ-systeminst\u00e4llningarna \n 2. Tryck p\u00e5 \"L\u00e5s upp gateway\"-knappen",
                 "title": "L\u00e4nka med deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "V\u00e4rd",
+                    "port": "Port (standardv\u00e4rde: '80')"
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/th.json b/homeassistant/components/deconz/.translations/th.json
index e40765e8220..db5e0efae10 100644
--- a/homeassistant/components/deconz/.translations/th.json
+++ b/homeassistant/components/deconz/.translations/th.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "step": {
-            "init": {
+            "manual_confirm": {
                 "data": {
                     "port": "Port"
                 }
diff --git a/homeassistant/components/deconz/.translations/vi.json b/homeassistant/components/deconz/.translations/vi.json
index 75d8969495b..95880d43e39 100644
--- a/homeassistant/components/deconz/.translations/vi.json
+++ b/homeassistant/components/deconz/.translations/vi.json
@@ -9,7 +9,7 @@
             "no_key": "Kh\u00f4ng th\u1ec3 l\u1ea5y kh\u00f3a API"
         },
         "step": {
-            "init": {
+            "manual_confirm": {
                 "data": {
                     "port": "C\u1ed5ng (gi\u00e1 tr\u1ecb m\u1eb7c \u0111\u1ecbnh: '80')"
                 }
diff --git a/homeassistant/components/deconz/.translations/zh-Hans.json b/homeassistant/components/deconz/.translations/zh-Hans.json
index 07213aa9539..1152d5c394d 100644
--- a/homeassistant/components/deconz/.translations/zh-Hans.json
+++ b/homeassistant/components/deconz/.translations/zh-Hans.json
@@ -10,15 +10,17 @@
         },
         "step": {
             "init": {
-                "data": {
-                    "host": "\u4e3b\u673a",
-                    "port": "\u7aef\u53e3\uff08\u9ed8\u8ba4\u503c\uff1a'80'\uff09"
-                },
                 "title": "\u5b9a\u4e49 deCONZ \u7f51\u5173"
             },
             "link": {
                 "description": "\u89e3\u9501\u60a8\u7684 deCONZ \u7f51\u5173\u4ee5\u6ce8\u518c\u5230 Home Assistant\u3002 \n\n 1. \u524d\u5f80 deCONZ \u7cfb\u7edf\u8bbe\u7f6e\n 2. \u70b9\u51fb\u201c\u89e3\u9501\u7f51\u5173\u201d\u6309\u94ae",
                 "title": "\u8fde\u63a5 deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "\u4e3b\u673a",
+                    "port": "\u7aef\u53e3\uff08\u9ed8\u8ba4\u503c\uff1a'80'\uff09"
+                }
             }
         }
     },
diff --git a/homeassistant/components/deconz/.translations/zh-Hant.json b/homeassistant/components/deconz/.translations/zh-Hant.json
index 0d7cf62f26e..5ee82bd6c5d 100644
--- a/homeassistant/components/deconz/.translations/zh-Hant.json
+++ b/homeassistant/components/deconz/.translations/zh-Hant.json
@@ -18,15 +18,17 @@
                 "title": "\u900f\u904e Hass.io \u9644\u52a0\u7d44\u4ef6 deCONZ Zigbee \u9598\u9053\u5668"
             },
             "init": {
-                "data": {
-                    "host": "\u4e3b\u6a5f\u7aef",
-                    "port": "\u901a\u8a0a\u57e0"
-                },
                 "title": "\u5b9a\u7fa9 deCONZ \u9598\u9053\u5668"
             },
             "link": {
                 "description": "\u89e3\u9664 deCONZ \u9598\u9053\u5668\u9396\u5b9a\uff0c\u4ee5\u65bc Home Assistant \u9032\u884c\u8a3b\u518a\u3002\n\n1. \u9032\u5165 deCONZ \u7cfb\u7d71\u8a2d\u5b9a -> \u9598\u9053\u5668 -> \u9032\u968e\u8a2d\u5b9a\n2. \u6309\u4e0b\u300c\u8a8d\u8b49\u7a0b\u5f0f\uff08Authenticate app\uff09\u300d\u6309\u9215",
                 "title": "\u9023\u7d50\u81f3 deCONZ"
+            },
+            "manual_confirm": {
+                "data": {
+                    "host": "\u4e3b\u6a5f\u7aef",
+                    "port": "\u901a\u8a0a\u57e0"
+                }
             }
         }
     },
diff --git a/homeassistant/components/emulated_roku/.translations/de.json b/homeassistant/components/emulated_roku/.translations/de.json
index 8192bf9267f..ce3d9e40d6c 100644
--- a/homeassistant/components/emulated_roku/.translations/de.json
+++ b/homeassistant/components/emulated_roku/.translations/de.json
@@ -17,5 +17,5 @@
             }
         }
     },
-    "title": "EmulatedRoku"
+    "title": "Emulated Roku"
 }
\ No newline at end of file
diff --git a/homeassistant/components/emulated_roku/.translations/ru.json b/homeassistant/components/emulated_roku/.translations/ru.json
index 3ff4a0c1351..878575788d8 100644
--- a/homeassistant/components/emulated_roku/.translations/ru.json
+++ b/homeassistant/components/emulated_roku/.translations/ru.json
@@ -17,5 +17,5 @@
             }
         }
     },
-    "title": "EmulatedRoku"
+    "title": "Emulated Roku"
 }
\ 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
index 0cb50c4e447..b38f471ddff 100644
--- a/homeassistant/components/emulated_roku/.translations/zh-Hant.json
+++ b/homeassistant/components/emulated_roku/.translations/zh-Hant.json
@@ -17,5 +17,5 @@
             }
         }
     },
-    "title": "EmulatedRoku"
+    "title": "Emulated Roku"
 }
\ No newline at end of file
diff --git a/homeassistant/components/homeassistant/.translations/pt.json b/homeassistant/components/homeassistant/.translations/pt.json
index 04b5b760f60..d8a4c453015 100644
--- a/homeassistant/components/homeassistant/.translations/pt.json
+++ b/homeassistant/components/homeassistant/.translations/pt.json
@@ -1,3 +1,3 @@
 {
-    "title": "Home Assistant"
+    "title": ""
 }
\ No newline at end of file
diff --git a/homeassistant/components/homekit_controller/.translations/de.json b/homeassistant/components/homekit_controller/.translations/de.json
index 9d69030da7b..b10fb6efe45 100644
--- a/homeassistant/components/homekit_controller/.translations/de.json
+++ b/homeassistant/components/homekit_controller/.translations/de.json
@@ -36,5 +36,5 @@
             }
         }
     },
-    "title": "HomeKit Zubeh\u00f6r"
+    "title": "HomeKit-Controller"
 }
\ No newline at end of file
diff --git a/homeassistant/components/homekit_controller/.translations/en.json b/homeassistant/components/homekit_controller/.translations/en.json
index 8cfd35b6c60..69ea4c3c351 100644
--- a/homeassistant/components/homekit_controller/.translations/en.json
+++ b/homeassistant/components/homekit_controller/.translations/en.json
@@ -36,5 +36,5 @@
             }
         }
     },
-    "title": "HomeKit Accessory"
+    "title": "HomeKit Controller"
 }
\ No newline at end of file
diff --git a/homeassistant/components/homekit_controller/.translations/zh-Hant.json b/homeassistant/components/homekit_controller/.translations/zh-Hant.json
index 569d4581c10..27ff273d117 100644
--- a/homeassistant/components/homekit_controller/.translations/zh-Hant.json
+++ b/homeassistant/components/homekit_controller/.translations/zh-Hant.json
@@ -36,5 +36,5 @@
             }
         }
     },
-    "title": "HomeKit \u914d\u4ef6"
+    "title": "HomeKit \u63a7\u5236\u5668"
 }
\ No newline at end of file
diff --git a/homeassistant/components/hue/.translations/ca.json b/homeassistant/components/hue/.translations/ca.json
index d0f625e7344..77686f5a272 100644
--- a/homeassistant/components/hue/.translations/ca.json
+++ b/homeassistant/components/hue/.translations/ca.json
@@ -35,13 +35,17 @@
             "button_4": "Quart bot\u00f3",
             "dim_down": "Atenua la brillantor",
             "dim_up": "Augmenta la brillantor",
+            "double_buttons_1_3": "primer i tercer botons",
+            "double_buttons_2_4": "segon i quart botons",
             "turn_off": "Apaga",
             "turn_on": "Enc\u00e9n"
         },
         "trigger_type": {
             "remote_button_long_release": "Bot\u00f3 \"{subtype}\" alliberat despr\u00e9s d'una estona premut",
             "remote_button_short_press": "Bot\u00f3 \"{subtype}\" premut",
-            "remote_button_short_release": "Bot\u00f3 \"{subtype}\" alliberat"
+            "remote_button_short_release": "Bot\u00f3 \"{subtype}\" alliberat",
+            "remote_double_button_long_press": "Ambd\u00f3s \"{subtype}\" alliberats despr\u00e9s d'una estona premuts",
+            "remote_double_button_short_press": "Ambd\u00f3s \"{subtype}\" alliberats"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/hue/.translations/es.json b/homeassistant/components/hue/.translations/es.json
index 550fd805bcd..ddaad5c424a 100644
--- a/homeassistant/components/hue/.translations/es.json
+++ b/homeassistant/components/hue/.translations/es.json
@@ -35,13 +35,17 @@
             "button_4": "Cuarto bot\u00f3n",
             "dim_down": "Bajar la intensidad",
             "dim_up": "Subir la intensidad",
+            "double_buttons_1_3": "Botones Primero y Tercero",
+            "double_buttons_2_4": "Botones Segundo y Cuarto",
             "turn_off": "Apagar",
             "turn_on": "Encender"
         },
         "trigger_type": {
             "remote_button_long_release": "Bot\u00f3n \"{subtype}\" soltado despu\u00e9s de una pulsaci\u00f3n larga",
             "remote_button_short_press": "Bot\u00f3n \"{subtype}\" pulsado",
-            "remote_button_short_release": "Bot\u00f3n \"{subtype}\" soltado"
+            "remote_button_short_release": "Bot\u00f3n \"{subtype}\" soltado",
+            "remote_double_button_long_press": "Ambos \"{subtype}\" soltados despu\u00e9s de pulsaci\u00f3n larga",
+            "remote_double_button_short_press": "Ambos \"{subtype}\" soltados"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/hue/.translations/fr.json b/homeassistant/components/hue/.translations/fr.json
index 5b3efb94559..45d2a28d35c 100644
--- a/homeassistant/components/hue/.translations/fr.json
+++ b/homeassistant/components/hue/.translations/fr.json
@@ -26,5 +26,11 @@
                 "title": "Hub de liaison"
             }
         }
+    },
+    "device_automation": {
+        "trigger_subtype": {
+            "double_buttons_1_3": "Premier et troisi\u00e8me boutons",
+            "double_buttons_2_4": "Deuxi\u00e8me et quatri\u00e8me boutons"
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/hue/.translations/ru.json b/homeassistant/components/hue/.translations/ru.json
index 19908402098..2b92391156a 100644
--- a/homeassistant/components/hue/.translations/ru.json
+++ b/homeassistant/components/hue/.translations/ru.json
@@ -35,13 +35,17 @@
             "button_4": "\u0427\u0435\u0442\u0432\u0435\u0440\u0442\u0430\u044f \u043a\u043d\u043e\u043f\u043a\u0430",
             "dim_down": "\u042f\u0440\u043a\u043e\u0441\u0442\u044c \u0443\u043c\u0435\u043d\u044c\u0448\u0430\u0435\u0442\u0441\u044f",
             "dim_up": "\u042f\u0440\u043a\u043e\u0441\u0442\u044c \u0443\u0432\u0435\u043b\u0438\u0447\u0438\u0432\u0430\u0435\u0442\u0441\u044f",
+            "double_buttons_1_3": "\u041f\u0435\u0440\u0432\u0430\u044f \u0438 \u0442\u0440\u0435\u0442\u044c\u044f \u043a\u043d\u043e\u043f\u043a\u0438",
+            "double_buttons_2_4": "\u0412\u0442\u043e\u0440\u0430\u044f \u0438 \u0447\u0435\u0442\u0432\u0435\u0440\u0442\u0430\u044f \u043a\u043d\u043e\u043f\u043a\u0438",
             "turn_off": "\u0412\u044b\u043a\u043b\u044e\u0447\u0430\u0435\u0442\u0441\u044f",
             "turn_on": "\u0412\u043a\u043b\u044e\u0447\u0430\u0435\u0442\u0441\u044f"
         },
         "trigger_type": {
-            "remote_button_long_release": "\"{subtype}\" \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430 \u043f\u043e\u0441\u043b\u0435 \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e\u0433\u043e \u043d\u0430\u0436\u0430\u0442\u0438\u044f",
-            "remote_button_short_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430",
-            "remote_button_short_release": "\"{subtype}\" \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430"
+            "remote_button_long_release": "{subtype} \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430 \u043f\u043e\u0441\u043b\u0435 \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e\u0433\u043e \u043d\u0430\u0436\u0430\u0442\u0438\u044f",
+            "remote_button_short_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430",
+            "remote_button_short_release": "{subtype} \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430",
+            "remote_double_button_long_press": "{subtype} \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u044b \u043f\u043e\u0441\u043b\u0435 \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e\u0433\u043e \u043d\u0430\u0436\u0430\u0442\u0438\u044f",
+            "remote_double_button_short_press": "{subtype} \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u044b"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/hue/.translations/zh-Hant.json b/homeassistant/components/hue/.translations/zh-Hant.json
index b7ec9588b3e..ff0cf55f2e9 100644
--- a/homeassistant/components/hue/.translations/zh-Hant.json
+++ b/homeassistant/components/hue/.translations/zh-Hant.json
@@ -35,13 +35,17 @@
             "button_4": "\u7b2c\u56db\u500b\u6309\u9215",
             "dim_down": "\u8abf\u6697",
             "dim_up": "\u8abf\u4eae",
+            "double_buttons_1_3": "\u7b2c\u4e00\u8207\u7b2c\u4e09\u500b\u6309\u9215",
+            "double_buttons_2_4": "\u7b2c\u4e8c\u8207\u7b2c\u56db\u500b\u6309\u9215",
             "turn_off": "\u95dc\u9589",
             "turn_on": "\u958b\u555f"
         },
         "trigger_type": {
             "remote_button_long_release": "\"{subtype}\" \u6309\u9215\u9577\u6309\u5f8c\u91cb\u653e",
             "remote_button_short_press": "\"{subtype}\" \u6309\u9215\u5df2\u6309\u4e0b",
-            "remote_button_short_release": "\"{subtype}\" \u6309\u9215\u5df2\u91cb\u653e"
+            "remote_button_short_release": "\"{subtype}\" \u6309\u9215\u5df2\u91cb\u653e",
+            "remote_double_button_long_press": "\"{subtype}\" \u4e00\u8d77\u9577\u6309\u5f8c\u91cb\u653e",
+            "remote_double_button_short_press": "\"{subtype}\" \u4e00\u8d77\u91cb\u653e"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/input_boolean/.translations/de.json b/homeassistant/components/input_boolean/.translations/de.json
index 29b5b3d1f45..5e263a612a0 100644
--- a/homeassistant/components/input_boolean/.translations/de.json
+++ b/homeassistant/components/input_boolean/.translations/de.json
@@ -1,3 +1,3 @@
 {
-    "title": "Boolsche Eingabe"
+    "title": "Boolescher Wert eingeben"
 }
\ No newline at end of file
diff --git a/homeassistant/components/ipp/.translations/es.json b/homeassistant/components/ipp/.translations/es.json
index c56083bbf61..bdb55b539fa 100644
--- a/homeassistant/components/ipp/.translations/es.json
+++ b/homeassistant/components/ipp/.translations/es.json
@@ -4,6 +4,8 @@
             "already_configured": "Esta impresora ya est\u00e1 configurada.",
             "connection_error": "No se pudo conectar con la impresora.",
             "connection_upgrade": "No se pudo conectar con la impresora debido a que se requiere una actualizaci\u00f3n de la conexi\u00f3n.",
+            "ipp_error": "Error IPP encontrado.",
+            "ipp_version_error": "Versi\u00f3n de IPP no compatible con la impresora.",
             "parse_error": "Error al analizar la respuesta de la impresora."
         },
         "error": {
diff --git a/homeassistant/components/ipp/.translations/fr.json b/homeassistant/components/ipp/.translations/fr.json
index 5d4ce687cf8..b1833e6d557 100644
--- a/homeassistant/components/ipp/.translations/fr.json
+++ b/homeassistant/components/ipp/.translations/fr.json
@@ -3,7 +3,10 @@
         "abort": {
             "already_configured": "Cette imprimante est d\u00e9j\u00e0 configur\u00e9e.",
             "connection_error": "Impossible de se connecter \u00e0 l'imprimante.",
-            "connection_upgrade": "Impossible de se connecter \u00e0 l'imprimante parce qu'une mise \u00e0 niveau de la connexion est n\u00e9cessaire."
+            "connection_upgrade": "Impossible de se connecter \u00e0 l'imprimante parce qu'une mise \u00e0 niveau de la connexion est n\u00e9cessaire.",
+            "ipp_error": "Erreur IPP rencontr\u00e9e.",
+            "ipp_version_error": "Version d'IPP non prise en charge par l'imprimante.",
+            "parse_error": "Impossible d'analyser la r\u00e9ponse de l'imprimante."
         },
         "error": {
             "connection_error": "Impossible de se connecter \u00e0 l'imprimante.",
@@ -16,7 +19,7 @@
                     "base_path": "Chemin d'acc\u00e8s relatif \u00e0 l'imprimante",
                     "host": "H\u00f4te ou adresse IP",
                     "port": "Port",
-                    "ssl": "L'imprimante prend en charge la communication via SSL / TLS",
+                    "ssl": "L'imprimante prend en charge la communication via SSL/TLS",
                     "verify_ssl": "L'imprimante utilise un certificat SSL appropri\u00e9"
                 },
                 "description": "Configurez votre imprimante via IPP (Internet Printing Protocol) pour l'int\u00e9grer \u00e0 Home Assistant",
diff --git a/homeassistant/components/lock/.translations/zh-Hant.json b/homeassistant/components/lock/.translations/zh-Hant.json
index bbc7b0c3738..ac5ccef6a2c 100644
--- a/homeassistant/components/lock/.translations/zh-Hant.json
+++ b/homeassistant/components/lock/.translations/zh-Hant.json
@@ -14,5 +14,5 @@
             "unlocked": "{entity_name}\u5df2\u89e3\u9396"
         }
     },
-    "title": "\u5df2\u4e0a\u9396"
+    "title": "\u9580\u9396"
 }
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/ru.json b/homeassistant/components/mqtt/.translations/ru.json
index a3747044a59..3de009aa002 100644
--- a/homeassistant/components/mqtt/.translations/ru.json
+++ b/homeassistant/components/mqtt/.translations/ru.json
@@ -39,14 +39,14 @@
             "turn_on": "\u0412\u043a\u043b\u044e\u0447\u0430\u0435\u0442\u0441\u044f"
         },
         "trigger_type": {
-            "button_double_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430 \u0434\u0432\u0430 \u0440\u0430\u0437\u0430",
-            "button_long_press": "\"{subtype}\" \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e \u043d\u0430\u0436\u0430\u0442\u0430",
-            "button_long_release": "\"{subtype}\" \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430 \u043f\u043e\u0441\u043b\u0435 \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e\u0433\u043e \u043d\u0430\u0436\u0430\u0442\u0438\u044f",
-            "button_quadruple_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430 \u0447\u0435\u0442\u044b\u0440\u0435 \u0440\u0430\u0437\u0430",
-            "button_quintuple_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430 \u043f\u044f\u0442\u044c \u0440\u0430\u0437",
-            "button_short_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430",
-            "button_short_release": "\"{subtype}\" \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430",
-            "button_triple_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430 \u0442\u0440\u0438 \u0440\u0430\u0437\u0430"
+            "button_double_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u0434\u0432\u0430 \u0440\u0430\u0437\u0430",
+            "button_long_press": "{subtype} \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e \u043d\u0430\u0436\u0430\u0442\u0430",
+            "button_long_release": "{subtype} \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430 \u043f\u043e\u0441\u043b\u0435 \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e\u0433\u043e \u043d\u0430\u0436\u0430\u0442\u0438\u044f",
+            "button_quadruple_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u0447\u0435\u0442\u044b\u0440\u0435 \u0440\u0430\u0437\u0430",
+            "button_quintuple_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u043f\u044f\u0442\u044c \u0440\u0430\u0437",
+            "button_short_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430",
+            "button_short_release": "{subtype} \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430",
+            "button_triple_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u0442\u0440\u0438 \u0440\u0430\u0437\u0430"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/nws/.translations/ca.json b/homeassistant/components/nws/.translations/ca.json
new file mode 100644
index 00000000000..bbb316439e5
--- /dev/null
+++ b/homeassistant/components/nws/.translations/ca.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "El dispositiu ja est\u00e0 configurat"
+        },
+        "error": {
+            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "unknown": "Error inesperat"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "Clau API (correu electr\u00f2nic)",
+                    "latitude": "Latitud",
+                    "longitude": "Longitud",
+                    "station": "Codi d'estaci\u00f3 METAR"
+                },
+                "description": "Si no s'especifica un codi d'estaci\u00f3 METAR, la latitud i longitud s'utilitzaran per trobar l'estaci\u00f3 m\u00e9s propera.",
+                "title": "Connexi\u00f3 amb el Servei Meteorol\u00f2gic Nacional (USA)"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nws/.translations/es.json b/homeassistant/components/nws/.translations/es.json
new file mode 100644
index 00000000000..0dd768d15d0
--- /dev/null
+++ b/homeassistant/components/nws/.translations/es.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "El dispositivo ya est\u00e1 configurado"
+        },
+        "error": {
+            "cannot_connect": "No se pudo conectar, por favor, int\u00e9ntalo de nuevo",
+            "unknown": "Error inesperado"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "Clave API (correo electr\u00f3nico)",
+                    "latitude": "Latitud",
+                    "longitude": "Longitud",
+                    "station": "C\u00f3digo de estaci\u00f3n METAR"
+                },
+                "description": "Si no se especifica un c\u00f3digo de estaci\u00f3n METAR, se utilizar\u00e1n la latitud y la longitud para encontrar la estaci\u00f3n m\u00e1s cercana.",
+                "title": "Conectar con el National Weather Service"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nws/.translations/fr.json b/homeassistant/components/nws/.translations/fr.json
new file mode 100644
index 00000000000..bb0eabe7754
--- /dev/null
+++ b/homeassistant/components/nws/.translations/fr.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "L'appareil est d\u00e9j\u00e0 configur\u00e9"
+        },
+        "error": {
+            "cannot_connect": "Impossible de se connecter, veuillez r\u00e9essayer",
+            "unknown": "Erreur inattendue"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/plant/.translations/pt.json b/homeassistant/components/plant/.translations/pt.json
index 9a3593e0799..39bd39b9712 100644
--- a/homeassistant/components/plant/.translations/pt.json
+++ b/homeassistant/components/plant/.translations/pt.json
@@ -1,3 +1,3 @@
 {
-    "title": "Planta"
+    "title": "Monitor de plantas"
 }
\ No newline at end of file
diff --git a/homeassistant/components/plant/.translations/zh-Hant.json b/homeassistant/components/plant/.translations/zh-Hant.json
index 5842ec092ea..e27276fd4f6 100644
--- a/homeassistant/components/plant/.translations/zh-Hant.json
+++ b/homeassistant/components/plant/.translations/zh-Hant.json
@@ -1,3 +1,3 @@
 {
-    "title": "\u690d\u7269"
+    "title": "\u690d\u7269\u76e3\u63a7"
 }
\ No newline at end of file
diff --git a/homeassistant/components/smartthings/.translations/es.json b/homeassistant/components/smartthings/.translations/es.json
index 148fb6dfc1b..db1b2f88877 100644
--- a/homeassistant/components/smartthings/.translations/es.json
+++ b/homeassistant/components/smartthings/.translations/es.json
@@ -1,5 +1,9 @@
 {
     "config": {
+        "abort": {
+            "invalid_webhook_url": "Home Assistant no est\u00e1 configurado correctamente para recibir actualizaciones de SmartThings. La URL del webhook no es v\u00e1lida: \n > {webhook_url} \n\n Actualiza tu configuraci\u00f3n seg\u00fan las [instrucciones]({component_url}), reinicia Home Assistant e int\u00e9ntalo de nuevo.",
+            "no_available_locations": "No hay Ubicaciones SmartThings disponibles para configurar en Home Assistant."
+        },
         "error": {
             "app_setup_error": "No se pudo configurar el SmartApp.  Por favor, int\u00e9ntelo de nuevo.",
             "token_forbidden": "El token no tiene los \u00e1mbitos de OAuth necesarios.",
@@ -8,6 +12,23 @@
             "webhook_error": "SmartThings no ha podido validar el endpoint configurado en 'base_url'. Por favor, revisa los requisitos del componente."
         },
         "step": {
+            "authorize": {
+                "title": "Autorizar a Home Assistant"
+            },
+            "pat": {
+                "data": {
+                    "access_token": "Token de acceso"
+                },
+                "description": "Por favor, introduce un [token de acceso personal]({token_url}) de SmartThings creado seg\u00fan las [instrucciones]({component_url}). Se usar\u00e1 para crear la integraci\u00f3n de Home Assistant en tu cuenta de SmartThings.",
+                "title": "Introduce el token de acceso personal"
+            },
+            "select_location": {
+                "data": {
+                    "location_id": "Ubicaci\u00f3n"
+                },
+                "description": "Selecciona la Ubicaci\u00f3n SmartThings que quieres a\u00f1adir a Home Assistant. Se abrir\u00e1 una nueva ventana que te pedir\u00e1 que inicies sesi\u00f3n y autorices la instalaci\u00f3n de la integraci\u00f3n de Home Assistant en la ubicaci\u00f3n seleccionada.",
+                "title": "Seleccionar Ubicaci\u00f3n"
+            },
             "user": {
                 "description": "Por favor, introduce el [token de acceso personal]({token_url}) de SmartThings que se haya creado seg\u00fan las [instrucciones]({component_url}).",
                 "title": "Introduce el token de acceso personal"
diff --git a/homeassistant/components/synology_dsm/.translations/ca.json b/homeassistant/components/synology_dsm/.translations/ca.json
index 18080db554a..bac518531e0 100644
--- a/homeassistant/components/synology_dsm/.translations/ca.json
+++ b/homeassistant/components/synology_dsm/.translations/ca.json
@@ -4,8 +4,7 @@
             "already_configured": "L'amfitri\u00f3 ja est\u00e0 configurat"
         },
         "error": {
-            "login": "Error d\u2019inici de sessi\u00f3: comprova el nom d'usuari i la contrasenya",
-            "unknown": "Error desconegut: torna-ho a provar m\u00e9s tard o revisa la configuraci\u00f3"
+            "login": "Error d\u2019inici de sessi\u00f3: comprova el nom d'usuari i la contrasenya"
         },
         "flow_title": "Synology DSM {name} ({host})",
         "step": {
diff --git a/homeassistant/components/synology_dsm/.translations/de.json b/homeassistant/components/synology_dsm/.translations/de.json
index 70a2bf7e490..b1a1d955092 100644
--- a/homeassistant/components/synology_dsm/.translations/de.json
+++ b/homeassistant/components/synology_dsm/.translations/de.json
@@ -4,8 +4,7 @@
             "already_configured": "Host bereits konfiguriert"
         },
         "error": {
-            "login": "Login-Fehler: Bitte \u00fcberpr\u00fcfen Sie Ihren Benutzernamen & Passwort",
-            "unknown": "Unbekannter Fehler: Bitte versuchen Sie es sp\u00e4ter noch einmal oder eine andere Konfiguration"
+            "login": "Login-Fehler: Bitte \u00fcberpr\u00fcfen Sie Ihren Benutzernamen & Passwort"
         },
         "flow_title": "Synology DSM {name} ({host})",
         "step": {
diff --git a/homeassistant/components/synology_dsm/.translations/es.json b/homeassistant/components/synology_dsm/.translations/es.json
index f5e4094839e..44fcac85f7d 100644
--- a/homeassistant/components/synology_dsm/.translations/es.json
+++ b/homeassistant/components/synology_dsm/.translations/es.json
@@ -4,8 +4,7 @@
             "already_configured": "El host ya est\u00e1 configurado."
         },
         "error": {
-            "login": "Error de inicio de sesi\u00f3n: comprueba tu nombre de usuario y contrase\u00f1a",
-            "unknown": "Error desconocido: por favor vuelve a intentarlo m\u00e1s tarde o usa otra configuraci\u00f3n"
+            "login": "Error de inicio de sesi\u00f3n: comprueba tu nombre de usuario y contrase\u00f1a"
         },
         "flow_title": "Synology DSM {name} ({host})",
         "step": {
diff --git a/homeassistant/components/synology_dsm/.translations/fr.json b/homeassistant/components/synology_dsm/.translations/fr.json
index 828d7feeb5e..5577885f404 100644
--- a/homeassistant/components/synology_dsm/.translations/fr.json
+++ b/homeassistant/components/synology_dsm/.translations/fr.json
@@ -5,7 +5,7 @@
         },
         "error": {
             "login": "Erreur de connexion: veuillez v\u00e9rifier votre nom d'utilisateur et votre mot de passe",
-            "unknown": "Erreur inconnue: veuillez r\u00e9essayer plus tard ou utilisez une autre configuration"
+            "missing_data": "Donn\u00e9es manquantes: veuillez r\u00e9essayer plus tard ou utilisez une autre configuration"
         },
         "flow_title": "Synology DSM {name} ({host})",
         "step": {
@@ -25,8 +25,11 @@
                     "api_version": "Version du DSM",
                     "host": "H\u00f4te",
                     "password": "Mot de passe",
-                    "port": "Port (facultatif)"
-                }
+                    "port": "Port (facultatif)",
+                    "ssl": "Utilisez SSL/TLS pour vous connecter \u00e0 votre NAS",
+                    "username": "Nom d'utilisateur"
+                },
+                "title": "Synology DSM"
             }
         }
     }
diff --git a/homeassistant/components/synology_dsm/.translations/it.json b/homeassistant/components/synology_dsm/.translations/it.json
index 18e87d7c70e..6cff2a94263 100644
--- a/homeassistant/components/synology_dsm/.translations/it.json
+++ b/homeassistant/components/synology_dsm/.translations/it.json
@@ -4,8 +4,7 @@
             "already_configured": "Host gi\u00e0 configurato"
         },
         "error": {
-            "login": "Errore di accesso: si prega di controllare il nome utente e la password",
-            "unknown": "Errore sconosciuto: riprovare pi\u00f9 tardi o un'altra configurazione"
+            "login": "Errore di accesso: si prega di controllare il nome utente e la password"
         },
         "flow_title": "Synology DSM {nome} ({host})",
         "step": {
diff --git a/homeassistant/components/synology_dsm/.translations/ko.json b/homeassistant/components/synology_dsm/.translations/ko.json
index 86b0db95c7c..ff7b3b66610 100644
--- a/homeassistant/components/synology_dsm/.translations/ko.json
+++ b/homeassistant/components/synology_dsm/.translations/ko.json
@@ -4,8 +4,7 @@
             "already_configured": "\ud638\uc2a4\ud2b8\uac00 \uc774\ubbf8 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4."
         },
         "error": {
-            "login": "\ub85c\uadf8\uc778 \uc624\ub958: \uc0ac\uc6a9\uc790 \uc774\ub984 \ubc0f \ube44\ubc00\ubc88\ud638\ub97c \ud655\uc778\ud574\uc8fc\uc138\uc694",
-            "unknown": "\uc54c \uc218 \uc5c6\ub294 \uc624\ub958\uc785\ub2c8\ub2e4. \ub098\uc911\uc5d0 \ub2e4\uc2dc \uc2dc\ub3c4\ud558\uac70\ub098 \ub2e4\ub978 \uad6c\uc131\uc744 \uc2dc\ub3c4\ud574\ubcf4\uc138\uc694"
+            "login": "\ub85c\uadf8\uc778 \uc624\ub958: \uc0ac\uc6a9\uc790 \uc774\ub984 \ubc0f \ube44\ubc00\ubc88\ud638\ub97c \ud655\uc778\ud574\uc8fc\uc138\uc694"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/synology_dsm/.translations/lb.json b/homeassistant/components/synology_dsm/.translations/lb.json
index 8c8844797cb..24c64ccf83c 100644
--- a/homeassistant/components/synology_dsm/.translations/lb.json
+++ b/homeassistant/components/synology_dsm/.translations/lb.json
@@ -4,8 +4,7 @@
             "already_configured": "Apparat ass scho konfigur\u00e9iert"
         },
         "error": {
-            "login": "Feeler beim Login: iwwerpr\u00e9if de Benotzernumm & Passwuert",
-            "unknown": "Onbekannte Feeler: prob\u00e9ier sp\u00e9ider nach emol oder mat enger aner Konfiguratioun"
+            "login": "Feeler beim Login: iwwerpr\u00e9if de Benotzernumm & Passwuert"
         },
         "flow_title": "Synology DSM {name} ({host})",
         "step": {
diff --git a/homeassistant/components/synology_dsm/.translations/nl.json b/homeassistant/components/synology_dsm/.translations/nl.json
index 3859617fbbd..5d6f5e53c5d 100644
--- a/homeassistant/components/synology_dsm/.translations/nl.json
+++ b/homeassistant/components/synology_dsm/.translations/nl.json
@@ -3,9 +3,6 @@
         "abort": {
             "already_configured": "Host is al geconfigureerd."
         },
-        "error": {
-            "unknown": "Onbekende fout: probeer het later opnieuw of een andere configuratie"
-        },
         "flow_title": "Synology DSM {name} ({host})",
         "step": {
             "link": {
diff --git a/homeassistant/components/synology_dsm/.translations/no.json b/homeassistant/components/synology_dsm/.translations/no.json
index 4778c51d52c..8844558fec4 100644
--- a/homeassistant/components/synology_dsm/.translations/no.json
+++ b/homeassistant/components/synology_dsm/.translations/no.json
@@ -4,8 +4,7 @@
             "already_configured": "Verten er allerede konfigurert"
         },
         "error": {
-            "login": "P\u00e5loggingsfeil: Vennligst sjekk brukernavnet ditt og passordet ditt",
-            "unknown": "Ukjent feil: pr\u00f8v p\u00e5 nytt senere eller en annen konfigurasjon"
+            "login": "P\u00e5loggingsfeil: Vennligst sjekk brukernavnet ditt og passordet ditt"
         },
         "flow_title": "Synology DSM {name} ( {host} )",
         "step": {
diff --git a/homeassistant/components/synology_dsm/.translations/pt.json b/homeassistant/components/synology_dsm/.translations/pt.json
new file mode 100644
index 00000000000..2c651539321
--- /dev/null
+++ b/homeassistant/components/synology_dsm/.translations/pt.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "port": "Porta (opcional)"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/synology_dsm/.translations/ru.json b/homeassistant/components/synology_dsm/.translations/ru.json
index 5dabd3a0d26..bb63dd9a68e 100644
--- a/homeassistant/components/synology_dsm/.translations/ru.json
+++ b/homeassistant/components/synology_dsm/.translations/ru.json
@@ -4,8 +4,7 @@
             "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0445\u043e\u0441\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
         },
         "error": {
-            "login": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0445\u043e\u0434\u0430: \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043b\u043e\u0433\u0438\u043d \u0438 \u043f\u0430\u0440\u043e\u043b\u044c.",
-            "unknown": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430: \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u0441 \u0434\u0440\u0443\u0433\u043e\u0439 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0435\u0439 \u0438\u043b\u0438 \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443 \u043f\u043e\u0437\u0436\u0435."
+            "login": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0445\u043e\u0434\u0430: \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043b\u043e\u0433\u0438\u043d \u0438 \u043f\u0430\u0440\u043e\u043b\u044c."
         },
         "flow_title": "Synology DSM {name} ({host})",
         "step": {
diff --git a/homeassistant/components/synology_dsm/.translations/sl.json b/homeassistant/components/synology_dsm/.translations/sl.json
index 97cf89463c7..168454a4331 100644
--- a/homeassistant/components/synology_dsm/.translations/sl.json
+++ b/homeassistant/components/synology_dsm/.translations/sl.json
@@ -4,8 +4,7 @@
             "already_configured": "Gostitelj je \u017ee konfiguriran"
         },
         "error": {
-            "login": "Napaka pri prijavi: preverite svoje uporabni\u0161ko ime in geslo",
-            "unknown": "Neznana napaka: poskusite pozneje ali z drugo konfiguracijo"
+            "login": "Napaka pri prijavi: preverite svoje uporabni\u0161ko ime in geslo"
         },
         "flow_title": "Synology DSM {name} ({host})",
         "step": {
diff --git a/homeassistant/components/synology_dsm/.translations/zh-Hant.json b/homeassistant/components/synology_dsm/.translations/zh-Hant.json
index f86c4268e06..aa4d61f0784 100644
--- a/homeassistant/components/synology_dsm/.translations/zh-Hant.json
+++ b/homeassistant/components/synology_dsm/.translations/zh-Hant.json
@@ -4,8 +4,7 @@
             "already_configured": "\u4e3b\u6a5f\u7aef\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "login": "\u767b\u5165\u932f\u8aa4\uff1a\u8acb\u78ba\u8a8d\u96fb\u5b50\u90f5\u4ef6\u8207\u5bc6\u78bc",
-            "unknown": "\u672a\u77e5\u932f\u8aa4\uff1a\u8acb\u7a0d\u5f8c\u518d\u8a66\u6216\u4f7f\u7528\u5176\u4ed6\u8a2d\u5b9a"
+            "login": "\u767b\u5165\u932f\u8aa4\uff1a\u8acb\u78ba\u8a8d\u96fb\u5b50\u90f5\u4ef6\u8207\u5bc6\u78bc"
         },
         "flow_title": "\u7fa4\u6689 DSM {name} ({host})",
         "step": {
diff --git a/homeassistant/components/unifi/.translations/es.json b/homeassistant/components/unifi/.translations/es.json
index 9776f893e1e..dbced017d77 100644
--- a/homeassistant/components/unifi/.translations/es.json
+++ b/homeassistant/components/unifi/.translations/es.json
@@ -37,6 +37,7 @@
             "device_tracker": {
                 "data": {
                     "detection_time": "Tiempo en segundos desde la \u00faltima vez que se vio hasta considerarlo desconectado",
+                    "ignore_wired_bug": "Desactivar la l\u00f3gica para el bug cableado de UniFi",
                     "ssid_filter": "Seleccione los SSIDs para realizar seguimiento de clientes inal\u00e1mbricos",
                     "track_clients": "Seguimiento de los clientes de red",
                     "track_devices": "Rastree dispositivos de red (dispositivos Ubiquiti)",
diff --git a/homeassistant/components/unifi/.translations/ru.json b/homeassistant/components/unifi/.translations/ru.json
index de3bc97e2a3..ae3e5c6e3f4 100644
--- a/homeassistant/components/unifi/.translations/ru.json
+++ b/homeassistant/components/unifi/.translations/ru.json
@@ -31,6 +31,7 @@
                     "new_client": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u043e\u0433\u043e \u043a\u043b\u0438\u0435\u043d\u0442\u0430 \u0434\u043b\u044f \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u044f \u0441\u0435\u0442\u0435\u0432\u043e\u0433\u043e \u0434\u043e\u0441\u0442\u0443\u043f\u0430",
                     "poe_clients": "\u0420\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044c POE \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u044c \u043a\u043b\u0438\u0435\u043d\u0442\u043e\u0432"
                 },
+                "description": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f.\n\n\u0421\u043e\u0437\u0434\u0430\u0439\u0442\u0435 \u043f\u0435\u0440\u0435\u043a\u043b\u044e\u0447\u0430\u0442\u0435\u043b\u0438 \u0434\u043b\u044f \u0441\u0435\u0440\u0438\u0439\u043d\u044b\u0445 \u043d\u043e\u043c\u0435\u0440\u043e\u0432, \u0434\u043b\u044f \u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0412\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u0441\u0435\u0442\u0438.",
                 "title": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 UniFi. \u0428\u0430\u0433 2"
             },
             "device_tracker": {
diff --git a/homeassistant/components/unifi/.translations/zh-Hant.json b/homeassistant/components/unifi/.translations/zh-Hant.json
index c8d48dc5064..7247293662a 100644
--- a/homeassistant/components/unifi/.translations/zh-Hant.json
+++ b/homeassistant/components/unifi/.translations/zh-Hant.json
@@ -37,6 +37,7 @@
             "device_tracker": {
                 "data": {
                     "detection_time": "\u6700\u7d42\u51fa\u73fe\u5f8c\u8996\u70ba\u96e2\u958b\u7684\u6642\u9593\uff08\u4ee5\u79d2\u70ba\u55ae\u4f4d\uff09",
+                    "ignore_wired_bug": "\u95dc\u9589 UniFi \u6709\u7dda\u932f\u8aa4\u908f\u8f2f",
                     "ssid_filter": "\u9078\u64c7\u6240\u8981\u8ffd\u8e64\u7684\u7121\u7dda\u7db2\u8def",
                     "track_clients": "\u8ffd\u8e64\u7db2\u8def\u5ba2\u6236\u7aef",
                     "track_devices": "\u8ffd\u8e64\u7db2\u8def\u8a2d\u5099\uff08Ubiquiti \u8a2d\u5099\uff09",
diff --git a/homeassistant/components/vacuum/.translations/de.json b/homeassistant/components/vacuum/.translations/de.json
index 62238436eb6..2ea148b8ace 100644
--- a/homeassistant/components/vacuum/.translations/de.json
+++ b/homeassistant/components/vacuum/.translations/de.json
@@ -13,5 +13,5 @@
             "docked": "{entity_name} angedockt"
         }
     },
-    "title": "Staubsauger"
+    "title": "Vacuum"
 }
\ No newline at end of file
diff --git a/homeassistant/components/zha/.translations/ru.json b/homeassistant/components/zha/.translations/ru.json
index acf619e79b7..d05dff4e478 100644
--- a/homeassistant/components/zha/.translations/ru.json
+++ b/homeassistant/components/zha/.translations/ru.json
@@ -39,36 +39,36 @@
             "face_5": "\u043d\u0430 \u043f\u044f\u0442\u043e\u0439 \u0433\u0440\u0430\u043d\u0438",
             "face_6": "\u043d\u0430 \u0448\u0435\u0441\u0442\u043e\u0439 \u0433\u0440\u0430\u043d\u0438",
             "face_any": "\u043d\u0430 \u043b\u044e\u0431\u043e\u0439 \u0433\u0440\u0430\u043d\u0438",
-            "left": "\u041d\u0430\u043b\u0435\u0432\u043e",
+            "left": "\u043d\u0430\u043b\u0435\u0432\u043e",
             "open": "\u041e\u0442\u043a\u0440\u044b\u0432\u0430\u0435\u0442\u0441\u044f",
-            "right": "\u041d\u0430\u043f\u0440\u0430\u0432\u043e",
+            "right": "\u043d\u0430\u043f\u0440\u0430\u0432\u043e",
             "turn_off": "\u0412\u044b\u043a\u043b\u044e\u0447\u0430\u0435\u0442\u0441\u044f",
             "turn_on": "\u0412\u043a\u043b\u044e\u0447\u0430\u0435\u0442\u0441\u044f"
         },
         "trigger_type": {
             "device_dropped": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0441\u0431\u0440\u043e\u0441\u0438\u043b\u0438",
-            "device_flipped": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0435\u0440\u0435\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \"{subtype}\"",
-            "device_knocked": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e\u043c \u043f\u043e\u0441\u0442\u0443\u0447\u0430\u043b\u0438 \"{subtype}\"",
-            "device_rotated": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u043e\u0432\u0435\u0440\u043d\u0443\u043b\u0438 \"{subtype}\"",
-            "device_shaken": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0432\u0441\u0442\u0440\u044f\u0445\u043d\u0443\u043b\u0438",
-            "device_slid": "\u0421\u0434\u0432\u0438\u0433 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \"{subtype}\"",
+            "device_flipped": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0435\u0440\u0435\u0432\u0435\u0440\u043d\u0443\u043b\u0438 {subtype}",
+            "device_knocked": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e\u043c \u043f\u043e\u0441\u0442\u0443\u0447\u0430\u043b\u0438 {subtype}",
+            "device_rotated": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u043e\u0432\u0435\u0440\u043d\u0443\u043b\u0438 {subtype}",
+            "device_shaken": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u043e\u0442\u0440\u044f\u0441\u043b\u0438",
+            "device_slid": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0441\u0434\u0432\u0438\u043d\u0443\u043b\u0438 {subtype}",
             "device_tilted": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043d\u0430\u043a\u043b\u043e\u043d\u0438\u043b\u0438",
-            "remote_button_alt_double_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430 \u0434\u0432\u0430 \u0440\u0430\u0437\u0430 (\u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c)",
-            "remote_button_alt_long_press": "\"{subtype}\" \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e \u043d\u0430\u0436\u0430\u0442\u0430 (\u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c)",
-            "remote_button_alt_long_release": "\"{subtype}\" \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430 \u043f\u043e\u0441\u043b\u0435 \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e\u0433\u043e \u043d\u0430\u0436\u0430\u0442\u0438\u044f (\u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c)",
-            "remote_button_alt_quadruple_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430 \u0447\u0435\u0442\u044b\u0440\u0435 \u0440\u0430\u0437\u0430  (\u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c)",
-            "remote_button_alt_quintuple_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430 \u043f\u044f\u0442\u044c \u0440\u0430\u0437 (\u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c)",
-            "remote_button_alt_short_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430 (\u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c)",
-            "remote_button_alt_short_release": "\"{subtype}\" \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430 \u043f\u043e\u0441\u043b\u0435 \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e\u0433\u043e \u043d\u0430\u0436\u0430\u0442\u0438\u044f (\u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c)",
-            "remote_button_alt_triple_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430 \u0442\u0440\u0438 \u0440\u0430\u0437\u0430  (\u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c)",
-            "remote_button_double_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430 \u0434\u0432\u0430 \u0440\u0430\u0437\u0430",
-            "remote_button_long_press": "\"{subtype}\" \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e \u043d\u0430\u0436\u0430\u0442\u0430",
-            "remote_button_long_release": "\"{subtype}\" \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430 \u043f\u043e\u0441\u043b\u0435 \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e\u0433\u043e \u043d\u0430\u0436\u0430\u0442\u0438\u044f",
-            "remote_button_quadruple_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430 \u0447\u0435\u0442\u044b\u0440\u0435 \u0440\u0430\u0437\u0430",
-            "remote_button_quintuple_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430 \u043f\u044f\u0442\u044c \u0440\u0430\u0437",
-            "remote_button_short_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430",
-            "remote_button_short_release": "\"{subtype}\" \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430",
-            "remote_button_triple_press": "\"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430 \u0442\u0440\u0438 \u0440\u0430\u0437\u0430"
+            "remote_button_alt_double_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u0434\u0432\u0430 \u0440\u0430\u0437\u0430 (\u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c)",
+            "remote_button_alt_long_press": "{subtype} \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e \u043d\u0430\u0436\u0430\u0442\u0430 (\u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c)",
+            "remote_button_alt_long_release": "{subtype} \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430 \u043f\u043e\u0441\u043b\u0435 \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e\u0433\u043e \u043d\u0430\u0436\u0430\u0442\u0438\u044f (\u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c)",
+            "remote_button_alt_quadruple_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u0447\u0435\u0442\u044b\u0440\u0435 \u0440\u0430\u0437\u0430  (\u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c)",
+            "remote_button_alt_quintuple_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u043f\u044f\u0442\u044c \u0440\u0430\u0437 (\u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c)",
+            "remote_button_alt_short_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 (\u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c)",
+            "remote_button_alt_short_release": "{subtype} \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430 \u043f\u043e\u0441\u043b\u0435 \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e\u0433\u043e \u043d\u0430\u0436\u0430\u0442\u0438\u044f (\u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c)",
+            "remote_button_alt_triple_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u0442\u0440\u0438 \u0440\u0430\u0437\u0430 (\u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c)",
+            "remote_button_double_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u0434\u0432\u0430 \u0440\u0430\u0437\u0430",
+            "remote_button_long_press": "{subtype} \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e \u043d\u0430\u0436\u0430\u0442\u0430",
+            "remote_button_long_release": "{subtype} \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430 \u043f\u043e\u0441\u043b\u0435 \u043d\u0435\u043f\u0440\u0435\u0440\u044b\u0432\u043d\u043e\u0433\u043e \u043d\u0430\u0436\u0430\u0442\u0438\u044f",
+            "remote_button_quadruple_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u0447\u0435\u0442\u044b\u0440\u0435 \u0440\u0430\u0437\u0430",
+            "remote_button_quintuple_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u043f\u044f\u0442\u044c \u0440\u0430\u0437",
+            "remote_button_short_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430",
+            "remote_button_short_release": "{subtype} \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430",
+            "remote_button_triple_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u0442\u0440\u0438 \u0440\u0430\u0437\u0430"
         }
     }
 }
\ No newline at end of file