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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6a496be1a106fc34501037235f49f65db5c23346..8a0c62b03695f18fb421f9ef0d50f62cdedf880c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -213,7 +213,7 @@ en:
       introduction: "Click on the map to find nearby features."
       nearby: "Nearby features"
       enclosing: "Enclosing features"
-  changeset:
+  changesets:
     changeset_paging_nav:
       showing_page: "Page %{page}"
       next: "Next »"
@@ -253,7 +253,7 @@ en:
       title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
     timeout:
       sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
-  diary_entry:
+  diary_entries:
     new:
       title: New Diary Entry
       publish_button: "Publish"