consolidate duplicate names/terms by using new cross-references

Author: tyrasd

data/fields/payment_multi_fee.json

@@ -1,7 +1,7 @@
 {
     "key": "payment:",
     "type": "multiCombo",
-    "label": "Payment Types",
+    "label": "{payment_multi}",
     "prerequisiteTag": {
         "key": "fee",
         "valueNot": "no"

data/presets/highway/motorway_link-US-CA.json

@@ -1,5 +1,5 @@
 {
-    "name": "Motorway Link",
+    "name": "{motorway_link}",
     "icon": "iD-highway-motorway-link",
     "fields": [
         "destination_oneway",
@@ -34,14 +34,6 @@
     "tags": {
         "highway": "motorway_link"
     },
-    "terms": [
-        "exit",
-        "ramp",
-        "road",
-        "street",
-        "on ramp",
-        "off ramp"
-    ],
     "locationSet": {
         "include": [
             "ca",

data/presets/highway/primary_link-US-CA.json

@@ -1,5 +1,5 @@
 {
-    "name": "Primary Link",
+    "name": "{primary_link}",
     "icon": "iD-highway-primary-link",
     "fields": [
         "destination_oneway",
@@ -38,13 +38,6 @@
     "tags": {
         "highway": "primary_link"
     },
-    "terms": [
-        "on ramp",
-        "off ramp",
-        "ramp",
-        "road",
-        "street"
-    ],
     "locationSet": {
         "include": [
             "ca",

data/presets/highway/trunk_link-US-CA.json

@@ -1,5 +1,5 @@
 {
-    "name": "Trunk Link",
+    "name": "{trunk_link}",
     "icon": "iD-highway-trunk-link",
     "fields": [
         "{highway/motorway_link-US-CA}"
@@ -13,13 +13,6 @@
     "tags": {
         "highway": "trunk_link"
     },
-    "terms": [
-        "on ramp",
-        "off ramp",
-        "ramp",
-        "road",
-        "street"
-    ],
     "locationSet": {
         "include": [
             "ca",

interim/source_strings.yaml

@@ -2165,8 +2165,6 @@ en:
         terms: '[translate with synonyms or related terms for ''Payment Types'', separated by commas]'
       payment_multi_fee:
         # payment:=*
-        label: Payment Types
-        terms: '[translate with synonyms or related terms for ''Payment Types'', separated by commas]'
       phases:
         # phases=*
         label: Phases
@@ -6358,9 +6356,6 @@ en:
         terms: <translate with synonyms or related terms for 'Motorway Link', separated by commas>
       highway/motorway_link-US-CA:
         # highway=motorway_link | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Motorway Link
-        # 'terms: exit,ramp,road,street,on ramp,off ramp'
-        terms: <translate with synonyms or related terms for 'Motorway Link', separated by commas>
       highway/passing_place:
         # highway=passing_place | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Passing Place
@@ -6403,9 +6398,6 @@ en:
         terms: <translate with synonyms or related terms for 'Primary Link', separated by commas>
       highway/primary_link-US-CA:
         # highway=primary_link | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Primary Link
-        # 'terms: on ramp,off ramp,ramp,road,street'
-        terms: <translate with synonyms or related terms for 'Primary Link', separated by commas>
       highway/raceway:
         # highway=raceway | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Motorsport Racetrack
@@ -6557,9 +6549,6 @@ en:
         terms: <translate with synonyms or related terms for 'Trunk Link', separated by commas>
       highway/trunk_link-US-CA:
         # highway=trunk_link | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Trunk Link
-        # 'terms: on ramp,off ramp,ramp,road,street'
-        terms: <translate with synonyms or related terms for 'Trunk Link', separated by commas>
       highway/turning_circle:
         # highway=turning_circle | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Turning Circle