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 d7837f2ffda0b69b3b21ba04cc6fa28432bddfa1..7636bad034218db147949ba88fee78d2e075c985 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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: