# HG changeset patch
# User Chris Cannam
# Date 1318867001 -3600
# Node ID 378aca14739fc31c518601017b34452d062cb607
# Parent  fce7374e48b781c1353c8554a3e547d7c9afc136# Parent  ebca856bd627a5ae0904ed6f1e1523534e19aaf7
Merge from branch "feature_36"

diff -r ebca856bd627 -r 378aca14739f app/views/account/register.rhtml
--- a/app/views/account/register.rhtml	Fri Sep 23 18:15:01 2011 +0100
+++ b/app/views/account/register.rhtml	Mon Oct 17 16:56:41 2011 +0100
@@ -29,9 +29,10 @@
 <p><label for="user_mail"><%=l(:field_mail)%> <span class="required">*</span></label>
 <%= text_field 'user', 'mail'  %></p>
 
+<!-- We only support English in this site 
 <p><label for="user_language"><%=l(:field_language)%></label>
 <%= select("user", "language", lang_options_for_select) %></p>
-
+-->
 
 <h3><%=l(:label_ssamr_details)%></h3>
 	
diff -r ebca856bd627 -r 378aca14739f config/locales/en.yml
--- a/config/locales/en.yml	Fri Sep 23 18:15:01 2011 +0100
+++ b/config/locales/en.yml	Mon Oct 17 16:56:41 2011 +0100
@@ -169,7 +169,7 @@
   notice_failed_to_save_issues: "Failed to save %{count} issue(s) on %{total} selected: %{ids}."
   notice_failed_to_save_members: "Failed to save member(s): %{errors}."
   notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
-  notice_account_pending: "Your account was created and is now pending administrator approval."
+  notice_account_pending: "Your account is now awaiting administrator approval. You will receive a notification email when your account has been activated."
   notice_default_data_loaded: Default configuration successfully loaded.
   notice_unable_delete_version: Unable to delete version.
   notice_unable_delete_time_entry: Unable to delete time log entry.