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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index bdfc37ac6ca37581e71b57e25c5d954782816414..28698fa522787766f63afbd153c8de37c7a5d489 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -441,7 +441,6 @@ en:
         sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
   changesets:
     changeset:
         sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
   changesets:
     changeset:

-      anonymous: "Anonymous"

       no_edits: "(no edits)"
       view_changeset_details: "View changeset details"
     index:
       no_edits: "(no edits)"
       view_changeset_details: "View changeset details"
     index:


@@ -473,7 +472,6 @@ en:
       title: "Changeset %{id}"
       created_by_html: "Created by %{link_user} on %{created}."
     no_such_entry:
       title: "Changeset %{id}"
       created_by_html: "Created by %{link_user} on %{created}."
     no_such_entry:

-      title: "No such changeset"

       heading: "No entry with the id: %{id}"
       body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
     show:
       heading: "No entry with the id: %{id}"
       body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
     show:


@@ -582,8 +580,6 @@ en:
       report: Report this comment
     location:
       location: "Location:"
       report: Report this comment
     location:
       location: "Location:"

-      view: "View"
-      edit: "Edit"

       coordinates: "%{latitude}; %{longitude}"
     feed:
       user:
       coordinates: "%{latitude}; %{longitude}"
     feed:
       user: