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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4eb2017537a60050ffefdfac653094971e388f24..335b8ad84a4bf7bf30cd66e9e9f9730b8f95fd94 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"
+          capital: "Capital"
+          city: "City"
           orchard_only: "Orchard"
           vineyard: "Vineyard"
           forest_only: "Forest"
@@ -3006,6 +3008,7 @@ en:
       reactivate: Reactivate
       comment_and_resolve: Comment & Resolve
       comment: Comment
+      log_in_to_comment: "Log in to comment on this note"
       report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}."
       other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment."
       other_problems_resolved: "For all other problems, resolving is sufficient."