# HG changeset patch
# User Chris Cannam
# Date 1301331905 -3600
# Node ID c80103b811941d830ff9bc934000a19d681540a7
# Parent  862e47cc1e09cad7f65cbfbc93e562e39a6dd259# Parent  c7d3b58bd01c75550474b1d4d660e6305246017c
Merge from branch "feature_117"

diff -r c7d3b58bd01c -r c80103b81194 app/controllers/files_controller.rb
--- a/app/controllers/files_controller.rb	Mon Mar 28 17:41:07 2011 +0100
+++ b/app/controllers/files_controller.rb	Mon Mar 28 18:05:05 2011 +0100
@@ -8,7 +8,7 @@
   include SortHelper
 
   def index
-    sort_init 'filename', 'asc'
+    sort_init 'active', 'asc'
     sort_update 'filename' => "#{Attachment.table_name}.filename",
 		'active' => "#{Attachment.table_name}.active",
                 'created_on' => "#{Attachment.table_name}.created_on",
diff -r c7d3b58bd01c -r c80103b81194 config/locales/en.yml
--- a/config/locales/en.yml	Mon Mar 28 17:41:07 2011 +0100
+++ b/config/locales/en.yml	Mon Mar 28 18:05:05 2011 +0100
@@ -978,11 +978,6 @@
 
   label_set_role_plural: Choose roles for new member
 
-  label_manager_description: All powers including adding and removing members and adjusting project settings
-  label_developer_description: Can commit to repository and carry out most project editing tasks
-  label_reporter_description: Can submit bug reports; has read access for private projects
-
-  label_set_role_plural: Choose roles for new member
   notice_added_to_project: 'You have been added to the project "{{project_name}}".'
   notice_project_homepage: "You can visit the project using the following link: {{project_url}}"
   mail_subject_added_to_project: "You've been added to a project on {{value}}"