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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ebf14bf3f3eca3bfef3141200312ff58f8cc7706..62fc7bc6aff3779e897e3ec6636f7aa5ad1bea03 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -963,6 +963,7 @@ en:
         mountain_pass:
           "yes" : "Mountain Pass"
         natural:
+          atoll: "Atoll"
           bare_rock: "Bare Rock"
           bay: "Bay"
           beach: "Beach"
@@ -1035,6 +1036,7 @@ en:
           "yes": "Office"
         place:
           allotments: "Allotments"
+          archipelago: "Archipelago"
           city: "City"
           city_block: "City Block"
           country: "Country"