# HG changeset patch
# User Chris Cannam
# Date 1301656447 -3600
# Node ID 055518fc4e4cdbd8dc51b0b70bf8e716b82a1c04
# Parent  a70a6b9df76b3f297098e27e27a910be9a216723# Parent  7d8567890fa37eeddaa7d547544625d9fd07dda6
Merge from branch "feature_125"

diff -r 7d8567890fa3 -r 055518fc4e4c app/views/layouts/base.rhtml
--- a/app/views/layouts/base.rhtml	Fri Apr 01 12:11:13 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 %> &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>
diff -r 7d8567890fa3 -r 055518fc4e4c config/locales/en.yml
--- a/config/locales/en.yml	Fri Apr 01 12:11:13 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