From b9a318967d21281e47f17c46c7cb832ce804daf9 Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Sun, 27 Mar 2022 20:20:34 +0200
Subject: [PATCH 1/2] Translation sync

---
 assets/themes/climbing/climbing.json | 47 ++++++++++++++--------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json
index 9a13c7e6c4..550131a869 100644
--- a/assets/themes/climbing/climbing.json
+++ b/assets/themes/climbing/climbing.json
@@ -224,14 +224,14 @@
             "point",
             "centroid"
           ],
-    "label": {
-        "mappings": [
-          {
-            "if": "name~*",
-            "then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>"
+          "label": {
+            "mappings": [
+              {
+                "if": "name~*",
+                "then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>"
+              }
+            ]
           }
-        ]
-      }
         }
       ]
     },
@@ -340,14 +340,15 @@
           "location": [
             "point",
             "centroid"
-          ],    "label": {
-        "mappings": [
-          {
-            "if": "name~*",
-            "then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>"
+          ],
+          "label": {
+            "mappings": [
+              {
+                "if": "name~*",
+                "then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>"
+              }
+            ]
           }
-        ]
-      }
         }
       ]
     },
@@ -583,15 +584,15 @@
           "location": [
             "point",
             "centroid"
-          ],    "label": {
-        "mappings": [
-          {
-            "if": "name~*",
-            "then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>"
+          ],
+          "label": {
+            "mappings": [
+              {
+                "if": "name~*",
+                "then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>"
+              }
+            ]
           }
-        ]
-      }
-
         },
         {
           "color": {
@@ -1692,4 +1693,4 @@
       }
     ]
   }
-}
+}
\ No newline at end of file

From d0abf148065d4a97ecf61412d51c6ad278310871 Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Tue, 29 Mar 2022 21:24:44 +0200
Subject: [PATCH 2/2] Fix filter on notes theme, fix #713

---
 assets/layers/note/note.json | 19 ++++++++++++-------
 langs/layers/en.json         | 12 ++++++------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/assets/layers/note/note.json b/assets/layers/note/note.json
index c2e978a801..fc5b015875 100644
--- a/assets/layers/note/note.json
+++ b/assets/layers/note/note.json
@@ -86,7 +86,12 @@
         {
           "if": "_total_comments>1",
           "then": "speech_bubble"
+        },
+        {
+          "if": "_is_import_note~*",
+          "then": "addSmall"
         }
+        
       ]
     }
   ],
@@ -134,7 +139,7 @@
             }
           ],
           "question": {
-            "en": "Opened by {search}"
+            "en": "Opened by contributor {search}"
           }
         }
       ]
@@ -150,7 +155,7 @@
             }
           ],
           "question": {
-            "en": "<b>Not</b> opened by {search}"
+            "en": "<b>Not</b> opened by contributor {search}"
           }
         }
       ]
@@ -159,14 +164,14 @@
       "id": "edited_by",
       "options": [
         {
-          "osmTags": "_lastt_user_lc~.*{search}.*",
+          "osmTags": "_last_user_lc~.*{search}.*",
           "fields": [
             {
               "name": "search"
             }
           ],
           "question": {
-            "en": "Opened before {search}"
+            "en": "Last edited by contributor {search}"
           }
         }
       ]
@@ -199,7 +204,7 @@
             }
           ],
           "question": {
-            "en": "Opened by anonymous user"
+            "en": "Created before {search}"
           }
         }
       ]
@@ -216,7 +221,7 @@
             }
           ],
           "question": {
-            "en": "Only show open notes"
+            "en": "Created after {search}"
           }
         }
       ]
@@ -227,7 +232,7 @@
         {
           "osmTags": "_opened_by_anonymous_user=true",
           "question": {
-            "en": "Hide import notes"
+            "en": "Only show notes opened by an anonymous contributor"
           }
         }
       ]
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 472d18c56d..81b2589b96 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -3748,21 +3748,21 @@
             "2": {
                 "options": {
                     "0": {
-                        "question": "Opened by {search}"
+                        "question": "Opened by contributor {search}"
                     }
                 }
             },
             "3": {
                 "options": {
                     "0": {
-                        "question": "<b>Not</b> opened by {search}"
+                        "question": "<b>Not</b> opened by contributor {search}"
                     }
                 }
             },
             "4": {
                 "options": {
                     "0": {
-                        "question": "Opened before {search}"
+                        "question": "Last edited by contributor {search}"
                     }
                 }
             },
@@ -3776,21 +3776,21 @@
             "6": {
                 "options": {
                     "0": {
-                        "question": "Opened by anonymous user"
+                        "question": "Created before {search}"
                     }
                 }
             },
             "7": {
                 "options": {
                     "0": {
-                        "question": "Only show open notes"
+                        "question": "Created after {search}"
                     }
                 }
             },
             "8": {
                 "options": {
                     "0": {
-                        "question": "Hide import notes"
+                        "question": "Only show notes opened by an anonymous contributor"
                     }
                 }
             },