diff --git a/Docs/BuiltinLayers.md b/Docs/BuiltinLayers.md
index 4e07e269f0..f8ad51c5f0 100644
--- a/Docs/BuiltinLayers.md
+++ b/Docs/BuiltinLayers.md
@@ -109,6 +109,8 @@ Meta layer showing the current location of the user. Add this to your theme and
 
   - This layer is shown at zoomlevel **0** and higher
   - **This layer is included automatically in every theme. This layer might contain no points**
+  - Elements don't have a title set and cannot be toggled nor will they show up in the dashboard. If you import this layer in your theme, override `title` to make this toggleable.
+  - Not visible in the layer selection by default. If you want to make this layer toggable, override `name`
 
 
 
diff --git a/Logic/Web/Wikidata.ts b/Logic/Web/Wikidata.ts
index cd09485d5d..8818be52fa 100644
--- a/Logic/Web/Wikidata.ts
+++ b/Logic/Web/Wikidata.ts
@@ -136,6 +136,11 @@ export default class Wikidata {
         UIEventSource<{ success: WikidataResponse } | { error: any }>
     >()
 
+    /**
+     * Same as LoadWikidataEntry, but wrapped into a UIEventSource
+     * @param value
+     * @constructor
+     */
     public static LoadWikidataEntry(
         value: string | number
     ): UIEventSource<{ success: WikidataResponse } | { error: any }> {
@@ -186,7 +191,7 @@ export default class Wikidata {
                 } .
                 ?label wikibase:apiOutput mwapi:label .
                 ?description wikibase:apiOutput "@description" .
-            } 
+            }
             ${instanceOf}
             ${minusPhrases.join("\n    ")}
         } ORDER BY ASC(?num) LIMIT ${options.maxCount ?? 20}`
diff --git a/UI/BigComponents/SimpleAddUI.ts b/UI/BigComponents/SimpleAddUI.ts
index 091db06e55..d7d8c05337 100644
--- a/UI/BigComponents/SimpleAddUI.ts
+++ b/UI/BigComponents/SimpleAddUI.ts
@@ -157,6 +157,10 @@ export default class SimpleAddUI extends Toggle {
                     cancel,
                     () => {
                         isShown.setData(false)
+                    },
+                    {
+                        cancelIcon: Svg.back_svg(),
+                        cancelText: Translations.t.general.add.backToSelect,
                     }
                 )
             })
diff --git a/UI/Input/TextField.ts b/UI/Input/TextField.ts
index f4e9366127..a87d9fa17a 100644
--- a/UI/Input/TextField.ts
+++ b/UI/Input/TextField.ts
@@ -131,6 +131,7 @@ export class TextField extends InputElement<string> {
             el.rows = options.textAreaRows
             el.cols = 50
             el.style.width = "100%"
+            el.dir = "auto"
             inputEl = el
             if (placeholderStore) {
                 placeholderStore.addCallbackAndRunD((placeholder) => (el.placeholder = placeholder))
@@ -141,6 +142,7 @@ export class TextField extends InputElement<string> {
             el.inputMode = options.inputMode
             el.placeholder = placeholder
             el.style.cssText = options.inputStyle ?? "width: 100%;"
+            el.dir = "auto"
             inputEl = el
             if (placeholderStore) {
                 placeholderStore.addCallbackAndRunD((placeholder) => (el.placeholder = placeholder))
diff --git a/UI/NewPoint/ConfirmLocationOfPoint.ts b/UI/NewPoint/ConfirmLocationOfPoint.ts
index 373dd8ea32..b6614123f2 100644
--- a/UI/NewPoint/ConfirmLocationOfPoint.ts
+++ b/UI/NewPoint/ConfirmLocationOfPoint.ts
@@ -19,6 +19,7 @@ import { GlobalFilter } from "../../Logic/State/MapState"
 import { VariableUiElement } from "../Base/VariableUIElement"
 import { Tag } from "../../Logic/Tags/Tag"
 import { WayId } from "../../Models/OsmFeature"
+import { Translation } from "../i18n/Translation"
 
 export default class ConfirmLocationOfPoint extends Combine {
     constructor(
@@ -39,7 +40,11 @@ export default class ConfirmLocationOfPoint extends Combine {
             snapOntoWayId: WayId | undefined
         ) => void,
         cancel: () => void,
-        closePopup: () => void
+        closePopup: () => void,
+        options?: {
+            cancelIcon: BaseUIElement
+            cancelText?: string | Translation
+        }
     ) {
         let preciseInput: LocationInput = undefined
         if (preset.preciseInput !== undefined) {
@@ -222,8 +227,8 @@ export default class ConfirmLocationOfPoint extends Combine {
         const tagInfo = SimpleAddUI.CreateTagInfoFor(preset, state.osmConnection)
 
         const cancelButton = new SubtleButton(
-            Svg.close_ui(),
-            Translations.t.general.cancel
+            options?.cancelIcon ?? Svg.close_ui(),
+            options?.cancelText ?? Translations.t.general.cancel
         ).onClick(cancel)
 
         let examples: BaseUIElement = undefined
diff --git a/assets/contributors.json b/assets/contributors.json
index 55d836bfec..5947a68a7d 100644
--- a/assets/contributors.json
+++ b/assets/contributors.json
@@ -1,7 +1,7 @@
 {
   "contributors": [
     {
-      "commits": 4645,
+      "commits": 4654,
       "contributor": "Pieter Vander Vennet"
     },
     {
diff --git a/assets/language_in_country.json b/assets/language_in_country.json
index 4e4970b558..f085d1a1da 100644
--- a/assets/language_in_country.json
+++ b/assets/language_in_country.json
@@ -663,6 +663,9 @@
     "en",
     "sw"
   ],
+  "US": [
+    "en"
+  ],
   "UY": [
     "es"
   ],
diff --git a/assets/language_translations.json b/assets/language_translations.json
index 6a2b26bb93..bb410f5cfc 100644
--- a/assets/language_translations.json
+++ b/assets/language_translations.json
@@ -1552,7 +1552,7 @@
     "de": "Cakchiquel-Sprache",
     "en": "Kaqchikel",
     "eo": "kakĉikela lingvo",
-    "es": "Idioma kakchikel",
+    "es": "Kaqchikel",
     "fr": "cakchiquel",
     "gl": "Lingua kaqchikel",
     "id": "Bahasa Kaqchikel",
@@ -2223,7 +2223,7 @@
     "nl": "Dagbani",
     "pt": "Língua dagbani",
     "pt_BR": "Língua dagbani",
-    "ru": "Дагбани",
+    "ru": "дагбани",
     "sv": "dagbani",
     "_meta": {
       "dir": [
@@ -2588,7 +2588,7 @@
     "sl": "grščina",
     "sv": "nygrekiska",
     "zh_Hans": "希腊语",
-    "zh_Hant": "希臘語",
+    "zh_Hant": "現代希臘語",
     "_meta": {
       "countries": [
         "CY",
@@ -2679,6 +2679,7 @@
         "TV",
         "TZ",
         "UG",
+        "US",
         "VC",
         "VU",
         "WS",
@@ -4604,7 +4605,7 @@
     "de": "Japanisch",
     "en": "Japanese",
     "eo": "japana lingvo",
-    "es": "japonés",
+    "es": "Japonés",
     "fi": "japani",
     "fr": "japonais",
     "gl": "lingua xaponesa",
@@ -4848,9 +4849,9 @@
     "ca": "katab",
     "de": "Tjap",
     "en": "Tyap",
-    "es": "katab",
+    "es": "Katab",
     "fi": "Tyap",
-    "fr": "katab",
+    "fr": "Katab",
     "gl": "Lingua tyap",
     "ja": "カタブ語",
     "nl": "Tyap",
@@ -5022,7 +5023,7 @@
   },
   "kjp": {
     "en": "Eastern Pwo",
-    "fr": "pwo de l’Est",
+    "fr": "pwo de l'Est",
     "ja": "東ポー語",
     "nb_NO": "østpwo",
     "nl": "oostelijk Pwo",
@@ -5045,7 +5046,7 @@
     "fi": "kazakki",
     "fr": "kazakh",
     "gl": "Lingua casaca",
-    "hu": "kazah",
+    "hu": "kazak",
     "id": "bahasa Kazak",
     "it": "kazako",
     "ja": "カザフ語",
@@ -5408,7 +5409,7 @@
     "ca": "kurd",
     "cs": "kurdština",
     "da": "kurdisk",
-    "de": "Kurdisch",
+    "de": "Kurmandschi",
     "en": "Kurdish",
     "eo": "kurda lingvo",
     "es": "kurdo",
@@ -5416,15 +5417,15 @@
     "fr": "kurde",
     "gl": "lingua kurda",
     "hu": "kurd",
-    "id": "Kurmanji",
-    "it": "kurmanji",
-    "ja": "クルマンジー",
+    "id": "Bahasa Kurdi",
+    "it": "curdo",
+    "ja": "クルド語",
     "nb_NO": "kurdisk",
-    "nl": "Kurmançi",
-    "pl": "język kurmandżi",
-    "pt": "curmânji",
-    "pt_BR": "Curmânji",
-    "ru": "курманджи",
+    "nl": "Koerdisch",
+    "pl": "język kurdyjski",
+    "pt": "língua curda",
+    "pt_BR": "língua curda",
+    "ru": "курдские языки",
     "sl": "Severnokurdski jezik",
     "sv": "nordkurdiska",
     "zh_Hans": "库尔德语",
@@ -7742,6 +7743,32 @@
       ]
     }
   },
+  "pa_PK": {
+    "ca": "panjabi",
+    "cs": "paňdžábština",
+    "da": "Punjabi",
+    "de": "Panjabi",
+    "en": "Punjabi",
+    "eo": "panĝaba lingvo",
+    "es": "panyabí",
+    "fi": "punjabin kieli",
+    "fr": "pendjabi",
+    "gl": "lingua punjabi",
+    "hu": "pandzsábi",
+    "id": "Bahasa Punjab",
+    "it": "punjabi",
+    "ja": "パンジャーブ語",
+    "nb_NO": "panjabi",
+    "nl": "Punjabi",
+    "pl": "język pendżabski",
+    "pt": "Língua panjabi",
+    "ru": "панджаби",
+    "sv": "punjabi",
+    "zh_Hant": "旁遮普語",
+    "_meta": {
+      "dir": []
+    }
+  },
   "pag": {
     "ca": "pangasinan",
     "da": "pangasinansk",
@@ -7787,7 +7814,7 @@
     "nb_NO": "papiamento",
     "nl": "Papiaments",
     "pl": "Język papiamento",
-    "pt": "papiamento",
+    "pt": "Papiamento",
     "ru": "папьяменто",
     "sv": "papiamento",
     "zh_Hans": "帕皮阿门托语",
@@ -8911,7 +8938,7 @@
     }
   },
   "shi": {
-    "ca": "chelja",
+    "ca": "taixelhit",
     "cs": "tašelhit",
     "de": "Taschelhit",
     "en": "Shilha",
@@ -10418,7 +10445,7 @@
     }
   },
   "tzm": {
-    "ca": "tamazight",
+    "ca": "tamazic",
     "de": "Zentralatlas-Tamazight",
     "en": "Central Atlas Tamazight",
     "eo": "tamaziĥta lingvo",
@@ -11358,8 +11385,8 @@
         "TW"
       ],
       "dir": [
-        "top-to-bottom",
-        "left-to-right"
+        "left-to-right",
+        "top-to-bottom"
       ]
     }
   },
diff --git a/assets/layers/address/address.json b/assets/layers/address/address.json
index 26ef213818..e641c9ea1a 100644
--- a/assets/layers/address/address.json
+++ b/assets/layers/address/address.json
@@ -85,7 +85,8 @@
         "id": "Nomor rumah ini <b>{addr:housenumber}</b>",
         "es": "El número de puerta es <b>{addr:housenumber}</b>",
         "da": "Husnummeret er <b>{addr:housenumber}</b>",
-        "cs": "Číslo domu je <b>{addr:housenumber}</b>"
+        "cs": "Číslo domu je <b>{addr:housenumber}</b>",
+        "pt": "The house number is <b>{addr:housenumber}</b>"
       },
       "question": {
         "en": "What is the number of this house?",
@@ -99,7 +100,8 @@
         "zh_Hans": "这个屋子的门牌号是多少？",
         "id": "Berapa nomor rumah ini?",
         "da": "Hvad er nummeret på dette hus?",
-        "cs": "Jaké je číslo tohoto domu?"
+        "cs": "Jaké je číslo tohoto domu?",
+        "pt": "Qual é o número desta casa?"
       },
       "freeform": {
         "key": "addr:housenumber",
@@ -127,7 +129,8 @@
             "zh_Hans": "这个建筑物没有门牌号",
             "da": "Denne bygning har intet husnummer",
             "zh_Hant": "這棟建築沒有門牌",
-            "cs": "Tato budova nemá číslo domu"
+            "cs": "Tato budova nemá číslo domu",
+            "pt": "Este prédio não tem número"
           }
         }
       ]
@@ -202,7 +205,8 @@
         "nl": "Wat moet hier gecorrigeerd worden? Leg het uit",
         "zh_Hans": "这里应被如何修复？请做出解释",
         "da": "Hvad skal rettes her? Forklar venligst",
-        "cs": "Co by se zde mělo opravit? Vysvětlete to, prosím"
+        "cs": "Co by se zde mělo opravit? Vysvětlete to, prosím",
+        "pt": "O que deve ser corrigido aqui? Explique"
       },
       "freeform": {
         "key": "fixme"
diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json
index 9484b90b6c..b4935e4a75 100644
--- a/assets/layers/artwork/artwork.json
+++ b/assets/layers/artwork/artwork.json
@@ -438,7 +438,8 @@
             "nl": "Houtsculptuur",
             "en": "Woodcarving",
             "de": "Holzschnitzerei",
-            "cs": "Dřevořezba"
+            "cs": "Dřevořezba",
+            "pt": "Entalhe em madeira"
           }
         }
       ],
@@ -450,13 +451,15 @@
         "en": "This artwork was made by {wikidata_label(artist:wikidata):font-weight:bold}<br/>{wikipedia(artist:wikidata)}",
         "de": "Dieses Kunstwerk wurde geschaffen von {wikidata_label(artist:wikidata):font-weight:bold}<br/>{wikipedia(artist:wikidata)}",
         "nl": "Dit kunstwerk is gemaakt door {wikidata_label(artist:wikidata):font-weight:bold}<br/>{wikipedia(artist:wikidata)}",
-        "cs": "Toto dílo vytvořil {wikidata_label(artist:wikidata):font-weight:bold}<br/>{wikipedia(artist:wikidata)}"
+        "cs": "Toto dílo vytvořil {wikidata_label(artist:wikidata):font-weight:bold}<br/>{wikipedia(artist:wikidata)}",
+        "pt": "Esta obra de arte foi feita por {wikidata_label(artist:wikidata):font-weight:bold}<br/>{wikipedia(artist:wikidata)}"
       },
       "question": {
         "en": "Who made this artwork?",
         "de": "Wer hat dieses Kunstwerk geschaffen?",
         "nl": "Wie heeft dit kunstwerk gemaakt?",
-        "cs": "Kdo je autorem tohoto díla?"
+        "cs": "Kdo je autorem tohoto díla?",
+        "pt": "Quem fez essa obra de arte?"
       },
       "freeform": {
         "key": "artist:wikidata",
@@ -565,7 +568,8 @@
         "en": "What does this artwork depict?",
         "de": "Was zeigt dieses Kunstwerk?",
         "nl": "Wat beeldt dit kunstwerk af?",
-        "cs": "Co zobrazuje toto umělecké dílo?"
+        "cs": "Co zobrazuje toto umělecké dílo?",
+        "pt": "O que esta obra de arte representa?"
       },
       "freeform": {
         "key": "subject:wikidata",
@@ -575,7 +579,8 @@
         "en": "This artwork depicts {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}",
         "de": "Das Kunstwerk zeigt {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}",
         "nl": "Dit kunstwerk beeldt {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)} af",
-        "cs": "Toto dílo zobrazuje {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}"
+        "cs": "Toto dílo zobrazuje {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}",
+        "pt": "A obra de arte representa {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}"
       }
     }
   ],
diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json
index aa61699fdb..144fc6f745 100644
--- a/assets/layers/barrier/barrier.json
+++ b/assets/layers/barrier/barrier.json
@@ -394,7 +394,8 @@
         "hu": "Legnagyobb szélesség: {maxwidth:physical} m",
         "es": "Anchura máxima: {maxwidth:physical} m",
         "da": "Maksimal bredde: {maxwidth:physical} m",
-        "cs": "Maximální šířka: {maxwidth:physical} m"
+        "cs": "Maximální šířka: {maxwidth:physical} m",
+        "pt": "Largura máxima: {maxwidth:physical} m"
       },
       "question": {
         "en": "How wide is the gap left over besides the barrier?",
diff --git a/assets/layers/bench_at_pt/bench_at_pt.json b/assets/layers/bench_at_pt/bench_at_pt.json
index fb54e60467..ce43197f1a 100644
--- a/assets/layers/bench_at_pt/bench_at_pt.json
+++ b/assets/layers/bench_at_pt/bench_at_pt.json
@@ -140,7 +140,8 @@
         "es": "¿Qué tipo de banco es este?",
         "fr": "Quel type de banc est-ce ?",
         "da": "Hvilken slags bænk er dette?",
-        "cs": "Co je to za lavičku?"
+        "cs": "Co je to za lavičku?",
+        "pt": "Que tipo de banco é este?"
       },
       "mappings": [
         {
@@ -180,7 +181,8 @@
             "nl": "Er is hier geen bank",
             "es": "No hay ningún banco aquí",
             "da": "Der er ingen bænk her",
-            "cs": "Zde není žádná lavička"
+            "cs": "Zde není žádná lavička",
+            "pt": "Não há nenhum banco aqui"
           }
         }
       ]
diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index d4bfc9649c..e6121d561b 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -3771,7 +3771,8 @@
       "override": {
         "question": {
           "en": "When is this charging station opened?",
-          "nl": "Wanneer is dit oplaadpunt beschikbaar??"
+          "nl": "Wanneer is dit oplaadpunt beschikbaar??",
+          "de": "Wann ist die Ladestation geöffnet?"
         }
       },
       "id": "OH"
@@ -4660,7 +4661,7 @@
         {
           "question": {
             "en": "Has a <div style='display: inline-block'><b>Type 1 <i>without</i> cable (J1772)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1_J1772.svg'/></div> connector",
-            "nl": "Heeft een <div style='display: inline-block'><b><b>Type 1 <i>zonder</i> kabel</b> (J1772)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1_J1772.svg'/></div>",
+            "nl": "Heeft een <div style='display: inline-block'><b>Type 1 <i>zonder</i> kabel (J1772)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1_J1772.svg'/></div>",
             "da": "Har et <div style='display: inline-block'><b>Type 1 <i>uden</i> kabel (J1772)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1_J1772.svg'/></div> stik",
             "de": "Verfügt über einen <div style='display: inline-block'><b>Typ 1 (J1772)</b>Stecker <i>ohne</i> Kabel<img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1_J1772.svg'/></div>",
             "es": "Tiene un conector de <div style='display: inline-block'><b>Tipo 1 <i>sin</i> cable (J1772)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1_J1772.svg'/></div>"
@@ -4670,7 +4671,7 @@
         {
           "question": {
             "en": "Has a <div style='display: inline-block'><b>Type 1 CCS (aka Type 1 Combo)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1-ccs.svg'/></div> connector",
-            "nl": "Heeft een <div style='display: inline-block'><b><b>Type 1 CCS</b> (ook gekend als Type 1 Combo)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1-ccs.svg'/></div>",
+            "nl": "Heeft een <div style='display: inline-block'><b>Type 1 CCS (ook gekend als Type 1 Combo)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1-ccs.svg'/></div>",
             "da": "Har et <div style='display: inline-block'><b>Type 1 CCS-stik (også kendt som Type 1 Combo)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1-ccs.svg'/></div> stik",
             "de": "Verfügt über einen <div style='display: inline-block'><b>Typ 1 CCS (Typ 1 Combo)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1-ccs.svg'/></div> Stecker",
             "es": "Tiene un conector <div style='display: inline-block'><b>Tipo 1 CCS (Combo Tipo 1)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1-ccs.svg'/></div>"
diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json
index 7bc12c5869..c0301dabd7 100644
--- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json
+++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json
@@ -1002,7 +1002,7 @@
       },
       "question": {
         "en": "What is the carriage width of this road (in meters)?<br/><span class='subtle'>This is measured curb to curb and thus includes the width of parallell parking lanes</span>",
-        "nl": "Hoe breed is de rijbaan in deze straat (in meters)?<br/><span class='subtle'>Dit is </span><br/><span class='subtle'>Meet dit van stoepsteen tot stoepsteen, dus inclusief een parallelle parkeerstrook</span>",
+        "nl": "Hoe breed is de rijbaan in deze straat (in meters)?<br/><span class='subtle'>Dit is gemeten van stoepsteen tot stoepsteen, dus inclusief een parallelle parkeerstrook</span>",
         "de": "Wie groß ist die Fahrbahnbreite dieser Straße (in Metern)?<br/><span class='subtle'>Diese wird von Bordstein zu Bordstein gemessen und schließt daher die Breite von parallelen Parkspuren ein</span>",
         "fr": "Quelle est la largeur de cette chaussée (en mètres) ?<br/><span class='subtle'>Elle est mesurée d'une bordure à l'autre et inclut donc la largeur des voies de stationnement parallèles</span>"
       },
diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json
index 6209d4d62f..c152e270c2 100644
--- a/assets/layers/food/food.json
+++ b/assets/layers/food/food.json
@@ -719,7 +719,7 @@
     {
       "id": "friture-take-your-container",
       "question": {
-        "nl": "Als je je eigen container (bv. kookpot of kleine potjes voor saus) meeneemt, gebruikt de frituur deze dan om je bestelling in te doen?",
+        "nl": "Als je je eigen container (bv. kookpot of kleine potjes voor saus) meeneemt, gebruikt de frituur deze dan om je bestelling in te doen?<br/>",
         "fr": "Est-il proposé d’utiliser ses propres contenants pour sa commande ?<br/>",
         "en": "If you bring your own container (such as a cooking pot and small pots), is it used to package your order?<br/>",
         "ja": "お客様が持参容器(調理用の鍋や小さな鍋など)をもってきた場合は、注文の梱包に使用されますか?<br/>",
diff --git a/assets/layers/gps_location/gps_location.json b/assets/layers/gps_location/gps_location.json
index 3e1a94f3a6..9d11abeab5 100644
--- a/assets/layers/gps_location/gps_location.json
+++ b/assets/layers/gps_location/gps_location.json
@@ -6,8 +6,6 @@
     "osmTags": "id=gps",
     "maxCacheAge": 0
   },
-  "title": "Current position",
-  "name": "GPS Location",
   "mapRendering": [
     {
       "icon": {
diff --git a/assets/layers/pharmacy/pharmacy.json b/assets/layers/pharmacy/pharmacy.json
index 655ac40355..f362393d6e 100644
--- a/assets/layers/pharmacy/pharmacy.json
+++ b/assets/layers/pharmacy/pharmacy.json
@@ -163,7 +163,8 @@
       ],
       "title": {
         "en": "a pharmacy",
-        "nl": "een apotheek"
+        "nl": "een apotheek",
+        "de": "eine Apotheke"
       }
     }
   ]
diff --git a/assets/layers/postoffices/postoffices.json b/assets/layers/postoffices/postoffices.json
index 487747989b..8ac6dee403 100644
--- a/assets/layers/postoffices/postoffices.json
+++ b/assets/layers/postoffices/postoffices.json
@@ -144,7 +144,8 @@
           "if": "post_office:brand=DHL",
           "then": {
             "en": "This location offers services for DHL",
-            "de": "Dieser Standort bietet Dienstleistungen für DHL an"
+            "de": "Dieser Standort bietet Dienstleistungen für DHL an",
+            "nl": "Deze locatie biedt diensten aan voor DHL"
           },
           "hideInAnswer": "_country=de"
         },
@@ -152,21 +153,24 @@
           "if": "post_office:brand=DPD",
           "then": {
             "en": "This location offers services for DPD",
-            "de": "Dieser Standort bietet Dienstleistungen für DPD an"
+            "de": "Dieser Standort bietet Dienstleistungen für DPD an",
+            "nl": "Deze locatie biedt diensten aan voor DPD"
           }
         },
         {
           "if": "post_office:brand=GLS",
           "then": {
             "en": "This location offers services for GLS",
-            "de": "Dieser Standort bietet Dienstleistungen für GLS an"
+            "de": "Dieser Standort bietet Dienstleistungen für GLS an",
+            "nl": "Deze locatie biedt diensten aan voor GLS"
           }
         },
         {
           "if": "post_office:brand=UPS",
           "then": {
             "en": "This location offers services for UPS",
-            "de": "Dieser Standort bietet Dienstleistungen für UPS an"
+            "de": "Dieser Standort bietet Dienstleistungen für UPS an",
+            "nl": "Deze locatie biedt diensten aan voor UPS"
           }
         },
         {
@@ -189,7 +193,8 @@
           "if": "post_office:brand=PostNL",
           "then": {
             "en": "This location is a PostNL-point",
-            "de": "Dieser Standort ist ein PostNL-Punkt"
+            "de": "Dieser Standort ist ein PostNL-Punkt",
+            "nl": "Deze locatie is een PostNL-punt"
           },
           "hideInAnswer": {
             "and": [
@@ -202,7 +207,8 @@
           "if": "post_office:brand=bpost",
           "then": {
             "en": "This location offers services for bpost",
-            "de": "Dieser Standort bietet Dienstleistungen für bpost an"
+            "de": "Dieser Standort bietet Dienstleistungen für bpost an",
+            "nl": "Deze locatie biedt diensten aan voor bpost"
           },
           "hideInAnswer": "_country!=be"
         }
@@ -243,11 +249,13 @@
       "id": "parcel-from",
       "render": {
         "en": "You can post parcels with these companies: {post_office:parcel_from}",
-        "de": "Sie können Pakete mit diesen Unternehmen versenden: {post_office:parcel_from}"
+        "de": "Sie können Pakete mit diesen Unternehmen versenden: {post_office:parcel_from}",
+        "nl": "Je kan pakketten versturen met deze bedrijven: {post_office:parcel_from}"
       },
       "question": {
         "en": "Can you send a parcel here?",
-        "de": "Können Sie hier Pakete versenden?"
+        "de": "Können Sie hier Pakete versenden?",
+        "nl": "Kan je hier pakketten versturen?"
       },
       "freeform": {
         "key": "post_office:parcel_from",
@@ -258,14 +266,16 @@
           "if": "post_office:parcel_from=yes",
           "then": {
             "en": "You can send parcels here",
-            "de": "Hier können Sie Pakete versenden"
+            "de": "Hier können Sie Pakete versenden",
+            "nl": "Je kan hier pakketten versturen"
           }
         },
         {
           "if": "post_office:parcel_from=no",
           "then": {
             "en": "You can't send parcels here",
-            "de": "Sie können hier keine Pakete versenden"
+            "de": "Sie können hier keine Pakete versenden",
+            "nl": "Je kan hier geen pakketten versturen"
           }
         }
       ]
@@ -336,11 +346,13 @@
       "id": "stamps",
       "render": {
         "en": "You can buy stamps from companies: {post_office:stamps}",
-        "de": "Sie können Briefmarken folgender Unternehmen kaufen: {post_office:stamps}"
+        "de": "Sie können Briefmarken folgender Unternehmen kaufen: {post_office:stamps}",
+        "nl": "Je kan hier postzegels kopen van de volgende bedrijven: {post_office:stamps}"
       },
       "question": {
         "en": "Can you buy stamps here?",
-        "de": "Kann man hier Briefmarken kaufen?"
+        "de": "Kann man hier Briefmarken kaufen?",
+        "nl": "Kan je hier postzegels kopen?"
       },
       "freeform": {
         "key": "post_office:stamps",
@@ -351,14 +363,16 @@
           "if": "post_office:stamps=yes",
           "then": {
             "en": "You can buy stamps here",
-            "de": "Sie können hier Briefmarken kaufen"
+            "de": "Sie können hier Briefmarken kaufen",
+            "nl": "Je kan hier postzegels kopen"
           }
         },
         {
           "if": "post_office:stamps=no",
           "then": {
             "en": "You can't buy stamps here",
-            "de": "Sie können hier keine Briefmarken kaufen"
+            "de": "Sie können hier keine Briefmarken kaufen",
+            "nl": "Je kan hier geen postzegels kopen"
           }
         }
       ]
diff --git a/assets/layers/stairs/stairs.json b/assets/layers/stairs/stairs.json
index 5ba836c2d9..7f9fbc1fba 100644
--- a/assets/layers/stairs/stairs.json
+++ b/assets/layers/stairs/stairs.json
@@ -151,7 +151,8 @@
       "id": "ramp",
       "question": {
         "en": "Is there a ramp at these stairs?",
-        "de": "Gibt es eine Rampe an dieser Treppe?"
+        "de": "Gibt es eine Rampe an dieser Treppe?",
+        "nl": "Is er een helling bij deze trap?"
       },
       "multiAnswer": true,
       "mappings": [
@@ -160,7 +161,8 @@
           "ifnot": "ramp:bicycle=no",
           "then": {
             "en": "There is a ramp for bicycles here",
-            "de": "Hier gibt es eine Rampe für Fahrräder"
+            "de": "Hier gibt es eine Rampe für Fahrräder",
+            "nl": "Er is hier een helling voor fietsen"
           }
         },
         {
@@ -168,14 +170,16 @@
           "ifnot": "ramp:wheelchair=no",
           "then": {
             "en": "There is a ramp for wheelchairs here",
-            "de": "Hier gibt es eine Rampe für Rollstühle"
+            "de": "Hier gibt es eine Rampe für Rollstühle",
+            "nl": "Er is hier een helling voor rolstoelen"
           }
         },
         {
           "if": "ramp=separate",
           "then": {
             "en": "There is ramp for wheelchairs here, but it is shown separately on the map",
-            "de": "Hier gibt es eine Rampe für Rollstühle, die jedoch auf der Karte separat angezeigt wird"
+            "de": "Hier gibt es eine Rampe für Rollstühle, die jedoch auf der Karte separat angezeigt wird",
+            "nl": "Er is hier een helling voor rolstoelen, maar deze is los aangegeven op de kaart"
           },
           "hideInAnswer": true
         },
@@ -184,7 +188,8 @@
           "ifnot": "ramp:stroller=no",
           "then": {
             "en": "There is a ramp for strollers here",
-            "de": "Hier gibt es eine Rampe für Kinderwagen"
+            "de": "Hier gibt es eine Rampe für Kinderwagen",
+            "nl": "Er is hier een helling voor kinderwagens"
           }
         },
         {
@@ -192,7 +197,8 @@
           "ifnot": "ramp=",
           "then": {
             "en": "There is no ramp at these stairs",
-            "de": "An dieser Treppe gibt es keine Rampe"
+            "de": "An dieser Treppe gibt es keine Rampe",
+            "nl": "Er is hier geen helling"
           }
         }
       ]
diff --git a/assets/layers/toilet_at_amenity/toilet_at_amenity.json b/assets/layers/toilet_at_amenity/toilet_at_amenity.json
index 8f97d58088..ae7cb2685d 100644
--- a/assets/layers/toilet_at_amenity/toilet_at_amenity.json
+++ b/assets/layers/toilet_at_amenity/toilet_at_amenity.json
@@ -18,7 +18,8 @@
         "if": "name~*",
         "then": {
           "en": "Toilet at {name}",
-          "de": "Toilette in {name}"
+          "de": "Toilette in {name}",
+          "nl": "Toilet bij {name}"
         }
       }
     ]
@@ -29,7 +30,8 @@
     {
       "question": {
         "en": "Are these toilets publicly accessible?",
-        "de": "Ist die Toilette öffentlich zugänglich?"
+        "de": "Ist die Toilette öffentlich zugänglich?",
+        "nl": "Zijn deze toiletten publiek toegankelijk?"
       },
       "render": {
         "en": "Access is {toilets:access}",
diff --git a/assets/layers/transit_routes/transit_routes.json b/assets/layers/transit_routes/transit_routes.json
index ee2be25d7e..4fbf96f4af 100644
--- a/assets/layers/transit_routes/transit_routes.json
+++ b/assets/layers/transit_routes/transit_routes.json
@@ -34,7 +34,8 @@
         "then": {
           "en": "{name}",
           "de": "{name}",
-          "da": "{name}"
+          "da": "{name}",
+          "nl": "{name}"
         }
       }
     ]
@@ -45,7 +46,8 @@
         "render": {
           "en": "#ff0000",
           "de": "#ff0000",
-          "da": "#ff0000"
+          "da": "#ff0000",
+          "nl": "#ff0000"
         },
         "mappings": [
           {
diff --git a/assets/themes/bag_import/bag.json b/assets/themes/bag_import/bag.json
index 10c19b65c2..07ead99ef3 100644
--- a/assets/themes/bag_import/bag.json
+++ b/assets/themes/bag_import/bag.json
@@ -244,7 +244,8 @@
           "id": "Build year",
           "render": {
             "en": "This building was built in <b>{_bag_obj:start_date}</b>",
-            "de": "Dieses Gebäude wurde gebaut in <b>{_bag_obj:start_date}</b>"
+            "de": "Dieses Gebäude wurde gebaut in <b>{_bag_obj:start_date}</b>",
+            "pt_BR": "Esta construção é de <b>{_bag_obj:start_date}</b>"
           },
           "mappings": [
             {
diff --git a/assets/translators.json b/assets/translators.json
index 97e47efa87..3113ff89c2 100644
--- a/assets/translators.json
+++ b/assets/translators.json
@@ -5,7 +5,7 @@
       "contributor": "Pieter Vander Vennet"
     },
     {
-      "commits": 180,
+      "commits": 181,
       "contributor": "kjon"
     },
     {
@@ -21,7 +21,7 @@
       "contributor": "Anonymous"
     },
     {
-      "commits": 38,
+      "commits": 39,
       "contributor": "Robin van der Linde"
     },
     {
@@ -252,6 +252,10 @@
       "commits": 3,
       "contributor": "SiegbjornSitumeang"
     },
+    {
+      "commits": 2,
+      "contributor": "Tarcila Cataldi"
+    },
     {
       "commits": 2,
       "contributor": "Valerio Bozzolan"
diff --git a/langs/en.json b/langs/en.json
index 0c7bbd4e34..206f5049c1 100644
--- a/langs/en.json
+++ b/langs/en.json
@@ -86,6 +86,7 @@
         "add": {
             "addNew": "Add {category}",
             "addNewMapLabel": "Click here to add a new item",
+            "backToSelect": "Select a different category",
             "confirmButton": "Add a {category}<br/><div class='alert'>Your addition is visible for everyone</div>",
             "confirmIntro": "<h3>Add a {title}?</h3>The feature you create here will be <b>visible for everyone</b>. Please, only add things on to the map if they truly exist. A lot of applications use this data.",
             "disableFilters": "Disable all filters",
diff --git a/langs/layers/de.json b/langs/layers/de.json
index e21d2558e7..68bbb842a3 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -1532,6 +1532,11 @@
                 "question": "Ist diese Ladestation Teil eines Netzwerks?",
                 "render": "Teil des Netzwerks <b>{network}</b>"
             },
+            "OH": {
+                "override": {
+                    "question": "Wann ist die Ladestation geöffnet?"
+                }
+            },
             "Operational status": {
                 "mappings": {
                     "0": {
@@ -5533,6 +5538,11 @@
             }
         },
         "name": "Apotheke",
+        "presets": {
+            "0": {
+                "title": "eine Apotheke"
+            }
+        },
         "tagRenderings": {
             "name": {
                 "freeform": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 1f996ea53e..2f06bd76b6 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -1347,10 +1347,10 @@
                         "question": "Heeft een <div style='display: inline-block'><b><b>Type 1 met kabel</b> (J1772)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1_J1772.svg'/></div>"
                     },
                     "5": {
-                        "question": "Heeft een <div style='display: inline-block'><b><b>Type 1 <i>zonder</i> kabel</b> (J1772)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1_J1772.svg'/></div>"
+                        "question": "Heeft een <div style='display: inline-block'><b>Type 1 <i>zonder</i> kabel (J1772)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1_J1772.svg'/></div>"
                     },
                     "6": {
-                        "question": "Heeft een <div style='display: inline-block'><b><b>Type 1 CCS</b> (ook gekend als Type 1 Combo)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1-ccs.svg'/></div>"
+                        "question": "Heeft een <div style='display: inline-block'><b>Type 1 CCS (ook gekend als Type 1 Combo)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1-ccs.svg'/></div>"
                     },
                     "7": {
                         "question": "Heeft een <div style='display: inline-block'><b><b>Tesla Supercharger</b></b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/></div>"
@@ -3056,7 +3056,7 @@
                 "question": "Is deze weg verlicht?"
             },
             "width:carriageway": {
-                "question": "Hoe breed is de rijbaan in deze straat (in meters)?<br/><span class='subtle'>Dit is </span><br/><span class='subtle'>Meet dit van stoepsteen tot stoepsteen, dus inclusief een parallelle parkeerstrook</span>",
+                "question": "Hoe breed is de rijbaan in deze straat (in meters)?<br/><span class='subtle'>Dit is gemeten van stoepsteen tot stoepsteen, dus inclusief een parallelle parkeerstrook</span>",
                 "render": "De breedte van deze rijbaan in deze straat is <strong>{width:carriageway}m</strong>"
             }
         },
@@ -3922,7 +3922,7 @@
                         "then": "Je <b>moet</b> je eigen containers meenemen om je bestelling in mee te nemen."
                     }
                 },
-                "question": "Als je je eigen container (bv. kookpot of kleine potjes voor saus) meeneemt, gebruikt de frituur deze dan om je bestelling in te doen?"
+                "question": "Als je je eigen container (bv. kookpot of kleine potjes voor saus) meeneemt, gebruikt de frituur deze dan om je bestelling in te doen?<br/>"
             },
             "friture-vegan": {
                 "mappings": {
@@ -5549,6 +5549,52 @@
                 "override": {
                     "question": "Wat zijn de openingsuren voor dit postkantoor?"
                 }
+            },
+            "parcel-from": {
+                "mappings": {
+                    "0": {
+                        "then": "Je kan hier pakketten versturen"
+                    },
+                    "1": {
+                        "then": "Je kan hier geen pakketten versturen"
+                    }
+                },
+                "question": "Kan je hier pakketten versturen?",
+                "render": "Je kan pakketten versturen met deze bedrijven: {post_office:parcel_from}"
+            },
+            "partner-brand": {
+                "mappings": {
+                    "0": {
+                        "then": "Deze locatie biedt diensten aan voor DHL"
+                    },
+                    "1": {
+                        "then": "Deze locatie biedt diensten aan voor DPD"
+                    },
+                    "2": {
+                        "then": "Deze locatie biedt diensten aan voor GLS"
+                    },
+                    "3": {
+                        "then": "Deze locatie biedt diensten aan voor UPS"
+                    },
+                    "6": {
+                        "then": "Deze locatie is een PostNL-punt"
+                    },
+                    "7": {
+                        "then": "Deze locatie biedt diensten aan voor bpost"
+                    }
+                }
+            },
+            "stamps": {
+                "mappings": {
+                    "0": {
+                        "then": "Je kan hier postzegels kopen"
+                    },
+                    "1": {
+                        "then": "Je kan hier geen postzegels kopen"
+                    }
+                },
+                "question": "Kan je hier postzegels kopen?",
+                "render": "Je kan hier postzegels kopen van de volgende bedrijven: {post_office:stamps}"
             }
         },
         "title": {
@@ -6344,6 +6390,26 @@
                     }
                 },
                 "question": "Heeft deze trap een leuning?"
+            },
+            "ramp": {
+                "mappings": {
+                    "0": {
+                        "then": "Er is hier een helling voor fietsen"
+                    },
+                    "1": {
+                        "then": "Er is hier een helling voor rolstoelen"
+                    },
+                    "2": {
+                        "then": "Er is hier een helling voor rolstoelen, maar deze is los aangegeven op de kaart"
+                    },
+                    "3": {
+                        "then": "Er is hier een helling voor kinderwagens"
+                    },
+                    "4": {
+                        "then": "Er is hier geen helling"
+                    }
+                },
+                "question": "Is er een helling bij deze trap?"
             }
         },
         "title": {
@@ -6891,6 +6957,7 @@
                         "then": "Publiek toegankelijk"
                     }
                 },
+                "question": "Zijn deze toiletten publiek toegankelijk?",
                 "render": "Toegankelijkheid is {toilets:access}"
             },
             "toilet-charge": {
@@ -6927,6 +6994,13 @@
                 "render": "De deur naar de rolstoeltoegankelijke toilet is {canonical(toilets:door:width)} wide"
             }
         },
+        "title": {
+            "mappings": {
+                "0": {
+                    "then": "Toilet bij {name}"
+                }
+            }
+        },
         "units": {
             "0": {
                 "applicableUnits": {
@@ -7010,6 +7084,13 @@
     },
     "transit_routes": {
         "description": "Laag met buslijnen",
+        "mapRendering": {
+            "0": {
+                "color": {
+                    "render": "#ff0000"
+                }
+            }
+        },
         "name": "Buslijnen",
         "tagRenderings": {
             "colour": {
@@ -7041,6 +7122,11 @@
             }
         },
         "title": {
+            "mappings": {
+                "0": {
+                    "then": "{name}"
+                }
+            },
             "render": "Buslijn"
         }
     },
diff --git a/langs/layers/pt.json b/langs/layers/pt.json
index 416879e836..04fd94f584 100644
--- a/langs/layers/pt.json
+++ b/langs/layers/pt.json
@@ -1,7 +1,21 @@
 {
     "address": {
         "description": "Endereços",
-        "name": "Endereços conhecidos no OSM"
+        "name": "Endereços conhecidos no OSM",
+        "tagRenderings": {
+            "fixme": {
+                "question": "O que deve ser corrigido aqui? Explique"
+            },
+            "housenumber": {
+                "mappings": {
+                    "0": {
+                        "then": "Este prédio não tem número"
+                    }
+                },
+                "question": "Qual é o número desta casa?",
+                "render": "The house number is <b>{addr:housenumber}</b>"
+            }
+        }
     },
     "artwork": {
         "description": "Diversas obras de arte",
@@ -12,6 +26,10 @@
             }
         },
         "tagRenderings": {
+            "artwork-artist-wikidata": {
+                "question": "Quem fez essa obra de arte?",
+                "render": "Esta obra de arte foi feita por {wikidata_label(artist:wikidata):font-weight:bold}<br/>{wikipedia(artist:wikidata)}"
+            },
             "artwork-artist_name": {
                 "question": "Que artista criou isto?",
                 "render": "Criado por {artist_name}"
@@ -53,6 +71,9 @@
                     },
                     "11": {
                         "then": "Ladrilhos"
+                    },
+                    "12": {
+                        "then": "Entalhe em madeira"
                     }
                 },
                 "question": "Qual é o tipo desta obra de arte?",
@@ -61,6 +82,10 @@
             "artwork-website": {
                 "question": "Existe um site com mais informações sobre esta obra de arte?",
                 "render": "Mais informações <a href='{website}' target='_blank'>neste site</a>"
+            },
+            "artwork_subject": {
+                "question": "O que esta obra de arte representa?",
+                "render": "A obra de arte representa {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}"
             }
         },
         "title": {
@@ -72,6 +97,13 @@
             "render": "Obra de arte"
         }
     },
+    "barrier": {
+        "tagRenderings": {
+            "MaxWidth": {
+                "render": "Largura máxima: {maxwidth:physical} m"
+            }
+        }
+    },
     "bench": {
         "name": "Bancos",
         "presets": {
@@ -165,6 +197,14 @@
     "bench_at_pt": {
         "name": "Bancos em pontos de transporte público",
         "tagRenderings": {
+            "bench_at_pt-bench_type": {
+                "mappings": {
+                    "2": {
+                        "then": "Não há nenhum banco aqui"
+                    }
+                },
+                "question": "Que tipo de banco é este?"
+            },
             "bench_at_pt-name": {
                 "render": "{name}"
             }
diff --git a/langs/themes/pt_BR.json b/langs/themes/pt_BR.json
index bdf96fb08a..d7191170a3 100644
--- a/langs/themes/pt_BR.json
+++ b/langs/themes/pt_BR.json
@@ -3,6 +3,17 @@
         "description": "Neste mapa, pode-se encontrar e marcar desfibriladores próximos",
         "title": "Abrir mapa AED"
     },
+    "bag": {
+        "layers": {
+            "2": {
+                "tagRenderings": {
+                    "Build year": {
+                        "render": "Esta construção é de <b>{_bag_obj:start_date}</b>"
+                    }
+                }
+            }
+        }
+    },
     "benches": {
         "shortDescription": "Um mapa de bancadas",
         "title": "Bancadas"