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

diff --combined config/locales/en.yml
index bebfedfde922c802d719b0250fe9c52bc51ea9d5,d7837f2ffda0b69b3b21ba04cc6fa28432bddfa1..7636bad034218db147949ba88fee78d2e075c985
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -253,7 -253,7 +253,7 @@@ en
      new:
        title: New Diary Entry
        publish_button: "Publish"
-     list:
+     index:
        title: "Users' diaries"
        title_friends: "Friends' diaries"
        title_nearby: "Nearby Users' diaries"
@@@ -2168,7 -2168,7 +2168,7 @@@
        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:

diff --combined config/routes.rb
index 35c46d8c1df9487914d698f8397105f5878ebdd0,77857aeac30cbfafc9fe5fec0e7e7b5530c992bf..e609948631818096551bc01cf89579f4d9788e51
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -215,16 -215,16 +215,16 @@@ OpenStreetMap::Application.routes.draw 
  
    # diary pages
    match "/diary/new" => "diary_entry#new", :via => [:get, :post]
-   get "/diary/friends" => "diary_entry#list", :friends => true, :as => "friend_diaries"
-   get "/diary/nearby" => "diary_entry#list", :nearby => true, :as => "nearby_diaries"
+   get "/diary/friends" => "diary_entry#index", :friends => true, :as => "friend_diaries"
+   get "/diary/nearby" => "diary_entry#index", :nearby => true, :as => "nearby_diaries"
    get "/user/:display_name/diary/rss" => "diary_entry#rss", :defaults => { :format => :rss }
    get "/diary/:language/rss" => "diary_entry#rss", :defaults => { :format => :rss }
    get "/diary/rss" => "diary_entry#rss", :defaults => { :format => :rss }
    get "/user/:display_name/diary/comments/:page" => "diary_entry#comments", :page => /[1-9][0-9]*/
    get "/user/:display_name/diary/comments/" => "diary_entry#comments"
-   get "/user/:display_name/diary" => "diary_entry#list"
-   get "/diary/:language" => "diary_entry#list"
-   get "/diary" => "diary_entry#list"
+   get "/user/:display_name/diary" => "diary_entry#index"
+   get "/diary/:language" => "diary_entry#index"
+   get "/diary" => "diary_entry#index"
    get "/user/:display_name/diary/:id" => "diary_entry#show", :id => /\d+/, :as => :diary_entry
    post "/user/:display_name/diary/:id/newcomment" => "diary_entry#comment", :id => /\d+/
    match "/user/:display_name/diary/:id/edit" => "diary_entry#edit", :via => [:get, :post], :id => /\d+/
@@@ -242,8 -242,8 +242,8 @@@
    get "/user/:display_name/delete" => "user#delete", :as => :delete_user
  
    # user lists
 -  match "/users" => "user#list", :via => [:get, :post]
 -  match "/users/:status" => "user#list", :via => [:get, :post]
 +  match "/users" => "user#index", :via => [:get, :post]
 +  match "/users/:status" => "user#index", :via => [:get, :post]
  
    # geocoder
    get "/search" => "geocoder#search"