Merge branch 'master' into develop

assets/layers/climbing_gym/climbing_gym.json

@@ -135,7 +135,6 @@
             "de": "Kletterschuhe können hier ausgeliehen werden"
           },
           "addExtraTags": [
-            "service:climbing_shoes:rental:fee=",
             "service:climbing_shoes:rental:charge="
           ]
         },

assets/layers/questions/questions.json

@@ -2154,20 +2154,23 @@
     {
       "id": "survey_date",
       "question": {
-        "en": "When was this object last surveyed?"
+        "en": "When was this object last surveyed?",
+        "de": "Wann wurde dieses Objekt zuletzt geprüft?"
       },
       "freeform": {
         "key": "survey:date",
         "type": "date"
       },
       "render": {
-        "en": "This object was last surveyed on <b>{survey:date}</b>"
+        "en": "This object was last surveyed on <b>{survey:date}</b>",
+        "de": "Dieses Objekt wurde zuletzt geprüft am <b>{survey:date}</b>"
       },
       "mappings": [
         {
           "if": "survey:date:={_now:date}",
           "then": {
-            "en": "This object was last surveyed today"
+            "en": "This object was last surveyed today",
+            "de": "Dieses Objekt wurde heute zuletzt geprüft"
           }
         }
       ]

assets/layers/usersettings/usersettings.json

@@ -39,7 +39,8 @@
           "if": "__url_parameter_initialized:language=yes",
           "icon": "./assets/layers/usersettings/translate_disabled.svg",
           "then": {
-            "en": "The language was set via an URL-parameter and cannot be set by the user.²"
+            "en": "The language was set via an URL-parameter and cannot be set by the user.²",
+            "de": "Die Sprache wurde über einen URL-Parameter gesetzt und kann nicht vom Benutzer eingestellt werden.²"
           }
         }
       ]

assets/themes/campersite/campersite.json

@@ -231,12 +231,7 @@
               }
             },
             {
-              "if": {
-                "and": [
-                  "fee=no",
-                  "charge="
-                ]
-              },
+              "if": "fee=no",
               "then": {
                 "en": "Can be used for free",
                 "id": "Boleh digunakan tanpa bayaran",
@@ -1562,4 +1557,4 @@
     ]
   },
   "credits": "joost schouppe"
-}
+}