Merge branch 'master' into develop

pietervdvn · Sep 18, 2024 · fdb71cc · fdb71cc
2 parents 58cec96 + 2569d0c
commit fdb71cc
Show file tree

Hide file tree

Showing 26 changed files with 282 additions and 125 deletions.
diff --git a/assets/layers/climbing_opportunity/climbing_opportunity.json b/assets/layers/climbing_opportunity/climbing_opportunity.json
@@ -150,7 +150,8 @@
   ],
   "allowMove": false,
   "snapName": {
-    "en": "a wall, cliff or rock"
+    "en": "a wall, cliff or rock",
+    "de": "eine Wand, eine Klippe oder einen Felsen"
   },
   "doCount": false
 }
diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json
@@ -1916,6 +1916,7 @@
   "allowSplit": true,
   "snapName": {
     "en": "a road or a cycleway",
-    "nl": "een weg, straat of fietspad"
+    "nl": "een weg, straat of fietspad",
+    "de": "eine Straße oder einen Radweg"
   }
 }
diff --git a/assets/layers/hackerspace/hackerspace.json b/assets/layers/hackerspace/hackerspace.json
@@ -196,7 +196,8 @@
         {
           "if": "hackerspace=hacklab",
           "then": {
-            "en": "This is a <b>hacklab</b> which is mostly focussed on basic computer skills, using recycled devices and/or providing internet to the community. This is typically located in autonomous spaces, squats or social facilities"
+            "en": "This is a <b>hacklab</b> which is mostly focussed on basic computer skills, using recycled devices and/or providing internet to the community. This is typically located in autonomous spaces, squats or social facilities",
+            "de": "Dies ist ein <b>Hackerspace/Hack-Lab</b>, das sich hauptsächlich auf grundlegende Computerkenntnisse konzentriert, recycelte Geräte verwendet und/oder der Gemeinschaft Internet bereitstellt. Es befindet sich typischerweise in autonomen Räumen, besetzten Häusern oder sozialen Einrichtungen."
           }
         }
       ]

diff --git a/assets/layers/indoors/indoors.json b/assets/layers/indoors/indoors.json
@@ -475,7 +475,8 @@
         {
           "if": "room=printer",
           "then": {
-            "en": "This is a copy room"
+            "en": "This is a copy room",
+            "de": "Dies ist ein Kopierraum"
           }
         },
         {
@@ -622,6 +623,7 @@
   },
   "snapName": {
     "en": "an indoor wall",
-    "nl": "een binnenmuur"
+    "nl": "een binnenmuur",
+    "de": "eine Innenwand"
   }
 }
diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json
@@ -408,6 +408,7 @@
     }
   ],
   "snapName": {
-    "en": "a kerb"
+    "en": "a kerb",
+    "de": "ein Bordstein"
   }
 }
diff --git a/assets/layers/note/note.json b/assets/layers/note/note.json
@@ -307,7 +307,6 @@
         }
       ]
     },
-
     {
       "id": "opened_by",
       "options": [
@@ -444,7 +443,7 @@
           "question": {
             "en": "Created after {search}",
             "nl": "Aangemaakt na {search}",
-            "de": "Erstellt nach dem {search}",
+            "de": "Zuletzt bearbeitet vor {search}",
             "es": "Creada después de {search}",
             "ca": "Creada després de {search}",
             "cs": "Vytvořeno po {search}",
@@ -465,7 +464,8 @@
             }
           ],
           "question": {
-            "en": "Last edited before {search}"
+            "en": "Last edited before {search}",
+            "de": "Zuletzt bearbeitet nach {search}"
           }
         }
       ]

diff --git a/assets/layers/pedestrian_path/pedestrian_path.json b/assets/layers/pedestrian_path/pedestrian_path.json
@@ -48,6 +48,7 @@
   ],
   "allowMove": false,
   "snapName": {
-    "en": "a pedestrian path"
+    "en": "a pedestrian path",
+    "de": "ein Fußweg"
   }
 }
