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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3c1fca3611bc9fcd0db164b6842d495df8813656..7636bad034218db147949ba88fee78d2e075c985 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -228,7 +228,7 @@ en:
       user: "User"
       comment: "Comment"
       area: "Area"
       user: "User"
       comment: "Comment"
       area: "Area"

-    list:
+    index:

       title: "Changesets"
       title_user: "Changesets by %{user}"
       title_friend: "Changesets by my friends"
       title: "Changesets"
       title_user: "Changesets by %{user}"
       title_friend: "Changesets by my friends"


@@ -253,7 +253,7 @@ en:
     new:
       title: New Diary Entry
       publish_button: "Publish"
     new:
       title: New Diary Entry
       publish_button: "Publish"

-    list:
+    index:

       title: "Users' diaries"
       title_friends: "Friends' diaries"
       title_nearby: "Nearby Users' diaries"
       title: "Users' diaries"
       title_friends: "Friends' diaries"
       title_nearby: "Nearby Users' diaries"


@@ -276,7 +276,7 @@ en:
       use_map_link: "use map"
       save_button: "Save"
       marker_text: Diary entry location
       use_map_link: "use map"
       save_button: "Save"
       marker_text: Diary entry location

-    view:
+    show:

       title: "%{user}'s diary | %{title}"
       user_title: "%{user}'s diary"
       leave_a_comment: "Leave a comment"
       title: "%{user}'s diary | %{title}"
       user_title: "%{user}'s diary"
       leave_a_comment: "Leave a comment"


@@ -2006,7 +2006,7 @@ en:
       heading: "The user %{user} does not exist"
       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
       deleted: "deleted"
       heading: "The user %{user} does not exist"
       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
       deleted: "deleted"

-    view:
+    show:

       my diary: My Diary
       new diary entry: new diary entry
       my edits: My Edits
       my diary: My Diary
       new diary entry: new diary entry
       my edits: My Edits


@@ -2168,7 +2168,7 @@ en:
       not_a_friend: "%{name} is not one of your friends."
     filter:
       not_an_administrator: "You need to be an administrator to perform that action."
       not_a_friend: "%{name} is not one of your friends."
     filter:
       not_an_administrator: "You need to be an administrator to perform that action."

-    list:
+    index:

       title: Users
       heading: Users
       showing:
       title: Users
       heading: Users
       showing: