Merge remote-tracking branch 'upstream/pull/4450'

diff --combined config/key.yml
index 1432c295630969127dbdd4d27f22879efa6f82b7,def6283b074e567668fcda21134cac385df5b6fd..072fc576b89d66c8b2bd2f918684e888cee742ec
--- 1/config/key.yml
--- 2/config/key.yml
+++ b/config/key.yml
@@@ -34,6 -34,11 +34,11 @@@ mapnik
    - { min_zoom: 11, name: apron_only, width: 26, height: 10, fill: "#dadae0" } # landcover.mss
    # administrative boundaries: admin.mss
    - { name: admin, width: 52, height: 2, fill: "#8d618b88" }
+   # places: placenames.mss
+   - { min_zoom: 4, max_zoom: 6, name: capital, image: capital4.svg }
+   - { min_zoom: 7, max_zoom: 7, name: capital, image: capital7.svg }
+   - { min_zoom: 4, max_zoom: 5, name: city, image: city4.svg }
+   - { min_zoom: 6, max_zoom: 7, name: city, image: city6.svg }
    # landcover z5: landcover.mss, water.mss
    - { name: [lake_only, reservoir], width: 26, height: 10, fill: "#aad3df" }
    - { name: intermittent_water, image: intermittent_water.svg }
@@@ -107,7 -112,6 +112,7 @@@ cyclemap
    - { min_zoom: 13, name: track, width: 50, height: 3, fill: white, casing: "#999", casing-dasharray: "5 3", casing-dashoffset: 1 }
    - { min_zoom: 15, name: track, width: 50, height: 4, fill: white, casing: "#999", casing-dasharray: "5 3", casing-dashoffset: 1 }
    - { min_zoom: 17, name: track, width: 50, height: 5, fill: white, casing: "#999", casing-dasharray: "5 3", casing-dashoffset: 1 }
 +  - { min_zoom: 13, name: bridleway, width: 52, height: 3, line: green, line-width: 1.5, line-dasharray: "4 2" }
    - { min_zoom:  8, name: cycleway, width: 50, height: 3, line: "#0100fe", line-width: 1.5, line-dasharray: "6 2" }
    - { min_zoom:  5, name: cycleway_national, width: 50, height: 2, fill: "#fe0000" }
    - { min_zoom: 13, name: cycleway_national, width: 50, height: 4, fill: "#ffb3b3" }
@@@ -115,8 -119,6 +120,8 @@@
    - { min_zoom: 13, name: cycleway_regional, width: 50, height: 4, fill: "#ddb5d9" }
    - { min_zoom:  8, name: cycleway_local, width: 50, height: 2, fill: "#0100fe" }
    - { min_zoom: 13, name: cycleway_local, width: 50, height: 4, fill: "#b2b2ff" }
 +  - { min_zoom: 10, name: cycleway_mtb, width: 50, height: 2, fill: "#ff7b1c" }
 +  - { min_zoom: 13, name: cycleway_mtb, width: 50, height: 4, fill: "#fbcaa3" }
    - { min_zoom: 13, name: footway, width: 50, height: 3, line: "#bd6d6e", line-width: 1.5, line-dasharray: "6 2" }
    - { min_zoom:  7, name: rail, width: 50, height: 3, line: "#999999", line-width: 1.5 }
    - { min_zoom: 14, name: rail, width: 50, height: 4, fill: "#999999", line: white, line-dasharray: 4, line-width: 2 }

diff --combined config/locales/en.yml
index 4eb2017537a60050ffefdfac653094971e388f24,25cb6c21e5cb473ee064b31503ca52242a8ab6e3..f81c2d6bd08bf31ccfb187919b5e313bcda11c00
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2306,7 -2306,6 +2306,7 @@@ en
            cycleway_national: "National cycleway"
            cycleway_regional: "Regional cycleway"
            cycleway_local: "Local cycleway"
 +          cycleway_mtb: "Mountain bike route"
            footway: "Footway"
            rail: "Railway"
            train: "Train"
@@@ -2322,6 -2321,8 +2322,8 @@@
            taxiway: "Taxiway"
            apron_only: "Airport apron"
            admin: "Administrative boundary"
+           capital: "Capital"
+           city: "City"
            orchard_only: "Orchard"
            vineyard: "Vineyard"
            forest_only: "Forest"