diff --git a/assets/layers/police/police.json b/assets/layers/police/police.json
@@ -1,10 +1,12 @@
 {
   "id": "police",
   "name": {
-    "en": "Police stations"
+    "en": "Police stations",
+    "de": "Polizeiwachen"
   },
   "description": {
-    "en": "Many types of police facilities "
+    "en": "Many types of police facilities ",
+    "de": "Verschiedene Polizeieinrichtungen "
   },
   "source": {
     "osmTags": {
@@ -17,7 +19,8 @@
   "minzoom": 10,
   "title": {
     "render": {
-      "en": "{name}"
+      "en": "{name}",
+      "de": "{name}"
     }
   },
   "pointRendering": [
@@ -49,32 +52,38 @@
         "amenity=police"
       ],
       "title": {
-        "en": "a police office"
+        "en": "a police office",
+        "de": "eine Polizeiwache"
       },
       "description": {
-        "en": "A police office where the general public can enter for inquiries"
+        "en": "A police office where the general public can enter for inquiries",
+        "de": "Eine Polizeiwache, die von der Öffentlichkeit für Anfragen genutzt werden kann"
       }
     },
     {
       "tags": [
         "police=checkpoint"
       ],
       "title": {
-        "en": "a police checkpoint"
+        "en": "a police checkpoint",
+        "de": "eine Polizeikontrolle"
       },
       "description": {
-        "en": "A place where police performs checks on travelling people"
+        "en": "A place where police performs checks on travelling people",
+        "de": "Ein Ort, an dem die Polizei Kontrollen von Reisenden durchführt"
       }
     },
     {
       "tags": [
         "police=offices"
       ],
       "title": {
-        "en": "an administrative, police backoffice"
+        "en": "an administrative, police backoffice",
+        "de": "ein Verwaltungsbüro der Polizei"
       },
       "description": {
-        "en": "An administrative police office without services for the general public."
+        "en": "An administrative police office without services for the general public.",
+        "de": "Ein Verwaltungsbüro der Polizei ohne Dienstleistungen für die Allgemeinheit."
       }
     },
     {
@@ -83,7 +92,8 @@
       ],
       "title": "a police detention center",
       "description": {
-        "en": "A jail run by the police without public services. People are detained here for a short time (at most a few days), e.g. for small misdemeanors, disturbance of the public order or awaiting a trial"
+        "en": "A jail run by the police without public services. People are detained here for a short time (at most a few days), e.g. for small misdemeanors, disturbance of the public order or awaiting a trial",
+        "de": "Ein von der Polizei betriebenes Gefängnis ohne öffentliche Dienstleistungen. Hier werden Menschen für kurze Zeit (höchstens ein paar Tage) inhaftiert, z. B. wegen kleinerer Vergehen, Störung der öffentlichen Ordnung oder in Erwartung eines Gerichtsverfahrens"
       }
     },
     {
@@ -92,7 +102,8 @@
       ],
       "title": "a police naval base",
       "description": {
-        "en": "A naval or maritime base for the maritime police; often with a pier and police boats nearby"
+        "en": "A naval or maritime base for the maritime police; often with a pier and police boats nearby",
+        "de": "Ein Stützpunkt für die Schifffahrtspolizei; oft mit einem Anleger und Polizeibooten in der Nähe"
       }
     }
   ],
@@ -101,11 +112,13 @@
     "reviews",
     {
       "question": {
-        "en": "What is the name of this police facility?"
+        "en": "What is the name of this police facility?",
+        "de": "Wie lautet der Name der Polizeieinrichtung?"
       },
       "id": "police_name",
       "render": {
-        "en": "<b>{name}</b>"
+        "en": "<b>{name}</b>",
+        "de": "<b>{name}</b>"
       },
       "freeform": {
         "key": "name"
@@ -116,21 +129,24 @@
     "opening_hours",
     {
       "question": {
-        "en": "Does this police office have detention facilities?"
+        "en": "Does this police office have detention facilities?",
+        "de": "Verfügt die Polizeidienststelle über Gewahrsamsräume?"
       },
       "id": "4_z2nrdhy6tyyh4fd",
       "condition": "amenity=police",
       "mappings": [
         {
           "if": "detention=yes",
           "then": {
-            "en": "This police office has some cells to detain people"
+            "en": "This police office has some cells to detain people",
+            "de": "Die Polizeidienststelle hat Zellen für die Inhaftierung von Personen"
           }
         },
         {
           "if": "detention=no",
           "then": {
-            "en": "This police office does not have cells to detain people"
+            "en": "This police office does not have cells to detain people",
+            "de": "Die Polizeidienststelle hat keine Zellen für die Inhaftierung von Personen"
           }
         }
       ]

diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json
@@ -2174,7 +2174,8 @@
           "if": "internet_access=terminal;wifi",
           "alsoShowIf": "internet_access=wifi;terminal",
           "then": {
-            "en": "This place offers both wireless internet and internet access via a terminal or computer"
+            "en": "This place offers both wireless internet and internet access via a terminal or computer",
+            "de": "Dieser Ort bietet sowohl drahtloses Internet als auch Internetzugang über ein Terminal oder einen Computer"
           }
         }
       ],

diff --git a/assets/layers/shelter/shelter.json b/assets/layers/shelter/shelter.json
@@ -127,6 +127,7 @@
     "enableImproveAccuracy": true
   },
   "snapName": {
-    "en": "a shelter"
+    "en": "a shelter",
+    "de": "ein Unterstand"
   }
 }
