# HG changeset patch # User Chris Cannam # Date 1302539291 -3600 # Node ID 59a5c4d96ff21ebe18ed78e43204533f2511ce43 # Parent f25c73364bfb9577aea1e955142ea350201fb506# Parent 7ba3ba2a0f633e3a364581950080a6094fc9da70 Merge diff -r f25c73364bfb -r 59a5c4d96ff2 config/locales/en.yml --- a/config/locales/en.yml Mon Apr 04 10:29:54 2011 +0100 +++ b/config/locales/en.yml Mon Apr 11 17:28:11 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, within the fields of audio and music.
This information 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!
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."