Mercurial > hg > soundsoftware-site
changeset 367:8da54f33a17b cannam-pre-20110113-merge
Merge
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Fri, 01 Apr 2011 12:14:07 +0100 |
parents | 3e8c33cbb8e0 (current diff) 9b25cd1b459b (diff) |
children | 4188c6eaadf7 bb5e1ca422f8 |
files | config/locales/en.yml |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/app/views/layouts/base.rhtml Fri Apr 01 12:13:01 2011 +0100 +++ b/app/views/layouts/base.rhtml Fri Apr 01 12:14:07 2011 +0100 @@ -88,7 +88,7 @@ <div id="footer"> <div class="bgl"><div class="bgr"> - Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> © 2006-2011 Jean-Philippe Lang + <small>Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %><br>© 2006-2011 Jean-Philippe Lang</small> </div></div> </div> </div>
--- a/config/locales/en.yml Fri Apr 01 12:13:01 2011 +0100 +++ b/config/locales/en.yml Fri Apr 01 12:14:07 2011 +0100 @@ -373,7 +373,7 @@ setting_rest_api_enabled: Enable REST web service setting_cache_formatted_text: Cache formatted text setting_default_notification_option: Default notification option - setting_has_welcome_page: Select this to replace the project overview page with your own welcome page + setting_has_welcome_page: Select this to replace the project overview page with your welcome page permission_add_project: Create project permission_add_subprojects: Create subprojects