# HG changeset patch # User Chris Cannam # Date 1302541317 -3600 # Node ID e7c58b88e670e7d831f46647e818c712bbe2ede2 # Parent 0f793aa84f750933b93144002727c4dfeb0b0a9c# Parent aef15dbf269298f683c7df024feb93351dd521a6 Merge from branch "feature_135" diff -r 0f793aa84f75 -r e7c58b88e670 config/locales/en.yml --- a/config/locales/en.yml Mon Apr 11 17:27:17 2011 +0100 +++ b/config/locales/en.yml Mon Apr 11 18:01:57 2011 +0100 @@ -903,7 +903,7 @@ text_project_homepage_info: 'Link to an external project page.' text_project_name_info: "This will be the name of your project throughout this site.
You can change your project's name at any time, in the project's settings." text_project_visibility_info: "If your project is not public, it will only be visible to users that you have added as project members." - text_user_ssamr_description_info: 'Please describe your current research or development interests.
This information will be used at registration to determine that you are a real person, so please be descriptive!
After registration, the description is publicly visible in your profile and you can edit it at any time.' + text_user_ssamr_description_info: 'Please describe your current research or development interests.
This information will be used at registration to determine that you are a real person – so please be descriptive, or your application may be delayed or rejected.
After registration, the description is publicly visible in your profile and you can edit it at any time.' text_issue_parent_issue_info: 'If this is a subtask, please insert its parent task number or write the main task name.' text_caracters_maximum: "{{count}} characters maximum." text_caracters_minimum: "Must be at least {{count}} characters long."