From ec2ce312046a14a8877c524583a756efb3327d9c Mon Sep 17 00:00:00 2001
From: Quentame <polletquentin74@me.com>
Date: Mon, 12 Aug 2019 05:40:18 +0200
Subject: [PATCH] Fix script/translations_develop launch + clean some unused
 error i18n (#25459)

* Fix : script/translations_develop launch + clean some unused error i18n

* Respecting strings.json order property

title
step
error
abort

* Review from @fredrike : remove Telldus Live all_configured
---
 .../arcam_fmj/.translations/ca.json           |  5 ---
 .../arcam_fmj/.translations/ko.json           |  5 ---
 .../arcam_fmj/.translations/nl.json           | 17 --------
 .../arcam_fmj/.translations/pl.json           | 23 -----------
 .../arcam_fmj/.translations/zh-Hant.json      |  5 ---
 .../components/arcam_fmj/strings.json         |  5 +--
 homeassistant/components/heos/strings.json    | 33 ++++++++--------
 .../tellduslive/.translations/bg.json         |  1 -
 .../tellduslive/.translations/ca.json         |  1 -
 .../tellduslive/.translations/da.json         |  1 -
 .../tellduslive/.translations/de.json         |  1 -
 .../tellduslive/.translations/en.json         |  1 -
 .../tellduslive/.translations/es-419.json     |  1 -
 .../tellduslive/.translations/es.json         |  1 -
 .../tellduslive/.translations/fr.json         |  1 -
 .../tellduslive/.translations/hu.json         |  1 -
 .../tellduslive/.translations/it.json         |  1 -
 .../tellduslive/.translations/ko.json         |  1 -
 .../tellduslive/.translations/lb.json         |  1 -
 .../tellduslive/.translations/nl.json         |  1 -
 .../tellduslive/.translations/no.json         |  1 -
 .../tellduslive/.translations/pl.json         |  1 -
 .../tellduslive/.translations/pt-BR.json      |  1 -
 .../tellduslive/.translations/pt.json         |  1 -
 .../tellduslive/.translations/ru.json         |  1 -
 .../tellduslive/.translations/sl.json         |  1 -
 .../tellduslive/.translations/sv.json         |  1 -
 .../tellduslive/.translations/zh-Hans.json    |  1 -
 .../tellduslive/.translations/zh-Hant.json    |  1 -
 .../twentemilieu/.translations/en.json        | 30 +++++++-------
 .../components/twentemilieu/strings.json      |  2 +-
 .../components/upnp/.translations/da.json     |  4 --
 .../components/upnp/.translations/de.json     |  4 --
 .../components/upnp/.translations/es.json     |  4 --
 .../components/upnp/.translations/hu.json     |  4 --
 .../components/upnp/.translations/lb.json     |  4 --
 .../components/upnp/.translations/nl.json     |  4 --
 .../components/upnp/.translations/nn.json     |  4 --
 .../components/upnp/.translations/no.json     |  8 ----
 .../components/upnp/.translations/pl.json     |  6 ---
 .../components/upnp/.translations/pt.json     |  4 --
 .../components/upnp/.translations/ro.json     |  5 ---
 .../components/upnp/.translations/sl.json     |  6 ---
 .../components/upnp/.translations/sv.json     |  4 --
 homeassistant/components/upnp/strings.json    | 39 +++++++++++++------
 .../components/vesync/.translations/en.json   | 24 ++++++------
 homeassistant/components/vesync/strings.json  | 32 +++++++--------
 homeassistant/components/zha/strings.json     | 33 ++++++++--------
 48 files changed, 105 insertions(+), 231 deletions(-)
 delete mode 100644 homeassistant/components/arcam_fmj/.translations/ca.json
 delete mode 100644 homeassistant/components/arcam_fmj/.translations/ko.json
 delete mode 100644 homeassistant/components/arcam_fmj/.translations/nl.json
 delete mode 100644 homeassistant/components/arcam_fmj/.translations/pl.json
 delete mode 100644 homeassistant/components/arcam_fmj/.translations/zh-Hant.json

diff --git a/homeassistant/components/arcam_fmj/.translations/ca.json b/homeassistant/components/arcam_fmj/.translations/ca.json
deleted file mode 100644
index b0ad4660d0f..00000000000
--- a/homeassistant/components/arcam_fmj/.translations/ca.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "config": {
-        "title": "Arcam FMJ"
-    }
-}
\ No newline at end of file
diff --git a/homeassistant/components/arcam_fmj/.translations/ko.json b/homeassistant/components/arcam_fmj/.translations/ko.json
deleted file mode 100644
index b0ad4660d0f..00000000000
--- a/homeassistant/components/arcam_fmj/.translations/ko.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "config": {
-        "title": "Arcam FMJ"
-    }
-}
\ No newline at end of file
diff --git a/homeassistant/components/arcam_fmj/.translations/nl.json b/homeassistant/components/arcam_fmj/.translations/nl.json
deleted file mode 100644
index 7197976d212..00000000000
--- a/homeassistant/components/arcam_fmj/.translations/nl.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "config": {
-        "abort": {
-            "one": "Een",
-            "other": "Ander"
-        },
-        "error": {
-            "one": "Een",
-            "other": "Ander"
-        },
-        "step": {
-            "one": "Een",
-            "other": "Ander"
-        },
-        "title": "Arcam FMJ"
-    }
-}
\ No newline at end of file
diff --git a/homeassistant/components/arcam_fmj/.translations/pl.json b/homeassistant/components/arcam_fmj/.translations/pl.json
deleted file mode 100644
index 5521c18c079..00000000000
--- a/homeassistant/components/arcam_fmj/.translations/pl.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "config": {
-        "abort": {
-            "few": "kilka",
-            "many": "wiele",
-            "one": "jeden",
-            "other": "inne"
-        },
-        "error": {
-            "few": "kilka",
-            "many": "wiele",
-            "one": "jeden",
-            "other": "inne"
-        },
-        "step": {
-            "few": "kilka",
-            "many": "wiele",
-            "one": "jeden",
-            "other": "inne"
-        },
-        "title": "Arcam FMJ"
-    }
-}
\ No newline at end of file
diff --git a/homeassistant/components/arcam_fmj/.translations/zh-Hant.json b/homeassistant/components/arcam_fmj/.translations/zh-Hant.json
deleted file mode 100644
index b0ad4660d0f..00000000000
--- a/homeassistant/components/arcam_fmj/.translations/zh-Hant.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "config": {
-        "title": "Arcam FMJ"
-    }
-}
\ No newline at end of file
diff --git a/homeassistant/components/arcam_fmj/strings.json b/homeassistant/components/arcam_fmj/strings.json
index 5844c277364..b0006dbb5ae 100644
--- a/homeassistant/components/arcam_fmj/strings.json
+++ b/homeassistant/components/arcam_fmj/strings.json
@@ -1,8 +1,5 @@
 {
     "config": {
-        "title": "Arcam FMJ",
-        "step": {},
-        "error": {},
-        "abort": {}
+        "title": "Arcam FMJ"
     }
 }
