# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1315307266 -3600
# Node ID efdb97a8286c73b8cbcbe6a6bcaf1ca8667f3335
# Parent  12701b2e1bfc890c9fae85252475cf500c0cb342
Restore Tip of the Day settings entry lost during merge of rev cd2282d2aa55

diff -r 12701b2e1bfc -r efdb97a8286c app/views/settings/_general.rhtml
--- a/app/views/settings/_general.rhtml	Tue Sep 06 11:31:51 2011 +0100
+++ b/app/views/settings/_general.rhtml	Tue Sep 06 12:07:46 2011 +0100
@@ -9,8 +9,8 @@
 <p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
 <%= wikitoolbar_for 'settings_welcome_text' %>
 
-<p><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
- <%= wikitoolbar_for 'settings_tipoftheday_text' %>
+<p><%= setting_text_area :tipoftheday_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
+<%= wikitoolbar_for 'settings_tipoftheday_text' %>
 
 <p><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
 
diff -r 12701b2e1bfc -r efdb97a8286c config/locales/en.yml
--- a/config/locales/en.yml	Tue Sep 06 11:31:51 2011 +0100
+++ b/config/locales/en.yml	Tue Sep 06 12:07:46 2011 +0100
@@ -390,6 +390,8 @@
   setting_commit_logtime_enabled: Enable time logging
   setting_commit_logtime_activity_id: Activity for logged time
   setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
+  setting_tipoftheday_text: Tip of the Day
+  setting_notifications_text: Notifications
   
   permission_add_project: Create project
   permission_add_subprojects: Create subprojects