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 4eb2017537a60050ffefdfac653094971e388f24..f81c2d6bd08bf31ccfb187919b5e313bcda11c00 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2322,6 +2322,8 @@ en:
           taxiway: "Taxiway"
           apron_only: "Airport apron"
           admin: "Administrative boundary"
           taxiway: "Taxiway"
           apron_only: "Airport apron"
           admin: "Administrative boundary"

+          capital: "Capital"
+          city: "City"

           orchard_only: "Orchard"
           vineyard: "Vineyard"
           forest_only: "Forest"
           orchard_only: "Orchard"
           vineyard: "Vineyard"
           forest_only: "Forest"