diff --git a/homeassistant/components/heos/strings.json b/homeassistant/components/heos/strings.json
index b210e0ba87f..9a00ac6a4bd 100644
--- a/homeassistant/components/heos/strings.json
+++ b/homeassistant/components/heos/strings.json
@@ -1,20 +1,21 @@
 {
-  "config": {
-    "title": "HEOS",
-    "step": {
-      "user": {
-        "title": "Connect to Heos",
-        "description": "Please enter the host name or IP address of a Heos device (preferably one connected via wire to the network).",
-        "data": {
-          "host": "Host"
+    "config": {
+        "title": "HEOS",
+        "step": {
+            "user": {
+                "title": "Connect to Heos",
+                "description": "Please enter the host name or IP address of a Heos device (preferably one connected via wire to the network).",
+                "data": {
+                    "access_token": "Host",
+                    "host": "Host"
+                }
+            }
+        },
+        "error": {
+            "connection_failure": "Unable to connect to the specified host."
+        },
+        "abort": {
+            "already_setup": "You can only configure a single Heos connection as it will support all devices on the network."
         }
-      }
-    },
-    "error": {
-      "connection_failure": "Unable to connect to the specified host."
-    },
-    "abort": {
-      "already_setup": "You can only configure a single Heos connection as it will support all devices on the network."
     }
-  }
 }
\ No newline at end of file
diff --git a/homeassistant/components/tellduslive/.translations/bg.json b/homeassistant/components/tellduslive/.translations/bg.json
index 3e493a3973a..46ae4eba463 100644
--- a/homeassistant/components/tellduslive/.translations/bg.json
+++ b/homeassistant/components/tellduslive/.translations/bg.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive \u0435 \u0432\u0435\u0447\u0435 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u043d",
             "already_setup": "TelldusLive \u0435 \u0432\u0435\u0447\u0435 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u043d",
             "authorize_url_fail": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430 \u0433\u0440\u0435\u0448\u043a\u0430 \u043f\u0440\u0438 \u0433\u0435\u043d\u0435\u0440\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0430\u0434\u0440\u0435\u0441 \u0437\u0430 \u043e\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u044f.",
             "authorize_url_timeout": "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0433\u0435\u043d\u0435\u0440\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0430\u0434\u0440\u0435\u0441 \u0437\u0430 \u043e\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u044f \u0432 \u0441\u0440\u043e\u043a.",
diff --git a/homeassistant/components/tellduslive/.translations/ca.json b/homeassistant/components/tellduslive/.translations/ca.json
index 437b9b460d2..fafa8798401 100644
--- a/homeassistant/components/tellduslive/.translations/ca.json
+++ b/homeassistant/components/tellduslive/.translations/ca.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive ja est\u00e0 configurat",
             "already_setup": "TelldusLive ja est\u00e0 configurat",
             "authorize_url_fail": "S'ha produ\u00eft un error desconegut al generar l'URL d'autoritzaci\u00f3.",
             "authorize_url_timeout": "S'ha acabat el temps d'espera mentre \u00e9s generava l'URL d'autoritzaci\u00f3.",
diff --git a/homeassistant/components/tellduslive/.translations/da.json b/homeassistant/components/tellduslive/.translations/da.json
index 717e3ec5ac9..895570c3698 100644
--- a/homeassistant/components/tellduslive/.translations/da.json
+++ b/homeassistant/components/tellduslive/.translations/da.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive er allerede konfigureret",
             "already_setup": "TelldusLive er allerede konfigureret",
             "authorize_url_fail": "Ukendt fejl ved generering af en autoriseret url.",
             "authorize_url_timeout": "Timeout ved generering af autoriseret url.",
diff --git a/homeassistant/components/tellduslive/.translations/de.json b/homeassistant/components/tellduslive/.translations/de.json
index 6c094ed6a8c..18c3e88666e 100644
--- a/homeassistant/components/tellduslive/.translations/de.json
+++ b/homeassistant/components/tellduslive/.translations/de.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive ist bereits konfiguriert",
             "already_setup": "TelldusLive ist bereits konfiguriert",
             "authorize_url_fail": "Unbekannter Fehler beim Erstellen der Authorisierungs-URL",
             "authorize_url_timeout": "Zeit\u00fcberschreitung beim Erstellen der Authorisierungs-URL.",
diff --git a/homeassistant/components/tellduslive/.translations/en.json b/homeassistant/components/tellduslive/.translations/en.json
index c2b00561858..4ed9ef597f4 100644
--- a/homeassistant/components/tellduslive/.translations/en.json
+++ b/homeassistant/components/tellduslive/.translations/en.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive is already configured",
             "already_setup": "TelldusLive is already configured",
             "authorize_url_fail": "Unknown error generating an authorize url.",
             "authorize_url_timeout": "Timeout generating authorize url.",
diff --git a/homeassistant/components/tellduslive/.translations/es-419.json b/homeassistant/components/tellduslive/.translations/es-419.json
index bf74d104835..503530e728a 100644
--- a/homeassistant/components/tellduslive/.translations/es-419.json
+++ b/homeassistant/components/tellduslive/.translations/es-419.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive ya est\u00e1 configurado",
             "already_setup": "TelldusLive ya est\u00e1 configurado",
             "unknown": "Se produjo un error desconocido"
         },
diff --git a/homeassistant/components/tellduslive/.translations/es.json b/homeassistant/components/tellduslive/.translations/es.json
index 6b3cea7f484..b0313a1eee3 100644
--- a/homeassistant/components/tellduslive/.translations/es.json
+++ b/homeassistant/components/tellduslive/.translations/es.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive ya est\u00e1 configurado",
             "already_setup": "TelldusLive ya est\u00e1 configurado",
             "authorize_url_fail": "Error desconocido generando la url de autorizaci\u00f3n",
             "authorize_url_timeout": "Tiempo de espera agotado generando la url de autorizaci\u00f3n",
diff --git a/homeassistant/components/tellduslive/.translations/fr.json b/homeassistant/components/tellduslive/.translations/fr.json
index a7ddd4c6fa6..70f4ef6f1d9 100644
--- a/homeassistant/components/tellduslive/.translations/fr.json
+++ b/homeassistant/components/tellduslive/.translations/fr.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive est d\u00e9j\u00e0 configur\u00e9",
             "already_setup": "TelldusLive est d\u00e9j\u00e0 configur\u00e9",
             "authorize_url_fail": "Erreur inconnue lors de la g\u00e9n\u00e9ration d'une URL d'autorisation.",
             "authorize_url_timeout": "D\u00e9lai de g\u00e9n\u00e9ration de l'URL d'authentification d\u00e9pass\u00e9.",
diff --git a/homeassistant/components/tellduslive/.translations/hu.json b/homeassistant/components/tellduslive/.translations/hu.json
index cd219be04e1..8519f02ef5b 100644
--- a/homeassistant/components/tellduslive/.translations/hu.json
+++ b/homeassistant/components/tellduslive/.translations/hu.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "A TelldusLive-ot m\u00e1r be\u00e1ll\u00edtottuk.",
             "already_setup": "A TelldusLive m\u00e1r be van \u00e1ll\u00edtva",
             "authorize_url_fail": "Ismeretlen hiba t\u00f6rt\u00e9nt a hiteles\u00edt\u00e9si link gener\u00e1l\u00e1sa sor\u00e1n.",
             "authorize_url_timeout": "Id\u0151t\u00fall\u00e9p\u00e9s az \u00e9rv\u00e9nyes\u00edt\u00e9si url gener\u00e1l\u00e1sa sor\u00e1n.",
diff --git a/homeassistant/components/tellduslive/.translations/it.json b/homeassistant/components/tellduslive/.translations/it.json
index 90f13184a67..3baa307de51 100644
--- a/homeassistant/components/tellduslive/.translations/it.json
+++ b/homeassistant/components/tellduslive/.translations/it.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive \u00e8 gi\u00e0 configurato",
             "already_setup": "TelldusLive \u00e8 gi\u00e0 configurato",
             "authorize_url_fail": "Errore sconosciuto nel generare l'url di autorizzazione",
             "authorize_url_timeout": "Tempo scaduto nel generare l'url di autorizzazione",
diff --git a/homeassistant/components/tellduslive/.translations/ko.json b/homeassistant/components/tellduslive/.translations/ko.json
index 6b04e867861..10e289f2520 100644
--- a/homeassistant/components/tellduslive/.translations/ko.json
+++ b/homeassistant/components/tellduslive/.translations/ko.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive \uac00 \uc774\ubbf8 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4",
             "already_setup": "TelldusLive \uac00 \uc774\ubbf8 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4",
             "authorize_url_fail": "\uc778\uc99d url \uc0dd\uc131\uc5d0 \uc54c \uc218 \uc5c6\ub294 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.",
             "authorize_url_timeout": "\uc778\uc99d url \uc0dd\uc131 \uc2dc\uac04\uc774 \ucd08\uacfc\ub418\uc5c8\uc2b5\ub2c8\ub2e4.",
diff --git a/homeassistant/components/tellduslive/.translations/lb.json b/homeassistant/components/tellduslive/.translations/lb.json
index 4584635066c..a01436f9ba8 100644
--- a/homeassistant/components/tellduslive/.translations/lb.json
+++ b/homeassistant/components/tellduslive/.translations/lb.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive ass scho konfigur\u00e9iert",
             "already_setup": "TelldusLive ass scho konfigur\u00e9iert",
             "authorize_url_fail": "Onbekannte Feeler beim gener\u00e9ieren vun der Autorisatiouns URL.",
             "authorize_url_timeout": "Z\u00e4it Iwwerschreidung beim gener\u00e9ieren vun der Autorisatiouns URL.",
diff --git a/homeassistant/components/tellduslive/.translations/nl.json b/homeassistant/components/tellduslive/.translations/nl.json
index a1029d991fe..fac9475f6f3 100644
--- a/homeassistant/components/tellduslive/.translations/nl.json
+++ b/homeassistant/components/tellduslive/.translations/nl.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive is al geconfigureerd",
             "already_setup": "TelldusLive is al geconfigureerd",
             "authorize_url_fail": "Onbekende fout bij het genereren van een autorisatie url.",
             "authorize_url_timeout": "Time-out tijdens genereren autorisatie url.",
diff --git a/homeassistant/components/tellduslive/.translations/no.json b/homeassistant/components/tellduslive/.translations/no.json
index 2c6439b364f..d311b3b0d38 100644
--- a/homeassistant/components/tellduslive/.translations/no.json
+++ b/homeassistant/components/tellduslive/.translations/no.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive er allerede konfigurert",
             "already_setup": "TelldusLive er allerede konfigurert",
             "authorize_url_fail": "Ukjent feil ved generering av autoriseringsadresse.",
             "authorize_url_timeout": "Tidsavbrudd ved generering av autoriseringsadresse.",
diff --git a/homeassistant/components/tellduslive/.translations/pl.json b/homeassistant/components/tellduslive/.translations/pl.json
index 9d791e0e786..06391b24b99 100644
--- a/homeassistant/components/tellduslive/.translations/pl.json
+++ b/homeassistant/components/tellduslive/.translations/pl.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive jest ju\u017c skonfigurowany",
             "already_setup": "TelldusLive jest ju\u017c skonfigurowany",
             "authorize_url_fail": "Nieznany b\u0142\u0105d podczas generowania url autoryzacji.",
             "authorize_url_timeout": "Min\u0105\u0142 limit czasu generowania url autoryzacji.",
diff --git a/homeassistant/components/tellduslive/.translations/pt-BR.json b/homeassistant/components/tellduslive/.translations/pt-BR.json
index 4a3983facf6..2183b9068b8 100644
--- a/homeassistant/components/tellduslive/.translations/pt-BR.json
+++ b/homeassistant/components/tellduslive/.translations/pt-BR.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive j\u00e1 est\u00e1 configurado",
             "already_setup": "TelldusLive j\u00e1 est\u00e1 configurado",
             "authorize_url_fail": "Erro desconhecido ao gerar um URL de autoriza\u00e7\u00e3o.",
             "authorize_url_timeout": "Tempo limite de gera\u00e7\u00e3o de url de autoriza\u00e7\u00e3o.",
diff --git a/homeassistant/components/tellduslive/.translations/pt.json b/homeassistant/components/tellduslive/.translations/pt.json
index a13f71f7505..9f8134ed07d 100644
--- a/homeassistant/components/tellduslive/.translations/pt.json
+++ b/homeassistant/components/tellduslive/.translations/pt.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive j\u00e1 est\u00e1 configurado",
             "already_setup": "TelldusLive j\u00e1 est\u00e1 configurado",
             "authorize_url_fail": "Erro desconhecido ao gerar um URL de autoriza\u00e7\u00e3o.",
             "authorize_url_timeout": "Limite temporal ultrapassado ao gerar um URL de autoriza\u00e7\u00e3o.",
diff --git a/homeassistant/components/tellduslive/.translations/ru.json b/homeassistant/components/tellduslive/.translations/ru.json
index 3b34e048b11..afaaf4edbf5 100644
--- a/homeassistant/components/tellduslive/.translations/ru.json
+++ b/homeassistant/components/tellduslive/.translations/ru.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430",
             "already_setup": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430",
             "authorize_url_fail": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438 \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
             "authorize_url_timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438 \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
diff --git a/homeassistant/components/tellduslive/.translations/sl.json b/homeassistant/components/tellduslive/.translations/sl.json
index 16e6ddcb5f4..7e0a8d28b9a 100644
--- a/homeassistant/components/tellduslive/.translations/sl.json
+++ b/homeassistant/components/tellduslive/.translations/sl.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive je \u017ee konfiguriran",
             "already_setup": "TelldusLive je \u017ee konfiguriran",
             "authorize_url_fail": "Neznana napaka pri generiranju potrditvenega URL-ja.",
             "authorize_url_timeout": "\u010casovna omejitev za generiranje URL-ja je potekla.",
diff --git a/homeassistant/components/tellduslive/.translations/sv.json b/homeassistant/components/tellduslive/.translations/sv.json
index 5636e137948..809132e01b0 100644
--- a/homeassistant/components/tellduslive/.translations/sv.json
+++ b/homeassistant/components/tellduslive/.translations/sv.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "Telldus Live! \u00e4r redan konfigurerad",
             "already_setup": "Telldus Live! \u00e4r redan konfigurerad",
             "authorize_url_fail": "Ok\u00e4nt fel n\u00e4r genererar en url f\u00f6r att auktorisera.",
             "authorize_url_timeout": "Timeout n\u00e4r genererar auktorisera url.",
diff --git a/homeassistant/components/tellduslive/.translations/zh-Hans.json b/homeassistant/components/tellduslive/.translations/zh-Hans.json
index e447fcf92ef..657722f7f13 100644
--- a/homeassistant/components/tellduslive/.translations/zh-Hans.json
+++ b/homeassistant/components/tellduslive/.translations/zh-Hans.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "Tellduslive \u5df2\u914d\u7f6e\u5b8c\u6210",
             "already_setup": "TelldusLive \u5df2\u914d\u7f6e\u5b8c\u6210",
             "authorize_url_fail": "\u751f\u6210\u6388\u6743\u7f51\u5740\u65f6\u53d1\u751f\u672a\u77e5\u9519\u8bef\u3002",
             "authorize_url_timeout": "\u751f\u6210\u6388\u6743\u7f51\u5740\u8d85\u65f6\u3002",
diff --git a/homeassistant/components/tellduslive/.translations/zh-Hant.json b/homeassistant/components/tellduslive/.translations/zh-Hant.json
index c95e96b21c9..23093d247ee 100644
--- a/homeassistant/components/tellduslive/.translations/zh-Hant.json
+++ b/homeassistant/components/tellduslive/.translations/zh-Hant.json
@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "all_configured": "TelldusLive \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "already_setup": "TelldusLive \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "authorize_url_fail": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u767c\u751f\u672a\u77e5\u932f\u8aa4",
             "authorize_url_timeout": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u903e\u6642",
diff --git a/homeassistant/components/twentemilieu/.translations/en.json b/homeassistant/components/twentemilieu/.translations/en.json
index deabeeeb835..ce969a4f464 100644
--- a/homeassistant/components/twentemilieu/.translations/en.json
+++ b/homeassistant/components/twentemilieu/.translations/en.json
@@ -1,23 +1,23 @@
 {
     "config": {
-        "title": "Twente Milieu",
-        "step": {
-            "user": {
-                "title": "Twente Milieu",
-                "description": "Set up Twente Milieu providing waste collection information on your address.",
-                "data": {
-                    "post_code": "Postal code",
-                    "house_number": "House number",
-                    "house_letter": "House letter/additional"
-                }
-            }
+        "abort": {
+            "address_exists": "Address already set up."
         },
         "error": {
             "connection_error": "Failed to connect.",
             "invalid_address": "Address not found in Twente Milieu service area."
         },
-        "abort": {
-            "address_already_set_up": "Address already set up."
-        }
+        "step": {
+            "user": {
+                "data": {
+                    "house_letter": "House letter/additional",
+                    "house_number": "House number",
+                    "post_code": "Postal code"
+                },
+                "description": "Set up Twente Milieu providing waste collection information on your address.",
+                "title": "Twente Milieu"
+            }
+        },
+        "title": "Twente Milieu"
     }
-}
+}
\ No newline at end of file
diff --git a/homeassistant/components/twentemilieu/strings.json b/homeassistant/components/twentemilieu/strings.json
index b94b7146d2c..811ecdbfa6e 100644
--- a/homeassistant/components/twentemilieu/strings.json
+++ b/homeassistant/components/twentemilieu/strings.json
@@ -20,4 +20,4 @@
             "address_exists": "Address already set up."
         }
     }
