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

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 14e9b5c442373e6e0f39b0999011c259ffa6b3cc..f81c2d6bd08bf31ccfb187919b5e313bcda11c00 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1870,6 +1870,7 @@ en:
       image: Image
       alt: Alt text
       url: URL
+      codeblock: Code block
     richtext_field:
       edit: Edit
       preview: Preview
@@ -2305,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"
@@ -2320,6 +2322,8 @@ en:
           taxiway: "Taxiway"
           apron_only: "Airport apron"
           admin: "Administrative boundary"
+          capital: "Capital"
+          city: "City"
           orchard_only: "Orchard"
           vineyard: "Vineyard"
           forest_only: "Forest"