Mercurial > hg > soundsoftware-site

diff config/locales/en-GB.yml @ 194:c56dcdfe6722 cannam-pre-20110113-merge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "feature_64"
author Chris Cannam
date Mon, 07 Feb 2011 13:16:36 +0000
parents b46db3a8b1b4 d1713ab10813
children 5da98461a9f6
line wrap: on
line diff
--- a/config/locales/en-GB.yml	Thu Feb 03 15:55:45 2011 +0000
+++ b/config/locales/en-GB.yml	Mon Feb 07 13:16:36 2011 +0000
@@ -123,6 +123,7 @@
         not_same_project: "doesn't belong to the same project"
         circular_dependency: "This relation would create a circular dependency"
         cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
+        must_accept_terms_and_conditions: "You must accept the Terms and Conditions"        
 
   actionview_instancetag_blank_option: Please select
   
@@ -417,6 +418,8 @@
   
   label_tipoftheday: Tip of the day
   label_notifications: Important Message
+  field_terms_and_conditions: 'Terms and Conditions:'
+  accept_terms_and_conditions: 'I have read and agree with the '
   label_ssamr_description: Research description
   label_ssamr_details: Other Details
   label_ssamr_institution: Institution