diff --git a/data/l10n/core.gan.json b/data/l10n/core.gan.json
index af9c32c11..e05a62dd5 100644
--- a/data/l10n/core.gan.json
+++ b/data/l10n/core.gan.json
@@ -338,11 +338,15 @@
       "extract": {
         "title": "抽出",
         "description": {
+          "line": "從這些線截取點。",
+          "area": "從這區域截取點",
           "feature": {
             "other": "從這些圖徽中擷取點。"
           }
         },
-        "annotation": "已擷取 {n} 個點。"
+        "annotation": "已擷取 {n} 個點。",
+        "too_large": "無法從這些圖徵截取點，因為沒有足夠可視的圖徵。",
+        "connected_to_hidden": "無法從這些圖徵截取點，因為有些連結的圖徵已經被隱藏了"
       }
     },
     "restriction": {
@@ -616,9 +620,16 @@
           "tooltip": "從開放街圖而來的註記資料",
           "title": "公家街圖註"
         },
+        "rapid": {
+          "license": "Facebook 地圖的 AI 授權條款"
+        },
         "maproulette": {
           "detail_title": "詳細資訊",
-          "cancel": "唔做"
+          "fixed": "我已經修復了!",
+          "cancel": "唔做",
+          "nearbyTask": {
+            "title": "跳到附近的任務"
+          }
         },
         "keepRight": {
           "tooltip": "由 keepright.at 偵測到的資料問題",
@@ -680,6 +691,7 @@
       }
     },
     "filters": {
+      "title": "篩選",
       "points": {
         "description": "處",
         "tooltip": "名勝"
@@ -875,6 +887,7 @@
       "cancel": "唔做"
     },
     "splash": {
+      "welcome": "歡迎來到{rapidicon}{version}！!",
       "start": "卽改"
     },
     "source_switch": {
@@ -883,12 +896,97 @@
       "lose_changes": "你未有修改未記妥。轉地圖電腦，就會無咗修改。你真係要轉地圖電腦？"
     },
     "rapid_inspector": {
-      "tags": "標籤"
+      "prompt": "針對這個選取的圖徵你要如何處理？",
+      "notice": {
+        "open_data": "這份資料集是由開放資料構成。請見 [license]({url}) 取得更多資訊。"
+      },
+      "tags": "標籤",
+      "option_accept": {
+        "label": "新增這個圖徵",
+        "description": "這看起來是正確的圖徵嗎？請確認之後選擇來開始連結、加標籤，然後儲存到開放街圖。👍",
+        "annotation": "新增 Rapid 圖徵。",
+        "tooltip": "新增這圖徵到地圖來開始編輯。",
+        "disabled": "要幫助改進開放街圖資料品質，我們每一次畫地圖階段只允許添加{n}個 AI 圖徵。請在編輯時修正問題，你可以在儲存之後添加更多 AI 圖徵。",
+        "disabled_flash": "要幫助改進開放街圖資料品質，我們只允許 {n}個 AI 圖徵加到每一次的畫地圖階段。"
+      },
+      "option_ignore": {
+        "label": "忽略這圖徵",
+        "description": "忽略這圖徵來幫助我們的機器學習機制。如果你不確定是否正確的話，請忽略就好，不會有東西儲存或是移除。👍",
+        "annotation": "忽略 Rapid 圖徵。",
+        "tooltip": "忽略這個圖徵。"
+      }
     },
     "rapid_menu": {
+      "license": "授權條款",
+      "toggle_all": "啟用所有 {rapidicon} 資料",
+      "add_manage_datasets": "新增/管理資料集",
+      "center_map": "在這裡置中地圖",
+      "worldwide": "全世界",
+      "no_datasets": "沒有可使用的資料集",
       "remove": "移走",
+      "add_dataset": "新增資料集",
+      "dataset_added": "已經添加的資料集",
+      "more_info": "更多資訊",
+      "about_the_catalog": "這些資料集從不同組織，以開放資料方式釋出，而 Esri 使用者社群則是能夠用來改善開放街圖的目的。<br/>你可以點下列連結瞭解更多，或是造訪 [Rapid 指南](https://github.com/facebookmicrosites/Open-Mapping-At-Facebook/wiki/Esri-ArcGIS-FAQ) 或是 [OSM Wiki 的 Esri/ArcGIS 資料集頁面](https://wiki.openstreetmap.org/wiki/Esri/ArcGIS_Datasets)。",
+      "clear_filters": "清除篩選",
+      "filter_datasets": "篩選資料集",
+      "any_type": "任何類似",
+      "datasets_found": "有找到{gt}{n}個資料集",
       "category": {
-        "roads": "路"
+        "addresses": "地址",
+        "buildings": "建築",
+        "featured": "強調",
+        "footways": "人行通道",
+        "microsoft": "微軟",
+        "places": "地點",
+        "preview": "預覽",
+        "roads": "路",
+        "trees": "樹木"
+      },
+      "fbRoads": {
+        "label": "Facebook 道路",
+        "description": "運用 AI 從 Maxar Premium 影像偵測出來預測的道路，範圍包括 80 個國家。"
+      },
+      "msBuildings": {
+        "label": "微軟建築",
+        "description": "全球的開放建築外框，從 2014 到 2024 年的 Bing 地圖影像偵測而來，包括 Maxar、Airbus ，以及 IGN 法國的影像。"
+      },
+      "overture": {
+        "places": {
+          "label": "Overture 地點",
+          "description": "含有超過 5300 萬筆代表現實世界的物件：例如學校、商家、醫院、宗教組織、地標、山峰等等。"
+        }
+      },
+      "omdFootways": {
+        "label": "人行通道的開放資料",
+        "description": "開啟從不同地方政府收集的人行通道資料。"
+      }
+    },
+    "rapid_poweruser": {
+      "beta": "Beta 功能",
+      "heading": {
+        "label": "Rapid 專業用戶的功能",
+        "description": "給 Rapid 專業用戶"
+      },
+      "previewDatasets": {
+        "label": "顯示預覽資料集",
+        "description": "預覽資料集仍在預覽階段，還沒有開放給所有人"
+      },
+      "tagnosticRoadCombine": {
+        "label": "與標籤無關的合併道路",
+        "description": "允許不同道路標籤能夠合併"
+      },
+      "tagSources": {
+        "label": "加上 Maxar 到道路標籤",
+        "description": "新增 `source=maxar` 到所有的道路上"
+      },
+      "showAutoFix": {
+        "label": "啟用問題面版的自動修正按鈕",
+        "description": "啟用問題面版的自動修正按鈕來修正簡單的問題"
+      },
+      "allowLargeEdits": {
+        "label": "允許大面積編輯",
+        "description": "解除編輯不在目前檢範圍圖徵的限制"
       }
     },
     "tag_reference": {
@@ -1330,6 +1428,7 @@
         "title": "處",
         "intro": "*點*可以用來表示像是商店、餐廳和紀念碑的圖徵。他們佔據特定的地點，描述在那裡的東西。",
         "add_point_h": "新增點",
+        "add_point": "要新增點，請按地圖上方工具列的{point_icon}**{point}** 按鈕，或是按快速建 `{add_point_key}`。",
         "move_point_h": "移動點",
         "delete_point_h": "刪除點",
         "delete_point": "刪除現實世界不存在的圖徵是很 OK 的事情。從開放街圖刪除圖徵，意味著從每個人會用到的地圖移除，所以你必須確定圖徵確實不在了，才真的刪除圖徵。"
@@ -1338,6 +1437,7 @@
         "title": "綫",
         "intro": "*線*用來代表像是道路、鐵路和河流。線應沿著被代表物體的中心繪製。",
         "add_line_h": "新增線",
+        "add_line": "要新增線段，請按地圖上方工具列的{line_icon}**{line}** 按鈕，或是按快速鍵 `{add_line_key}`。",
         "add_line_finish": "要完成畫線，按、輕按或是按下 `{return}` 最後一個節點。",
         "modify_line_h": "變更線",
         "modify_line_dragnode": "有時候你會看線的形狀並不正確，比方說道路並沒有與背景影像重合。要調整線的形狀，首先選取線，所有線的點都會變成小的圓圈，接著你可以拖動這些點到更適合的位置。",
@@ -1356,6 +1456,7 @@
         "point_or_area_h": "點或區域？",
         "point_or_area": "許多圖徵能夠用點或是區域表示。你應該儘可能用區域來畫建築和其他東西的外框。將節點放在建築區域裡來表示商家、便利設施和其他在位於建築的圖徵。",
         "add_area_h": "新增區域",
+        "add_area_command": "要新增區域，請按地圖上方工具列的{area_icon}**{area}** 按鈕，或是按快速鍵 `{add_area_key}`。",
         "add_area_finish": "要畫完成區域時，按、輕按最後一個節點或是按下 `{return}` 。",
         "square_area_h": "直角角落",
         "modify_area_h": "變動區域",
@@ -1486,7 +1587,9 @@
       "title": "議題",
       "errors": "錯誤",
       "warnings": "警告",
+      "suggestions": "建議",
       "rules": "規則",
+      "open_tooltip": "偵測的錯誤、警告以及建議",
       "resolved_tooltip": "問題已被您的編輯解決",
       "no_issues": {
         "message": {
@@ -1554,6 +1657,19 @@
           "reference": "單獨的點不應共享同一個位置。"
         }
       },
+      "curb_nodes": {
+        "reference": {
+          "text": "交叉的路徑應該有獨立路緣節點 (適合的情境)。套疊圖片來判斷路緣類型。",
+          "link_alt_text": "路緣標籤指南",
+          "link_text": "更多資訊"
+        },
+        "fix": {
+          "add_curb_nodes": "新增{type}路緣節點"
+        },
+        "annotation": {
+          "added_curb_nodes": "已新增{type}路緣節點"
+        }
+      },
       "crossing_ways": {
         "message": "{feature} 跨過 {feature2}",
         "tip": "尋找沒有正確跨越另一圖徵的圖徵",
@@ -1642,6 +1758,7 @@
         "title": "無效格式",
         "tip": "尋找有非預期格式的標籤",
         "email": {
+          "message": "{feature}有多個無效電子郵件地址",
           "reference": "Email 地址應該長得像 \"user@example.com\"。"
         }
       },
@@ -2157,6 +2274,9 @@
         "retry_circle": "你沒有按 {circularize_icon} {circularize} 按鈕。再試一下。",
         "play": "太好了！再試著描幾棟建築，試著用編輯選單的其他操作。**當你準備好進入下一章時，點 ' {next}'。**"
       },
+      "rapid": {
+        "add_road": "點一下'使用這個圖徵'按鈕來在工作地圖上新增道路。"
+      },
       "startediting": {
         "title": "開始改",
         "help": "你現在準備好可以來編輯開放街圖了！ {br}你可以再看一次新手教學，或者按下{help_icon} {help} 按鈕或 `{help_key}` 鍵看更多使用說明文件。 ",
@@ -2172,6 +2292,8 @@
         "delete": "刪",
         "enter": "回车",
         "menu": "選單",
+        "option": "選項",
+        "pause": "暫停",
         "return": "回车",
         "space": "空格"
       },
@@ -2181,20 +2303,41 @@
       "or": "-或-",
       "browsing": "瀏覽",
       "editing": "編輯",
+      "tools": "工具 / 顯示",
       "navigation": "周圍望",
       "selecting_features": "選擇圖徵",
       "with_features_selected": "選取的圖徽",
       "with_node_selected": "選中節點",
       "with_way_selected": "選定路徑",
+      "with_rapid_selected": "與選取的 Rapid 圖徵",
+      "with_photo_selected": "與選取照片",
       "drawing": "繪製",
       "commands": "指示",
+      "operations": "編輯指令",
       "help": "指南",
       "display_options": "顯示設定",
+      "viewers": "檢視器",
+      "layers": "圖層",
       "info": "資訊",
       "command": {
         "pan": {
           "label": "平移地圖"
         },
+        "pan_more": {
+          "label": "平移地圖一些"
+        },
+        "zoom": {
+          "label": "放大 / 縮小"
+        },
+        "zoom_more": {
+          "label": "放大 / 縮小一些"
+        },
+        "rotate_map": {
+          "label": "旋轉地圖"
+        },
+        "rotate_incremental": {
+          "label": "增量旋轉地圖"
+        },
         "select_one": {
           "label": "選擇單一圖徵"
         },
@@ -2207,6 +2350,15 @@
         "edit_menu": {
           "label": "切換編輯選單"
         },
+        "zoom_to": {
+          "label": "放大 / 縮小選取的圖徵"
+        },
+        "previous_node": {
+          "label": "輪到上個節點"
+        },
+        "next_node": {
+          "label": "輪到下個節點"
+        },
         "first_node": {
           "label": "跳轉到第一個節點"
         },
@@ -2222,6 +2374,15 @@
         "select_children": {
           "label": "選取子節點"
         },
+        "accept_feature": {
+          "label": "接受圖徵"
+        },
+        "ignore_feature": {
+          "label": "忽略圖徵"
+        },
+        "follow_sequence": {
+          "label": "輪到下一張 / 上一張序列的照片"
+        },
         "add_point": {
           "label": "'增加節點'模式"
         },
@@ -2306,9 +2467,21 @@
         "delete": {
           "label": "刪除選擇圖徵"
         },
+        "cycle_highway_tag": {
+          "label": "在常見標籤循環"
+        },
         "toggle_background": {
           "label": "切換背景圖像面板"
         },
+        "background_switch": {
+          "label": "切換到上一個使用的背景圖"
+        },
+        "background_previous": {
+          "label": "切換到上一個清單當中的背景底圖"
+        },
+        "background_next": {
+          "label": "切換到下一個清單當中的背景底圖"
+        },
         "toggle_map_data": {
           "label": "切換地圖資料面板"
         },
@@ -2318,7 +2491,17 @@
         "toggle_preferences": {
           "label": "收放喜好欄"
         },
+        "toggle_help": {
+          "label": "切換說明/文件面版"
+        },
+        "toggle_fullscreen": {
+          "label": "切換全螢幕模式"
+        },
+        "toggle_inspector": {
+          "label": "切換圖徵檢查器"
+        },
         "wireframe": {
+          "label": "切換網格檢視",
           "key": "西"
         },
         "highlight_edits": {
@@ -2327,15 +2510,35 @@
         "keyboard_shortcuts": {
           "label": "睇鍵盤快掣"
         },
+        "toggle_minimap": {
+          "label": "切換迷你地圖"
+        },
+        "toggle_3dmap": {
+          "label": "切換 3D 地圖"
+        },
+        "toggle_all_layers": {
+          "label": "切換所有資料圖層"
+        },
         "toggle_osm_data": {
           "label": "切換 OpenStreetMap 資料"
         },
         "toggle_osm_notes": {
+          "label": "切換開放街圖註解",
           "key": "北"
         },
+        "toggle_rapid_data": {
+          "label": "切換 Rapid 功能"
+        },
+        "toggle_mapillary": {
+          "label": "切換 Mapillary 街景"
+        },
         "toggle_streetside": {
+          "label": "切換 Bing 街景",
           "key": "南"
         },
+        "toggle_kartaview": {
+          "label": "切換 Kartaview"
+        },
         "toggle_all_cards": {
           "label": "切換所有資訊面板"
         },
diff --git a/data/l10n/core.yue.json b/data/l10n/core.yue.json
index 8d2770019..b2fb6add8 100644
--- a/data/l10n/core.yue.json
+++ b/data/l10n/core.yue.json
@@ -338,11 +338,15 @@
       "extract": {
         "title": "抽出",
         "description": {
+          "line": "從這些線截取點。",
+          "area": "從這區域截取點",
           "feature": {
             "other": "從這些圖徽中擷取點。"
           }
         },
-        "annotation": "已擷取 {n} 個點。"
+        "annotation": "已擷取 {n} 個點。",
+        "too_large": "無法從這些圖徵截取點，因為沒有足夠可視的圖徵。",
+        "connected_to_hidden": "無法從這些圖徵截取點，因為有些連結的圖徵已經被隱藏了"
       }
     },
     "restriction": {
@@ -616,9 +620,16 @@
           "tooltip": "從開放街圖而來的註記資料",
           "title": "公家街圖註"
         },
+        "rapid": {
+          "license": "Facebook 地圖的 AI 授權條款"
+        },
         "maproulette": {
           "detail_title": "明細",
-          "cancel": "唔記"
+          "fixed": "我已經修復了!",
+          "cancel": "唔記",
+          "nearbyTask": {
+            "title": "跳到附近的任務"
+          }
         },
         "keepRight": {
           "tooltip": "由 keepright.at 偵測到的資料問題",
@@ -680,6 +691,7 @@
       }
     },
     "filters": {
+      "title": "篩選",
       "points": {
         "description": "處",
         "tooltip": "名勝"
@@ -875,6 +887,7 @@
       "cancel": "唔做"
     },
     "splash": {
+      "welcome": "歡迎來到{rapidicon}{version}！!",
       "start": "卽改"
     },
     "source_switch": {
@@ -883,12 +896,97 @@
       "lose_changes": "你未有修改未記妥。轉地圖電腦，就會無咗修改。你真係要轉地圖電腦？"
     },
     "rapid_inspector": {
-      "tags": "標籤"
+      "prompt": "針對這個選取的圖徵你要如何處理？",
+      "notice": {
+        "open_data": "這份資料集是由開放資料構成。請見 [license]({url}) 取得更多資訊。"
+      },
+      "tags": "標籤",
+      "option_accept": {
+        "label": "新增這個圖徵",
+        "description": "這看起來是正確的圖徵嗎？請確認之後選擇來開始連結、加標籤，然後儲存到開放街圖。👍",
+        "annotation": "新增 Rapid 圖徵。",
+        "tooltip": "新增這圖徵到地圖來開始編輯。",
+        "disabled": "要幫助改進開放街圖資料品質，我們每一次畫地圖階段只允許添加{n}個 AI 圖徵。請在編輯時修正問題，你可以在儲存之後添加更多 AI 圖徵。",
+        "disabled_flash": "要幫助改進開放街圖資料品質，我們只允許 {n}個 AI 圖徵加到每一次的畫地圖階段。"
+      },
+      "option_ignore": {
+        "label": "忽略這圖徵",
+        "description": "忽略這圖徵來幫助我們的機器學習機制。如果你不確定是否正確的話，請忽略就好，不會有東西儲存或是移除。👍",
+        "annotation": "忽略 Rapid 圖徵。",
+        "tooltip": "忽略這個圖徵。"
+      }
     },
     "rapid_menu": {
+      "license": "授權條款",
+      "toggle_all": "啟用所有 {rapidicon} 資料",
+      "add_manage_datasets": "新增/管理資料集",
+      "center_map": "在這裡置中地圖",
+      "worldwide": "全世界",
+      "no_datasets": "沒有可使用的資料集",
       "remove": "移走",
+      "add_dataset": "新增資料集",
+      "dataset_added": "已經添加的資料集",
+      "more_info": "更多資訊",
+      "about_the_catalog": "這些資料集從不同組織，以開放資料方式釋出，而 Esri 使用者社群則是能夠用來改善開放街圖的目的。<br/>你可以點下列連結瞭解更多，或是造訪 [Rapid 指南](https://github.com/facebookmicrosites/Open-Mapping-At-Facebook/wiki/Esri-ArcGIS-FAQ) 或是 [OSM Wiki 的 Esri/ArcGIS 資料集頁面](https://wiki.openstreetmap.org/wiki/Esri/ArcGIS_Datasets)。",
+      "clear_filters": "清除篩選",
+      "filter_datasets": "篩選資料集",
+      "any_type": "任何類似",
+      "datasets_found": "有找到{gt}{n}個資料集",
       "category": {
-        "roads": "路"
+        "addresses": "地址",
+        "buildings": "建築",
+        "featured": "強調",
+        "footways": "人行通道",
+        "microsoft": "微軟",
+        "places": "地點",
+        "preview": "預覽",
+        "roads": "路",
+        "trees": "樹木"
+      },
+      "fbRoads": {
+        "label": "Facebook 道路",
+        "description": "運用 AI 從 Maxar Premium 影像偵測出來預測的道路，範圍包括 80 個國家。"
+      },
+      "msBuildings": {
+        "label": "微軟建築",
+        "description": "全球的開放建築外框，從 2014 到 2024 年的 Bing 地圖影像偵測而來，包括 Maxar、Airbus ，以及 IGN 法國的影像。"
+      },
+      "overture": {
+        "places": {
+          "label": "Overture 地點",
+          "description": "含有超過 5300 萬筆代表現實世界的物件：例如學校、商家、醫院、宗教組織、地標、山峰等等。"
+        }
+      },
+      "omdFootways": {
+        "label": "開啟人行通道",
+        "description": "開啟從不同地方政府收集的人行通道資料。"
+      }
+    },
+    "rapid_poweruser": {
+      "beta": "Beta 功能",
+      "heading": {
+        "label": "Rapid 專業用戶的功能",
+        "description": "給 Rapid 專業用戶"
+      },
+      "previewDatasets": {
+        "label": "顯示預覽資料集",
+        "description": "預覽資料集仍在預覽階段，還沒有開放給所有人"
+      },
+      "tagnosticRoadCombine": {
+        "label": "與標籤無關的合併道路",
+        "description": "允許不同道路標籤能夠合併"
+      },
+      "tagSources": {
+        "label": "加上 Maxar 到道路標籤",
+        "description": "新增 `source=maxar` 到所有的道路上"
+      },
+      "showAutoFix": {
+        "label": "啟用問題面版的自動修正按鈕",
+        "description": "啟用問題面版的自動修正按鈕來修正簡單的問題"
+      },
+      "allowLargeEdits": {
+        "label": "允許大面積編輯",
+        "description": "解除編輯不在目前檢範圍圖徵的限制"
       }
     },
     "tag_reference": {
@@ -1330,6 +1428,7 @@
         "title": "處",
         "intro": "*點*可以用來表示像是商店、餐廳和紀念碑的圖徵。他們佔據特定的地點，描述在那裡的東西。",
         "add_point_h": "新增點",
+        "add_point": "要新增點，請按地圖上方工具列的{point_icon}**{point}** 按鈕，或是按快速建 `{add_point_key}`。",
         "move_point_h": "移動點",
         "delete_point_h": "刪除點",
         "delete_point": "刪除現實世界不存在的圖徵是很 OK 的事情。從開放街圖刪除圖徵，意味著從每個人會用到的地圖移除，所以你必須確定圖徵確實不在了，才真的刪除圖徵。"
@@ -1338,6 +1437,7 @@
         "title": "綫",
         "intro": "*線*用來代表像是道路、鐵路和河流。線應沿著被代表物體的中心繪製。",
         "add_line_h": "新增線",
+        "add_line": "要新增線段，請按地圖上方工具列的{line_icon}**{line}** 按鈕，或是按快速鍵 `{add_line_key}`。",
         "add_line_finish": "要完成畫線，按、輕按或是按下 `{return}` 最後一個節點。",
         "modify_line_h": "變更線",
         "modify_line_dragnode": "有時候你會看線的形狀並不正確，比方說道路並沒有與背景影像重合。要調整線的形狀，首先選取線，所有線的點都會變成小的圓圈，接著你可以拖動這些點到更適合的位置。",
@@ -1356,6 +1456,7 @@
         "point_or_area_h": "點或區域？",
         "point_or_area": "許多圖徵能夠用點或是區域表示。你應該儘可能用區域來畫建築和其他東西的外框。將節點放在建築區域裡來表示商家、便利設施和其他在位於建築的圖徵。",
         "add_area_h": "新增區域",
+        "add_area_command": "要新增區域，請按地圖上方工具列的{area_icon}**{area}** 按鈕，或是按快速鍵 `{add_area_key}`。",
         "add_area_finish": "要畫完成區域時，按、輕按最後一個節點或是按下 `{return}` 。",
         "square_area_h": "直角角落",
         "modify_area_h": "變動區域",
@@ -1486,7 +1587,9 @@
       "title": "議題",
       "errors": "錯誤",
       "warnings": "警告",
+      "suggestions": "建議",
       "rules": "規則",
+      "open_tooltip": "偵測的錯誤、警告以及建議",
       "resolved_tooltip": "問題已被您的編輯解決",
       "no_issues": {
         "message": {
@@ -1554,6 +1657,19 @@
           "reference": "單獨的點不應共享同一個位置。"
         }
       },
+      "curb_nodes": {
+        "reference": {
+          "text": "交叉的路徑應該有獨立路緣節點 (適合的情境)。套疊圖片來判斷路緣類型。",
+          "link_alt_text": "路緣標籤指南",
+          "link_text": "更多資訊"
+        },
+        "fix": {
+          "add_curb_nodes": "新增{type}路緣節點"
+        },
+        "annotation": {
+          "added_curb_nodes": "已新增{type}路緣節點"
+        }
+      },
       "crossing_ways": {
         "message": "{feature} 跨過 {feature2}",
         "tip": "尋找沒有正確跨越另一圖徵的圖徵",
@@ -1642,6 +1758,7 @@
         "title": "無效格式",
         "tip": "尋找有非預期格式的標籤",
         "email": {
+          "message": "{feature}有多個無效電子郵件地址",
           "reference": "Email 地址應該長得像 \"user@example.com\"。"
         }
       },
@@ -2157,6 +2274,9 @@
         "retry_circle": "你沒有按 {circularize_icon} {circularize} 按鈕。再試一下。",
         "play": "太好了！再試著描幾棟建築，試著用編輯選單的其他操作。**當你準備好進入下一章時，點 ' {next}'。**"
       },
+      "rapid": {
+        "add_road": "點一下'使用這個圖徵'按鈕來在工作地圖上新增道路。"
+      },
       "startediting": {
         "title": "開始改",
         "help": "你現在準備好可以來編輯開放街圖了！ {br}你可以再看一次新手教學，或者按下{help_icon} {help} 按鈕或 `{help_key}` 鍵看更多使用說明文件。 ",
@@ -2172,6 +2292,8 @@
         "delete": "刪",
         "enter": "回车",
         "menu": "選單",
+        "option": "選項",
+        "pause": "暫停",
         "return": "回车",
         "space": "空格"
       },
@@ -2181,20 +2303,41 @@
       "or": "-或-",
       "browsing": "瀏覽",
       "editing": "編輯",
+      "tools": "工具 / 顯示",
       "navigation": "周圍望",
       "selecting_features": "選擇圖徵",
       "with_features_selected": "選取的圖徽",
       "with_node_selected": "選中節點",
       "with_way_selected": "選定路徑",
+      "with_rapid_selected": "與選取的 Rapid 圖徵",
+      "with_photo_selected": "與選取照片",
       "drawing": "繪製",
       "commands": "指示",
+      "operations": "編輯指令",
       "help": "指南",
       "display_options": "顯示設定",
+      "viewers": "檢視器",
+      "layers": "圖層",
       "info": "資訊",
       "command": {
         "pan": {
           "label": "平移地圖"
         },
+        "pan_more": {
+          "label": "平移地圖一些"
+        },
+        "zoom": {
+          "label": "放大 / 縮小"
+        },
+        "zoom_more": {
+          "label": "放大 / 縮小一些"
+        },
+        "rotate_map": {
+          "label": "旋轉地圖"
+        },
+        "rotate_incremental": {
+          "label": "增量旋轉地圖"
+        },
         "select_one": {
           "label": "選擇單一圖徵"
         },
@@ -2207,6 +2350,15 @@
         "edit_menu": {
           "label": "切換編輯選單"
         },
+        "zoom_to": {
+          "label": "放大 / 縮小選取的圖徵"
+        },
+        "previous_node": {
+          "label": "輪到上個節點"
+        },
+        "next_node": {
+          "label": "輪到下個節點"
+        },
         "first_node": {
           "label": "跳轉到第一個節點"
         },
@@ -2222,6 +2374,15 @@
         "select_children": {
           "label": "選取子節點"
         },
+        "accept_feature": {
+          "label": "接受圖徵"
+        },
+        "ignore_feature": {
+          "label": "忽略圖徵"
+        },
+        "follow_sequence": {
+          "label": "輪到下一張 / 上一張序列的照片"
+        },
         "add_point": {
           "label": "'增加節點'模式"
         },
@@ -2306,9 +2467,21 @@
         "delete": {
           "label": "刪除選擇圖徵"
         },
+        "cycle_highway_tag": {
+          "label": "在常見標籤循環"
+        },
         "toggle_background": {
           "label": "切換背景圖像面板"
         },
+        "background_switch": {
+          "label": "切換到上一個使用的背景圖"
+        },
+        "background_previous": {
+          "label": "切換到上一個清單當中的背景底圖"
+        },
+        "background_next": {
+          "label": "切換到下一個清單當中的背景底圖"
+        },
         "toggle_map_data": {
           "label": "切換地圖資料面板"
         },
@@ -2318,7 +2491,17 @@
         "toggle_preferences": {
           "label": "收放喜好欄"
         },
+        "toggle_help": {
+          "label": "切換說明/文件面版"
+        },
+        "toggle_fullscreen": {
+          "label": "切換全螢幕模式"
+        },
+        "toggle_inspector": {
+          "label": "切換圖徵檢查器"
+        },
         "wireframe": {
+          "label": "切換網格檢視",
           "key": "西"
         },
         "highlight_edits": {
@@ -2327,15 +2510,35 @@
         "keyboard_shortcuts": {
           "label": "睇鍵盤快掣"
         },
+        "toggle_minimap": {
+          "label": "切換迷你地圖"
+        },
+        "toggle_3dmap": {
+          "label": "切換 3D 地圖"
+        },
+        "toggle_all_layers": {
+          "label": "切換所有資料圖層"
+        },
         "toggle_osm_data": {
           "label": "切換 OpenStreetMap 資料"
         },
         "toggle_osm_notes": {
+          "label": "切換開放街圖註解",
           "key": "北"
         },
+        "toggle_rapid_data": {
+          "label": "切換 Rapid 功能"
+        },
+        "toggle_mapillary": {
+          "label": "切換 Mapillary 街景"
+        },
         "toggle_streetside": {
+          "label": "切換 Bing 街景",
           "key": "南"
         },
+        "toggle_kartaview": {
+          "label": "切換 Kartaview"
+        },
         "toggle_all_cards": {
           "label": "切換所有資訊面板"
         },
diff --git a/data/l10n/core.zh-TW.json b/data/l10n/core.zh-TW.json
index 0657509ad..0718dfee4 100644
--- a/data/l10n/core.zh-TW.json
+++ b/data/l10n/core.zh-TW.json
@@ -156,6 +156,12 @@
           "create": "已增加轉向限制",
           "delete": "已移除轉向限制"
         }
+      },
+      "extract": {
+        "description": {
+          "area": "從這區域截取點。"
+        },
+        "connected_to_hidden": "無法從這些圖徵截取點，因為有些連結的圖徵已經被隱藏了。"
       }
     },
     "undo": {
@@ -290,6 +296,7 @@
         },
         "maproulette": {
           "detail_title": "詳細資料",
+          "fixed": "我已經修復了！",
           "cancel": "唔做"
         }
       },
