diff config/locales/en.yml @ 193:90cc857e968a luisf

Merge from branch "feature_64"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 07 Feb 2011 12:52:57 +0000
parents 857ac9ccf613 d1713ab10813
children 2eaccf99a7b0 61d8fba252fd
line wrap: on
line diff
--- a/config/locales/en.yml	Mon Jan 24 14:35:24 2011 +0000
+++ b/config/locales/en.yml	Mon Feb 07 12:52:57 2011 +0000
@@ -86,7 +86,6 @@
           gb: "GB"
           tb: "TB"
 
-        
 # Used in array.to_sentence.
   support:
     array:
@@ -120,6 +119,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
   
@@ -203,6 +203,10 @@
 
   field_ssamr_user_detail:
     description: User Description
+    institution: Institution
+
+  field_other_institution: ''
+
   field_name: Name
   field_description: Description
   field_summary: Summary
@@ -304,6 +308,8 @@
   
   setting_tipoftheday_text: Tip of the Day
   setting_notifications_text: Notifications
+  field_terms_and_conditions: 'Terms and Conditions:'
+  accept_terms_and_conditions: 'I have read and agree with the '
   label_ssamr_description: Research description
   setting_app_title: Application title
   setting_app_subtitle: Application subtitle