diff config/locales/en.yml @ 662:cd9499a11381 live

Merge from branch "cannam"

--- a/config/locales/en.yml	Tue Sep 06 09:47:02 2011 +0100
+++ b/config/locales/en.yml	Fri Sep 09 16:34:36 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
@@ -489,6 +491,7 @@
   label_issue_new: New issue
   label_issue_plural: Issues
   label_issue_view_all: View all issues
+  label_issue_view_all_watched: View all watched issues
   label_issues_by: "Issues by %{value}"
   label_issue_added: Issue added
   label_issue_updated: Issue updated