From 021ae5c4cd7580298139345b74d3b11fafa35313 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 29 Mar 2023 16:13:36 +0200 Subject: [PATCH] Properly fix recycling types --- assets/layers/recycling/recycling.json | 52 ++++++------- langs/layers/ca.json | 10 ++- langs/layers/de.json | 9 +-- langs/layers/en.json | 12 +-- langs/layers/es.json | 5 +- langs/layers/it.json | 9 +-- langs/layers/nl.json | 12 +-- langs/themes/ca.json | 102 ------------------------- langs/themes/cs.json | 102 ------------------------- langs/themes/de.json | 102 ------------------------- 10 files changed, 45 insertions(+), 370 deletions(-) diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json index c4f956452..c278dfb33 100644 --- a/assets/layers/recycling/recycling.json +++ b/assets/layers/recycling/recycling.json @@ -942,12 +942,8 @@ "if": "recycling:printer_cartridges=yes", "ifnot": "recycling:printer_cartridges=", "then": { - "en": "Scrap metal can be recycled here", - "nl": "Oud metaal kan hier gerecycled worden", - "ca": "Aquí es pot reciclar ferralla", - "de": "Metallschrott kann hier recycelt werden", - "es": "Aquí se puede reciclar chatarra", - "it": "Rottami metallici" + "en": "Printer cartridges can be recycled here", + "nl": "Inktpatronen kunnen hier gerecycleerd worden" }, "icon": { "path": "./assets/layers/recycling/printer_cartridges.svg", @@ -958,12 +954,12 @@ "if": "recycling:scrap_metal=yes", "ifnot": "recycling:scrap_metal=", "then": { - "en": "Shoes can be recycled here", - "nl": "Schoenen kunnen hier gerecycled worden", - "de": "Schuhe können hier recycelt werden", - "es": "Aquí se pueden reciclar zapatos", - "it": "Scarpe", - "ca": "Aquí es poden reciclar sabates" + "en": "Scrap metal can be recycled here", + "nl": "Oud metaal kan hier gerecycled worden", + "ca": "Aquí es pot reciclar ferralla", + "de": "Metallschrott kann hier recycelt werden", + "es": "Aquí se puede reciclar chatarra", + "it": "Rottami metallici" }, "icon": { "path": "./assets/layers/recycling/scrap_metal.svg", @@ -974,12 +970,12 @@ "if": "recycling:shoes=yes", "ifnot": "recycling:shoes=", "then": { - "en": "Small electrical appliances can be recycled here", - "nl": "Kleine elektrische apparaten kunnen hier gerecycled worden", - "de": "Elektrokleingeräte können hier recycelt werden", + "en": "Shoes can be recycled here", + "nl": "Schoenen kunnen hier gerecycled worden", + "de": "Schuhe können hier recycelt werden", "es": "Aquí se pueden reciclar zapatos", - "it": "Piccoli elettrodomestici", - "ca": "Aquí es poden reciclar petits aparells electrònics" + "it": "Scarpe", + "ca": "Aquí es poden reciclar sabates" }, "icon": { "path": "./assets/layers/recycling/shoes.svg", @@ -1005,11 +1001,11 @@ "if": "recycling:small_electrical_appliances=yes", "ifnot": "recycling:small_electrical_appliances=", "then": { - "en": "Needles can be recycled here", - "nl": "Injectienaalden kunnen hier gerecycled worden", - "de": "Nadeln können hier recycelt werden", - "it": "Aghi e oggetti appuntiti", - "ca": "Aquí es poden reciclar agulles" + "en": "Small electrical appliances can be recycled here", + "nl": "Kleine elektrische apparaten kunnen hier gerecycled worden", + "de": "Elektrokleingeräte können hier recycelt werden", + "it": "Piccoli elettrodomestici", + "ca": "Aquí es poden reciclar petits aparells elèctrics" }, "hideInAnswer": true, "icon": { @@ -1021,11 +1017,11 @@ "if": "recycling:needles=yes", "ifnot": "recycling:needles=", "then": { - "en": "Residual waste can be recycled here", - "nl": "Restafval kan hier gerecycled worden", - "de": "Restmüll kann hier recycelt werden", - "it": "Secco", - "ca": "Ací es pot reciclar el rebuig" + "en": "Needles can be recycled here", + "nl": "Injectienaalden kunnen hier gerecycled worden", + "de": "Nadeln können hier recycelt werden", + "it": "Aghi e oggetti appuntiti", + "ca": "Aquí es poden reciclar agulles" } }, { @@ -1390,4 +1386,4 @@ "enableRelocation": true, "enableImproveAccuracy": true } -} \ No newline at end of file +} diff --git a/langs/layers/ca.json b/langs/layers/ca.json index 2f286e18d..36da9a856 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -3337,15 +3337,21 @@ "16": { "then": "Aquí es pot reciclar plàstic" }, + "18": { + "then": "Aquí es pot reciclar ferralla" + }, "19": { "then": "Aquí es poden reciclar sabates" }, "20": { - "then": "Aquí es poden reciclar petits aparells electrònics" + "then": "Aquí es poden reciclar petits aparells elèctrics" }, "21": { "then": "Aquí es poden reciclar petits aparells elèctrics" }, + "22": { + "then": "Aquí es poden reciclar agulles" + }, "23": { "then": "Ací es pot reciclar el rebuig" } @@ -4334,4 +4340,4 @@ } } } -} +} \ No newline at end of file diff --git a/langs/layers/de.json b/langs/layers/de.json index a50e9ef13..bf7f97282 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -6710,13 +6710,13 @@ "16": { "question": "Recycling von Kunststoffen" }, - "18": { + "17": { "question": "Recycling von Metallschrott" }, - "19": { + "18": { "question": "Recycling von Elektrokleingeräten" }, - "20": { + "19": { "question": "Recycling von Restabfällen" }, "20": { @@ -6848,9 +6848,6 @@ "22": { "then": "Nadeln können hier recycelt werden" }, - "23": { - "then": "Restmüll kann hier recycelt werden" - }, "23": { "then": "Restmüll kann hier recycelt werden" } diff --git a/langs/layers/en.json b/langs/layers/en.json index cabdb1be0..02be7a033 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -6711,15 +6711,12 @@ "question": "Recycling of plastic" }, "17": { - "question": "Recycling of printer cartridges" - }, - "18": { "question": "Recycling of scrap metal" }, - "19": { + "18": { "question": "Recycling of small electrical appliances" }, - "20": { + "19": { "question": "Recycling of residual waste" }, "20": { @@ -6837,7 +6834,7 @@ "then": "Plastic can be recycled here" }, "17": { - "then": "Printer cartridges (inkjet/toner) can be recycled here" + "then": "Printer cartridges can be recycled here" }, "18": { "then": "Scrap metal can be recycled here" @@ -6854,9 +6851,6 @@ "22": { "then": "Needles can be recycled here" }, - "23": { - "then": "Residual waste can be recycled here" - }, "23": { "then": "Residual waste can be recycled here" } diff --git a/langs/layers/es.json b/langs/layers/es.json index 6467db790..a0d335599 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -3228,7 +3228,7 @@ "16": { "question": "Reciclaje de plástico" }, - "18": { + "17": { "question": "Reciclaje de chatarra" }, "18": { @@ -3314,9 +3314,6 @@ "18": { "then": "Aquí se puede reciclar chatarra" }, - "19": { - "then": "Aquí se pueden reciclar zapatos" - }, "19": { "then": "Aquí se pueden reciclar zapatos" } diff --git a/langs/layers/it.json b/langs/layers/it.json index 7a7466483..6e48ce23b 100644 --- a/langs/layers/it.json +++ b/langs/layers/it.json @@ -1790,13 +1790,13 @@ "16": { "question": "Riciclo di plastica" }, - "18": { + "17": { "question": "Riciclo di rottami metallici" }, - "19": { + "18": { "question": "Riciclo di piccoli elettrodomestici" }, - "20": { + "19": { "question": "Riciclo di secco" }, "20": { @@ -1907,9 +1907,6 @@ "22": { "then": "Aghi e oggetti appuntiti" }, - "23": { - "then": "Secco" - }, "23": { "then": "Secco" } diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 296744a53..992fc3349 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -6497,15 +6497,12 @@ "question": "Recycling van plastic" }, "17": { - "question": "Recycling van printer cartridges" - }, - "18": { "question": "Recycling van oud metaal" }, - "19": { + "18": { "question": "Recycling van kleine elektrische apparaten" }, - "20": { + "19": { "question": "Recycling van restafval" }, "20": { @@ -6623,7 +6620,7 @@ "then": "Plastic kan hier gerecycled worden" }, "17": { - "then": "Printer cartridges (inkjet/toner) kunnen hier gerecycled worden" + "then": "Inktpatronen kunnen hier gerecycleerd worden" }, "18": { "then": "Oud metaal kan hier gerecycled worden" @@ -6640,9 +6637,6 @@ "22": { "then": "Injectienaalden kunnen hier gerecycled worden" }, - "23": { - "then": "Restafval kan hier gerecycled worden" - }, "23": { "then": "Restafval kan hier gerecycled worden" } diff --git a/langs/themes/ca.json b/langs/themes/ca.json index 56889641c..9aa7e19d1 100644 --- a/langs/themes/ca.json +++ b/langs/themes/ca.json @@ -984,108 +984,6 @@ "description": "Un mapa amb voreres i encreuaments.", "title": "Vorals i encreuaments" }, - "mapcomplete-changes": { - "description": "Aquest mapa mostra tots els canvis fets amb MapComplete", - "layers": { - "0": { - "description": "Mostra tots els canvis de MapComplete", - "filter": { - "0": { - "options": { - "0": { - "question": "El tema conté {search}" - } - } - }, - "1": { - "options": { - "0": { - "question": "Fet pel col·laborador {search}" - } - } - }, - "2": { - "options": { - "0": { - "question": "No fet pel col·laborador {search}" - } - } - }, - "3": { - "options": { - "0": { - "question": "Fet abans {search}" - } - } - }, - "4": { - "options": { - "0": { - "question": "Fet després {search}" - } - } - }, - "5": { - "options": { - "0": { - "question": "Idioma de l'usuari (codi iso) {search}" - } - } - }, - "6": { - "options": { - "0": { - "question": "Fet amb l'amfitrió {search}" - } - } - }, - "7": { - "options": { - "0": { - "question": "El conjunt de canvis ha afegit almenys una imatge" - } - } - } - }, - "name": "Centre del conjunt de canvis", - "tagRenderings": { - "contributor": { - "question": "Quin col·laborador va fer aquest canvi?", - "render": "Canvi fet per {user}" - }, - "host": { - "question": "Amb quin amfitrió (lloc web) es va fer aquest canvi?", - "render": "Canvi amb {host}" - }, - "locale": { - "question": "Amb quina configuració regional (idioma) s'ha fet aquest canvi?", - "render": "La configuració regional de l'usuari és {locale}" - }, - "show_changeset_id": { - "render": "Conjunt de canvi {id}" - }, - "theme-id": { - "question": "Quin tema es va utilitzar per fer aquest canvi?", - "render": "Canvi amb el tema {theme}" - } - }, - "title": { - "render": "Conjunt de canvis per a {theme}" - } - }, - "1": { - "override": { - "tagRenderings": { - "link_to_more": { - "render": "Es poden trobar més estadístiques aquí" - } - } - } - } - }, - "shortDescription": "Mostra els canvis fets per MapComplete", - "title": "Canvis fets amb MapComplete" - }, "maproulette": { "description": "Tema que mostra les tasques de MapRoulette, que us permet cercar-les, filtrar-les i solucionar-les.", "title": "Tasques de MapRoulette" diff --git a/langs/themes/cs.json b/langs/themes/cs.json index c060f8e74..0a8493971 100644 --- a/langs/themes/cs.json +++ b/langs/themes/cs.json @@ -984,108 +984,6 @@ "description": "Mapa zobrazující obrubníky a přechody.", "title": "Obrubníky a přechody" }, - "mapcomplete-changes": { - "description": "Tato mapa zobrazuje všechny změny provedené pomocí MapComplete", - "layers": { - "0": { - "description": "Zobrazuje všechny změny MapComplete", - "filter": { - "0": { - "options": { - "0": { - "question": "Název tématu obsahuje {search}" - } - } - }, - "1": { - "options": { - "0": { - "question": "Vytvořeno přispěvatelem {search}" - } - } - }, - "2": { - "options": { - "0": { - "question": "Nevytvořeno přispěvatelem {search}" - } - } - }, - "3": { - "options": { - "0": { - "question": "Vytvořeno před {search}" - } - } - }, - "4": { - "options": { - "0": { - "question": "Vytvořeno po {search}" - } - } - }, - "5": { - "options": { - "0": { - "question": "Jazyk uživatele (kód iso) {search}" - } - } - }, - "6": { - "options": { - "0": { - "question": "Vytvořeno s hostitelem {search}" - } - } - }, - "7": { - "options": { - "0": { - "question": "Sada změn přidala alespoň jeden obrázek" - } - } - } - }, - "name": "Centra sady změn", - "tagRenderings": { - "contributor": { - "question": "Jaký přispěvatel provedl tuto změnu?", - "render": "Změna byla provedena uživatelem {user}" - }, - "host": { - "question": "S jakým hostitelem (webem) byla tato změna provedena?", - "render": "Změnit s {host}" - }, - "locale": { - "question": "V jakém národním prostředí (jazyce) byla tato změna provedena?", - "render": "Národní prostředí uživatele je {locale}" - }, - "show_changeset_id": { - "render": "Sada změn {id}" - }, - "theme-id": { - "question": "Jaké téma bylo použito k provedení této změny?", - "render": "Změna pomocí tématu {theme}" - } - }, - "title": { - "render": "Sada změn pro {theme}" - } - }, - "1": { - "override": { - "tagRenderings": { - "link_to_more": { - "render": "Další statistiky najdete zde" - } - } - } - } - }, - "shortDescription": "Zobrazuje změny provedené pomocí MapComplete", - "title": "Změny provedené pomocí MapComplete" - }, "maproulette": { "description": "Téma zobrazující úkoly MapRoulette, které umožňuje vyhledávat, filtrovat a opravovat je.", "title": "Úkoly MapRoulette" diff --git a/langs/themes/de.json b/langs/themes/de.json index 52b43cb89..b33b770c0 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -984,108 +984,6 @@ "description": "Eine Karte mit Bordsteinen und Überwegen.", "title": "Bordsteine und Überwege" }, - "mapcomplete-changes": { - "description": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", - "layers": { - "0": { - "description": "Zeigt alle MapComplete-Änderungen", - "filter": { - "0": { - "options": { - "0": { - "question": "Themename enthält {search}" - } - } - }, - "1": { - "options": { - "0": { - "question": "Erstellt von {search}" - } - } - }, - "2": { - "options": { - "0": { - "question": "Nicht erstellt von {search}" - } - } - }, - "3": { - "options": { - "0": { - "question": "Erstellt vor {search}" - } - } - }, - "4": { - "options": { - "0": { - "question": "Erstellt nach {search}" - } - } - }, - "5": { - "options": { - "0": { - "question": "Benutzersprache (ISO-Code) {search}" - } - } - }, - "6": { - "options": { - "0": { - "question": "Erstellt mit host {search}" - } - } - }, - "7": { - "options": { - "0": { - "question": "Im Änderungssatz wurde mindestens ein Bild hinzugefügt" - } - } - } - }, - "name": "Zentrum der Änderungssätze", - "tagRenderings": { - "contributor": { - "question": "Wer hat diese Änderung vorgenommen?", - "render": "Änderung vorgenommen von {user}" - }, - "host": { - "question": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?", - "render": "Geändert über {host}" - }, - "locale": { - "question": "In welchem Gebietsschema (Sprache) wurde diese Änderung vorgenommen?", - "render": "Benutzergebietsschema ist {locale}" - }, - "show_changeset_id": { - "render": "Änderungssatz {id}" - }, - "theme-id": { - "question": "Welches Thema wurde für diese Änderung verwendet?", - "render": "Geändert mit Thema {theme}" - } - }, - "title": { - "render": "Änderungssatz für {theme}" - } - }, - "1": { - "override": { - "tagRenderings": { - "link_to_more": { - "render": "Weitere Statistiken hier" - } - } - } - } - }, - "shortDescription": "Zeigt Änderungen, die von MapComplete vorgenommen wurden", - "title": "Änderungen mit MapComplete" - }, "maproulette": { "description": "Thema mit MapRoulette-Aufgaben, die Sie suchen, filtern und beheben können.", "title": "MapRoulette-Aufgaben"