Mercurial > hg > soundsoftware-site
changeset 906:154205fd9f8b luisf
Merge from branch "cannam"
| author | luisf <luis.figueira@eecs.qmul.ac.uk> |
|---|---|
| date | Thu, 02 Feb 2012 17:06:23 +0000 |
| parents | f2a30f704798 (current diff) 6e80a22916e9 (diff) |
| children | 5bf2b9fac683 |
| files | |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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 -->
--- 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
--- 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"