changeset 369:a70a6b9df76b live

Merge from branch "feature_124"
author Chris Cannam
date Fri, 01 Apr 2011 12:13:55 +0100
parents f3d8335d4e71 (diff) ce85aa993384 (current diff)
children 055518fc4e4c
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/app/views/layouts/base.rhtml	Fri Apr 01 11:56:49 2011 +0100
+++ b/app/views/layouts/base.rhtml	Fri Apr 01 12:13:55 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 %> &copy; 2006-2011 Jean-Philippe Lang
+    <small>Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %><br>&copy; 2006-2011 Jean-Philippe Lang</small>
   </div></div>
 </div>
 </div>
--- a/config/locales/en.yml	Fri Apr 01 11:56:49 2011 +0100
+++ b/config/locales/en.yml	Fri Apr 01 12:13:55 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