@@ -427,10 +434,19 @@
       "live": "實況模式",
       "lose_changes": "您有尚未儲存的編輯，切換地圖伺服器會失去這些編輯。您是否確定要切換伺服器？"
     },
+    "rapid_inspector": {
+      "option_accept": {
+        "disabled_flash": "要幫助改進開放街圖資料品質，我們每一次畫地圖階段只允許添加 {n}個 AI 圖徵。"
+      }
+    },
     "rapid_menu": {
       "remove": "移除",
+      "any_type": "任何類型",
       "category": {
         "roads": "道路"
+      },
+      "omdFootways": {
+        "label": "人行通道的開放資料"
       }
     },
     "tag_reference": {
@@ -578,7 +594,9 @@
       "title": "鍵盤快速鍵",
       "tooltip": "顯示鍵盤快速鍵畫面",
       "key": {
-        "delete": "刪除"
+        "delete": "刪除",
+        "enter": "輸入鍵",
+        "return": "退回"
       },
       "navigation": "導航",
       "commands": "命令",
@@ -592,6 +610,9 @@
         },
         "keyboard_shortcuts": {
           "label": "顯示鍵盤快速鍵"
+        },
+        "toggle_mapillary": {
+          "key": "MM"
         }
       }
     },
diff --git a/data/l10n/core.zh.json b/data/l10n/core.zh.json
index 5c651b2cf..a937974a2 100644
--- a/data/l10n/core.zh.json
+++ b/data/l10n/core.zh.json
@@ -338,11 +338,15 @@
       "extract": {
         "title": "抽出",
         "description": {
+          "line": "從這些線截取點。",
+          "area": "從這區域截取點",
           "feature": {
             "other": "從這些圖徽中擷取點。"
           }
         },
-        "annotation": "已擷取 {n} 個點。"
+        "annotation": "已擷取 {n} 個點。",
+        "too_large": "無法從這些圖徵截取點，因為沒有足夠可視的圖徵。",
+        "connected_to_hidden": "無法從這些圖徵截取點，因為有些連結的圖徵已經被隱藏了"
       }
     },
     "restriction": {
@@ -616,9 +620,16 @@
           "tooltip": "從開放街圖而來的註記資料",
           "title": "公家街圖註"
         },
+        "rapid": {
+          "license": "Facebook 地圖的 AI 授權條款"
+        },
         "maproulette": {
           "detail_title": "詳細資訊",
-          "cancel": "取消"
+          "fixed": "我已經修復了!",
+          "cancel": "取消",
+          "nearbyTask": {
+            "title": "跳到附近的任務"
+          }
         },
         "keepRight": {
           "tooltip": "由 keepright.at 偵測到的資料問題",
@@ -680,6 +691,7 @@
       }
     },
     "filters": {
+      "title": "篩選",
       "points": {
         "description": "点。",
         "tooltip": "名勝"
@@ -875,6 +887,7 @@
       "cancel": "取消"
     },
     "splash": {
+      "welcome": "歡迎來到{rapidicon}{version}！!",
       "start": "卽改"
     },
     "source_switch": {
@@ -883,12 +896,97 @@
       "lose_changes": "您有未保存的更改。切换地图服务器会丢弃他们。你确定要切换服务器吗？"
     },
     "rapid_inspector": {
-      "tags": "標籤"
+      "prompt": "針對這個選取的圖徵你要如何處理？",
+      "notice": {
+        "open_data": "這份資料集是由開放資料構成。請見 [license]({url}) 取得更多資訊。"
+      },
+      "tags": "標籤",
+      "option_accept": {
+        "label": "新增這個圖徵",
+        "description": "這看起來是正確的圖徵嗎？請確認之後選擇來開始連結、加標籤，然後儲存到開放街圖。👍",
+        "annotation": "新增 Rapid 圖徵。",
+        "tooltip": "新增這圖徵到地圖來開始編輯。",
+        "disabled": "要幫助改進開放街圖資料品質，我們每一次畫地圖階段只允許添加{n}個 AI 圖徵。請在編輯時修正問題，你可以在儲存之後添加更多 AI 圖徵。",
+        "disabled_flash": "要幫助改進開放街圖資料品質，我們只允許 {n}個 AI 圖徵加到每一次的畫地圖階段。"
+      },
+      "option_ignore": {
+        "label": "忽略這圖徵",
+        "description": "忽略這圖徵來幫助我們的機器學習機制。如果你不確定是否正確的話，請忽略就好，不會有東西儲存或是移除。👍",
+        "annotation": "忽略 Rapid 圖徵。",
+        "tooltip": "忽略這個圖徵。"
+      }
     },
     "rapid_menu": {
+      "license": "授權條款",
+      "toggle_all": "啟用所有 {rapidicon} 資料",
+      "add_manage_datasets": "新增/管理資料集",
+      "center_map": "在這裡置中地圖",
+      "worldwide": "全世界",
+      "no_datasets": "沒有可使用的資料集",
       "remove": "删除",
+      "add_dataset": "新增資料集",
+      "dataset_added": "已經添加的資料集",
+      "more_info": "更多資訊",
+      "about_the_catalog": "這些資料集從不同組織，以開放資料方式釋出，而 Esri 使用者社群則是能夠用來改善開放街圖的目的。<br/>你可以點下列連結瞭解更多，或是造訪 [Rapid 指南](https://github.com/facebookmicrosites/Open-Mapping-At-Facebook/wiki/Esri-ArcGIS-FAQ) 或是 [OSM Wiki 的 Esri/ArcGIS 資料集頁面](https://wiki.openstreetmap.org/wiki/Esri/ArcGIS_Datasets)。",
+      "clear_filters": "清除篩選",
+      "filter_datasets": "篩選資料集",
+      "any_type": "任何類似",
+      "datasets_found": "有找到{gt}{n}個資料集",
       "category": {
-        "roads": "路"
+        "addresses": "地址",
+        "buildings": "建築",
+        "featured": "強調",
+        "footways": "人行通道",
+        "microsoft": "微軟",
+        "places": "地點",
+        "preview": "預覽",
+        "roads": "路",
+        "trees": "樹木"
+      },
+      "fbRoads": {
+        "label": "Facebook 道路",
+        "description": "運用 AI 從 Maxar Premium 影像偵測出來預測的道路，範圍包括 80 個國家。"
+      },
+      "msBuildings": {
+        "label": "微軟建築",
+        "description": "全球的開放建築外框，從 2014 到 2024 年的 Bing 地圖影像偵測而來，包括 Maxar、Airbus ，以及 IGN 法國的影像。"
+      },
+      "overture": {
+        "places": {
+          "label": "Overture 地點",
+          "description": "含有超過 5300 萬筆代表現實世界的物件：例如學校、商家、醫院、宗教組織、地標、山峰等等。"
+        }
+      },
+      "omdFootways": {
+        "label": "開啟人行通道",
+        "description": "開啟從不同地方政府收集的人行通道資料。"
+      }
+    },
+    "rapid_poweruser": {
+      "beta": "Beta 功能",
+      "heading": {
+        "label": "Rapid 專業用戶的功能",
+        "description": "給 Rapid 專業用戶"
+      },
+      "previewDatasets": {
+        "label": "顯示預覽資料集",
+        "description": "預覽資料集仍在預覽階段，還沒有開放給所有人"
+      },
+      "tagnosticRoadCombine": {
+        "label": "與標籤無關的合併道路",
+        "description": "允許不同道路標籤能夠合併"
+      },
+      "tagSources": {
+        "label": "加上 Maxar 到道路標籤",
+        "description": "新增 `source=maxar` 到所有的道路上"
+      },
+      "showAutoFix": {
+        "label": "啟用問題面版的自動修正按鈕",
+        "description": "啟用問題面版的自動修正按鈕來修正簡單的問題"
+      },
+      "allowLargeEdits": {
+        "label": "允許大面積編輯",
+        "description": "解除編輯不在目前檢範圍圖徵的限制"
       }
     },
     "tag_reference": {
@@ -1330,6 +1428,7 @@
         "title": "点。",
         "intro": "*點*可以用來表示像是商店、餐廳和紀念碑的圖徵。他們佔據特定的地點，描述在那裡的東西。",
         "add_point_h": "新增點",
+        "add_point": "要新增點，請按地圖上方工具列的{point_icon}**{point}** 按鈕，或是按快速建 `{add_point_key}`。",
         "move_point_h": "移動點",
         "delete_point_h": "刪除點",
         "delete_point": "刪除現實世界不存在的圖徵是很 OK 的事情。從開放街圖刪除圖徵，意味著從每個人會用到的地圖移除，所以你必須確定圖徵確實不在了，才真的刪除圖徵。"
@@ -1338,6 +1437,7 @@
         "title": "直线。",
         "intro": "*線*用來代表像是道路、鐵路和河流。線應沿著被代表物體的中心繪製。",
         "add_line_h": "新增線",
+        "add_line": "要新增線段，請按地圖上方工具列的{line_icon}**{line}** 按鈕，或是按快速鍵 `{add_line_key}`。",
         "add_line_finish": "要完成畫線，按、輕按或是按下 `{return}` 最後一個節點。",
         "modify_line_h": "變更線",
         "modify_line_dragnode": "有時候你會看線的形狀並不正確，比方說道路並沒有與背景影像重合。要調整線的形狀，首先選取線，所有線的點都會變成小的圓圈，接著你可以拖動這些點到更適合的位置。",
@@ -1356,6 +1456,7 @@
         "point_or_area_h": "點或區域？",
         "point_or_area": "許多圖徵能夠用點或是區域表示。你應該儘可能用區域來畫建築和其他東西的外框。將節點放在建築區域裡來表示商家、便利設施和其他在位於建築的圖徵。",
         "add_area_h": "新增區域",
+        "add_area_command": "要新增區域，請按地圖上方工具列的{area_icon}**{area}** 按鈕，或是按快速鍵 `{add_area_key}`。",
         "add_area_finish": "要畫完成區域時，按、輕按最後一個節點或是按下 `{return}` 。",
         "square_area_h": "直角角落",
         "modify_area_h": "變動區域",
@@ -1486,7 +1587,9 @@
       "title": "議題",
       "errors": "錯誤",
       "warnings": "警告",
+      "suggestions": "建議",
       "rules": "規則",
+      "open_tooltip": "偵測的錯誤、警告以及建議",
       "resolved_tooltip": "問題已被您的編輯解決",
       "no_issues": {
         "message": {
@@ -1554,6 +1657,19 @@
           "reference": "單獨的點不應共享同一個位置。"
         }
       },
+      "curb_nodes": {
+        "reference": {
+          "text": "交叉的路徑應該有獨立路緣節點 (適合的情境)。套疊圖片來判斷路緣類型。",
+          "link_alt_text": "路緣標籤指南",
+          "link_text": "更多資訊"
+        },
+        "fix": {
+          "add_curb_nodes": "新增{type}路緣節點"
+        },
+        "annotation": {
+          "added_curb_nodes": "已新增{type}路緣節點"
+        }
+      },
       "crossing_ways": {
         "message": "{feature} 跨過 {feature2}",
         "tip": "尋找沒有正確跨越另一圖徵的圖徵",
@@ -1642,6 +1758,7 @@
         "title": "無效格式",
         "tip": "尋找有非預期格式的標籤",
         "email": {
+          "message": "{feature}有多個無效電子郵件地址",
           "reference": "Email 地址應該長得像 \"user@example.com\"。"
         }
       },
@@ -2157,6 +2274,9 @@
         "retry_circle": "你沒有按 {circularize_icon} {circularize} 按鈕。再試一下。",
         "play": "太好了！再試著描幾棟建築，試著用編輯選單的其他操作。**當你準備好進入下一章時，點 ' {next}'。**"
       },
+      "rapid": {
+        "add_road": "點一下'使用這個圖徵'按鈕來在工作地圖上新增道路。"
+      },
       "startediting": {
         "title": "开始编辑。",
         "help": "你現在準備好可以來編輯開放街圖了！ {br}你可以再看一次新手教學，或者按下{help_icon} {help} 按鈕或 `{help_key}` 鍵看更多使用說明文件。 ",
@@ -2172,6 +2292,8 @@
         "delete": "删除",
         "enter": "回车",
         "menu": "選單",
+        "option": "選項",
+        "pause": "暫停",
         "return": "回车",
         "space": "空格"
       },
@@ -2181,20 +2303,41 @@
       "or": "-或-",
       "browsing": "瀏覽",
       "editing": "編輯",
+      "tools": "工具 / 顯示",
       "navigation": "导航",
       "selecting_features": "選擇圖徵",
       "with_features_selected": "選取的圖徽",
       "with_node_selected": "選中節點",
       "with_way_selected": "選定路徑",
+      "with_rapid_selected": "與選取的 Rapid 圖徵",
+      "with_photo_selected": "與選取照片",
       "drawing": "繪製",
       "commands": "指示",
+      "operations": "編輯指令",
       "help": "帮助",
       "display_options": "顯示設定",
+      "viewers": "檢視器",
+      "layers": "圖層",
       "info": "資訊",
       "command": {
         "pan": {
           "label": "平移地圖"
         },
+        "pan_more": {
+          "label": "平移地圖一些"
+        },
+        "zoom": {
+          "label": "放大 / 縮小"
+        },
+        "zoom_more": {
+          "label": "放大 / 縮小一些"
+        },
+        "rotate_map": {
+          "label": "旋轉地圖"
+        },
+        "rotate_incremental": {
+          "label": "增量旋轉地圖"
+        },
         "select_one": {
           "label": "選擇單一圖徵"
         },
@@ -2207,6 +2350,15 @@
         "edit_menu": {
           "label": "切換編輯選單"
         },
+        "zoom_to": {
+          "label": "放大 / 縮小選取的圖徵"
+        },
+        "previous_node": {
+          "label": "輪到上個節點"
+        },
+        "next_node": {
+          "label": "輪到下個節點"
+        },
         "first_node": {
           "label": "跳轉到第一個節點"
         },
@@ -2222,6 +2374,15 @@
         "select_children": {
           "label": "選取子節點"
         },
+        "accept_feature": {
+          "label": "接受圖徵"
+        },
+        "ignore_feature": {
+          "label": "忽略圖徵"
+        },
+        "follow_sequence": {
+          "label": "輪到下一張 / 上一張序列的照片"
+        },
         "add_point": {
           "label": "'增加節點'模式"
         },
@@ -2306,9 +2467,21 @@
         "delete": {
           "label": "刪除選擇圖徵"
         },
+        "cycle_highway_tag": {
+          "label": "在常見標籤循環"
+        },
         "toggle_background": {
           "label": "切換背景圖像面板"
         },
+        "background_switch": {
+          "label": "切換到上一個使用的背景圖"
+        },
+        "background_previous": {
+          "label": "切換到上一個清單當中的背景底圖"
+        },
+        "background_next": {
+          "label": "切換到下一個清單當中的背景底圖"
+        },
         "toggle_map_data": {
           "label": "切換地圖資料面板"
         },
@@ -2318,7 +2491,17 @@
         "toggle_preferences": {
           "label": "收放喜好欄"
         },
+        "toggle_help": {
+          "label": "切換說明/文件面版"
+        },
+        "toggle_fullscreen": {
+          "label": "切換全螢幕模式"
+        },
+        "toggle_inspector": {
+          "label": "切換圖徵檢查器"
+        },
         "wireframe": {
+          "label": "切換網格檢視",
           "key": "西"
         },
         "highlight_edits": {
@@ -2327,15 +2510,35 @@
         "keyboard_shortcuts": {
           "label": "睇鍵盤快掣"
         },
+        "toggle_minimap": {
+          "label": "切換迷你地圖"
+        },
+        "toggle_3dmap": {
+          "label": "切換 3D 地圖"
+        },
+        "toggle_all_layers": {
+          "label": "切換所有資料圖層"
+        },
         "toggle_osm_data": {
           "label": "切換 OpenStreetMap 資料"
         },
         "toggle_osm_notes": {
+          "label": "切換開放街圖註解",
           "key": "北"
         },
+        "toggle_rapid_data": {
+          "label": "切換 Rapid 功能"
+        },
+        "toggle_mapillary": {
+          "label": "切換 Mapillary 街景"
+        },
         "toggle_streetside": {
+          "label": "切換 Bing 街景",
           "key": "南"
         },
+        "toggle_kartaview": {
+          "label": "切換 Kartaview"
+        },
         "toggle_all_cards": {
           "label": "切換所有資訊面板"
         },
diff --git a/data/l10n/imagery.cs.json b/data/l10n/imagery.cs.json
index 78c0f788b..f1dacb6c4 100644
--- a/data/l10n/imagery.cs.json
+++ b/data/l10n/imagery.cs.json
@@ -398,14 +398,24 @@
         },
         "name": "Hlivice: Budovy"
       },
+      "LSA-ALKIS-CP": {
+        "description": "Vektorový záznam parcel z oficiálního katastru nemovitostí.",
+        "name": "© GeoBasis-DE/LVermGeo LSA, Katastrální parcely ALKIS"
+      },
       "LSA-ALKIS_BU": {
-        "description": "Tvar budov v Sasku-Anhaltsku"
+        "description": "Tvar budov v Sasku-Anhaltsku",
+        "name": "© GeoBasis-DE/LVermGeo LSA, Obrysy budov ALKIS"
+      },
+      "LSA-ATKIS-HYN": {
+        "description": "Záznam vodovodních sítí (přesnost se může lišit od skutečnosti, vždy uvažujte v souvislosti s ortofotem)",
+        "name": "© GeoBasis-DE/LVermGeo LSA, Vodovodní síť ATKIS"
       },
       "LSA-DOP20": {
         "description": "Letecký snímek spolkové země Sasko-Anhaltsko, rozlišení 20 cm"
       },
       "LSA-DVG": {
-        "description": "Vektorový záznam administrativních hranic. Jsou uvedeny hranice spolkové země, okresu, obce a části obce."
+        "description": "Vektorový záznam administrativních hranic. Jsou uvedeny hranice spolkové země, okresu, obce a části obce.",
+        "name": "© GeoBasis-DE/LVermGeo LSA, Digitální administrativní hranice"
       },
       "LocalAuthorities_RightsOfWay": {
         "attribution": {
diff --git a/data/l10n/imagery.de.json b/data/l10n/imagery.de.json
index 4570d9536..005edbef6 100644
--- a/data/l10n/imagery.de.json
+++ b/data/l10n/imagery.de.json
@@ -248,14 +248,23 @@
       "Gliwice-buildings": {
         "name": "Gliwice: Gebäude"
       },
+      "LSA-ALKIS-CP": {
+        "description": "Vektorielle Erfassung von Parzellen aus dem amtlichen Liegenschaftskataster.",
+        "name": "© GeoBasis-DE/LVermGeo LSA, ALKIS-Katasterparzellen"
+      },
       "LSA-ALKIS_BU": {
-        "description": "Gebäudeumrisse in Sachsen-Anhalt"
+        "description": "Gebäudeumrisse in Sachsen-Anhalt",
+        "name": "© GeoBasis-DE/LVermGeo LSA, ALKIS-Gebäudeumrisse"
+      },
+      "LSA-ATKIS-HYN": {
+        "description": "Aufzeichnung von Wassernetzen (kann von der Realität abweichen, immer in Verbindung mit Orthofoto betrachten)"
       },
       "LSA-DOP20": {
         "description": "Luftbild des Landes Sachsen-Anhalt, 20 cm Auflösung"
       },
       "LSA-DVG": {
-        "description": "Vektorisierte Erfassung von Verwaltungsgrenzen. Angegeben sind die Grenzen des Bundeslandes, des Kreises, der Gemeinde und der Gemeindeteile."
+        "description": "Vektorisierte Erfassung von Verwaltungsgrenzen. Angegeben sind die Grenzen des Bundeslandes, des Kreises, der Gemeinde und der Gemeindeteile.",
+        "name": "© GeoBasis-DE/LVermGeo LSA, Digitale Verwaltungsgrenzen"
       },
       "LocalAuthorities_RightsOfWay": {
         "attribution": {
diff --git a/data/l10n/imagery.es.json b/data/l10n/imagery.es.json
index ab529e18c..b4492e48b 100644
--- a/data/l10n/imagery.es.json
+++ b/data/l10n/imagery.es.json
@@ -394,14 +394,24 @@
         },
         "name": "Gliwice: Edificios"
       },
+      "LSA-ALKIS-CP": {
+        "description": "Registro vectorial de parcelas del catastro inmobiliario oficial.",
+        "name": "© GeoBasis-DE/LVermGeo LSA, parcelas del Catastro ALKIS."
+      },
       "LSA-ALKIS_BU": {
-        "description": "Forma de edificios en sajonia-anhalt"
+        "description": "Forma de edificios en sajonia-anhalt",
+        "name": "© GeoBasis-DE/LVermGeo LSA, contornos de edificios del Catastro ALKIS."
+      },
+      "LSA-ATKIS-HYN": {
+        "description": "Registro de redes hídricas (puede variar en precisión respecto a la realidad; siempre considerar en conjunto con la ortofoto).",
+        "name": "© GeoBasis-DE/LVermGeo LSA, red hídrica de ATKIS."
       },
       "LSA-DOP20": {
         "description": "imagen aérea del estado Sajonia-Anhalt, resolución 20 cm"
       },
       "LSA-DVG": {
-        "description": "Registro vectorial de límites administrativos. Se dan los límites del estado federal, distrito, municipio y partes del municipio."
+        "description": "Registro vectorial de límites administrativos. Se dan los límites del estado federal, distrito, municipio y partes del municipio.",
+        "name": "© GeoBasis-DE/LVermGeo LSA, límites administrativos digitales."
       },
       "LocalAuthorities_RightsOfWay": {
         "attribution": {
diff --git a/data/l10n/imagery.et.json b/data/l10n/imagery.et.json
index 2c5aea32d..86f23765f 100644
--- a/data/l10n/imagery.et.json
+++ b/data/l10n/imagery.et.json
@@ -41,6 +41,7 @@
         "attribution": {
           "text": "GeoScribble'i kaasautorid"
         },
+        "description": "Kuni kolm nädalat vanad märkused kohtvaatluse rakendusest Every Door",
         "name": "GeoScribble'i viimased märkused"
       },
       "maaamet<TX_DOT>ee-cir_ngr": {
diff --git a/data/l10n/imagery.gan.json b/data/l10n/imagery.gan.json
index 50d026a89..bbeb67eb9 100644
--- a/data/l10n/imagery.gan.json
+++ b/data/l10n/imagery.gan.json
@@ -375,9 +375,15 @@
         },
         "name": "Gliwice：建築"
       },
+      "LSA-ALKIS-CP": {
+        "description": "從官方房地產地籍表中對土地進行向量記錄。"
+      },
       "LSA-ALKIS_BU": {
         "description": "薩克森-安哈特邦建築物的形狀"
       },
+      "LSA-ATKIS-HYN": {
+        "description": "水體網紀錄（準確度可能與真實情況有所不同，請務必對照正射影像）"
+      },
       "LSA-DOP20": {
         "description": "萨克森-安哈尔特州的航空影像，分辨率为20cm"
       },
diff --git a/data/l10n/imagery.yue.json b/data/l10n/imagery.yue.json
index d473bee0e..0d1d6c006 100644
--- a/data/l10n/imagery.yue.json
+++ b/data/l10n/imagery.yue.json
@@ -375,9 +375,15 @@
         },
         "name": "Gliwice：建築"
       },
+      "LSA-ALKIS-CP": {
+        "description": "從官方房地產地籍表中對土地進行向量記錄。"
+      },
       "LSA-ALKIS_BU": {
         "description": "薩克森-安哈特邦建築物的形狀"
       },
+      "LSA-ATKIS-HYN": {
+        "description": "水體網紀錄（準確度可能與真實情況有所不同，請務必對照正射影像）"
+      },
       "LSA-DOP20": {
         "description": "萨克森-安哈尔特州的航空影像，分辨率为20cm"
       },
diff --git a/data/l10n/imagery.zh.json b/data/l10n/imagery.zh.json
index 6cad9ff15..d611c719f 100644
--- a/data/l10n/imagery.zh.json
+++ b/data/l10n/imagery.zh.json
@@ -375,9 +375,15 @@
         },
         "name": "Gliwice：建築"
       },