diff --git a/assets/layers/usersettings/usersettings.json b/assets/layers/usersettings/usersettings.json
@@ -555,22 +555,25 @@
       "id": "scalebar",
       "question": {
         "en": "Should a scale bar be shown on the map?",
-        "nl": "Moet er een schaalbalk weergegeven worden?"
+        "nl": "Moet er een schaalbalk weergegeven worden?",
+        "de": "Kartenmaßstab anzeigen?"
       },
       "mappings": [
         {
           "if": "mapcomplete-preference-show-scale=true",
           "then": {
             "en": "Show the scalebar",
-            "nl": "Toon de schaalbalk"
+            "nl": "Toon de schaalbalk",
+            "de": "Maßstab anzeigen"
           }
         },
         {
           "if": "mapcomplete-preference-show-scale=false",
           "alsoShowIf": "mapcomplete-preference-show-scale=",
           "then": {
             "en": "Hide the scalebar",
-            "nl": "Verberg de schaalbalk"
+            "nl": "Verberg de schaalbalk",
+            "de": "Maßstab ausblenden"
           }
         }
       ]

diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json
@@ -143,6 +143,7 @@
   ],
   "snapName": {
     "en": "a wall or building",
-    "nl": "een muur of gebouw"
+    "nl": "een muur of gebouw",
+    "de": "eine Wand oder ein Gebäude"
   }
 }
diff --git a/assets/themes/bag/bag.json b/assets/themes/bag/bag.json
@@ -73,7 +73,8 @@
             "es": "La referencia de BAG es <b>{ref:bag}</b>",
             "cs": "Reference v BAG je <b>{ref:bag}</b>",
             "pl": "Numer referencyjny w BAG to <b>{ref:bag}</b>",
-            "zh_Hans": "在 BAG 中的参考是 <b>{ref:bag}</b>"
+            "zh_Hans": "在 BAG 中的参考是 <b>{ref:bag}</b>",
+            "fil": "Ang sanggunian sa BAG ay <b>{ref:bag}</b>"
           },
           "mappings": [
             {
@@ -88,7 +89,8 @@
                 "zgh": "ⵜⵓⵚⴽⴰ ⴰⴷ ⵓⵔ ⵖⵓⵔⵙ ⵜⴰⵙⴰⵖⵓⵍⵜ ⴳ BAG",
                 "es": "Este edificio no tiene referencia en el BAG",
                 "pl": "Budynek ten nie ma odniesienia w BAG",
-                "zh_Hans": "这栋建筑在BAG中没有参考信息"
+                "zh_Hans": "这栋建筑在BAG中没有参考信息",
+                "fil": "Walang sanggunian ang gusaling ito sa BAG"
               }
             }
           ]
@@ -205,7 +207,8 @@
         "es": "Edificios del registro BAG",
         "cs": "Budovy z registru BAG",
         "pl": "Budynki z rejestru BAG",