-}
+}
\ No newline at end of file
diff --git a/homeassistant/components/upnp/.translations/da.json b/homeassistant/components/upnp/.translations/da.json
index 1d0097c2f1f..778834d24eb 100644
--- a/homeassistant/components/upnp/.translations/da.json
+++ b/homeassistant/components/upnp/.translations/da.json
@@ -8,10 +8,6 @@
             "no_sensors_or_port_mapping": "Aktiv\u00e9r enten sensorer eller porttilknytning",
             "single_instance_allowed": "Det er kun n\u00f8dvendigt med en ops\u00e6tning af UPnP/IGD."
         },
-        "error": {
-            "one": "En",
-            "other": "Anden"
-        },
         "step": {
             "confirm": {
                 "description": "Er du sikker p\u00e5 at du vil konfigurere UPnP/IGD?",
diff --git a/homeassistant/components/upnp/.translations/de.json b/homeassistant/components/upnp/.translations/de.json
index 907bfffbeea..51faf56367d 100644
--- a/homeassistant/components/upnp/.translations/de.json
+++ b/homeassistant/components/upnp/.translations/de.json
@@ -8,10 +8,6 @@
             "no_sensors_or_port_mapping": "Aktiviere mindestens Sensoren oder Port-Mapping",
             "single_instance_allowed": "Es ist nur eine einzige Konfiguration von UPnP/IGD erforderlich."
         },
-        "error": {
-            "one": "Ein",
-            "other": "andere"
-        },
         "step": {
             "confirm": {
                 "description": "M\u00f6chten Sie UPnP/IGD einrichten?",
diff --git a/homeassistant/components/upnp/.translations/es.json b/homeassistant/components/upnp/.translations/es.json
index fa299cc379f..99b1065fb89 100644
--- a/homeassistant/components/upnp/.translations/es.json
+++ b/homeassistant/components/upnp/.translations/es.json
@@ -8,10 +8,6 @@
             "no_sensors_or_port_mapping": "Habilitar al menos sensores o mapeo de puertos",
             "single_instance_allowed": "S\u00f3lo se necesita una configuraci\u00f3n de UPnP/IGD."
         },
-        "error": {
-            "one": "UNO",
-            "other": "OTRO"
-        },
         "step": {
             "confirm": {
                 "description": "\u00bfDesea configurar UPnP/IGD?",
diff --git a/homeassistant/components/upnp/.translations/hu.json b/homeassistant/components/upnp/.translations/hu.json
index 29dab5e09da..b4785f2f625 100644
--- a/homeassistant/components/upnp/.translations/hu.json
+++ b/homeassistant/components/upnp/.translations/hu.json
@@ -7,10 +7,6 @@
             "no_devices_found": "Nincsenek UPnPIGD eszk\u00f6z\u00f6k a h\u00e1l\u00f3zaton.",
             "single_instance_allowed": "Csak egy UPnP / IGD konfigur\u00e1ci\u00f3 sz\u00fcks\u00e9ges."
         },
-        "error": {
-            "one": "hiba",
-            "other": ""
-        },
         "step": {
             "confirm": {
                 "description": "Be szeretn\u00e9d \u00e1ll\u00edtani a UPnP/IGD-t?",
diff --git a/homeassistant/components/upnp/.translations/lb.json b/homeassistant/components/upnp/.translations/lb.json
index 029e1e87cf1..55d41e588f6 100644
--- a/homeassistant/components/upnp/.translations/lb.json
+++ b/homeassistant/components/upnp/.translations/lb.json
@@ -8,10 +8,6 @@
             "no_sensors_or_port_mapping": "Aktiv\u00e9ier op mannst Sensoren oder Port Mapping",
             "single_instance_allowed": "N\u00ebmmen eng eenzeg Konfiguratioun vun UPnP/IGD ass n\u00e9ideg."
         },
-        "error": {
-            "one": "Een",
-            "other": "Aaner"
-        },
         "step": {
             "confirm": {
                 "description": "Soll UPnP/IGD konfigur\u00e9iert ginn?",
diff --git a/homeassistant/components/upnp/.translations/nl.json b/homeassistant/components/upnp/.translations/nl.json
index a94471bb610..5d426f2edaf 100644
--- a/homeassistant/components/upnp/.translations/nl.json
+++ b/homeassistant/components/upnp/.translations/nl.json
@@ -8,10 +8,6 @@
             "no_sensors_or_port_mapping": "Schakel ten minste sensoren of poorttoewijzing in",
             "single_instance_allowed": "Er is slechts \u00e9\u00e9n configuratie van UPnP/IGD nodig."
         },
-        "error": {
-            "one": "Een",
-            "other": "Ander"
-        },
         "step": {
             "confirm": {
                 "description": "Wilt u UPnP/IGD instellen?",
diff --git a/homeassistant/components/upnp/.translations/nn.json b/homeassistant/components/upnp/.translations/nn.json
index 286efcf0353..63339244116 100644
--- a/homeassistant/components/upnp/.translations/nn.json
+++ b/homeassistant/components/upnp/.translations/nn.json
@@ -3,10 +3,6 @@
         "abort": {
             "no_sensors_or_port_mapping": "I det minste, aktiver sensor eller portkartlegging"
         },
-        "error": {
-            "one": "Ein",
-            "other": "Andre"
-        },
         "step": {
             "init": {
                 "title": "UPnP / IGD"
diff --git a/homeassistant/components/upnp/.translations/no.json b/homeassistant/components/upnp/.translations/no.json
index 813509121e3..b3b6ef17366 100644
--- a/homeassistant/components/upnp/.translations/no.json
+++ b/homeassistant/components/upnp/.translations/no.json
@@ -8,14 +8,6 @@
             "no_sensors_or_port_mapping": "Aktiver minst sensorer eller port mapping",
             "single_instance_allowed": "Bare en enkelt konfigurasjon av UPnP / IGD er n\u00f8dvendig."
         },
-        "error": {
-            "few": "f\u00e5",
-            "many": "mange",
-            "one": "en",
-            "other": "andre",
-            "two": "to",
-            "zero": "ingen"
-        },
         "step": {
             "confirm": {
                 "description": "\u00d8nsker du \u00e5 konfigurere UPnP / IGD?",
diff --git a/homeassistant/components/upnp/.translations/pl.json b/homeassistant/components/upnp/.translations/pl.json
index d7ede44d22d..94823bd90d3 100644
--- a/homeassistant/components/upnp/.translations/pl.json
+++ b/homeassistant/components/upnp/.translations/pl.json
@@ -8,12 +8,6 @@
             "no_sensors_or_port_mapping": "W\u0142\u0105cz przynajmniej sensory lub mapowanie port\u00f3w",
             "single_instance_allowed": "Wymagana jest tylko jedna konfiguracja UPnP/IGD."
         },
-        "error": {
-            "few": "kilka",
-            "many": "wiele",
-            "one": "jeden",
-            "other": "inne"
-        },
         "step": {
             "confirm": {
                 "description": "Czy chcesz skonfigurowa\u0107 UPnP/IGD?",
diff --git a/homeassistant/components/upnp/.translations/pt.json b/homeassistant/components/upnp/.translations/pt.json
index d559a05ff23..698a0d98f3d 100644
--- a/homeassistant/components/upnp/.translations/pt.json
+++ b/homeassistant/components/upnp/.translations/pt.json
@@ -8,10 +8,6 @@
             "no_sensors_or_port_mapping": "Ative pelo menos os sensores ou o mapeamento de porta",
             "single_instance_allowed": "Apenas uma \u00fanica configura\u00e7\u00e3o do UPnP/IGD \u00e9 necess\u00e1ria."
         },
-        "error": {
-            "one": "um",
-            "other": "v\u00e1rios"
-        },
         "step": {
             "confirm": {
                 "description": "Deseja configurar o UPnP / IGD?",
diff --git a/homeassistant/components/upnp/.translations/ro.json b/homeassistant/components/upnp/.translations/ro.json
index bb584da05dc..1a328adb9ef 100644
--- a/homeassistant/components/upnp/.translations/ro.json
+++ b/homeassistant/components/upnp/.translations/ro.json
@@ -4,11 +4,6 @@
             "already_configured": "UPnP/IGD este deja configurat",
             "no_devices_discovered": "Nu au fost descoperite UPnP/IGD-uri"
         },
-        "error": {
-            "few": "",
-            "one": "Unul",
-            "other": ""
-        },
         "step": {
             "init": {
                 "title": "UPnP/IGD"
diff --git a/homeassistant/components/upnp/.translations/sl.json b/homeassistant/components/upnp/.translations/sl.json
index 4c019d8f207..b31a7e792ea 100644
--- a/homeassistant/components/upnp/.translations/sl.json
+++ b/homeassistant/components/upnp/.translations/sl.json
@@ -8,12 +8,6 @@
             "no_sensors_or_port_mapping": "Omogo\u010dite vsaj senzorje ali preslikavo vrat (port mapping)",
             "single_instance_allowed": "Potrebna je samo ena konfiguracija UPnp/IGD."
         },
-        "error": {
-            "few": "nekaj",
-            "one": "ena",
-            "other": "ve\u010d",
-            "two": "dve"
-        },
         "step": {
             "confirm": {
                 "description": "Ali \u017eelite nastaviti UPnp/IGD?",
diff --git a/homeassistant/components/upnp/.translations/sv.json b/homeassistant/components/upnp/.translations/sv.json
index e3864aee4da..c2447be1216 100644
--- a/homeassistant/components/upnp/.translations/sv.json
+++ b/homeassistant/components/upnp/.translations/sv.json
@@ -8,10 +8,6 @@
             "no_sensors_or_port_mapping": "Aktivera minst sensorer eller portmappning",
             "single_instance_allowed": "Endast en enda konfiguration av UPnP/IGD \u00e4r n\u00f6dv\u00e4ndig."
         },
-        "error": {
-            "one": "En",
-            "other": "Andra"
-        },
         "step": {
             "confirm": {
                 "description": "Vill du konfigurera UPnP/IGD?",
diff --git a/homeassistant/components/upnp/strings.json b/homeassistant/components/upnp/strings.json
index f4de9ad4c0d..6c5b2fb2bb2 100644
--- a/homeassistant/components/upnp/strings.json
+++ b/homeassistant/components/upnp/strings.json
@@ -1,15 +1,30 @@
 {
-  "config": {
-    "title": "UPnP/IGD",
-    "step": {
-      "confirm": {
+    "config": {
         "title": "UPnP/IGD",
-        "description": "Do you want to set up UPnP/IGD?"
-      }
-    },
-    "abort": {
-      "single_instance_allowed": "Only a single configuration of UPnP/IGD is necessary.",
-      "no_devices_found": "No UPnP/IGD devices found on the network."
+        "step": {
+            "init": {
+                "title": "UPnP/IGD"
+            },
+            "confirm": {
+                "title": "UPnP/IGD",
+                "description": "Do you want to set up UPnP/IGD?"
+            },
+            "user": {
+                "title": "Configuration options for the UPnP/IGD",
+                "data": {
+                    "enable_port_mapping": "Enable port mapping for Home Assistant",
+                    "enable_sensors": "Add traffic sensors",
+                    "igd": "UPnP/IGD"
+                }
+            }
+        },
+        "abort": {
+            "already_configured": "UPnP/IGD is already configured",
+            "incomplete_device": "Ignoring incomplete UPnP device",
+            "no_devices_discovered": "No UPnP/IGDs discovered",
+            "no_devices_found": "No UPnP/IGD devices found on the network.",
+            "no_sensors_or_port_mapping": "Enable at least sensors or port mapping",
+            "single_instance_allowed": "Only a single configuration of UPnP/IGD is necessary."
+        }
     }
-  }
-}
+}
\ No newline at end of file
diff --git a/homeassistant/components/vesync/.translations/en.json b/homeassistant/components/vesync/.translations/en.json
index ec0bc728cdb..cd8b3e59cbf 100644
--- a/homeassistant/components/vesync/.translations/en.json
+++ b/homeassistant/components/vesync/.translations/en.json
@@ -1,20 +1,20 @@
 {
     "config": {
-        "title": "VeSync",
-        "step": {
-            "user": {
-                "title": "Enter Username and Password",
-                "data": {
-                    "username": "Email Address",
-                    "password": "Password"
-                }
-            }
+        "abort": {
+            "already_setup": "Only one Vesync instance is allowed"
         },
         "error": {
             "invalid_login": "Invalid username or password"
         },
-        "abort": {
-            "already_setup": "Only one Vesync instance is allow"
-        }
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Password",
+                    "username": "Email Address"
+                },
+                "title": "Enter Username and Password"
+            }
+        },
+        "title": "VeSync"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/vesync/strings.json b/homeassistant/components/vesync/strings.json
index f28d7d0d0c2..2d808e85bea 100644
--- a/homeassistant/components/vesync/strings.json
+++ b/homeassistant/components/vesync/strings.json
@@ -1,20 +1,20 @@
 {
-  "config": {
-    "title": "VeSync",
-    "step": {
-      "user": {
-        "title": "Enter Username and Password",
-        "data": {
-          "username": "Email Address",
-          "password": "Password"
+    "config": {
+        "title": "VeSync",
+        "step": {
+            "user": {
+                "title": "Enter Username and Password",
+                "data": {
+                    "username": "Email Address",
+                    "password": "Password"
+                }
+            }
+        },
+        "error": {
+            "invalid_login": "Invalid username or password"
+        },
+        "abort": {
+            "already_setup": "Only one Vesync instance is allowed"
         }
-      }
-    },
-    "error": {
-      "invalid_login": "Invalid username or password"
-    },
-    "abort": {
-      "already_setup": "Only one Vesync instance is allowed"
     }
-  }
 }
\ No newline at end of file
diff --git a/homeassistant/components/zha/strings.json b/homeassistant/components/zha/strings.json
index aacfd2a0d96..e1ed6a678e3 100644
--- a/homeassistant/components/zha/strings.json
+++ b/homeassistant/components/zha/strings.json
@@ -1,21 +1,20 @@
 {
-  "config": {
-    "title": "ZHA",
-    "step": {
-      "user": {
+    "config": {
         "title": "ZHA",
-        "description": "",
-        "data": {
-          "usb_path": "USB Device Path",
-          "radio_type": "Radio Type"
+        "step": {
+            "user": {
+                "title": "ZHA",
+                "data": {
+                    "radio_type": "Radio Type",
+                    "usb_path": "USB Device Path"
+                }
+            }
+        },
+        "error": {
+            "cannot_connect": "Unable to connect to ZHA device."
+        },
+        "abort": {
+            "single_instance_allowed": "Only a single configuration of ZHA is allowed."
         }
-      }
-    },
-    "abort": {
-      "single_instance_allowed": "Only a single configuration of ZHA is allowed."
-    },
-    "error": {
-      "cannot_connect": "Unable to connect to ZHA device."
     }
-  }
-}
+}
\ No newline at end of file