Merge remote-tracking branch 'upstream/pull/2993' into master

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8531800809f650901c96904acfe63863ef5160c3..21ea7e106a40f8b940c8e8e41de753a5e76aac8c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -433,7 +433,8 @@ en:
       heading: "No entry with the id: %{id}"
       body: "Sorry, there is no diary entry or comment with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
     diary_entry:
-      posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}"
+      posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}."
+      updated_at_html: "Last updated on %{updated}."
       comment_link: Comment on this entry
       reply_link: Send a message to the author
       comment_count:
@@ -1244,12 +1245,15 @@ en:
           "yes": "Waterway"
       admin_levels:
         level2: "Country Boundary"
+        level3: "Region Boundary"
         level4: "State Boundary"
         level5: "Region Boundary"
         level6: "County Boundary"
+        level7: "Municipality Boundary"
         level8: "City Boundary"
         level9: "Village Boundary"
         level10: "Suburb Boundary"
+        level11: "Neighbourhood Boundary"
       types:
         cities: Cities
         towns: Towns