-        "zh_Hans": "BAG 注册中的建筑物"
+        "zh_Hans": "BAG 注册中的建筑物",
+        "fil": "Mga gusali mula sa rehistro ng BAG"
       },
       "source": {
         "geoJson": "https://service.pdok.nl/lv/bag/wfs/v2_0?request=GetFeature&service=WFS&version=2.0.0&outputFormat=application%2Fjson%3B%20subtype%3Dgeojson&typeName=bag%3Apand&bbox={x_min}%2C{y_min}%2C{x_max}%2C{y_max}%2CCRS84&srsName=EPSG%3A4326",
@@ -291,7 +294,8 @@
             "es": "La referencia en BAG es <b>{_bag_obj:ref:bag}</b>",
             "cs": "Reference v BAG je <b>{_bag_obj:ref:bag}</b>",
             "pl": "Odniesienie w BAG to <b>{_bag_obj:ref:bag}</b>",
-            "zh_Hans": "在 BAG 中的参考文献是 <b>{_bag_obj:ref:bag}</b>"
+            "zh_Hans": "在 BAG 中的参考文献是 <b>{_bag_obj:ref:bag}</b>",
+            "fil": "Ang sanggunian sa BAG ay <b>{_bag_obj:ref:bag}</b>"
           }
         },
         {
@@ -308,7 +312,8 @@
             "nb_NO": "Bygning oppført <b>{_bag_obj:start_date}</b>",
             "pl": "Ten budynek zbudowano w <b>{_bag_obj:start_date}</b>",
             "pt": "Esta construção é de <b>{_bag_obj:start_date}</b>",
-            "zh_Hans": "这座建筑建于 <b>{_bag_obj:start_date}</b>"
+            "zh_Hans": "这座建筑建于 <b>{_bag_obj:start_date}</b>",
+            "fil": "Ang gusaling ito ay itinayo noong <b>{_bag_obj:start_date}</b>"
           },
           "mappings": [
             {
@@ -323,7 +328,8 @@
                 "nb_NO": "Oppføring startet <b>{_bag_obj:start_date}</b>",
                 "es": "Este edificio se empezó a construir en <b>{_bag_obj:start_date}</b>",
                 "pl": "Budynek został zbudowany w <b>{_bag_obj:start_date}</b>",
-                "zh_Hans": "该建筑始建于 <b>{_bag_obj:start_date}</b>"
+                "zh_Hans": "该建筑始建于 <b>{_bag_obj:start_date}</b>",
+                "fil": "Sinimulan ang gusali noong <b>{_bag_obj:start_date}</b>"
               }
             }
           ]
@@ -340,7 +346,8 @@
             "nb_NO": "Dette er en bygning av typen <b>{_bag_obj:building}</b>",
             "es": "El edificio es de tipo <b>{_bag_obj:building}</b>",
             "pl": "Rodzaj budynku to <b>{_bag_obj:building}</b>",
-            "zh_Hans": "建筑类型是 <b>{_bag_obj:building}</b>"
+            "zh_Hans": "建筑类型是 <b>{_bag_obj:building}</b>",
+            "fil": "Ang uri ng gusali ay <b>{_bag_obj:building}</b>"
           },
           "mappings": [
             {
@@ -354,7 +361,8 @@
                 "cs": "Typ budovy bude <b>{_bag_obj:construction}</b>",
                 "es": "El tipo de edificio será un <b>{_bag_obj:construction}</b>",
                 "pl": "Budynek będzie o typie <b>{_bag_obj:construction}</b>",
-                "zh_Hans": "建筑类型将是 <b>{_bag_obj:construction}</b>"
+                "zh_Hans": "建筑类型将是 <b>{_bag_obj:construction}</b>",
+                "fil": "Ang uri ng gusali ay magiging <b>{_bag_obj:construction}</b>"
               }
             }
           ]

diff --git a/assets/themes/benches/benches.json b/assets/themes/benches/benches.json
@@ -21,7 +21,8 @@
     "cs": "Lavičky",
     "eu": "Eserlekuak",
     "pl": "Ławki",
-    "pt": "Bancadas"
+    "pt": "Bancadas",
+    "fil": "Mga upuan"
   },
   "description": {
     "en": "This map shows all benches that are recorded in OpenStreetMap: Individual benches, and benches belonging to public transport stops or shelters.",
@@ -62,7 +63,8 @@
     "cs": "Mapa laviček",
     "eu": "Eserleku mapa bat",
     "pl": "Mapa ławek",
-    "pt": "Um mapa de bancadas"
+    "pt": "Um mapa de bancadas",
+    "fil": "Mapa ng upuan"
   },
   "icon": "./assets/themes/benches/bench_poi.svg",
   "credits": [