+      "LSA-ALKIS-CP": {
+        "description": "從官方房地產地籍表中對土地進行向量記錄。"
+      },
       "LSA-ALKIS_BU": {
         "description": "薩克森-安哈特邦建築物的形狀"
       },
+      "LSA-ATKIS-HYN": {
+        "description": "水體網紀錄（準確度可能與真實情況有所不同，請務必對照正射影像）"
+      },
       "LSA-DOP20": {
         "description": "萨克森-安哈尔特州的航空影像，分辨率为20cm"
       },
diff --git a/data/l10n/tagging.af.json b/data/l10n/tagging.af.json
index 519f3384f..51be2b0bc 100644
--- a/data/l10n/tagging.af.json
+++ b/data/l10n/tagging.af.json
@@ -842,10 +842,18 @@
         "parking": {
           "label": "Tipe",
           "options": {
-            "garage_boxes": "Vulstasies",
-            "rooftop": "Dak",
-            "sheds": "Skure",
-            "surface": "Oppervlakte"
+            "garage_boxes": {
+              "title": "Vulstasies"
+            },
+            "rooftop": {
+              "title": "Dak"
+            },
+            "sheds": {
+              "title": "Skure"
+            },
+            "surface": {
+              "title": "Oppervlakte"
+            }
           }
         },
         "parking/side/parking": {
diff --git a/data/l10n/tagging.ar-AA.json b/data/l10n/tagging.ar-AA.json
index 87de8ce92..3830ed01a 100644
--- a/data/l10n/tagging.ar-AA.json
+++ b/data/l10n/tagging.ar-AA.json
@@ -228,11 +228,6 @@
         "park_ride": {
           "label": "اصطف واركب"
         },
-        "parking": {
-          "options": {
-            "surface": "السطح"
-          }
-        },
         "payment_multi": {
           "label": "أنواع الدفع",
           "terms": "أنواع الدفع,أنواع الحساب"
diff --git a/data/l10n/tagging.ar.json b/data/l10n/tagging.ar.json
index 65b3b0666..b274342df 100644
--- a/data/l10n/tagging.ar.json
+++ b/data/l10n/tagging.ar.json
@@ -2288,17 +2288,39 @@
         "parking": {
           "label": "النوع",
           "options": {
-            "carports": "مظلات سيارات",
-            "garage_boxes": "صناديق المرآب",
-            "lane": "على جانب الطريق",
-            "layby": "جانب الطريق",
-            "multi-storey": "متعدد الطوابق",
-            "rooftop": "على سطح بناية",
-            "sheds": "مظلله",
-            "shoulder": "كتف الطريق",
-            "street_side": "جانب الشارع",
-            "surface": "أرضية",
-            "underground": "تحت الأرض"
+            "carports": {
+              "title": "مظلات سيارات"
+            },
+            "garage_boxes": {
+              "title": "صناديق المرآب"
+            },
+            "lane": {
+              "title": "على جانب الطريق"
+            },
+            "layby": {
+              "title": "جانب الطريق"
+            },
+            "multi-storey": {
+              "title": "متعدد الطوابق"
+            },
+            "rooftop": {
+              "title": "على سطح بناية"
+            },
+            "sheds": {
+              "title": "مظلله"
+            },
+            "shoulder": {
+              "title": "كتف الطريق"
+            },
+            "street_side": {
+              "title": "جانب الشارع"
+            },
+            "surface": {
+              "title": "السطح"
+            },
+            "underground": {
+              "title": "تحت الأرض"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.ast.json b/data/l10n/tagging.ast.json
index 9367d6e81..ac3459d38 100644
--- a/data/l10n/tagging.ast.json
+++ b/data/l10n/tagging.ast.json
@@ -1171,13 +1171,27 @@
         "parking": {
           "label": "Tipu",
           "options": {
-            "carports": "Techaos",
-            "garage_boxes": "Cocheres",
-            "lane": "Llateral de carretera",
-            "multi-storey": "Multinivel",
-            "sheds": "Casetes",
-            "surface": "Superficie",
-            "underground": "Baxo tierra"
+            "carports": {
+              "title": "Techaos"
+            },
+            "garage_boxes": {
+              "title": "Cocheres"
+            },
+            "lane": {
+              "title": "Llateral de carretera"
+            },
+            "multi-storey": {
+              "title": "Multinivel"
+            },
+            "sheds": {
+              "title": "Casetes"
+            },
+            "surface": {
+              "title": "Superficie"
+            },
+            "underground": {
+              "title": "Baxo tierra"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.bg.json b/data/l10n/tagging.bg.json
index 7b52e3d2e..9f4c01ac6 100644
--- a/data/l10n/tagging.bg.json
+++ b/data/l10n/tagging.bg.json
@@ -1369,13 +1369,27 @@
         "parking": {
           "label": "Вид",
           "options": {
-            "carports": "Навеси",
-            "garage_boxes": "Гаражни клетки",
-            "lane": "Паркинг лента",
-            "multi-storey": "Многоетажен",
-            "sheds": "Паянтов",
-            "surface": "Наземен",
-            "underground": "Подземен"
+            "carports": {
+              "title": "Навеси"
+            },
+            "garage_boxes": {
+              "title": "Гаражни клетки"
+            },
+            "lane": {
+              "title": "Паркинг лента"
+            },
+            "multi-storey": {
+              "title": "Многоетажен паркинг"
+            },
+            "sheds": {
+              "title": "Паянтов"
+            },
+            "surface": {
+              "title": "Наземен"
+            },
+            "underground": {
+              "title": "Подземен паркинг"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.bn.json b/data/l10n/tagging.bn.json
index 94ca12456..a18989d34 100644
--- a/data/l10n/tagging.bn.json
+++ b/data/l10n/tagging.bn.json
@@ -679,7 +679,9 @@
         "parking": {
           "label": "ধরন",
           "options": {
-            "surface": "উপরিভাগ"
+            "surface": {
+              "title": "উপরিভাগ"
+            }
           }
         },
         "parking/side/parking": {
diff --git a/data/l10n/tagging.br.json b/data/l10n/tagging.br.json
index fcef6f9d1..b3aa5efcc 100644
--- a/data/l10n/tagging.br.json
+++ b/data/l10n/tagging.br.json
@@ -2167,10 +2167,18 @@
         "parking": {
           "label": "Seurt",
           "options": {
-            "rooftop": "Toenn",
-            "sheds": "Lochoù",
-            "surface": "A-us d'an douar",
-            "underground": "Dindandouar"
+            "rooftop": {
+              "title": "Toenn"
+            },
+            "sheds": {
+              "title": "Lochoù"
+            },
+            "surface": {
+              "title": "A-us d'an douar"
+            },
+            "underground": {
+              "title": "Dindandouar"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.bs.json b/data/l10n/tagging.bs.json
index 1c62a1b47..cb77eabbd 100644
--- a/data/l10n/tagging.bs.json
+++ b/data/l10n/tagging.bs.json
@@ -596,7 +596,9 @@
         "parking": {
           "label": "Vrsta",
           "options": {
-            "surface": "Površina"
+            "surface": {
+              "title": "Površina"
+            }
           }
         },
         "parking_entrance": {
diff --git a/data/l10n/tagging.ca.json b/data/l10n/tagging.ca.json
index 9d6bb55d3..8cd616d56 100644
--- a/data/l10n/tagging.ca.json
+++ b/data/l10n/tagging.ca.json
@@ -2533,19 +2533,45 @@
         "parking": {
           "label": "Tipus",
           "options": {
-            "carports": "Aixoplucs",
-            "garage_boxes": "Boxs",
-            "half_on_kerb": "Parcialment en la vorera",
-            "lane": "Adossat a la carretera",
-            "layby": "Apartadero de descans",
-            "multi-storey": "Diversos nivells",
-            "on_kerb": "A la vorera",
-            "rooftop": "Terrat",
-            "sheds": "Garatges",
-            "shoulder": "Voral",
-            "street_side": "Adjacent a la carretera",
-            "surface": "Superfície",
-            "underground": "Subterrani"
+            "carports": {
+              "title": "Aixoplucs"
+            },
+            "garage_boxes": {
+              "title": "Boxs"
+            },
+            "half_on_kerb": {
+              "title": "Parcialment en la vorera"
+            },
+            "lane": {
+              "title": "Adossat a la carretera"
+            },
+            "layby": {
+              "title": "Apartadero de descans"
+            },
+            "multi-storey": {
+              "title": "Diversos nivells"
+            },
+            "on_kerb": {
+              "title": "A la vorera"
+            },
+            "rooftop": {
+              "title": "Terrat"
+            },
+            "sheds": {
+              "title": "Garatges"
+            },
+            "shoulder": {
+              "title": "Voral"
+            },
+            "street_side": {
+              "title": "Adjacent a la carretera"
+            },
+            "surface": {
+              "title": "Superfície"
+            },
+            "underground": {
+              "title": "Subterrani"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.ckb.json b/data/l10n/tagging.ckb.json
index fde608e4c..16badeeb8 100644
--- a/data/l10n/tagging.ckb.json
+++ b/data/l10n/tagging.ckb.json
@@ -1305,9 +1305,15 @@
         "parking": {
           "label": "جۆر",
           "options": {
-            "lane": "کەلی قەراخ ڕێ",
-            "street_side": "ڕۆخی شەقام",
-            "surface": "ڕووپۆش"
+            "lane": {
+              "title": "کەلی قەراخ ڕێ"
+            },
+            "street_side": {
+              "title": "ڕۆخی شەقام"
+            },
+            "surface": {
+              "title": "ڕووپۆش"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.cs.json b/data/l10n/tagging.cs.json
index 9d8e41b78..01725561a 100644
--- a/data/l10n/tagging.cs.json
+++ b/data/l10n/tagging.cs.json
@@ -2535,7 +2535,8 @@
           "terms": "štítek,jméno"
         },
         "nat_name": {
-          "label": "Národní název"
+          "label": "Národní název",
+          "terms": "národní jméno"
         },
         "natural": {
           "label": "Přírodní objekt"
@@ -2739,19 +2740,58 @@
         "parking": {
           "label": "Druh",
           "options": {
-            "carports": "Přístřešek",
-            "garage_boxes": "Garáž",
-            "half_on_kerb": "Polovinou na obrubníku",
-            "lane": "Pruh na straně silnice",
-            "layby": "Volební účast / Odstávka",
-            "multi-storey": "Víceúrovňové",
-            "on_kerb": "Na obrubníku",
-            "rooftop": "Na střeše",
-            "sheds": "Lehký přístřešek",
-            "shoulder": "Na krajnici",
-            "street_side": "Podél ulice",
-            "surface": "Povrchové",
-            "underground": "Podzemní"
+            "carports": {
+              "description": "Struktura používaná k poskytování omezené ochrany vozidlům, obvykle bez stěn.",
+              "title": "Přístřešek"
+            },
+            "garage_boxes": {
+              "description": "Soukromá garáž s více samostatnými boxy pro každý vůz.",
+              "title": "Garáž"
+            },
+            "half_on_kerb": {
+              "description": "Parkování částečně na chodníku.",
+              "title": "Polovinou na obrubníku"
+            },
+            "lane": {
+              "description": "Parkování na ulici (kterou lze snadno předělat na jízdní pruh).",
+              "title": "Pruh na straně silnice"
+            },
+            "layby": {
+              "description": "Parkování na odpočívadle u silnice.",
+              "title": "Volební účast / Odstávka"
+            },
+            "multi-storey": {
+              "description": "Dvě nebo více úrovní parkovacích ploch v konstrukci budovy.",
+              "title": "Vícepatrové"
+            },
+            "on_kerb": {
+              "description": "Parkování na chodníku.",
+              "title": "Na obrubníku"
+            },
+            "rooftop": {
+              "description": "Jedna úroveň parkovací plochy na vrcholu budovy.",
+              "title": "Na střeše"
+            },
+            "sheds": {
+              "description": "Soukromé hangáry pro vozidla.",
+              "title": "Lehký přístřešek"
+            },
+            "shoulder": {
+              "description": "Parkování na krajnici.",
+              "title": "Na krajnici"
+            },
+            "street_side": {
+              "description": "Parkování přímo na ulici (ale ne na ní).",
+              "title": "Podél ulice"
+            },
+            "surface": {
+              "description": "Jedna úroveň parkování na pozemku.",
+              "title": "Povrch"
+            },
+            "underground": {
+              "description": "Podzemní parkoviště.",
+              "title": "Podzemní"
+            }
           }
         },
         "parking/side/orientation": {
@@ -3317,7 +3357,8 @@
             "demanding_mountain_hiking": "T3: Náročná horská turistika",
             "difficult_alpine_hiking": "T6: Těžká vysokohorská turistika",
             "hiking": "T1: Turistika",
-            "mountain_hiking": "T2: Horská turistika"
+            "mountain_hiking": "T2: Horská turistika",
+            "strolling": "Procházky"
           },
           "placeholder": "Horská turistika, vysokohorská turistika...",
           "terms": "náročnost,obtížnost,složitost,terén,chůze,hory"
@@ -3458,7 +3499,8 @@
           "terms": "prodává použité,prodej použitého,použitý,z druhé ruky,bazarové,bazar,sekáč,second-hand,není nové,nové,zašlé,staré,antikvariát,veteš"
         },
         "segregated": {
-          "label": "Oddělení chodců od cyklistů"
+          "label": "Oddělení chodců od cyklistů",
+          "terms": "jízdní kolo,kolo,chodník,cyklostezka,cyklotrasa,oddělení,čára"
         },
         "self_service": {
           "label": "Samoobsluha"
@@ -4780,26 +4822,32 @@
           "terms": "událost,hala"
         },
         "amenity/community_centre/club_home": {
-          "name": "Domácí klub"
+          "name": "Domácí klub",
+          "terms": "klubovna,klubová místnost,klubové centrum"
         },
         "amenity/community_centre/community_hall": {
-          "name": "Společenský sál"
+          "name": "Společenský sál",
+          "terms": "komunitní sál"
         },
         "amenity/community_centre/cultural_centre": {
-          "name": "Kulturní středisko"
+          "name": "Kulturní středisko",
+          "terms": "centrum kultury"
         },
         "amenity/community_centre/family_centre": {
-          "name": "Rodinné středisko"
+          "name": "Rodinné středisko",
+          "terms": "centrum pro rodinu"
         },
         "amenity/community_centre/lgbtq": {
           "name": "Komunitní centrum LGBTQ+",
           "terms": "lgbtq událost,lgbtq hala,lgbt událost,lgbt hala,lgb událost,lgb hala'"
         },
         "amenity/community_centre/parish_hall": {
-          "name": "Farní sál"
+          "name": "Farní sál",
+          "terms": "sál fary"
         },
         "amenity/community_centre/village_hall": {
-          "name": "Obecní úřad"
+          "name": "Obecní úřad",
+          "terms": "obecní sál"
         },
         "amenity/community_centre/youth_centre": {
           "name": "Centrum mládeže",
@@ -5004,7 +5052,8 @@
           "terms": "snídaně,jídelna,stolovat,stolování,večeře,drive-in,jíst,gril,oběd,stůl"
         },
         "amenity/fast_food/chinese": {
-          "name": "Čínské rychlé občerstvení"
+          "name": "Čínské rychlé občerstvení",
+          "terms": "čínská,čína,rychlé občerstvení,fast food,restaurace,jídlo,oběd,večeře"
         },
         "amenity/fast_food/donut": {
           "name": "Kiosek s donuty",
@@ -5573,7 +5622,8 @@
           "terms": "filmová produkce,filmové studio,videoprodukce,videozáznam,videostudio"
         },
         "amenity/swingerclub": {
-          "name": "Swingers klub"
+          "name": "Swingers klub",
+          "terms": "dospělý*,lifestyle club,porno*,sex,strip*,swinger"
         },
         "amenity/taxi": {
           "name": "Stanoviště taxi",
@@ -5600,7 +5650,8 @@
           "terms": "divadelní,představení,hra,muzikál"
         },
         "amenity/theatre/type/amphi": {
-          "name": "Amfiteátr"
+          "name": "Amfiteátr",
+          "terms": "otevřený,venkovní,řecký,amfitéatr"
         },
         "amenity/ticket_validator": {
           "name": "Ověřovač vstupenek",
@@ -6716,6 +6767,10 @@
           "name": "Hlavní vchod",
           "terms": "hlavní vchod,vchod,dveře,průchod,vstup,východ,hlavní vstup,vchodové dveře,vstupní dveře"
         },
+        "entrance/shop": {
+          "name": "Vchod do obchodu",
+          "terms": "dveře"
+        },
         "entrance/staircase": {
           "name": "Vstup na schodiště",
           "terms": "dveře,schody,schodiště,schodový"
@@ -7449,10 +7504,12 @@
           "terms": "louka,pastviny,tráva"
         },
         "landuse/meadow_orchard/meadow": {
-          "name": "Louka s ovocnými stromy"
+          "name": "Louka s ovocnými stromy",
+          "terms": "ovoce,louka"
         },
         "landuse/meadow_orchard/orchard": {
-          "name": "Sad vysazený na louce"
+          "name": "Sad vysazený na louce",
+          "terms": "ovoce,louka"
         },
         "landuse/military": {
           "name": "Vojenský prostor",
@@ -7961,7 +8018,8 @@
           "terms": "jezdecká dostihová dráha,cval,sázení na dostihy,dostihy,dostihové,sázky,dostihová dráha,jezdecká dráha"
         },
         "leisure/sports_centre/karting": {
-          "name": "Zařízení pro motokáry"
+          "name": "Zařízení pro motokáry",
+          "terms": "jít na káru,motokáry,motokárové závody"
         },
         "leisure/sports_centre/shooting": {
           "name": "Areál střelnice",
@@ -8146,7 +8204,8 @@
           "terms": "plynový komín,plyn,olej,oheň,hořet"
         },
         "man_made/footwear_decontamination-AU-NZ": {
-          "name": "Dekontaminační stanice obuvi"
+          "name": "Dekontaminační stanice obuvi",
+          "terms": "čištění obuvi,boty čištění,čištění bot,kontaminační stanice,dekontaminační stanice"
         },
         "man_made/fuel_pump": {
           "name": "Čerpací stanice",
@@ -8288,7 +8347,8 @@
           "terms": "silo,zásobník,silážní,sýpka,špýchar,špejchar"
         },
         "man_made/ski_jump": {
-          "name": "Věž skoku na lyžích"
+          "name": "Věž skoku na lyžích",
+          "terms": "skok,skokanský můstek,běh,náběh,struktura skokanského můstku,skokanská věž,věž skokanského můstku"
         },
         "man_made/storage_tank": {
           "name": "Zásobník",
@@ -8477,6 +8537,10 @@
         "natural": {
           "name": "Přírodní prvek"
         },
+        "natural/arch": {
+          "name": "Přírodní oblouk",
+          "terms": "přírodní most,kamenný oblouk"
+        },
         "natural/bare_rock": {
           "name": "Plochy jednolité skály",
           "terms": "skála"
@@ -8931,7 +8995,8 @@
           "terms": "terapie"
         },
         "office/translator": {
-          "name": "Překladatelská kancelář"
+          "name": "Překladatelská kancelář",
+          "terms": "překladatel,překlad,překladatelská agentura"
         },
         "office/travel_agent": {
           "name": "Cestovní kancelář"
@@ -8982,7 +9047,8 @@
           "name": "Stezka/sjezdovka pro sněžné sporty (nespecifikovaný druh)"
         },
         "piste/ski_jump": {
-          "name": "Sjezdovka pro skoky na lyžích"
+          "name": "Sjezdovka pro skoky na lyžích",
+          "terms": "skok,skok na lyžích,skokanský můstek"
         },
         "piste/skitour": {
           "name": "Lyžařská turistická stezka",
@@ -8997,7 +9063,8 @@
           "terms": "psí spřežení,husky,kůň,sjezdovka,sáně,saně,ski-joring,skijoring"
         },
         "piste/take_off": {
-          "name": "Odrazová hrana skoku na lyžích"
+          "name": "Odrazová hrana skoku na lyžích",
+          "terms": "skok,skok na lyžích,start,odjezová,skok s lyžemi,hrana pro skoky na lyžích,hrana pro skoky s lyžemi"
         },
         "place": {
           "name": "Místo"
@@ -9953,6 +10020,9 @@
           "name": "Dárky, suvenýry",
           "terms": "obchod s dárky,suvenýry"
         },
+        "shop/gold_buyer": {
+          "name": "Zlatokupec"
+        },
         "shop/greengrocer": {
           "name": "Ovoce a zelenina",
           "terms": "zelinář,zelinářství,prodejna zeleniny,zelenina,ovoce,ovoce a zelenina"
@@ -9962,7 +10032,8 @@
           "terms": "kadeřník,holič,vizážista,kadeřnictví"
         },
         "shop/hairdresser/barber": {
-          "name": "Holičství"
+          "name": "Holičství",
+          "terms": "vousy,knír,holit,holení,kadeře,kadeřnictví,holicí strojek,kadeřník,stříhání vlasů"
         },
         "shop/hairdresser_supply": {
           "name": "Kadeřnické potřeby",
diff --git a/data/l10n/tagging.cy.json b/data/l10n/tagging.cy.json
index abe5bfe36..ec95cbd6b 100644
--- a/data/l10n/tagging.cy.json
+++ b/data/l10n/tagging.cy.json
@@ -2345,18 +2345,42 @@
         "parking": {
           "label": "Math",
           "options": {
-            "carports": "Cysgod Car",
-            "half_on_kerb": "Hanner Ar Gwrb",
-            "lane": "Lôn Ochr Ffordd",
-            "layby": "Cilfan",
-            "multi-storey": "Aml-lawr",
-            "on_kerb": "Ar Gwrb",
-            "rooftop": "To",
-            "sheds": "Sieds",
-            "shoulder": "Llain Galed",
-            "street_side": "Ochr Stryd",
-            "surface": "Arwynebol",
-            "underground": "Dan Ddaear"
+            "carports": {
+              "title": "Cysgod Car"
+            },
+            "half_on_kerb": {
+              "title": "Hanner Ar Gwrb"
+            },
+            "lane": {
+              "title": "Lôn Ochr Ffordd"
+            },
+            "layby": {
+              "title": "Cilfan"
+            },
+            "multi-storey": {
+              "title": "Aml-lawr"
+            },
+            "on_kerb": {
+              "title": "Ar Gwrb"
+            },
+            "rooftop": {
+              "title": "To"
+            },
+            "sheds": {
+              "title": "Sieds"
+            },
+            "shoulder": {
+              "title": "Llain Galed"
+            },
+            "street_side": {
+              "title": "Ochr Stryd"
+            },
+            "surface": {
+              "title": "Arwyneb"
+            },
+            "underground": {
+              "title": "Dan Ddaear"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.da.json b/data/l10n/tagging.da.json
index 5ed69f8c5..a977f300e 100644
--- a/data/l10n/tagging.da.json
+++ b/data/l10n/tagging.da.json
@@ -2224,19 +2224,45 @@
         },
         "parking": {
           "options": {
-            "carports": "Carporte",
-            "garage_boxes": "Garagebokse",
-            "half_on_kerb": "Halvt på fortovet",
-            "lane": "Vejsidespor",
-            "layby": "Mindre rasteplads",
-            "multi-storey": "Multiniveau",
-            "on_kerb": "På fortovet",
-            "rooftop": "Tag",
-            "sheds": "Skure",
-            "shoulder": "Nødspor",
-            "street_side": "Kantsten",
-            "surface": "Overflade",
-            "underground": "Underjordisk"
+            "carports": {
+              "title": "Carporte"
+            },
+            "garage_boxes": {
+              "title": "Garagebokse"
+            },
+            "half_on_kerb": {
+              "title": "Halvt på fortovet"
+            },
+            "lane": {
+              "title": "Vejsidespor"
+            },
+            "layby": {
+              "title": "Mindre rasteplads"
+            },
+            "multi-storey": {
+              "title": "Multiniveau"
+            },
+            "on_kerb": {
+              "title": "På fortovet"
+            },
+            "rooftop": {
+              "title": "Tag"
+            },
+            "sheds": {
+              "title": "Skure"
+            },
+            "shoulder": {
+              "title": "Nødspor"
+            },
+            "street_side": {
+              "title": "Kantsten"
+            },
+            "surface": {
+              "title": "Overflade"
+            },
+            "underground": {
+              "title": "Underjordisk"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.de-AT.json b/data/l10n/tagging.de-AT.json
index beade2ad1..e01824f9d 100644
--- a/data/l10n/tagging.de-AT.json
+++ b/data/l10n/tagging.de-AT.json
@@ -577,10 +577,12 @@
         "parking": {
           "label": "Art",
           "options": {
-            "multi-storey": "Mehrstöckig",
-            "rooftop": "auf dem Dach",
-            "shoulder": "Standstreifen",
-            "surface": "Oberfläche"
+            "shoulder": {
+              "title": "Standstreifen"
+            },
+            "underground": {
+              "title": "Tiefgarage"
+            }
           }
         },
         "parking/side/parking": {
diff --git a/data/l10n/tagging.de.json b/data/l10n/tagging.de.json
index f1be9f9ee..3afac9a88 100644
--- a/data/l10n/tagging.de.json
+++ b/data/l10n/tagging.de.json
@@ -2681,18 +2681,57 @@
         "parking": {
           "label": "Typ",
           "options": {
-            "garage_boxes": "Garagenboxen",
-            "half_on_kerb": "Halb auf Gehweg",
-            "lane": "Parkstreifen am Straßenrand",
-            "layby": "Haltebucht",
-            "multi-storey": "Parkhaus",
-            "on_kerb": "Auf Gehweg",
-            "rooftop": "Dachfläche",
-            "sheds": "Schuppen",
-            "shoulder": "Auf Seitenstreifen",
-            "street_side": "Straßenrand",
-            "surface": "Ebenerdig",
-            "underground": "Tiefgarage"
+            "carports": {
+              "description": "Struktur, die Fahrzeugen begrenzten Schutz bietet, in der Regel ohne Wände."
+            },
+            "garage_boxes": {
+              "description": "Private Garage mit mehreren Einzelboxen für jeweils ein Auto.",
+              "title": "Garagenboxen"
+            },
+            "half_on_kerb": {
+              "description": "Parken teilweise auf dem Gehweg.",
+              "title": "Halb auf Gehweg"
+            },
+            "lane": {
+              "description": "Parken auf der Straße (die leicht in eine Fahrspur umgewandelt werden könnte).",
+              "title": "Parkstreifen am Straßenrand"
+            },
+            "layby": {
+              "description": "Parken auf einem Rastplatz an einer Straße.",
+              "title": "Haltebucht"
+            },
+            "multi-storey": {
+              "description": "Zwei oder mehr Parkdecks in einem Gebäude.",
+              "title": "Mehrstöckig"
+            },
+            "on_kerb": {
+              "description": "Parken auf dem Gehweg.",
+              "title": "Auf Gehweg"
+            },
+            "rooftop": {
+              "description": "Eine Ebene eines Parkdecks auf einem Gebäude.",
+              "title": "auf dem Dach"
+            },
+            "sheds": {
+              "description": "Private Schuppen für Fahrzeuge.",
+              "title": "Schuppen"
+            },
+            "shoulder": {
+              "description": "Parken auf dem Seitenstreifen.",
+              "title": "Seitenstreifen"
+            },
+            "street_side": {
+              "description": "Parken direkt an der Straße (aber nicht auf der Straße).",
+              "title": "Straßenrand"
+            },
+            "surface": {
+              "description": "Eine Parkebene auf dem Boden.",
+              "title": "Oberfläche"
+            },
+            "underground": {
+              "description": "Tiefgarage.",
+              "title": "Unterflurhydrant"
+            }
           }
         },
         "parking/side/orientation": {
@@ -3241,7 +3280,8 @@
             "demanding_mountain_hiking": "T3: Anspruchsvolles Bergwandern",
             "difficult_alpine_hiking": "T6: Schwieriges alpines Bergsteigen",
             "hiking": "T1: Wandern",
-            "mountain_hiking": "T2: Bergwandern"
+            "mountain_hiking": "T2: Bergwandern",
+            "strolling": "Spazieren"
           },
           "placeholder": "Bergwandern, alpines Bergwandern...",
           "terms": "Wanderschwierigkeit, Wanderwegschwierigkeit"
@@ -9868,6 +9908,10 @@
           "name": "Geschenkeladen",
           "terms": "Geschenkeladen, Geschenkehandlung, Geschenkartikelladen, Souvenirladen, Souvenirgeschäft"
         },
+        "shop/gold_buyer": {
+          "name": "Goldankauf",
+          "terms": "Goldankaufstelle,Goldhandel,Edelmetallhandel,Goldbörse,Goldhändler,Altgoldankauf,Schmuckankauf"
+        },
         "shop/greengrocer": {
           "name": "Obst- und Gemüseladen",
           "terms": "Obsthandlung, Gemüsehändler, Gemüsehandlung, Obst- und Gemüsehandlung"
diff --git a/data/l10n/tagging.dv.json b/data/l10n/tagging.dv.json
index 1df6a2b84..4e3247d43 100644
--- a/data/l10n/tagging.dv.json
+++ b/data/l10n/tagging.dv.json
@@ -341,7 +341,9 @@
         "parking": {
           "label": "އެކިިބާވަތްތަކުގެ ތަންތަން",
           "options": {
-            "surface": "މަގު"
+            "surface": {
+              "title": "މަގު"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.el.json b/data/l10n/tagging.el.json
index 594c07000..95348ad4a 100644
--- a/data/l10n/tagging.el.json
+++ b/data/l10n/tagging.el.json
@@ -2645,19 +2645,45 @@
         "parking": {
           "label": "Είδος",
           "options": {
-            "carports": "Υπόστεγο αυτοκινήτου",
-            "garage_boxes": "Τετράγωνο Παρκαρίσματος",
-            "half_on_kerb": "Μισό Στο Κράσπεδο",
-            "lane": "Πλευρική Λωρίδα",
-            "layby": "Χώρος στάθμευσης σε δρόμο για στάση/ξεκούραση",
-            "multi-storey": "Πολυεπίπεδο",
-            "on_kerb": "Στο Κράσπεδο",
-            "rooftop": "Ταράτσα",
-            "sheds": "Υπόστεγα",
-            "shoulder": "Λ.Ε.Α.",
-            "street_side": "Παραπλεύρως του δρόμου",
-            "surface": "Επίγειο",
-            "underground": "Υπόγειο"
+            "carports": {
+              "title": "Υπόστεγο αυτοκινήτου"
+            },
+            "garage_boxes": {
+              "title": "Τετράγωνο Παρκαρίσματος"
+            },
+            "half_on_kerb": {
+              "title": "Μισό Στο Κράσπεδο"
+            },
+            "lane": {
+              "title": "Πλευρική Λωρίδα"
+            },
+            "layby": {
+              "title": "Χώρος στάθμευσης σε δρόμο για στάση/ξεκούραση"
+            },
+            "multi-storey": {
+              "title": "Πολυεπίπεδο"
+            },
+            "on_kerb": {
+              "title": "Στο Κράσπεδο"
+            },
+            "rooftop": {
+              "title": "Ταράτσα"
+            },
+            "sheds": {
+              "title": "Υπόστεγα"
+            },
+            "shoulder": {
+              "title": "Λ.Ε.Α."
+            },
+            "street_side": {
+              "title": "Παραπλεύρως του δρόμου"
+            },
+            "surface": {
+              "title": "Υλικό Στρώσης"
+            },
+            "underground": {
+              "title": "Υπόγειο"
+            }
           }
         },
         "parking/side/orientation": {
@@ -3173,7 +3199,8 @@
             "demanding_mountain_hiking": "Τ3: Απαιτητική Ορειβασία",
             "difficult_alpine_hiking": "Τ6: Δύσκολη Αλπική Ανάβαση",
             "hiking": "Τ1: Ορεινή Ανάβαση",
-            "mountain_hiking": "Τ2: Ορειβασία"
+            "mountain_hiking": "Τ2: Ορειβασία",
+            "strolling": "Περίπατος"
           },
           "placeholder": "Ορειβασία, Αλπική Πεζοπορία...",
           "terms": "Δυσκολία Πεζοπορίας, Δυσκολία Πεζοπορικής Διαδρομής"
@@ -6015,6 +6042,10 @@
         "entrance/main": {
           "name": "Κύρια Είσοδος"
         },
+        "entrance/shop": {
+          "name": "Είσοδος καταστήματος",
+          "terms": "Είσοδος μαγαζιού"
+        },
         "entrance/staircase": {
           "name": "Είσοδος Με Σκαλιά",
           "terms": "σκαλιά, σκαλοπάτια"
@@ -7387,6 +7418,10 @@
         "natural": {
           "name": "Στοιχείο Φύση"
         },
+        "natural/arch": {
+          "name": "Φυσική αψίδα",
+          "terms": "Αψίδα"
+        },
         "natural/bare_rock": {
           "name": "Γυμνός Βράχος",
           "terms": "βράχος"
@@ -8598,6 +8633,10 @@
           "name": "Κατάστημα Δώρων",
           "terms": "Είδη δώρων"
         },
+        "shop/gold_buyer": {
+          "name": "Αγοραστής χρυσού",
+          "terms": "Αγορά χρυσού"
+        },
         "shop/greengrocer": {
           "name": "Οπωροπωλείο",
           "terms": "Οπωροπώλης, Μανάβης, μανάβικο, φρούτα, λαχανικά"
diff --git a/data/l10n/tagging.en-AU.json b/data/l10n/tagging.en-AU.json
index 15fd0e2bf..22a86b61c 100644
--- a/data/l10n/tagging.en-AU.json
+++ b/data/l10n/tagging.en-AU.json
@@ -280,7 +280,9 @@
         },
         "parking": {
           "options": {
-            "layby": "Lay-By"
+            "layby": {
+              "title": "Lay-By"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.en-CA.json b/data/l10n/tagging.en-CA.json
index 812e8d037..f504a5fbb 100644
--- a/data/l10n/tagging.en-CA.json
+++ b/data/l10n/tagging.en-CA.json
@@ -267,7 +267,9 @@
         },
         "parking": {
           "options": {
-            "layby": "Lay-By"
+            "layby": {
+              "title": "Lay-By"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.en-GB.json b/data/l10n/tagging.en-GB.json
index 6bde39790..749d174bd 100644
--- a/data/l10n/tagging.en-GB.json
+++ b/data/l10n/tagging.en-GB.json
@@ -252,7 +252,9 @@
         },
         "parking": {
           "options": {
-            "layby": "Lay-By"
+            "layby": {
+              "title": "Lay-By"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.eo.json b/data/l10n/tagging.eo.json
index f8121c55f..783ba4eff 100644
--- a/data/l10n/tagging.eo.json
+++ b/data/l10n/tagging.eo.json
@@ -2113,16 +2113,36 @@
         "parking": {
           "label": "Speco",
           "options": {
-            "carports": "Tegmentitaj duonbudoj",
-            "garage_boxes": "Parkumeja domo",
-            "lane": "Apudvoja",
-            "layby": "Trafikgolfo (servejo de vojaĝantoj)",
-            "multi-storey": "Pluretaĝa",
-            "rooftop": "Tegmento",
-            "sheds": "Garaĝ-budoj privataj",
-            "street_side": "Apudstrata",
-            "surface": "Supraĵa",
-            "underground": "Subtera"
+            "carports": {
+              "title": "Tegmentitaj duonbudoj"
+            },
+            "garage_boxes": {
+              "title": "Parkumeja domo"
+            },
+            "lane": {
+              "title": "Apudvoja"
+            },
+            "layby": {
+              "title": "Trafikgolfo (servejo de vojaĝantoj)"
+            },
+            "multi-storey": {
+              "title": "Pluretaĝa"
+            },
+            "rooftop": {
+              "title": "Tegmento"
+            },
+            "sheds": {
+              "title": "Garaĝ-budoj privataj"
+            },
+            "street_side": {
+              "title": "Apudstrata"
+            },
+            "surface": {
+              "title": "Pavimo"
+            },
+            "underground": {
+              "title": "Subtera"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.es.json b/data/l10n/tagging.es.json
index 45edb9d32..3e738d3b5 100644
--- a/data/l10n/tagging.es.json
+++ b/data/l10n/tagging.es.json
@@ -2684,19 +2684,58 @@
         "parking": {
           "label": "Tipo",
           "options": {
-            "carports": "Cochera abierta",
-            "garage_boxes": "Garaje en cubículos",
-            "half_on_kerb": "La mitad en la acera",
-            "lane": "Carril al borde de la calzada",
-            "layby": "Área de descanso",
-            "multi-storey": "Multinivel",
-            "on_kerb": "En la acera",
-            "rooftop": "Techo",
-            "sheds": "Galpones",
-            "shoulder": "Arcén / banquina",
-            "street_side": "Adyacente a la calzada",
-            "surface": "Superficie",
-            "underground": "Subterráneo"
+            "carports": {
+              "description": "Estructura utilizada para ofrecer protección limitada a vehículos, típicamente sin paredes.",
+              "title": "Cochera abierta"
+            },
+            "garage_boxes": {
+              "description": "Garaje privado con múltiples compartimientos individuales para un vehículo cada uno.",
+              "title": "Garaje en cubículos"
+            },
+            "half_on_kerb": {
+              "description": "Estacionamiento parcialmente en la acera.",
+              "title": "La mitad en la acera"
+            },
+            "lane": {
+              "description": "Estacionamiento en la calle (que podría ser fácilmente convertido en un carril de circulación).",
+              "title": "Carril al borde de la calzada"
+            },
+            "layby": {
+              "description": "Estacionamiento en un área de descanso, al costado de una vía.",
+              "title": "Área de descanso"
+            },
+            "multi-storey": {
+              "description": "Dos o más niveles de estacionamiento en una estructura de edificio.",
+              "title": "Multinivel"
+            },
+            "on_kerb": {
+              "description": "Estacionamiento sobre la acera.",
+              "title": "En la acera"
+            },
+            "rooftop": {
+              "description": "Un nivel de estacionamiento en la parte superior de un edificio.",
+              "title": "Techo"
+            },
+            "sheds": {
+              "description": "Hangares privados para vehículos.",
+              "title": "Galpones"
+            },
+            "shoulder": {
+              "description": "Estacionamiento al costado de la vía.",
+              "title": "Arcén / Banquina"
+            },
+            "street_side": {
+              "description": "Estacionamiento directamente adyacente a la calle (pero no sobre ella).",
+              "title": "Adyacente a la calzada"
+            },
+            "surface": {
+              "description": "Un nivel de estacionamiento a nivel del suelo.",
+              "title": "Superficie"
+            },
+            "underground": {
+              "description": "Estacionamiento subterráneo.",
+              "title": "Subterráneo"
+            }
           }
         },
         "parking/side/orientation": {
@@ -3250,7 +3289,8 @@
             "demanding_mountain_hiking": "T3: Senderismo de montaña exigente",
             "difficult_alpine_hiking": "T6: Senderismo alpino difícil",
             "hiking": "T1: Senderismo",
-            "mountain_hiking": "T2: Senderismo de montaña"
+            "mountain_hiking": "T2: Senderismo de montaña",
+            "strolling": "Paseo"
           },
           "placeholder": "Caminata de montaña, caminata alpina...",
           "terms": "Excursionismo, hiking, dificultad, senderismo, caminata"
@@ -6643,6 +6683,10 @@
           "name": "Entrada principal",
           "terms": "entrada, ingreso, puerta, portón, acceso, principal, vestíbulo"
         },
+        "entrance/shop": {
+          "name": "Entrada de tienda",
+          "terms": "Entrada de tienda, acceso comercial, entrada de comercio."
+        },
         "entrance/staircase": {
           "name": "Escalera de entrada",
           "terms": "Escalera de entrada, puerta, escaleras"
@@ -8432,6 +8476,10 @@
         "natural": {
           "name": "Elemento natural"
         },
+        "natural/arch": {
+          "name": "Arco natural",
+          "terms": "Arco natural, puente de roca, formación rocosa arqueada."
+        },
         "natural/bare_rock": {
           "name": "Roca desnuda",
           "terms": "roca, roca desnuda, roca descubierta, costa rocosa, montaña"
@@ -9936,6 +9984,10 @@
           "name": "Tienda de regalos",
           "terms": "regalo, obsequio, presentes, recuerdo, souvenir, regaleria, regionales"
         },
+        "shop/gold_buyer": {
+          "name": "Comprador de oro",
+          "terms": "Comprador de oro, adquisición de metales preciosos, casa de empeño"
+        },
         "shop/greengrocer": {
           "name": "Tienda de frutas y verduras",
           "terms": "hortaliza, verdura, fruta, verdulería, frutería, legumbre, vegetal, verdulero, frutero"
diff --git a/data/l10n/tagging.et.json b/data/l10n/tagging.et.json
index 1b5f0ad45..af81d756f 100644
--- a/data/l10n/tagging.et.json
+++ b/data/l10n/tagging.et.json
@@ -1933,13 +1933,28 @@
         "kerb": {
           "label": "Kõnnitee serv",
           "options": {
+            "flush": {
+              "description": "Kas muu teeosaga samas tasapinnas või üliväikese kaldega äärekivi või kaldtee.",
+              "title": "Tasane äärekivi"
+            },
+            "lowered": {
+              "description": "Kuni kui 3 sentimeetrit kõrge kaldu äärekivi, kust saab üle ratastooliga.",
+              "title": "Madaldatud äärekivi"
+            },
             "no": {
+              "description": "Antud asukohas äärekivi puudub.",
               "title": "Puudub"
             },
             "raised": {
-              "title": "Tõstetud pind"
+              "description": "Enam kui 3 sentimeetrit kõrge kandiline äärekivi, kust ei saa üle ratastooliga.",
+              "title": "Tõstetud äärekivi"
+            },
+            "rolled": {
+              "description": "Üldjuhul nõgus, mõnel puhul ka kumer äärekivi tavaliselt elamupiirkonnas, kust saab üle auto või jalgrattaga, aga mitte ratastooliga.",
+              "title": "Nõgus äärekivi"
             },
             "yes": {
+              "description": "Mingit sorti äärekivi on olemas, kuid täpne tüüp pole teada",
               "title": "Olemas"
             }
           },
@@ -2498,19 +2513,58 @@
         "parking": {
           "label": "Tüüp",
           "options": {
-            "carports": "Auto varjualused",
-            "garage_boxes": "Garaažiboksid",
-            "half_on_kerb": "Poolenisti kõnniteel",
-            "lane": "Teeäärne parkimisrada",
-            "layby": "Parkimistasku",
-            "multi-storey": "Mitmekorruseline",
-            "on_kerb": "Kõnniteel",
-            "rooftop": "Katusel",
-            "sheds": "Angaar",
-            "shoulder": "Tee õlal",
-            "street_side": "Teeäärne parkimisrada",
-            "surface": "Maapealne",
-            "underground": "Maaalune"
+            "carports": {
+              "description": "Tavaliselt ilma seinteta varikatus, mis pakub autole osalist kaitset välise keskkonna eest.",
+              "title": "Auto varjualused"
+            },
+            "garage_boxes": {
+              "description": "Hoone, kus asub palju tavaliselt eri omanikele kuuluvaid garaaže, millest igaüks on mõeldud ühele autole.",
+              "title": "Garaažiboksid"
+            },
+            "half_on_kerb": {
+              "description": "Tänavaäärne parkimiskorraldus, kus parkiv sõiduk võib osaliselt paikneda kõnniteel.",
+              "title": "Parkimine mõlemal pool poolenisti kõnniteel"
+            },
+            "lane": {
+              "description": "Tänavaäärne parkimiskorraldus, kus parkiv sõiduk võib asuda sõiduteel (ja parkimisala saab vajadusel kergesti muuta sõidurajaks).",
+              "title": "Teeäärne parkimisrada mõlemal pool"
+            },
+            "layby": {
+              "description": "Tee ääres või kõrval paiknev väike ilma teepoolse piirdeta eraldi ala mõne auto parkimiseks.",
+              "title": "Parkimistasku"
+            },
+            "multi-storey": {
+              "description": "Kaks või enam parkimiskorrust hoones.",
+              "title": "Mitmekorruseline"
+            },
+            "on_kerb": {
+              "description": "Tänavaäärne parkimiskorraldus, kus parkiv sõiduk võib paikneda kõnniteel.",
+              "title": "Parkimine mõlemal pool kõnniteel"
+            },
+            "rooftop": {
+              "description": "Üks parkimiskorrus hoone või ehitise katusel.",
+              "title": "Katusel"
+            },
+            "sheds": {
+              "description": "Väike, sageli kaarjas angaarilaadne rajatis ühe või mõne auto jaoks.",
+              "title": "Väike parkimisangaar"
+            },
+            "shoulder": {
+              "description": "Teeäärne parkimiskorraldus, kus parkiv sõiduk võib paikneda tee õlal.",
+              "title": "Tee õlal"
+            },
+            "street_side": {
+              "description": "Tänavaäärne parkimiskorraldus, kus parkiv sõiduk võib paikneda otse tee kõrval (kuid mitte tee sõidurea peal).",
+              "title": "Teeäärne parkimisrada mõlemal pool"
+            },
+            "surface": {
+              "description": "Ühetasandiline parkimine maapinnal.",
+              "title": "Maapealne"
+            },
+            "underground": {
+              "description": "Parkimine asub maa all kas hoone vastavas osas või eraldi rajatises.",
+              "title": "maa all"
+            }
           }
         },
         "parking/side/orientation": {
@@ -2861,7 +2915,8 @@
             "demanding_mountain_hiking": "T3: Raske mägimatkamine",
             "difficult_alpine_hiking": "T6: Väga raske alpimatkamine",
             "hiking": "T1: Matkamine",
-            "mountain_hiking": "T2: Mägimatkamine"
+            "mountain_hiking": "T2: Mägimatkamine",
+            "strolling": "Lonkimine"
           },
           "placeholder": "Šveitsi Alpiklubi rajatasemed"
         },
@@ -3003,6 +3058,9 @@
             "right": "Ratturist paremal"
           }
         },
+        "siren/purpose": {
+          "label": "Eesmärk"
+        },
         "siren/type": {
           "label": "Tüüp",
           "options": {
@@ -3245,7 +3303,8 @@
           }
         },
         "summit/cross": {
-          "label": "Rist mäetipus"
+          "label": "Rist mäetipus",
+          "terms": "mäerist"
         },
         "supervised": {
           "label": "Valvega"
@@ -3300,6 +3359,7 @@
           "label": "Jälgitav piirkond"
         },
         "survey_point/purpose": {
+          "label": "Eesmärk",
           "options": {
             "both": "mõlemad"
           }
@@ -3309,7 +3369,9 @@
           "options": {
             "beacon": "Majakas",
             "block": "Plokk",
-            "cairn": "Kivikangur"
+            "cairn": "Kivikangur",
+            "plaque": "Tahvel",
+            "pole": "Teivas"
           }
         },
         "swimming_pool": {
@@ -3391,6 +3453,11 @@
         "toilets": {
           "label": "Tualetid"
         },
+        "toilets/disposal": {
+          "options": {
+            "flush": "Tasanäe äärekivi"
+          }
+        },
         "toilets/menstrual_products": {
           "label": "Saadaval on tasuta hügieenitooted naistele",
           "options": {
@@ -4841,13 +4908,15 @@
           "name": "Ala"
         },
         "area/highway/traffic_island": {
-          "name": "Eraldussaar"
+          "name": "Eraldussaar",
+          "terms": "ohutussaar,liiklussaar"
         },
         "attraction/amusement_ride": {
           "name": "Lõbuatraktsioon"
         },
         "attraction/big_wheel": {
-          "name": "Vaateratas"
+          "name": "Vaateratas",
+          "terms": "ilmaratas,kuradiratas"
         },
         "attraction/bungee_jumping": {
           "name": "Bendžihüpped"
@@ -5554,6 +5623,10 @@
         "entrance/main": {
           "name": "Peasissepääs\nPeasissekäik\nPortaal"
         },
+        "entrance/shop": {
+          "name": "Poe sissepääs",
+          "terms": "uks,pood,kauplus,kaupluse,peauks,sissepääs"
+        },
         "entrance/staircase": {
           "name": "Sissepääs trepikotta"
         },
@@ -6351,6 +6424,10 @@
         "leisure/ice_rink": {
           "name": "Uisuväljak"
         },
+        "leisure/indoor_play": {
+          "name": "Suur mängutuba",
+          "terms": "mängusaal"
+        },
         "leisure/marina": {
           "name": "Väikesadam",
           "terms": "Jahisadam,kaatrisadam,jaht,paat,kaater,sadam"
@@ -6472,6 +6549,10 @@
         "leisure/pitch/padel": {
           "name": "Padeliväljak"
         },
+        "leisure/pitch/paintball": {
+          "name": "Paintballi väljak",
+          "terms": "värvisõda,värvikuulimäng,värvipall,väljak,plats"
+        },
         "leisure/pitch/rugby_league": {
           "name": "Ragbiväljak (liigareeglite alusel)"
         },
@@ -6479,7 +6560,8 @@
           "name": "Ragbiväljak (liidureeglite alusel)"
         },
         "leisure/pitch/shooting": {
-          "name": "Lasketiir"
+          "name": "Lasketiir",
+          "terms": "tiir,laskerada,jahilasmine,sportlaskmine,sportpüss"
         },
         "leisure/pitch/skateboard": {
           "name": "Rulapark",
@@ -6503,6 +6585,10 @@
         "leisure/playground": {
           "name": "Mänguväljak"
         },
+        "leisure/playground/indoor": {
+          "name": "Väike mängutuba",
+          "terms": "mängusaal"
+        },
         "leisure/resort": {
           "name": "Kuurort",
           "terms": "spa,spaa,puhkekeskus"
@@ -6535,6 +6621,10 @@
         "leisure/sports_centre/karting": {
           "name": "Kardistaadion"
         },
+        "leisure/sports_centre/shooting": {
+          "name": "Laskespordi keskus",
+          "terms": "laskesport"
+        },
         "leisure/sports_centre/swimming": {
           "name": "Ujula",
           "terms": "bassein,supelhoone,veekeskus,siseujula,lastebassein,väliujula,välisujula,ujumisbassein"
@@ -6987,6 +7077,10 @@
         "natural": {
           "name": "Loodusobjekt"
         },
+        "natural/arch": {
+          "name": "Looduslik kaar või võlv",
+          "terms": "võlv,kaar,võlvkäik,kivikaar,kaljukaar"
+        },
         "natural/bare_rock": {
           "name": "Paljand",
           "terms": "Kivi paljand"
@@ -7282,7 +7376,8 @@
           "name": "Energiafirma  kontor"
         },
         "office/engineer": {
-          "name": "Inseneribüroo"
+          "name": "Inseneribüroo",
+          "terms": "tehnoloogiabüroo"
         },
         "office/estate_agent": {
           "name": "Kinnisvarabüroo"
@@ -7769,7 +7864,8 @@
           "name": "Trammi peatuspunkt"
         },
         "railway/turntable": {
-          "name": "Pöördesild"
+          "name": "Pöördesild",
+          "terms": "raudtee pöördesild"
         },
         "relation": {
           "name": "Relatsioon",
@@ -8080,6 +8176,10 @@
         "shop/gift": {
           "name": "Kingipood"
         },
+        "shop/gold_buyer": {
+          "name": "Kulla kokkuostja",
+          "terms": "kuld,väärismetall,kokkuost,kokkuostja"
+        },
         "shop/greengrocer": {
           "name": "Puu- ja köögiviljapood",
           "terms": "puuviljad,aedviljad,talukaup,juurviljad"
diff --git a/data/l10n/tagging.eu.json b/data/l10n/tagging.eu.json
index e7e6b59e6..e22611887 100644
--- a/data/l10n/tagging.eu.json
+++ b/data/l10n/tagging.eu.json
@@ -1319,10 +1319,18 @@
         "parking": {
           "label": "Mota",
           "options": {
-            "carports": "Garaje",
-            "rooftop": "Teilatuan",
-            "sheds": "Estalgune",
-            "underground": "Lur azpiko"
+            "carports": {
+              "title": "Garaje"
+            },
+            "rooftop": {
+              "title": "Teilatuan"
+            },
+            "sheds": {
+              "title": "Estalgune"
+            },
+            "underground": {
+              "title": "Lur azpiko"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.fa.json b/data/l10n/tagging.fa.json
index 3a2239336..e1e34b924 100644
--- a/data/l10n/tagging.fa.json
+++ b/data/l10n/tagging.fa.json
@@ -2079,17 +2079,39 @@
         "parking": {
           "label": "نوع",
           "options": {
-            "carports": "سایبان پارکینگ",
-            "garage_boxes": "اتاقک‌های گاراژ",
-            "lane": "خط عبوری کنار جاده",
-            "layby": "مشارکت / غیرفعال",
-            "multi-storey": "چندطبقه",
-            "rooftop": "پشت بام",
-            "sheds": "پارکینگ آلونکی",
-            "shoulder": "شانه",
-            "street_side": "کنار-خیابان",
-            "surface": "سطح",
-            "underground": "زیرزمینی"
+            "carports": {
+              "title": "سایبان پارکینگ"
+            },
+            "garage_boxes": {
+              "title": "اتاقک‌های گاراژ"
+            },
+            "lane": {
+              "title": "خط عبوری کنار جاده"
+            },
+            "layby": {
+              "title": "مشارکت / غیرفعال"
+            },
+            "multi-storey": {
+              "title": "چندطبقه"
+            },
+            "rooftop": {
+              "title": "پشت بام"
+            },
+            "sheds": {
+              "title": "پارکینگ آلونکی"
+            },
+            "shoulder": {
+              "title": "شانه"
+            },
+            "street_side": {
+              "title": "کنار-خیابان"
+            },
+            "surface": {
+              "title": "سطح"
+            },
+            "underground": {
+              "title": "زیر زمینی"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.fi.json b/data/l10n/tagging.fi.json
index 545390794..a5831d13c 100644
--- a/data/l10n/tagging.fi.json
+++ b/data/l10n/tagging.fi.json
@@ -380,8 +380,8 @@
             "chain": "ketju",
             "city_wall": "Kaupunginmuuri",
             "cycle_barrier": "Pyöräilyeste",
-            "ditch": "Oja",
-            "entrance": "Sisäänkäynti",
+            "ditch": "Kaivanto",
+            "entrance": "Kulkuaukko\nSisäänkäyntiaukko\nAidan aukko\nAukko aidassa\nMuurin aukko",
             "fence": "Aita",
             "gate": "portti",
             "guard_rail": "tiekaide",
@@ -396,7 +396,7 @@
             "swing_gate": "Kääntyvä puomi",
             "toll_booth": "Tietullipiste",
             "turnstile": "Kääntöportti",
-            "wall": "Seinä\nMuuri"
+            "wall": "Muuri\nSeinämuuri"
           }
         },
         "barrier_planter": {
@@ -1008,7 +1008,7 @@
           }
         },
         "crossing/barrier": {
-          "label": "Puomi",
+          "label": "Tasoristeyspuomi",
           "options": {
             "double_half": "kaksi puolipituista puomia",
             "full": "täysipituinen puomi",
@@ -2593,19 +2593,45 @@
         "parking": {
           "label": "Tyyppi",
           "options": {
-            "carports": "autokatos",
-            "garage_boxes": "riviautotalli",
-            "half_on_kerb": "Puoliksi reunakiven päällä",
-            "lane": "kadunvarren pysäköintikaista",
-            "layby": "Parkkipaikka tien varrella",
-            "multi-storey": "monikerroksinen pysäköintitalo",
-            "on_kerb": "kokonaan reunakiven päällä",
-            "rooftop": "katolla",
-            "sheds": "metallikatos",
-            "shoulder": "Pientareella",
-            "street_side": "kadunvarsi",
-            "surface": "kaduntasoinen pysäköintialue",
-            "underground": "pysäköintiluola"
+            "carports": {
+              "title": "autokatos"
+            },
+            "garage_boxes": {
+              "title": "riviautotalli"
+            },
+            "half_on_kerb": {
+              "title": "Puoliksi reunakiven päällä"
+            },
+            "lane": {
+              "title": "kadunvarren pysäköintikaista"
+            },
+            "layby": {
+              "title": "Parkkipaikka tien varrella"
+            },
+            "multi-storey": {
+              "title": "monikerroksinen pysäköintitalo"
+            },
+            "on_kerb": {
+              "title": "kokonaan reunakiven päällä"
+            },
+            "rooftop": {
+              "title": "katolla"
+            },
+            "sheds": {
+              "title": "metallikatos"
+            },
+            "shoulder": {
+              "title": "Pientareella"
+            },
+            "street_side": {
+              "title": "katuun liitetty pysäköintialue"
+            },
+            "surface": {
+              "title": "Pinta"
+            },
+            "underground": {
+              "title": "Paloposti maan alla"
+            }
           }
         },
         "parking/side/orientation": {
@@ -4285,7 +4311,7 @@
           "name": "Polkupyörävaja"
         },
         "amenity/bicycle_rental": {
-          "name": "Polkupyörän vuokrauspiste\nPyöränvuokrauspiste\nPyörävuokraus\nKaupunkipyöräasema",
+          "name": "Kaupunkipyöräasema",
           "terms": "pyörävuokraamo, kaupunkipyörä, pyöränvuokraus, pyörän vuokraus, polkupyörävuokraamo, polkupyörän vuokraus, polkupyöränvuokraus, polkupyörä, pyörä"
         },
         "amenity/bicycle_repair_station": {
@@ -5336,7 +5362,7 @@
           "name": "Nostopuomi"
         },
         "barrier/log": {
-          "name": "Kaatunut puu"
+          "name": "Kaatunut puu (este)"
         },
         "barrier/motorcycle_barrier": {
           "name": "Moottoripyöräeste"
@@ -5925,6 +5951,9 @@
         "entrance/main": {
           "name": "Pääsisäänkäynti"
         },
+        "entrance/shop": {
+          "name": "Myymälän sisäänkäynti"
+        },
         "entrance/staircase": {
           "name": "Sisäänkäynti portaikkoon",
           "terms": "portaikko, porras, rappu, raput"
diff --git a/data/l10n/tagging.fr.json b/data/l10n/tagging.fr.json
index 1a8a0eb29..b89933b6e 100644
--- a/data/l10n/tagging.fr.json
+++ b/data/l10n/tagging.fr.json
@@ -2512,19 +2512,45 @@
         },
         "parking": {
           "options": {
-            "carports": "Auvent",
-            "garage_boxes": "Box",
-            "half_on_kerb": "Chevauchement du trottoir",
-            "lane": "Stationnement de rue",
-            "layby": "Bas-côté",
-            "multi-storey": "Sur plusieurs niveaux",
-            "on_kerb": "Sur le trottoir",
-            "rooftop": "Toiture",
-            "sheds": "Abri privé",
-            "shoulder": "Bas-côté",
-            "street_side": "Bordure de voie",
-            "surface": "En surface",
-            "underground": "Souterrain"
+            "carports": {
+              "title": "Auvent"
+            },
+            "garage_boxes": {
+              "title": "Box"
+            },
+            "half_on_kerb": {
+              "title": "Chevauchement du trottoir"
+            },
+            "lane": {
+              "title": "Stationnement de rue"
+            },
+            "layby": {
+              "title": "Bas-côté"
+            },
+            "multi-storey": {
+              "title": "Sur plusieurs niveaux"
+            },
+            "on_kerb": {
+              "title": "Sur le trottoir"
+            },
+            "rooftop": {
+              "title": "Toiture"
+            },
+            "sheds": {
+              "title": "Abri privé"
+            },
+            "shoulder": {
+              "title": "Accotement"
+            },
+            "street_side": {
+              "title": "Bordure de voie"
+            },
+            "surface": {
+              "title": "En surface"
+            },
+            "underground": {
+              "title": "Souterrain"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.ga.json b/data/l10n/tagging.ga.json
index 758f014a9..2db03749f 100644
--- a/data/l10n/tagging.ga.json
+++ b/data/l10n/tagging.ga.json
@@ -1207,8 +1207,12 @@
         "parking": {
           "label": "Cineál",
           "options": {
-            "surface": "Dromchla",
-            "underground": "Faoi Thalamh"
+            "surface": {
+              "title": "Dromchla"
+            },
+            "underground": {
+              "title": "Faoi Thalamh"
+            }
           }
         },
         "parking/side/parking": {
diff --git a/data/l10n/tagging.gan.json b/data/l10n/tagging.gan.json
index 6c539de50..e7833cce7 100644
--- a/data/l10n/tagging.gan.json
+++ b/data/l10n/tagging.gan.json
@@ -2783,19 +2783,58 @@
         "parking": {
           "label": "类型",
           "options": {
-            "carports": "停車棚",
-            "garage_boxes": "集合車庫",
-            "half_on_kerb": "骑路缘",
-            "lane": "路边",
-            "layby": "停車彎",
-            "multi-storey": "立體停車場",
-            "on_kerb": "人行道上",
-            "rooftop": "天台",
-            "sheds": "私人停車棚",
-            "shoulder": "路肩",
-            "street_side": "内凹",
-            "surface": "地面",
-            "underground": "地下式"
+            "carports": {
+              "description": "用來為車輛提供有限保護的結構物，通常沒有牆壁。",
+              "title": "停車棚"
+            },
+            "garage_boxes": {
+              "description": "有多個獨立區塊的私人車庫，每個區塊一台車。",
+              "title": "集合車庫"
+            },
+            "half_on_kerb": {
+              "description": "部份停放在人行道上。",
+              "title": "骑路缘"
+            },
+            "lane": {
+              "description": "在街道上停車（可輕鬆轉換為車道）。",
+              "title": "路边"
+            },
+            "layby": {
+              "description": "停在路邊的暫時休息區域。",
+              "title": "停車彎"
+            },
+            "multi-storey": {
+              "description": "建築物結構中的兩層或多層停車場。",
+              "title": "立體停車場"
+            },
+            "on_kerb": {
+              "description": "在人行道上停車。",
+              "title": "人行道上"
+            },
+            "rooftop": {
+              "description": "建築物頂部的一層停車場。",
+              "title": "天台"
+            },
+            "sheds": {
+              "description": "私人停車棚。",
+              "title": "私人停車棚"
+            },
+            "shoulder": {
+              "description": "路肩停車。",
+              "title": "路肩"
+            },
+            "street_side": {
+              "description": "直接停在街道旁（但不在街道上）。",
+              "title": "内凹"
+            },
+            "surface": {
+              "description": "地面上的單層停車場。",
+              "title": "地面"
+            },
+            "underground": {
+              "description": "地下停車場。",
+              "title": "地下式"
+            }
           }
         },
         "parking/side/orientation": {
@@ -3375,7 +3414,8 @@
             "demanding_mountain_hiking": "T3：進階山區健行",
             "difficult_alpine_hiking": "T6：艱困高山健行",
             "hiking": "T1：健行",
-            "mountain_hiking": "T2：山區健行"
+            "mountain_hiking": "T2：山區健行",
+            "strolling": "散步"
           },
           "placeholder": "山區健行、高山健行...",
           "terms": "路線難度,健行難度,步行難度"
@@ -6807,6 +6847,10 @@
           "name": "主要入口",
           "terms": "主要,出入口,入口,出口,出入口"
         },
+        "entrance/shop": {
+          "name": "商店入口",
+          "terms": "商店入口"
+        },
         "entrance/staircase": {
           "name": "樓梯間入口",
           "terms": "樓梯間入口"
@@ -8604,6 +8648,10 @@
         "natural": {
           "name": "自然"
         },
+        "natural/arch": {
+          "name": "天然拱門",
+          "terms": "天然拱門"
+        },
         "natural/bare_rock": {
           "name": "裸岩",
           "terms": "裸岩"
@@ -10111,6 +10159,10 @@
           "name": "禮品店",
           "terms": "禮物店"
         },
+        "shop/gold_buyer": {
+          "name": "黃金買家",
+          "terms": "黃金買家"
+        },
         "shop/greengrocer": {
           "name": "蔬果行",
           "terms": "蔬果行"
diff --git a/data/l10n/tagging.gl.json b/data/l10n/tagging.gl.json
index a5130f78d..4b0e2c26a 100644
--- a/data/l10n/tagging.gl.json
+++ b/data/l10n/tagging.gl.json
@@ -1748,14 +1748,30 @@
         "parking": {
           "label": "Tipo",
           "options": {
-            "carports": "Cocheiras",
-            "garage_boxes": "Garaxe en cubículos",
-            "lane": "Carril na estrada",
-            "multi-storey": "Multinivel",
-            "rooftop": "Sobre do edificio",
-            "sheds": "Pendellos",
-            "surface": "Superficie",
-            "underground": "Subterráneo"
+            "carports": {
+              "title": "Cocheiras"
+            },
+            "garage_boxes": {
+              "title": "Garaxe en cubículos"
+            },
+            "lane": {
+              "title": "Carril na estrada"
+            },
+            "multi-storey": {
+              "title": "Varios niveis"
+            },
+            "rooftop": {
+              "title": "Sobre do edificio"
+            },
+            "sheds": {
+              "title": "Pendellos"
+            },
+            "surface": {
+              "title": "Superficie"
+            },
+            "underground": {
+              "title": "Subterráneo"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.he.json b/data/l10n/tagging.he.json
index 32cf4df0a..effb69cd1 100644
--- a/data/l10n/tagging.he.json
+++ b/data/l10n/tagging.he.json
@@ -2508,18 +2508,42 @@
         "parking": {
           "label": "סוג",
           "options": {
-            "carports": "חניות מקורות",
-            "garage_boxes": "מוסך קופסה",
-            "half_on_kerb": "חצי על המדרכה",
-            "lane": "לצד הכביש",
-            "multi-storey": "רב־קומתי",
-            "on_kerb": "על המדרכה",
-            "rooftop": "גג",
-            "sheds": "מסוכך",
-            "shoulder": "בשוליים",
-            "street_side": "לצד-הכביש",
-            "surface": "משטח",
-            "underground": "תת־קרקעי"
+            "carports": {
+              "title": "חניות מקורות"
+            },
+            "garage_boxes": {
+              "title": "מוסך קופסה"
+            },
+            "half_on_kerb": {
+              "title": "חצי על המדרכה"
+            },
+            "lane": {
+              "title": "לצד הכביש"
+            },
+            "multi-storey": {
+              "title": "רב קומתי"
+            },
+            "on_kerb": {
+              "title": "על המדרכה"
+            },
+            "rooftop": {
+              "title": "גג"
+            },
+            "sheds": {
+              "title": "מסוכך"
+            },
+            "shoulder": {
+              "title": "בשוליים"
+            },
+            "street_side": {
+              "title": "לצידי-הכביש"
+            },
+            "surface": {
+              "title": "משטח"
+            },
+            "underground": {
+              "title": "תת־קרקעי"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.hr.json b/data/l10n/tagging.hr.json
index 88f3b78df..7e5fc8553 100644
--- a/data/l10n/tagging.hr.json
+++ b/data/l10n/tagging.hr.json
@@ -400,7 +400,10 @@
           }
         },
         "basin": {
-          "label": "Vrsta"
+          "label": "Vrsta",
+          "options": {
+            "evaporation": "Isparavanje"
+          }
         },
         "bath/open_air": {
           "label": "Vanjsko kupalište"
@@ -436,7 +439,8 @@
         "bicycle_parking": {
           "label": "Vrsta",
           "options": {
-            "building": "U zgradi"
+            "building": "U zgradi",
+            "stands": "Stalak za bicikle"
           }
         },
         "bicycle_road": {
@@ -515,6 +519,9 @@
           "label": "Vrsta",
           "placeholder": "Predefinirano"
         },
+        "bridge/ref": {
+          "label": "Broj mosta"
+        },
         "bridge/support": {
           "label": "Vrsta"
         },
@@ -595,6 +602,9 @@
         "building/colour": {
           "label": "Boja fasade"
         },
+        "building/flats": {
+          "label": "Stambene jedinice"
+        },
         "building/levels": {
           "label": "Broj katova zajedno sa prizemljem",
           "terms": "Razine, katovi"
@@ -638,18 +648,29 @@
           }
         },
         "camp_site": {
-          "label": "Vrsta"
+          "label": "Vrsta",
+          "options": {
+            "serviced": {
+              "description": "Dostupni su toalet, voda, tuševi i opskrba električnom energijom"
+            }
+          }
         },
         "capacity": {
           "label": "Kapacitet",
           "terms": "Kapacitet"
         },
+        "capacity/disabled_parking": {
+          "label": "Broj mjesta za slabopokretne osobe"
+        },
         "capacity/persons": {
           "label": "Kapacitet (osoba)"
         },
         "capacity/tents": {
           "label": "Kapacitet (šatora)"
         },
+        "capacity_parking": {
+          "label": "Ukupan broj mjesta"
+        },
         "capacity_volume": {
           "label": "Kapacitet (kubnih metara)"
         },
@@ -708,6 +729,7 @@
           "label": "Vrijeme preuzimanja"
         },
         "collector": {
+          "label": "Predmeti",
           "options": {
             "coins": "Numizmatika\nKovanice",
             "comics": "Stripovi",
@@ -747,6 +769,9 @@
           "label": "URL web kamere",
           "placeholder": "http://primjer.hr/"
         },
+        "content": {
+          "label": "Sadržaj"
+        },
         "conveying": {
           "label": "Smjer kretanja",
           "options": {
@@ -788,6 +813,7 @@
             "carpet_layer": "Postavljač tepiha",
             "caterer": "Dostavljač",
             "chimney_sweeper": "Dimnjačar",
+            "cleaning": "Služba čišćenja",
             "clockmaker": "Urar",
             "distillery": "Destilerija",
             "dressmaker": "Krojač za žene",
@@ -878,6 +904,9 @@
             "yes": "Da"
           }
         },
+        "crossing/bell": {
+          "label": "Zvono"
+        },
         "crossing/island": {
           "label": "Pješački otok"
         },
@@ -910,8 +939,10 @@
             "argentinian": "Argentinska",
             "asian": "Azijska",
             "balkan": "Balkanska",
+            "barbecue": "Ugljani roštilj",
             "brazilian": "Brazilska",
             "breakfast": "Doručak",
+            "burger": "Hamburger",
             "cake": "Kolači",
             "chicken": "Piletina",
             "dessert": "Desert",
@@ -919,6 +950,7 @@
             "filipino": "Filipinska",
             "fish": "Riba",
             "french": "Francuska",
+            "fries": "Pomfrit",
             "frozen_yogurt": "Smrznuti jogurt",
             "german": "Njemačka",
             "greek": "Grčka",
@@ -928,6 +960,7 @@
             "indonesian": "Indonezijska",
             "italian": "Talijanska",
             "japanese": "Japanska",
+            "juice": "Sok",
             "korean": "Korejska",
             "mediterranean": "Mediteranska",
             "mexican": "Meksička",
@@ -1128,7 +1161,10 @@
           "label": "Vrsta"
         },
         "dock": {
-          "label": "Vrsta"
+          "label": "Vrsta",
+          "options": {
+            "drydock": "Suhi dok"
+          }
         },
         "dog": {
           "label": "Psi",
@@ -1192,6 +1228,8 @@
         "embassy": {
           "label": "Vrsta",
           "options": {
+            "delegation": "Delegacija",
+            "mission": "Diplomatska misija",
             "yes": "Ambasada"
           }
         },
@@ -1212,9 +1250,11 @@
           "options": {
             "emergency": "Izlaz u slučaju opasnosti",
             "entrance": "Samo ulaz",
+            "exit": "Samo izlaz",
             "garage": "Garažna vrata",
             "home": "Kućni ulaz",
             "main": "Glavni",
+            "service": "Usluga",
             "staircase": "Stubište"
           }
         },
@@ -1284,8 +1324,21 @@
           "label": "Popravi me",
           "terms": "Pomoć, traženje pomoći"
         },
+        "flag/name": {
+          "label": "Zastava države"
+        },
         "flashing_lights": {
           "options": {
+            "always": {
+              "title": "Uvijek trepere"
+            },
+            "button": {
+              "description": "Svjetla na aktivaciju tipkalom",
+              "title": "Aktivacija putem tipkala"
+            },
+            "button;sensor": {
+              "title": "Aktivacija senzorom i tipkalom"
+            },
             "no": "Ne",
             "yes": "Da"
           }
@@ -1309,7 +1362,10 @@
         "fuel/fuel_multi": {
           "label": "Tipovi goriva",
           "options": {
-            "diesel": "Dizel"
+            "LH2": "Tekući dušik",
+            "cng": "Stlačeni prirodni plin",
+            "diesel": "Dizel",
+            "propane": "Propan"
           }
         },
         "gauge": {
@@ -1327,7 +1383,8 @@
         "generator/method": {
           "label": "Metoda",
           "options": {
-            "water-storage": "Akumulacija"
+            "water-storage": "Akumulacija",
+            "wind_turbine": "Vjetrenjača"
           }
         },
         "generator/output/electricity": {
@@ -1340,6 +1397,7 @@
             "coal": "Ugljen",
             "diesel": "Dizel",
             "gas": "Zemni plin",
+            "nuclear": "Nuklearna energija",
             "wind": "Vjetar"
           }
         },
@@ -1972,18 +2030,39 @@
         "parking": {
           "label": "Vrsta",
           "options": {
-            "carports": "Nastrešnica",
-            "garage_boxes": "Boks garaža",
-            "half_on_kerb": "Dijelom na rubniku",
-            "lane": "Parking na prometnici",
-            "layby": "Na odmorištu",
-            "multi-storey": "Višerazinski",
-            "on_kerb": "Na rubnik",
-            "rooftop": "Na krovu",
-            "sheds": "Šupe",
-            "street_side": "Uz kolnik",
-            "surface": "Površinski",
-            "underground": "Podzemni"
+            "carports": {
+              "title": "Nastrešnica"
+            },
+            "garage_boxes": {
+              "title": "Boks garaža"
+            },
+            "half_on_kerb": {
+              "title": "Dijelom na rubniku"
+            },
+            "lane": {
+              "title": "Parking na prometnici"
+            },
+            "layby": {
+              "title": "Na odmorištu"
+            },
+            "on_kerb": {
+              "title": "Na rubnik"
+            },
+            "rooftop": {
+              "title": "Na krovu"
+            },
+            "sheds": {
+              "title": "Šupe"
+            },
+            "street_side": {
+              "title": "Uz kolnik"
+            },
+            "surface": {
+              "title": "Površinski"
+            },
+            "underground": {
+              "title": "Podzemni"
+            }
           }
         },
         "parking/side/orientation": {
@@ -4112,6 +4191,9 @@
         "craft/chimney_sweeper": {
           "name": "Dimnjačar"
         },
+        "craft/cleaning": {
+          "name": "Služba čišćenja"
+        },
         "craft/clockmaker": {
           "name": "Urar (ručni satovi)"
         },
@@ -4737,6 +4819,12 @@
         "landuse/industrial": {
           "name": "Industrijska zona"
         },
+        "landuse/industrial/depot": {
+          "name": "Terminal"
+        },
+        "landuse/industrial/scrap_yard": {
+          "name": "Smetlište"
+        },
         "landuse/industrial/slaughterhouse": {
           "name": "Klaonica"
         },
@@ -4761,6 +4849,9 @@
         "landuse/military/base/navy": {
           "name": "Vojna luka"
         },
+        "landuse/military/obstacle_course": {
+          "name": "Vojni poligon"
+        },
         "landuse/military/range": {
           "name": "Vojna streljana"
         },
@@ -4776,6 +4867,9 @@
         "landuse/quarry": {
           "name": "Kamenolom"
         },
+        "landuse/railway": {
+          "name": "Željeznički koridor"
+        },
         "landuse/religious": {
           "name": "Religiozno područje"
         },
@@ -4785,12 +4879,18 @@
         "landuse/residential": {
           "name": "Stambena zona"
         },
+        "landuse/residential/apartments": {
+          "name": "Apartmanski kompleks"
+        },
         "landuse/retail": {
           "name": "Trgovačka zona"
         },
         "landuse/vineyard": {
           "name": "Vinograd"
         },
+        "landuse/winter_sports": {
+          "name": "Zimsko-rekreacijski centar"
+        },
         "leisure/adult_gaming_centre": {
           "name": "Centar igara na sreću za odrasle"
         },
@@ -4812,6 +4912,9 @@
         "leisure/dancing_school": {
           "name": "Plesna škola"
         },
+        "leisure/disc_golf_course": {
+          "name": "Disk golf teren"
+        },
         "leisure/dog_park": {
           "name": "Park za pse"
         },
@@ -4828,6 +4931,9 @@
         "leisure/fitness_station": {
           "name": "Vanjski prostor za vježbanje"
         },
+        "leisure/fitness_station/horizontal_bar": {
+          "name": "Poluga za vježbanje"
+        },
         "leisure/garden": {
           "name": "Vrt",
           "terms": "vrt,bašća,povrtnjak,cvjetnjak"
@@ -5339,8 +5445,8 @@
           "name": "Greben"
         },
         "natural/saddle": {
-          "name": "Sedlo",
-          "terms": "prijevoj"
+          "name": "Prijevoj",
+          "terms": "planinarski prijevoj, sedlo"
         },
         "natural/sand": {
           "name": "Pijesak"
@@ -5687,6 +5793,9 @@
         "power/generator/source/nuclear": {
           "name": "Nuklearni reaktor"
         },
+        "power/generator/source/wind": {
+          "name": "Vjetrenjača"
+        },
         "power/line": {
           "name": "Dalekovod",
           "terms": "dalekovod,električni vod,strujni vod"
diff --git a/data/l10n/tagging.hu.json b/data/l10n/tagging.hu.json
index 5c8735306..25f8bc9cc 100644
--- a/data/l10n/tagging.hu.json
+++ b/data/l10n/tagging.hu.json
@@ -2704,19 +2704,45 @@
         "parking": {
           "label": "Típus",
           "options": {
-            "carports": "Fedett, oldalról nyitott parkolóhelyek",
-            "garage_boxes": "Garázsok",
-            "half_on_kerb": "Félig a járdaszegélyen",
-            "lane": "Parkolósáv",
-            "layby": "Félreállóöböl",
-            "multi-storey": "Parkolóház",
-            "on_kerb": "Járdaszegélyen",
-            "rooftop": "Tetőn",
-            "sheds": "Kocsiszín",
-            "shoulder": "Leállósáv",
-            "street_side": "Úttest melletti",
-            "surface": "Felszíni",
-            "underground": "Föld alatti"
+            "carports": {
+              "title": "Fedett, oldalról nyitott parkolóhelyek"
+            },
+            "garage_boxes": {
+              "title": "Garázsok"
+            },
+            "half_on_kerb": {
+              "title": "Félig a járdaszegélyen"
+            },
+            "lane": {
+              "title": "Parkolósávon"
+            },
+            "layby": {
+              "title": "Félreállóöböl"
+            },
+            "multi-storey": {
+              "title": "Parkolóház"
+            },
+            "on_kerb": {
+              "title": "Járdaszegélyen"
+            },
+            "rooftop": {
+              "title": "Tetőn"
+            },
+            "sheds": {
+              "title": "Kocsiszín"
+            },
+            "shoulder": {
+              "title": "Leállósávban"
+            },
+            "street_side": {
+              "title": "Úttest mellett"
+            },
+            "surface": {
+              "title": "Felület"
+            },
+            "underground": {
+              "title": "Föld alatti"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.id.json b/data/l10n/tagging.id.json
index 702c21da7..5f2c5c23b 100644
--- a/data/l10n/tagging.id.json
+++ b/data/l10n/tagging.id.json
@@ -1336,9 +1336,15 @@
         "parking": {
           "label": "Tipe",
           "options": {
-            "rooftop": "Atap",
-            "surface": "Permukaan",
-            "underground": "Bawah Tanah"
+            "rooftop": {
+              "title": "Atap"
+            },
+            "surface": {
+              "title": "Permukaan"
+            },
+            "underground": {
+              "title": "Bawah tanah"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.is.json b/data/l10n/tagging.is.json
index 637fe8745..5dd84e34d 100644
--- a/data/l10n/tagging.is.json
+++ b/data/l10n/tagging.is.json
@@ -1645,14 +1645,30 @@
         "parking": {
           "label": "Tegund",
           "options": {
-            "carports": "Bílskýli",
-            "garage_boxes": "Bílskúrar",
-            "lane": "Við hlið vegar",
-            "multi-storey": "Margra hæða",
-            "rooftop": "Þak",
-            "sheds": "Skúrar",
-            "surface": "Yfirborð",
-            "underground": "Neðanjarðar"
+            "carports": {
+              "title": "Bílskýli"
+            },
+            "garage_boxes": {
+              "title": "Bílskúrar"
+            },
+            "lane": {
+              "title": "Við hlið vegar"
+            },
+            "multi-storey": {
+              "title": "Margra hæða"
+            },
+            "rooftop": {
+              "title": "Þak"
+            },
+            "sheds": {
+              "title": "Skúrar"
+            },
+            "surface": {
+              "title": "Yfirborð"
+            },
+            "underground": {
+              "title": "Neðanjarðar"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.it.json b/data/l10n/tagging.it.json
index 9e551376f..1637e153f 100644
--- a/data/l10n/tagging.it.json
+++ b/data/l10n/tagging.it.json
@@ -2505,19 +2505,45 @@
         "parking": {
           "label": "Tipo",
           "options": {
-            "carports": "Tettoia",
-            "garage_boxes": "Box garage",
-            "half_on_kerb": "Mezzo sul marciapiede",
-            "lane": "Corsia",
-            "layby": "Affluenza alle urne / piazzola di sosta",
-            "multi-storey": "Più piani",
-            "on_kerb": "Sul marciapiede",
-            "rooftop": "Tetto",
-            "sheds": "Capanno",
-            "shoulder": "Banchina",
-            "street_side": "Lato strada",
-            "surface": "Superficie",
-            "underground": "Sotterraneo"
+            "carports": {
+              "title": "Tettoia"
+            },
+            "garage_boxes": {
+              "title": "Box garage"
+            },
+            "half_on_kerb": {
+              "title": "Mezzo sul marciapiede"
+            },
+            "lane": {
+              "title": "Vicolo a bordo strada"
+            },
+            "layby": {
+              "title": "Affluenza alle urne / piazzola di sosta"
+            },
+            "multi-storey": {
+              "title": "Multi-piano"
+            },
+            "on_kerb": {
+              "title": "Sul marciapiede"
+            },
+            "rooftop": {
+              "title": "Tetto"
+            },
+            "sheds": {
+              "title": "Capanno"
+            },
+            "shoulder": {
+              "title": "Banchina"
+            },
+            "street_side": {
+              "title": "Lato strada"
+            },
+            "surface": {
+              "title": "Superficie"
+            },
+            "underground": {
+              "title": "Sotterraneo"
+            }
           }
         },
         "parking/side/orientation": {
@@ -5539,7 +5565,7 @@
         },
         "building/apartments": {
           "name": "Condominio",
-          "terms": "appartamenti,condomini,palazzi,palazzoni,casermoni,case popolari,abitazioni,case,edilizia popolare,peep,iacp,terreno,lotto,terreno condominiale, area condominiale"
+          "terms": "appartamenti,condomini,condominio,palazzi,palazzo,palazzoni,casermoni,case popolari,abitazioni,abitazione,residenza,case,edilizia popolare,peep,iacp,terreno,lotto,terreno condominiale, area condominiale"
         },
         "building/bakehouse": {
           "name": "Forno\nFornace\nFornaio"
diff --git a/data/l10n/tagging.ja.json b/data/l10n/tagging.ja.json
index 763b85ea3..4855ab1c8 100644
--- a/data/l10n/tagging.ja.json
+++ b/data/l10n/tagging.ja.json
@@ -2740,19 +2740,58 @@
         "parking": {
           "label": "種類",
           "options": {
-            "carports": "カーポート",
-            "garage_boxes": "箱型ガレージ",
-            "half_on_kerb": "片輪乗り上げ",
-            "lane": "路側帯",
-            "layby": "レイバイ（待避所）",
-            "multi-storey": "立体",
-            "on_kerb": "歩道縁石上",
-            "rooftop": "屋上",
-            "sheds": "小屋",
-            "shoulder": "路肩",
-            "street_side": "道路脇",
-            "surface": "地面",
-            "underground": "地下"
+            "carports": {
+              "description": "車両を限定的ながら風雨から保護するための構造物で、普通は壁がありません。",
+              "title": "カーポート"
+            },
+            "garage_boxes": {
+              "description": "それぞれ1台の自動車を格納できる複数の格納庫からなるガレージです。",
+              "title": "箱型ガレージ"
+            },
+            "half_on_kerb": {
+              "description": "歩道縁石へ半分乗り上げての駐車。",
+              "title": "片輪乗り上げ"
+            },
+            "lane": {
+              "description": "道路上にある駐車施設（容易に通行用レーンに転換できるようなもの）。",
+              "title": "駐車帯"
+            },
+            "layby": {
+              "description": "道路脇に設けられた休憩用の駐車施設。",
+              "title": "レイバイ（待避所）"
+            },
+            "multi-storey": {
+              "description": "建造物内にある2階建て以上の駐車デッキ。",
+              "title": "立体"
+            },
+            "on_kerb": {
+              "description": "歩道縁石上への駐車。",
+              "title": "歩道縁石上"
+            },
+            "rooftop": {
+              "description": "建物の屋上にある駐車デッキ。",
+              "title": "屋上"
+            },
+            "sheds": {
+              "description": "個人用の車両格納庫。",
+              "title": "小屋"
+            },
+            "shoulder": {
+              "description": "路肩への駐車。",
+              "title": "路肩"
+            },
+            "street_side": {
+              "description": "（道路上ではなく）道路のすぐ脇に設けられた駐車場。",
+              "title": "道路脇"
+            },
+            "surface": {
+              "description": "地面にある駐車場。 ",
+              "title": "表面の材質"
+            },
+            "underground": {
+              "description": "地下駐車場。",
+              "title": "地下式"
+            }
           }
         },
         "parking/side/orientation": {
@@ -6713,6 +6752,10 @@
           "name": "出入口 (正面)",
           "terms": "正面玄関, 表玄関, 表口, ドア, 正面入口, 出入口"
         },
+        "entrance/shop": {
+          "name": "出入口（店舗）",
+          "terms": "店舗入口, ドア, 扉, 入口"
+        },
         "entrance/staircase": {
           "name": "出入口（階段）",
           "terms": "階段の入口, 階段, 出入口, 出入り口, 出口, 入口"
@@ -8510,6 +8553,10 @@
         "natural": {
           "name": "自然関連"
         },
+        "natural/arch": {
+          "name": "天然橋",
+          "terms": "岩門, 石門"
+        },
         "natural/bare_rock": {
           "name": "岩場",
           "terms": "岩場"
@@ -10015,6 +10062,10 @@
           "name": "ギフト店",
           "terms": "ギフト店, ギフト用品店, 土産店, お土産, 贈答品, 店舗, お店, ギフト, プレゼント"
         },
+        "shop/gold_buyer": {
+          "name": "金買取店",
+          "terms": "貴金属買取店"
+        },
         "shop/greengrocer": {
           "name": "青果店",
           "terms": "青果店, 八百屋, 果物屋, 食料品, 食品, 食べ物, 野菜, ベジタブル, 果物, くだもの, フルーツ, 小売, 店舗, お店"
diff --git a/data/l10n/tagging.kn.json b/data/l10n/tagging.kn.json
index 4635ede37..56f850cb5 100644
--- a/data/l10n/tagging.kn.json
+++ b/data/l10n/tagging.kn.json
@@ -868,10 +868,18 @@
         "parking": {
           "label": "ವಿಧ",
           "options": {
-            "multi-storey": "ಬಹುಮಟ್ಟದ",
-            "sheds": "ತಂಗುದಾಣ",
-            "surface": "ಮೇಲ್ಮೈ",
-            "underground": "‍‍‍ನೆಲದಡಿ"
+            "multi-storey": {
+              "title": "ಬಹುಮಟ್ಟದ"
+            },
+            "sheds": {
+              "title": "ತಂಗುದಾಣ"
+            },
+            "surface": {
+              "title": "ಮೇಲ್ಮೈ"
+            },
+            "underground": {
+              "title": "‍‍‍ನೆಲದಡಿ"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.ko.json b/data/l10n/tagging.ko.json
index 83c840527..d88084065 100644
--- a/data/l10n/tagging.ko.json
+++ b/data/l10n/tagging.ko.json
@@ -2745,19 +2745,42 @@
         "parking": {
           "label": "유형",
           "options": {
-            "carports": "간이 차고",
-            "garage_boxes": "차고 상자",
-            "half_on_kerb": "연석에 걸친 주차",
-            "lane": "가로변 차로",
-            "layby": "임시 주차장 / 레이바이",
-            "multi-storey": "다층",
-            "on_kerb": "보도 주차",
-            "rooftop": "옥상 주차장",
-            "sheds": "개인 차고",
-            "shoulder": "갓길 주차",
-            "street_side": "갓길 주차장",
-            "surface": "지상",
-            "underground": "지하"
+            "carports": {
+              "title": "간이 차고"
+            },
+            "garage_boxes": {
+              "title": "차고 상자"
+            },
+            "half_on_kerb": {
+              "title": "연석에 걸친 주차"
+            },
+            "lane": {
+              "title": "가로변 차로"
+            },
+            "layby": {
+              "title": "임시 주차장 / 레이바이"
+            },
+            "multi-storey": {
+              "title": "다층"
+            },
+            "on_kerb": {
+              "title": "보도 주차"
+            },
+            "rooftop": {
+              "title": "옥상 주차장"
+            },
+            "sheds": {
+              "title": "개인 차고"
+            },
+            "shoulder": {
+              "title": "갓길 주차"
+            },
+            "street_side": {
+              "title": "갓길 주차장"
+            },
+            "underground": {
+              "title": "지하식 소화전"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.lt.json b/data/l10n/tagging.lt.json
index f8ac789d1..67dfaef28 100644
--- a/data/l10n/tagging.lt.json
+++ b/data/l10n/tagging.lt.json
@@ -1259,13 +1259,27 @@
         "parking": {
           "label": "Tipas",
           "options": {
-            "carports": "Stoginės",
-            "garage_boxes": "Garažai",
-            "lane": "Kelkraštis",
-            "multi-storey": "Daugiaaukštis",
-            "sheds": "Pašiūrės",
-            "surface": "Danga",
-            "underground": "Požeminis"
+            "carports": {
+              "title": "Stoginės"
+            },
+            "garage_boxes": {
+              "title": "Garažai"
+            },
+            "lane": {
+              "title": "Kelkraštis"
+            },
+            "multi-storey": {
+              "title": "Daugiaaukštis"
+            },
+            "sheds": {
+              "title": "Pašiūrės"
+            },
+            "surface": {
+              "title": "Danga"
+            },
+            "underground": {
+              "title": "Požeminis"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.lv.json b/data/l10n/tagging.lv.json
index 3f50e5f5b..aeed6552a 100644
--- a/data/l10n/tagging.lv.json
+++ b/data/l10n/tagging.lv.json
@@ -1325,14 +1325,30 @@
         "parking": {
           "label": "Tips",
           "options": {
-            "carports": "Nojumes",
-            "garage_boxes": "Garāžas",
-            "lane": "Ielas mala",
-            "multi-storey": "Vairākstāvu",
-            "rooftop": "Jumta",
-            "sheds": "Sķūnis",
-            "surface": "Virszemes",
-            "underground": "Apakšzemes"
+            "carports": {
+              "title": "Nojumes"
+            },
+            "garage_boxes": {
+              "title": "Garāžas"
+            },
+            "lane": {
+              "title": "Ielas mala"
+            },
+            "multi-storey": {
+              "title": "Vairākstāvu"
+            },
+            "rooftop": {
+              "title": "Jumta"
+            },
+            "sheds": {
+              "title": "Sķūnis"
+            },
+            "surface": {
+              "title": "Virszemes"
+            },
+            "underground": {
+              "title": "Apakšzemes"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.mk.json b/data/l10n/tagging.mk.json
index e7304ba9e..012623675 100644
--- a/data/l10n/tagging.mk.json
+++ b/data/l10n/tagging.mk.json
@@ -2768,19 +2768,58 @@
         "parking": {
           "label": "Вид",
           "options": {
-            "carports": "Автомобилски стреи",
-            "garage_boxes": "Гаражи",
-            "half_on_kerb": "Половина на тротоар",
-            "lane": "Крајпатна лента",
-            "layby": "Одмориште",
-            "multi-storey": "Катно",
-            "on_kerb": "На тротоар",
-            "rooftop": "Покрив",
-            "sheds": "Шупи",
-            "shoulder": "Принудна лента",
-            "street_side": "Крајулично",
-            "surface": "Надземно",
-            "underground": "Подземно"
+            "carports": {
+              "description": "Градба со ограничена заштита за возилата, обично без ѕидови.",
+              "title": "Автомобилски стреи"
+            },
+            "garage_boxes": {
+              "description": "Приватна гаража со повеќе поединечни поделоци, секој за по една кола",
+              "title": "Гаражи"
+            },
+            "half_on_kerb": {
+              "description": "Паркиринг делумно на тротоар",
+              "title": "Половина на тротоар"
+            },
+            "lane": {
+              "description": "Паркинг на улицата (кој лесно може да се претвори во патека)",
+              "title": "Крајпатна лента"
+            },
+            "layby": {
+              "description": "Паркинг на одмориште, покрај патот.",
+              "title": "Одмориште"
+            },
+            "multi-storey": {
+              "description": "Два или повеќе ката за паркирање во зграда.",
+              "title": "Катно"
+            },
+            "on_kerb": {
+              "description": "Паркинг на тротоар",
+              "title": "На тротоар"
+            },
+            "rooftop": {
+              "description": "Едено ниво ниво за паркирање врз зграда.",
+              "title": "Покрив"
+            },
+            "sheds": {
+              "description": "Приватни хангари за возила.",
+              "title": "Шупи"
+            },
+            "shoulder": {
+              "description": "Паркинг на принудна лента",
+              "title": "Принудна лента"
+            },
+            "street_side": {
+              "description": "Паркинг веднаш до улица (но не на неа).",
+              "title": "Крајулично"
+            },
+            "surface": {
+              "description": "Едно ниво за паркирање, наземно.",
+              "title": "Надземно"
+            },
+            "underground": {
+              "description": "Подземно паркирање.",
+              "title": "Подземно"
+            }
           }
         },
         "parking/side/orientation": {
@@ -3346,7 +3385,8 @@
             "demanding_mountain_hiking": "T3: Посветено планинарење",
             "difficult_alpine_hiking": "T6: Тешко високогорство",
             "hiking": "T1: Планинарење",
-            "mountain_hiking": "T2: Планинарење"
+            "mountain_hiking": "T2: Планинарење",
+            "strolling": "Лесна прошетка"
           },
           "placeholder": "Планинарење, високогорство...",
           "terms": "[преведете со истозначници и сродни поими на „Тешкотија на искачување“, одделени со запирки]"
@@ -6497,6 +6537,10 @@
         "entrance/main": {
           "name": "Главен влез"
         },
+        "entrance/shop": {
+          "name": "Влез во дуќан",
+          "terms": "<преведете со истозначници или сродни поими на „Влез во дуќан“, одделени со запирки>"
+        },
         "entrance/staircase": {
           "name": "Влез кон скали",
           "terms": "<преведете со истозначници или сродни поими на „Влез кон скали“, одделени со запирки>"
@@ -8066,6 +8110,10 @@
         "natural": {
           "name": "Природен елемент"
         },
+        "natural/arch": {
+          "name": "Природен лак",
+          "terms": "<преведете со истозначници или сродни поими на „Природен лак“, одделени со запирки>"
+        },
         "natural/bare_rock": {
           "name": "Гола карпа",
           "terms": "<преведете со истозначници или сродни поими на „Гола карпа“, одделени со запирки>"
@@ -9344,6 +9392,10 @@
           "name": "Продавница за подароци",
           "terms": "<преведете со истозначници или сродни поими на „Продавница за подароци“, одделени со запирки>"
         },
+        "shop/gold_buyer": {
+          "name": "Откупувач на злато",
+          "terms": "<преведете со истозначници или сродни поими на „Откупувач на злато“, одделени со запирки>"
+        },
         "shop/greengrocer": {
           "name": "Пилјарница",
           "terms": "<преведете со истозначници или сродни поими на „Пилјарница“, одделени со запирки>"
diff --git a/data/l10n/tagging.ms.json b/data/l10n/tagging.ms.json
index a42063117..f2619edfe 100644
--- a/data/l10n/tagging.ms.json
+++ b/data/l10n/tagging.ms.json
@@ -1118,13 +1118,27 @@
         "parking": {
           "label": "Jenis",
           "options": {
-            "carports": "Garaj",
-            "garage_boxes": "Kotak Garaj",
-            "lane": "Lorong Pinggir Jalan",
-            "multi-storey": "Bertingkat-tingkat",
-            "sheds": "Bangsal",
-            "surface": "Permukaan",
-            "underground": "Bawah Tanah"
+            "carports": {
+              "title": "Garaj"
+            },
+            "garage_boxes": {
+              "title": "Kotak Garaj"
+            },
+            "lane": {
+              "title": "Lorong Pinggir Jalan"
+            },
+            "multi-storey": {
+              "title": "Bertingkat-tingkat"
+            },
+            "sheds": {
+              "title": "Bangsal"
+            },
+            "surface": {
+              "title": "Permukaan"
+            },
+            "underground": {
+              "title": "Bawah Tanah"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.nb.json b/data/l10n/tagging.nb.json
index 43e46e3a8..642e72f3c 100644
--- a/data/l10n/tagging.nb.json
+++ b/data/l10n/tagging.nb.json
@@ -322,7 +322,9 @@
         },
         "parking": {
           "options": {
-            "underground": "Underjordisk "
+            "underground": {
+              "title": "Underjordisk "
+            }
           }
         },
         "parking/side/parking": {
diff --git a/data/l10n/tagging.nl.json b/data/l10n/tagging.nl.json
index 188f5469d..ef5466851 100644
--- a/data/l10n/tagging.nl.json
+++ b/data/l10n/tagging.nl.json
@@ -2521,18 +2521,42 @@
         },
         "parking": {
           "options": {
-            "garage_boxes": "Garageboxen",
-            "half_on_kerb": "Half op de borduur",
-            "lane": "Parkeerstrook",
-            "layby": "Uitwijkplaats",
-            "multi-storey": "Parkeergebouw met meerdere verdiepingen",
-            "on_kerb": "Op de borduur",
-            "rooftop": "Dak",
-            "sheds": "Stallen",
-            "shoulder": "Berm",
-            "street_side": "Straatkant",
-            "surface": "Oppervlak",
-            "underground": "Ondergronds"
+            "garage_boxes": {
+              "title": "Garageboxen"
+            },
+            "half_on_kerb": {
+              "title": "Half op de borduur"
+            },
+            "lane": {
+              "title": "Parkeerstrook"
+            },
+            "layby": {
+              "title": "Uitwijkplaats"
+            },
+            "multi-storey": {
+              "title": "Meerdere verdiepingen"
+            },
+            "on_kerb": {
+              "title": "Op de borduur"
+            },
+            "rooftop": {
+              "title": "Dak"
+            },
+            "sheds": {
+              "title": "Stallen"
+            },
+            "shoulder": {
+              "title": "Berm"
+            },
+            "street_side": {
+              "title": "Straatkant"
+            },
+            "surface": {
+              "title": "Oppervlak"
+            },
+            "underground": {
+              "title": "Ondergronds"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.nn.json b/data/l10n/tagging.nn.json
index 644ffbd27..0dba30c18 100644
--- a/data/l10n/tagging.nn.json
+++ b/data/l10n/tagging.nn.json
@@ -658,8 +658,12 @@
         },
         "parking": {
           "options": {
-            "carports": "Biloppstillingsplassar under tak",
-            "rooftop": "Hustak"
+            "carports": {
+              "title": "Biloppstillingsplassar under tak"
+            },
+            "rooftop": {
+              "title": "Hustak"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.no.json b/data/l10n/tagging.no.json
index 2f8448ad9..f0144ec47 100644
--- a/data/l10n/tagging.no.json
+++ b/data/l10n/tagging.no.json
@@ -2052,15 +2052,33 @@
         },
         "parking": {
           "options": {
-            "carports": "Bilbåser",
-            "garage_boxes": "Garasjekasser ",
-            "lane": "Parallell gateparkering",
-            "multi-storey": "Fler-etasjes",
-            "rooftop": "Tak",
-            "sheds": "Skur/utebod",
-            "street_side": "Gateparkering",
-            "surface": "Overflate",
-            "underground": "Under overflaten"
+            "carports": {
+              "title": "Bilbåser"
+            },
+            "garage_boxes": {
+              "title": "Garasjekasser "
+            },
+            "lane": {
+              "title": "Parallell gateparkering"
+            },
+            "multi-storey": {
+              "title": "Fleretasje parking"
+            },
+            "rooftop": {
+              "title": "Tak"
+            },
+            "sheds": {
+              "title": "Skur/utebod"
+            },
+            "street_side": {
+              "title": "Gateparkering"
+            },
+            "surface": {
+              "title": "Overflate"
+            },
+            "underground": {
+              "title": "Underjordisk"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.pa.json b/data/l10n/tagging.pa.json
index 281f96413..024237843 100644
--- a/data/l10n/tagging.pa.json
+++ b/data/l10n/tagging.pa.json
@@ -742,7 +742,9 @@
         "parking": {
           "label": "قسم",
           "options": {
-            "surface": "بھومی"
+            "surface": {
+              "title": "بھومی"
+            }
           }
         },
         "parking/side/parking": {
diff --git a/data/l10n/tagging.pl.json b/data/l10n/tagging.pl.json
index 307f3df54..a2e52137e 100644
--- a/data/l10n/tagging.pl.json
+++ b/data/l10n/tagging.pl.json
@@ -2727,19 +2727,58 @@
         "parking": {
           "label": "Rodzaj",
           "options": {
-            "carports": "Zadaszenia",
-            "garage_boxes": "Boksy garażowe",
-            "half_on_kerb": "W połowie na chodniku",
-            "lane": "Pas na jezdni",
-            "layby": "Zatoczka",
-            "multi-storey": "Wielopoziomowy",
-            "on_kerb": "Na chodniku",
-            "rooftop": "Na dachu",
-            "sheds": "Wiaty",
-            "shoulder": "Na poboczu",
-            "street_side": "Obok jezdni",
-            "surface": "Naziemny",
-            "underground": "Podziemny"
+            "carports": {
+              "description": "Budowla zapewniająca pojazdom ograniczoną osłonę, przeważnie pozbawiona ścian.",
+              "title": "Zadaszenia"
+            },
+            "garage_boxes": {
+              "description": "Zespół prywatnych boksów garażowych mieszczących po jednym pojeździe.",
+              "title": "Boksy garażowe"
+            },
+            "half_on_kerb": {
+              "description": "Parkowanie częściowo na chodniku.",
+              "title": "W połowie na chodniku"
+            },
+            "lane": {
+              "description": "Parkowanie na części jezdni, która może być łatwo przekształcona w pas ruchu.",
+              "title": "Pas na jezdni"
+            },
+            "layby": {
+              "description": "Parkowanie w zatoczce wzdłuż drogi, przewidziany dla odpoczynku podróżnych.",
+              "title": "Zatoczka"
+            },
+            "multi-storey": {
+              "description": "Budynek o dwu lub więcej poziomach przeznaczony do parkowania pojazdów.",
+              "title": "Wielopoziomowy"
+            },
+            "on_kerb": {
+              "description": "Parkowanie w całości na chodniku.",
+              "title": "Na chodniku"
+            },
+            "rooftop": {
+              "description": "Pojedynczy poziom parkingowy na dachu budynku.",
+              "title": "Na dachu"
+            },
+            "sheds": {
+              "description": "Prywatne garaże.",
+              "title": "Garaże"
+            },
+            "shoulder": {
+              "description": "Parkowanie na poboczu drogi.",
+              "title": "Na poboczu"
+            },
+            "street_side": {
+              "description": "Parkowanie bezpośrednio przy jezdni (lecz nie na niej).",
+              "title": "Obok jezdni"
+            },
+            "surface": {
+              "description": "Jednopoziomowy parking na powierzchni.",
+              "title": "Na powierzchni"
+            },
+            "underground": {
+              "description": "Parking podziemny.",
+              "title": "Podziemny"
+            }
           }
         },
         "parking/side/orientation": {
@@ -3302,7 +3341,8 @@
             "demanding_mountain_hiking": "T3: Wymagająca Wędrówka Górska",
             "difficult_alpine_hiking": "T6: Trudna Wędrówka Alpejska",
             "hiking": "T1: Wędrówka",
-            "mountain_hiking": "T2: Wędrówka Górska"
+            "mountain_hiking": "T2: Wędrówka Górska",
+            "strolling": "Spacer"
           },
           "placeholder": "Wędrówka górska, Wędrówka alpejska...",
           "terms": "stopień trudności turystyki pieszej"
@@ -6703,6 +6743,10 @@
           "name": "Wejście główne",
           "terms": "wejście główne, główne wejście, drzwi"
         },
+        "entrance/shop": {
+          "name": "Wejście do sklepu",
+          "terms": "wejście do sklepu, wejście do lokalu usługowego, sklep, lokal usługowy"
+        },
         "entrance/staircase": {
           "name": "Wejście do klatki schodowej",
           "terms": "wejście do klatki schodowej, wejście na klatkę schodową, klatka schodowa"
@@ -8492,6 +8536,10 @@
         "natural": {
           "name": "Obiekt geograficzny"
         },
+        "natural/arch": {
+          "name": "Most skalny",
+          "terms": "most skalny, łuk skalny"
+        },
         "natural/bare_rock": {
           "name": "Odkryte skały",
           "terms": "odkryte skały, odkryta skała, obnażone skały, obnażona skała, skała macierzysta, skała, skały"
@@ -9999,6 +10047,10 @@
           "name": "Sklep z pamiątkami",
           "terms": "sklep z pamiątkami, sklep z prezentami, pamiątki, prezenty, gadżety, pocztówki, magnesy, figurki"
         },
+        "shop/gold_buyer": {
+          "name": "Skup złota",
+          "terms": "skup złota"
+        },
         "shop/greengrocer": {
           "name": "Warzywniak",
           "terms": "warzywniak, zieleniak, sklep warzywny, sklep z warzywami, sklep z owocami, stoisko z warzywami, stragan z warzywami, owoce, warzywa"
diff --git a/data/l10n/tagging.pt-BR.json b/data/l10n/tagging.pt-BR.json
index b68bdf886..1d3736056 100644
--- a/data/l10n/tagging.pt-BR.json
+++ b/data/l10n/tagging.pt-BR.json
@@ -1522,17 +1522,39 @@
         },
         "parking": {
           "options": {
-            "carports": "Abrigo de carros",
-            "garage_boxes": "Vagas de estacionamento",
-            "half_on_kerb": "Metade na calçada",
-            "lane": "Faixa de acostamento",
-            "layby": "Separado/Alça de acesso",
-            "multi-storey": "Estacionamento vertical",
-            "on_kerb": "Na calçada",
-            "rooftop": "Telhado",
-            "sheds": "Cabanas",
-            "shoulder": "Acostamento",
-            "street_side": "Lado da rua"
+            "carports": {
+              "title": "Abrigo de carros"
+            },
+            "garage_boxes": {
+              "title": "Vagas de estacionamento"
+            },
+            "half_on_kerb": {
+              "title": "Metade na calçada"
+            },
+            "lane": {
+              "title": "Faixa de estacionamento"
+            },
+            "layby": {
+              "title": "Separado/Alça de acesso"
+            },
+            "multi-storey": {
+              "title": "Estacionamento vertical"
+            },
+            "on_kerb": {
+              "title": "Na calçada"
+            },
+            "rooftop": {
+              "title": "Telhado"
+            },
+            "sheds": {
+              "title": "Cabanas"
+            },
+            "shoulder": {
+              "title": "Acostamento"
+            },
+            "street_side": {
+              "title": "Lado da rua"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.pt.json b/data/l10n/tagging.pt.json
index 9fbd73f1a..70b6a4542 100644
--- a/data/l10n/tagging.pt.json
+++ b/data/l10n/tagging.pt.json
@@ -2695,19 +2695,45 @@
         "parking": {
           "label": "Tipo",
           "options": {
-            "carports": "Telheiros",
-            "garage_boxes": "Garagens",
-            "half_on_kerb": "Metade sobre o passeio",
-            "lane": "Estacionamento paralelo à estrada",
-            "layby": "Área de descanso",
-            "multi-storey": "Multinível",
-            "on_kerb": "Sobre o passeio",
-            "rooftop": "Topo de edifício",
-            "sheds": "Barracões",
-            "shoulder": "Berma",
-            "street_side": "Ao lado da rua",
-            "surface": "Superfície",
-            "underground": "Subterrâneo"
+            "carports": {
+              "title": "Telheiros"
+            },
+            "garage_boxes": {
+              "title": "Garagens"
+            },
+            "half_on_kerb": {
+              "title": "Metade sobre o passeio"
+            },
+            "lane": {
+              "title": "Via na estrada"
+            },
+            "layby": {
+              "title": "Área de descanso"
+            },
+            "multi-storey": {
+              "title": "Multiandares"
+            },
+            "on_kerb": {
+              "title": "Sobre o passeio"
+            },
+            "rooftop": {
+              "title": "Topo de edifício"
+            },
+            "sheds": {
+              "title": "Barracões"
+            },
+            "shoulder": {
+              "title": "Berma"
+            },
+            "street_side": {
+              "title": "Ao lado da rua"
+            },
+            "surface": {
+              "title": "Superfície"
+            },
+            "underground": {
+              "title": "Subterrâneo"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.ro.json b/data/l10n/tagging.ro.json
index 6203439ad..f23f2624a 100644
--- a/data/l10n/tagging.ro.json
+++ b/data/l10n/tagging.ro.json
@@ -1174,7 +1174,9 @@
         "parking": {
           "label": "Tip",
           "options": {
-            "surface": "Suprafaţă"
+            "surface": {
+              "title": "Suprafaţă"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.ru.json b/data/l10n/tagging.ru.json
index bc1603915..0dde7d19b 100644
--- a/data/l10n/tagging.ru.json
+++ b/data/l10n/tagging.ru.json
@@ -2657,18 +2657,42 @@
         "parking": {
           "label": "Тип",
           "options": {
-            "carports": "Навес",
-            "garage_boxes": "Одноярусные гаражи",
-            "half_on_kerb": "Частично на тротуаре",
-            "lane": "Уличная парковка",
-            "multi-storey": "Многоярусная",
-            "on_kerb": "На тротуаре",
-            "rooftop": "На крыше",
-            "sheds": "Козырёк",
-            "shoulder": "На обочине",
-            "street_side": "Придорожная",
-            "surface": "Наземная",
-            "underground": "Подземная"
+            "carports": {
+              "title": "Навес"
+            },
+            "garage_boxes": {
+              "title": "Одноярусные гаражи"
+            },
+            "half_on_kerb": {
+              "title": "Частично на тротуаре"
+            },
+            "lane": {
+              "title": "На полосе"
+            },
+            "multi-storey": {
+              "title": "Многоуровневая"
+            },
+            "on_kerb": {
+              "title": "На тротуаре"
+            },
+            "rooftop": {
+              "title": "На крыше"
+            },
+            "sheds": {
+              "title": "Козырёк"
+            },
+            "shoulder": {
+              "title": "На обочине"
+            },
+            "street_side": {
+              "title": "В кармане"
+            },
+            "surface": {
+              "title": "Дорожное покрытие"
+            },
+            "underground": {
+              "title": "Подземный"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.sk.json b/data/l10n/tagging.sk.json
index e761d296e..f21ea1ded 100644
--- a/data/l10n/tagging.sk.json
+++ b/data/l10n/tagging.sk.json
@@ -2476,16 +2476,36 @@
         "parking": {
           "label": "Typ",
           "options": {
-            "carports": "Prístrešky pre autá",
-            "garage_boxes": "Garáže",
-            "lane": "Postranný pruh",
-            "layby": "Odpočívadlo pri ceste (malé)",
-            "multi-storey": "Viacúrovňové",
-            "rooftop": "Na streche",
-            "sheds": "Súkromný prístrešok",
-            "street_side": "Pri ceste",
-            "surface": "Povrchové",
-            "underground": "Podzemné"
+            "carports": {
+              "title": "Prístrešky pre autá"
+            },
+            "garage_boxes": {
+              "title": "Garáže"
+            },
+            "lane": {
+              "title": "Cestný pruh"
+            },
+            "layby": {
+              "title": "Odpočívadlo pri ceste (malé)"
+            },
+            "multi-storey": {
+              "title": "Viacúrovňové"
+            },
+            "rooftop": {
+              "title": "Na streche"
+            },
+            "sheds": {
+              "title": "Súkromný prístrešok"
+            },
+            "street_side": {
+              "title": "Pri ceste"
+            },
+            "surface": {
+              "title": "Povrchové"
+            },
+            "underground": {
+              "title": "Podzemné"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.sl.json b/data/l10n/tagging.sl.json
index c74de3d8c..44998f37f 100644
--- a/data/l10n/tagging.sl.json
+++ b/data/l10n/tagging.sl.json
@@ -1184,13 +1184,27 @@
         "parking": {
           "label": "Vrsta parkirišča",
           "options": {
-            "carports": "Nadstrešek",
-            "garage_boxes": "Garažni boksi",
-            "lane": "Obcestno parkirišče",
-            "multi-storey": "Več nadstropij",
-            "sheds": "Zasebna garaža",
-            "surface": "Na prostem",
-            "underground": "Podzemna"
+            "carports": {
+              "title": "Nadstrešek"
+            },
+            "garage_boxes": {
+              "title": "Garažni boksi"
+            },
+            "lane": {
+              "title": "Obcestno parkirišče"
+            },
+            "multi-storey": {
+              "title": "Več nadstropij"
+            },
+            "sheds": {
+              "title": "Zasebna garaža"
+            },
+            "surface": {
+              "title": "Površina"
+            },
+            "underground": {
+              "title": "Podzemna"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.so.json b/data/l10n/tagging.so.json
index b5d123ed5..134542a72 100644
--- a/data/l10n/tagging.so.json
+++ b/data/l10n/tagging.so.json
@@ -465,7 +465,9 @@
         "parking": {
           "label": "Nooca",
           "options": {
-            "surface": "Sagxada"
+            "surface": {
+              "title": "Sagxada"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.sr.json b/data/l10n/tagging.sr.json
index 7768f9710..80c4a948f 100644
--- a/data/l10n/tagging.sr.json
+++ b/data/l10n/tagging.sr.json
@@ -2560,18 +2560,42 @@
         "parking": {
           "label": "Врста",
           "options": {
-            "carports": "Складиште аутомобила",
-            "half_on_kerb": "делом на тротоару",
-            "lane": "као трака",
-            "layby": "Одмориште",
-            "multi-storey": "Вишеспратно",
-            "on_kerb": "На ивичњаку",
-            "rooftop": "Кровни простор",
-            "sheds": "Наткривени",
-            "shoulder": "на зауставној траци",
-            "street_side": "Паркиг уз улицу",
-            "surface": "Надземни",
-            "underground": "Подземни"
+            "carports": {
+              "title": "Складиште аутомобила"
+            },
+            "half_on_kerb": {
+              "title": "делом на тротоару"
+            },
+            "lane": {
+              "title": "као трака"
+            },
+            "layby": {
+              "title": "Одмориште"
+            },
+            "multi-storey": {
+              "title": "Вишеспратно"
+            },
+            "on_kerb": {
+              "title": "На ивичњаку"
+            },
+            "rooftop": {
+              "title": "Кровни простор"
+            },
+            "sheds": {
+              "title": "Наткривени"
+            },
+            "shoulder": {
+              "title": "на зауставној траци"
+            },
+            "street_side": {
+              "title": "Паркиг уз улицу"
+            },
+            "surface": {
+              "title": "Подлога"
+            },
+            "underground": {
+              "title": "Подземна"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.sv.json b/data/l10n/tagging.sv.json
index 56921debb..270ba588c 100644
--- a/data/l10n/tagging.sv.json
+++ b/data/l10n/tagging.sv.json
@@ -2691,19 +2691,45 @@
         "parking": {
           "label": "Typ",
           "options": {
-            "carports": "Carportar",
-            "garage_boxes": "Garageboxar",
-            "half_on_kerb": "Halvvägs på trotoar",
-            "lane": "Fickparkering",
-            "layby": "Rastplats",
-            "multi-storey": "Flera våningar",
-            "on_kerb": "På trotoar",
-            "rooftop": "På taket",
-            "sheds": "Skjul",
-            "shoulder": "Vägren",
-            "street_side": "Sidan av väg",
-            "surface": "Yta",
-            "underground": "Underjordisk"
+            "carports": {
+              "title": "Carportar"
+            },
+            "garage_boxes": {
+              "title": "Garageboxar"
+            },
+            "half_on_kerb": {
+              "title": "Halvvägs på trotoar"
+            },
+            "lane": {
+              "title": "Fickparkering"
+            },
+            "layby": {
+              "title": "Rastplats"
+            },
+            "multi-storey": {
+              "title": "Flera våningar"
+            },
+            "on_kerb": {
+              "title": "På trotoar"
+            },
+            "rooftop": {
+              "title": "På taket"
+            },
+            "sheds": {
+              "title": "Skjul"
+            },
+            "shoulder": {
+              "title": "Vägren"
+            },
+            "street_side": {
+              "title": "Sidan av väg"
+            },
+            "surface": {
+              "title": "Yta"
+            },
+            "underground": {
+              "title": "Underjordisk"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.ta.json b/data/l10n/tagging.ta.json
index 7dfa44064..51856ac78 100644
--- a/data/l10n/tagging.ta.json
+++ b/data/l10n/tagging.ta.json
@@ -1028,9 +1028,15 @@
         "parking": {
           "label": "வகை",
           "options": {
-            "sheds": "கொட்டகைகள்",
-            "surface": "மேற்பரப்பு",
-            "underground": "நிலத்தடி"
+            "sheds": {
+              "title": "கொட்டகைகள்"
+            },
+            "surface": {
+              "title": "மேற்பரப்பு"
+            },
+            "underground": {
+              "title": "நிலத்துக்குக் கீழ்"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.te.json b/data/l10n/tagging.te.json
index 09f095f8b..fba62286f 100644
--- a/data/l10n/tagging.te.json
+++ b/data/l10n/tagging.te.json
@@ -463,7 +463,9 @@
         "parking": {
           "label": "రకం",
           "options": {
-            "surface": "ఉపరితలం"
+            "surface": {
+              "title": "ఉపరితలం"
+            }
           }
         },
         "parking/side/parking": {
diff --git a/data/l10n/tagging.th.json b/data/l10n/tagging.th.json
index 5c0e7cfff..3786e4467 100644
--- a/data/l10n/tagging.th.json
+++ b/data/l10n/tagging.th.json
@@ -2764,19 +2764,45 @@
         "parking": {
           "label": "ประเภท",
           "options": {
-            "carports": "โรงรถ",
-            "garage_boxes": "ตู้โรงรถ",
-            "half_on_kerb": "จอดครึ่งบนขอบถนน",
-            "lane": "ริมถนน",
-            "layby": "จุดพักรถ",
-            "multi-storey": "หลายชั้น",
-            "on_kerb": "จอดบนขอบถนน",
-            "rooftop": "ดาดฟ้า",
-            "sheds": "เพิง",
-            "shoulder": "ไหล่ทาง",
-            "street_side": "ริมถนน",
-            "surface": "ลานจอด",
-            "underground": "ใต้ดิน"
+            "carports": {
+              "title": "โรงรถ"
+            },
+            "garage_boxes": {
+              "title": "ตู้โรงรถ"
+            },
+            "half_on_kerb": {
+              "title": "จอดครึ่งบนขอบถนน"
+            },
+            "lane": {
+              "title": "ริมถนน"
+            },
+            "layby": {
+              "title": "จุดพักรถ"
+            },
+            "multi-storey": {
+              "title": "หลายชั้น"
+            },
+            "on_kerb": {
+              "title": "จอดบนขอบถนน"
+            },
+            "rooftop": {
+              "title": "ดาดฟ้า"
+            },
+            "sheds": {
+              "title": "เพิง"
+            },
+            "shoulder": {
+              "title": "ไหล่ทาง"
+            },
+            "street_side": {
+              "title": "ริมถนน"
+            },
+            "surface": {
+              "title": "ลานจอด"
+            },
+            "underground": {
+              "title": "ใต้ดิน"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.tr.json b/data/l10n/tagging.tr.json
index 4c9363e11..2444255f1 100644
--- a/data/l10n/tagging.tr.json
+++ b/data/l10n/tagging.tr.json
@@ -1818,14 +1818,24 @@
         "parking": {
           "label": "Tür",
           "options": {
-            "carports": "Kenarları Açık Park Alanı",
-            "garage_boxes": "Park Kutuları",
-            "lane": "Yol Kenarı Park Şeridi",
-            "multi-storey": "Çokkatlı",
-            "rooftop": "Çatı",
-            "sheds": "Gölgelik",
-            "surface": "Yüzey",
-            "underground": "Yeraltı"
+            "carports": {
+              "title": "Kenarları Açık Park Alanı"
+            },
+            "garage_boxes": {
+              "title": "Park Kutuları"
+            },
+            "multi-storey": {
+              "title": "Seviyeli"
+            },
+            "rooftop": {
+              "title": "Çatı"
+            },
+            "sheds": {
+              "title": "Gölgelik"
+            },
+            "surface": {
+              "title": "Yüzey"
+            }
           }
         },
         "parking_entrance": {
diff --git a/data/l10n/tagging.uk.json b/data/l10n/tagging.uk.json
index e72197182..88e04cb52 100644
--- a/data/l10n/tagging.uk.json
+++ b/data/l10n/tagging.uk.json
@@ -2790,19 +2790,50 @@
         "parking": {
           "label": "Тип",
           "options": {
-            "carports": "Навіси",
-            "garage_boxes": "Гаражі",
-            "half_on_kerb": "Одним боком на тротуарі",
-            "lane": "Смуга вздовж дороги",
-            "layby": "Місце відпочинку",
-            "multi-storey": "Багаторівнева",
-            "on_kerb": "На тротуарі",
-            "rooftop": "На даху",
-            "sheds": "Сарайчики",
-            "shoulder": "На узбіччі",
-            "street_side": "Вздовж дороги",
-            "surface": "Наземна",
-            "underground": "Підземна"
+            "carports": {
+              "title": "Навіси"
+            },
+            "garage_boxes": {
+              "title": "Гаражі"
+            },
+            "half_on_kerb": {
+              "description": "Паркування частково на тротуарі.",
+              "title": "Одним боком на тротуарі"
+            },
+            "lane": {
+              "title": "Смуга вздовж дороги"
+            },
+            "layby": {
+              "description": "Паркування на місці відпочинку вздовж дороги.",
+              "title": "Місце відпочинку"
+            },
+            "multi-storey": {
+              "title": "Багаторівнева"
+            },
+            "on_kerb": {
+              "description": "Паркування на тротуарі.",
+              "title": "На тротуарі"
+            },
+            "rooftop": {
+              "title": "На даху"
+            },
+            "sheds": {
+              "title": "Сарайчики"
+            },
+            "shoulder": {
+              "description": "Паркування на узбіччі.",
+              "title": "На узбіччі"
+            },
+            "street_side": {
+              "title": "Вздовж дороги"
+            },
+            "surface": {
+              "title": "Покриття"
+            },
+            "underground": {
+              "description": "Підземна автостоянка.",
+              "title": "Під землею"
+            }
           }
         },
         "parking/side/orientation": {
@@ -6796,6 +6827,9 @@
           "name": "Головний вхід",
           "terms": "двері,вхід,під’їзд"
         },
+        "entrance/shop": {
+          "name": "Вхід до магазину"
+        },
         "entrance/staircase": {
           "name": "Вхід в підʼїзд",
           "terms": "підʼїзд,вхід,двері,сходи"
diff --git a/data/l10n/tagging.ur.json b/data/l10n/tagging.ur.json
index bdb010a63..7d635a724 100644
--- a/data/l10n/tagging.ur.json
+++ b/data/l10n/tagging.ur.json
@@ -771,7 +771,9 @@
         "parking": {
           "label": "قسم",
           "options": {
-            "surface": "فرش"
+            "surface": {
+              "title": "فرش"
+            }
           }
         },
         "parking/side/parking": {
diff --git a/data/l10n/tagging.vi.json b/data/l10n/tagging.vi.json
index ea2284a3d..1555e1d45 100644
--- a/data/l10n/tagging.vi.json
+++ b/data/l10n/tagging.vi.json
@@ -2476,19 +2476,45 @@
         "parking": {
           "label": "Kiểu",
           "options": {
-            "carports": "Nhà xe",
-            "garage_boxes": "Ga ra",
-            "half_on_kerb": "Một phần trên hè",
-            "lane": "Làn đường",
-            "layby": "Trạm Dừng Nghỉ",
-            "multi-storey": "Cao tầng",
-            "on_kerb": "Trên hè",
-            "rooftop": "Trên Nóc nhà",
-            "sheds": "Lán",
-            "shoulder": "Làn dừng khẩn cấp",
-            "street_side": "Dọc đường",
-            "surface": "Ngoài trời",
-            "underground": "Ngầm"
+            "carports": {
+              "title": "Nhà xe"
+            },
+            "garage_boxes": {
+              "title": "Ga ra"
+            },
+            "half_on_kerb": {
+              "title": "Một phần trên hè"
+            },
+            "lane": {
+              "title": "Làn cạnh đường"
+            },
+            "layby": {
+              "title": "Trạm Dừng Nghỉ"
+            },
+            "multi-storey": {
+              "title": "Cao tầng"
+            },
+            "on_kerb": {
+              "title": "Trên hè"
+            },
+            "rooftop": {
+              "title": "Trên Nóc nhà"
+            },
+            "sheds": {
+              "title": "Lán"
+            },
+            "shoulder": {
+              "title": "Làn dừng khẩn cấp"
+            },
+            "street_side": {
+              "title": "Dọc đường"
+            },
+            "surface": {
+              "title": "Ngoài trời"
+            },
+            "underground": {
+              "title": "Ngầm"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.yue.json b/data/l10n/tagging.yue.json
index ad38c6885..7f246300f 100644
--- a/data/l10n/tagging.yue.json
+++ b/data/l10n/tagging.yue.json
@@ -2777,19 +2777,58 @@
         "parking": {
           "label": "類",
           "options": {
-            "carports": "亭",
-            "garage_boxes": "廂房",
-            "half_on_kerb": "骑路缘",
-            "lane": "街邊",
-            "layby": "休息站",
-            "multi-storey": "多層",
-            "on_kerb": "人行道上",
-            "rooftop": "天台",
-            "sheds": "屋",
-            "shoulder": "路肩",
-            "street_side": "街邊",
-            "surface": "地面",
-            "underground": "地底"
+            "carports": {
+              "description": "用來為車輛提供有限保護的結構物，通常沒有牆壁。",
+              "title": "亭"
+            },
+            "garage_boxes": {
+              "description": "有多個獨立區塊的私人車庫，每個區塊一台車。",
+              "title": "廂房"
+            },
+            "half_on_kerb": {
+              "description": "部份停放在人行道上。",
+              "title": "骑路缘"
+            },
+            "lane": {
+              "description": "在街道上停車（可輕鬆轉換為車道）。",
+              "title": "街邊"
+            },
+            "layby": {
+              "description": "停在路邊的暫時休息區域。",
+              "title": "休息站"
+            },
+            "multi-storey": {
+              "description": "建築物結構中的兩層或多層停車場。",
+              "title": "多層"
+            },
+            "on_kerb": {
+              "description": "在人行道上停車。",
+              "title": "人行道上"
+            },
+            "rooftop": {
+              "description": "建築物頂部的一層停車場。",
+              "title": "天台"
+            },
+            "sheds": {
+              "description": "私人停車棚。",
+              "title": "屋"
+            },
+            "shoulder": {
+              "description": "路肩停車。",
+              "title": "路肩"
+            },
+            "street_side": {
+              "description": "直接停在街道旁（但不在街道上）。",
+              "title": "街邊"
+            },
+            "surface": {
+              "description": "地面上的單層停車場。",
+              "title": "地面"
+            },
+            "underground": {
+              "description": "地下停車場。",
+              "title": "地底"
+            }
           }
         },
         "parking/side/orientation": {
@@ -3367,7 +3406,8 @@
             "demanding_mountain_hiking": "T3：耐力行山",
             "difficult_alpine_hiking": "T6：艱行高山",
             "hiking": "T1：遠行",
-            "mountain_hiking": "T2：行山"
+            "mountain_hiking": "T2：行山",
+            "strolling": "散步"
           },
           "placeholder": "行山、行高山...",
           "terms": "路線難度,健行難度,步行難度"
@@ -6795,6 +6835,10 @@
           "name": "主要入口",
           "terms": "主要,出入口,入口,出口,出入口"
         },
+        "entrance/shop": {
+          "name": "商店入口",
+          "terms": "商店入口"
+        },
         "entrance/staircase": {
           "name": "樓梯間入口",
           "terms": "樓梯間入口"
@@ -8592,6 +8636,10 @@
         "natural": {
           "name": "自然"
         },
+        "natural/arch": {
+          "name": "天然拱門",
+          "terms": "天然拱門"
+        },
         "natural/bare_rock": {
           "name": "石地",
           "terms": "裸岩"
@@ -10099,6 +10147,10 @@
           "name": "禮品舖",
           "terms": "Gift Shop,禮品店,禮品舖,禮物店"
         },
+        "shop/gold_buyer": {
+          "name": "黃金買家",
+          "terms": "黃金買家"
+        },
         "shop/greengrocer": {
           "name": "菜檔",
           "terms": "Greengrocer,果蔬店,菜檔,蔬果店"
diff --git a/data/l10n/tagging.zh-CN.json b/data/l10n/tagging.zh-CN.json
index 96c9e1321..4b2fcfb32 100644
--- a/data/l10n/tagging.zh-CN.json
+++ b/data/l10n/tagging.zh-CN.json
@@ -1876,16 +1876,33 @@
         },
         "parking": {
           "options": {
-            "carports": "车棚",
-            "garage_boxes": "车库盒",
-            "layby": "公路停车港湾",
-            "multi-storey": "多层",
-            "on_kerb": "路缘上",
-            "rooftop": "屋顶",
-            "sheds": "车棚",
-            "street_side": "路边",
-            "surface": "地面",
-            "underground": "地下"
+            "carports": {
+              "title": "车棚"
+            },
+            "garage_boxes": {
+              "title": "车库盒"
+            },
+            "layby": {
+              "title": "公路停车港湾"
+            },
+            "multi-storey": {
+              "title": "多层"
+            },
+            "on_kerb": {
+              "title": "路缘上"
+            },
+            "rooftop": {
+              "title": "屋顶"
+            },
+            "sheds": {
+              "title": "车棚"
+            },
+            "surface": {
+              "title": "表面铺设"
+            },
+            "underground": {
+              "title": "地埋式"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.zh-HK.json b/data/l10n/tagging.zh-HK.json
index 7af222f2e..9d9c837e6 100644
--- a/data/l10n/tagging.zh-HK.json
+++ b/data/l10n/tagging.zh-HK.json
@@ -1278,14 +1278,30 @@
         "parking": {
           "label": "種類",
           "options": {
-            "carports": "車位",
-            "garage_boxes": "車庫箱",
-            "lane": "路旁",
-            "multi-storey": "多層",
-            "sheds": "有蓋",
-            "street_side": "路邊",
-            "surface": "地面",
-            "underground": "地下"
+            "carports": {
+              "title": "車位"
+            },
+            "garage_boxes": {
+              "title": "車庫箱"
+            },
+            "lane": {
+              "title": "路旁"
+            },
+            "multi-storey": {
+              "title": "多層"
+            },
+            "sheds": {
+              "title": "有蓋"
+            },
+            "street_side": {
+              "title": "路邊"
+            },
+            "surface": {
+              "title": "地面"
+            },
+            "underground": {
+              "title": "地下"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.zh-TW.json b/data/l10n/tagging.zh-TW.json
index 26c5a801f..559861bf6 100644
--- a/data/l10n/tagging.zh-TW.json
+++ b/data/l10n/tagging.zh-TW.json
@@ -380,6 +380,10 @@
             "warehouse": "倉庫"
           }
         },
+        "building/colour": {
+          "label": "立面顏色",
+          "terms": "立面,正面,前面,側面,顏色"
+        },
         "building/levels": {
           "label": "地上樓層數"
         },
@@ -1458,12 +1462,21 @@
         "parking": {
           "label": "類型",
           "options": {
-            "half_on_kerb": "部份在人行道上",
-            "lane": "路邊停車位",
-            "rooftop": "屋頂",
-            "street_side": "路邊",
-            "surface": "地面",
-            "underground": "地下"
+            "half_on_kerb": {
+              "title": "部份在人行道上"
+            },
+            "lane": {
+              "title": "路邊停車位"
+            },
+            "rooftop": {
+              "title": "屋頂"
+            },
+            "street_side": {
+              "title": "路邊"
+            },
+            "surface": {
+              "title": "地面"
+            }
           }
         },
         "parking/side/orientation": {
diff --git a/data/l10n/tagging.zh.json b/data/l10n/tagging.zh.json
index 41f4b3630..a6e425ff5 100644
--- a/data/l10n/tagging.zh.json
+++ b/data/l10n/tagging.zh.json
@@ -2772,19 +2772,58 @@
         "parking": {
           "label": "类型",
           "options": {
-            "carports": "停車棚",
-            "garage_boxes": "集合車庫",
-            "half_on_kerb": "骑路缘",
-            "lane": "路边",
-            "layby": "停車彎",
-            "multi-storey": "立體停車場",
-            "on_kerb": "人行道上",
-            "rooftop": "天台",
-            "sheds": "私人停車棚",
-            "shoulder": "路肩",
-            "street_side": "内凹",
-            "surface": "表面",
-            "underground": "地下式"
+            "carports": {
+              "description": "用來為車輛提供有限保護的結構物，通常沒有牆壁。",
+              "title": "停車棚"
+            },
+            "garage_boxes": {
+              "description": "有多個獨立區塊的私人車庫，每個區塊一台車。",
+              "title": "集合車庫"
+            },
+            "half_on_kerb": {
+              "description": "部份停放在人行道上。",
+              "title": "骑路缘"
+            },
+            "lane": {
+              "description": "在街道上停車（可輕鬆轉換為車道）。",
+              "title": "路边"
+            },
+            "layby": {
+              "description": "停在路邊的暫時休息區域。",
+              "title": "停車彎"
+            },
+            "multi-storey": {
+              "description": "建築物結構中的兩層或多層停車場。",
+              "title": "立體停車場"
+            },
+            "on_kerb": {
+              "description": "在人行道上停車。",
+              "title": "人行道上"
+            },
+            "rooftop": {
+              "description": "建築物頂部的一層停車場。",
+              "title": "天台"
+            },
+            "sheds": {
+              "description": "私人停車棚。",
+              "title": "私人停車棚"
+            },
+            "shoulder": {
+              "description": "路肩停車。",
+              "title": "路肩"
+            },
+            "street_side": {
+              "description": "直接停在街道旁（但不在街道上）。",
+              "title": "内凹"
+            },
+            "surface": {
+              "description": "地面上的單層停車場。",
+              "title": "表面"
+            },
+            "underground": {
+              "description": "地下停車場。",
+              "title": "地下式"
+            }
           }
         },
         "parking/side/orientation": {
@@ -3362,7 +3401,8 @@
             "demanding_mountain_hiking": "T3：進階山區健行",
             "difficult_alpine_hiking": "T6：艱困高山健行",
             "hiking": "T1：健行",
-            "mountain_hiking": "T2：山區健行"
+            "mountain_hiking": "T2：山區健行",
+            "strolling": "散步"
           },
           "placeholder": "山區健行、高山健行...",
           "terms": "路線難度,健行難度,步行難度"
@@ -6792,6 +6832,10 @@
           "name": "主要入口",
           "terms": "主要,出入口,入口,出口,出入口"
         },
+        "entrance/shop": {
+          "name": "商店入口",
+          "terms": "商店入口"
+        },
         "entrance/staircase": {
           "name": "樓梯間入口",
           "terms": "樓梯間入口"
@@ -8589,6 +8633,10 @@
         "natural": {
           "name": "自然"
         },
+        "natural/arch": {
+          "name": "天然拱門",
+          "terms": "天然拱門"
+        },
         "natural/bare_rock": {
           "name": "裸岩",
           "terms": "裸岩"
@@ -10096,6 +10144,10 @@
           "name": "礼品店",
           "terms": "禮物店"
         },
+        "shop/gold_buyer": {
+          "name": "黃金買家",
+          "terms": "黃金買家"
+        },
         "shop/greengrocer": {
           "name": "果蔬店",
           "terms": "蔬果行"