From 7f5e771759b6a5b7d79f5ca5cd90273da3970a84 Mon Sep 17 00:00:00 2001
From: Flo Edelmann <git@flo-edelmann.de>
Date: Sat, 20 Jul 2024 15:52:42 +0200
Subject: [PATCH 1/2] Add `armchair` question to bench layer

---
 assets/layers/bench/bench.json | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/assets/layers/bench/bench.json b/assets/layers/bench/bench.json
index ede50afd2e..d62e48fd86 100644
--- a/assets/layers/bench/bench.json
+++ b/assets/layers/bench/bench.json
@@ -234,6 +234,32 @@
         "bench-questions"
       ]
     },
+    {
+      "mappings": [
+        {
+          "if": "armrest=yes",
+          "then": {
+            "en": "This bench does have one or more armrests",
+            "de": "Diese Sitzbank hat eine oder mehrere Armlehnen"
+          }
+        },
+        {
+          "if": "armrest=no",
+          "then": {
+            "en": "This bench does <b>not</b> have any armrests",
+            "de": "Diese Sitzbank hat <b>keine</b> Armlehnen"
+          }
+        }
+      ],
+      "question": {
+        "en": "Does this bench have one or more armrests?",
+        "de": "Hat diese Sitzbank eine oder mehrere Armlehnen?"
+      },
+      "id": "bench-armrest",
+      "labels": [
+        "bench-questions"
+      ]
+    },
     {
       "render": {
         "en": "This bench has {seats} seats",

From cce460dbc98c2fbc9d9c407fb6614bc8dd693f3e Mon Sep 17 00:00:00 2001
From: Flo Edelmann <git@flo-edelmann.de>
Date: Sat, 20 Jul 2024 15:52:59 +0200
Subject: [PATCH 2/2] Fix typo in contributing guidelines

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6acc1b1eee..36b4cb00c0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,7 +23,7 @@ to `https://pietervdvn.github.io/mc/<branchname>`. You can see the deploy proces
 on [GitHub Actions](https://github.com/pietervdvn/MapComplete/actions). Don't worry about pushing too much. These
 deploys are free and totally automatic. They might fail if something is wrong, but this will hinder no one.
 
-Additionaly, some other maintainer might step in and merge the latest develop with your branch, making later pull
+Additionally, some other maintainer might step in and merge the latest develop with your branch, making later pull
 requests easier.
 
 Don't worry about bugs