# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1328202383 0
# Node ID 154205fd9f8b57c6e409a1e1b119f758b85ebad8
# Parent  f2a30f704798e1601f8fb673273283f4ef7e31c3# Parent  6e80a22916e94668524aa0c2c37b736355bddfac
Merge from branch "cannam"

diff -r f2a30f704798 -r 154205fd9f8b app/views/repositories/_navigation.rhtml
--- a/app/views/repositories/_navigation.rhtml	Thu Feb 02 15:21:09 2012 +0000
+++ b/app/views/repositories/_navigation.rhtml	Thu Feb 02 17:06:23 2012 +0000
@@ -2,7 +2,7 @@
   <%= javascript_include_tag 'repository_navigation' %>
 <% end %>
 
-<%= link_to_revision_archive(@repository, @changeset, @project, { :text => l(:label_download_revision), :class => 'icon icon-package' }) %>
+<%= link_to_revision_archive(@repository, @rev, @project, { :text => l(:label_download_revision), :class => 'icon icon-package' }) %>
 
 <% form_tag({:action => controller.action_name, :id => @project, :path => to_path_param(@path), :rev => ''}, {:method => :get, :id => 'revision_selector'}) do -%>
   <!-- Branches Dropdown -->
diff -r f2a30f704798 -r 154205fd9f8b config/locales/en.yml
--- a/config/locales/en.yml	Thu Feb 02 15:21:09 2012 +0000
+++ b/config/locales/en.yml	Thu Feb 02 17:06:23 2012 +0000
@@ -453,9 +453,9 @@
   
   project_module_issue_tracking: Issue tracking (bugs and feature requests)
   project_module_time_tracking: Time tracking
-  project_module_news: News
-  project_module_documents: Documents
-  project_module_files: Files for download
+  project_module_news: News updates
+  project_module_documents: Documents for download
+  project_module_files: Files for download (such as software builds)
   project_module_wiki: Wiki
   project_module_repository: Source code repository
   project_module_boards: Forums
diff -r f2a30f704798 -r 154205fd9f8b vendor/plugins/redmine_bibliography/config/locales/en.yml
--- a/vendor/plugins/redmine_bibliography/config/locales/en.yml	Thu Feb 02 15:21:09 2012 +0000
+++ b/vendor/plugins/redmine_bibliography/config/locales/en.yml	Thu Feb 02 17:06:23 2012 +0000
@@ -1,6 +1,6 @@
 # English strings go here for Rails i18n
 en:
-  project_module_redmine_bibliography: "Publications (articles and papers related to the project)"
+  project_module_redmine_bibliography: "Publications (references to papers related to the project)"
 
   title: "Title"
   authors: "Authors"