- Patch #6406 by TDobes: fixed typos in profile/user module.

4 files changed, 8 insertions, 8 deletions

diff --git a/modules/profile.module b/modules/profile.module
index d9e2604ae..b50678001 100644
--- a/modules/profile.module
+++ b/modules/profile.module
@@ -236,14 +236,14 @@ function _profile_field_form($type, $edit = array()) {
 
   $output  = form_textfield(t('Title'), 'title', $edit['title'], 70, 128, t("The title of the new field.  The title will be shown to the user.  An example title is 'Favorite color'."), NULL, FORM_REQUIRED);
   $output .= form_textfield(t('Form name'), 'name', $edit['name'], 70, 128, t("The name of the field.  The form name is not shown to the user but used internally in the HTML code and URLs.
-Unless you know what you are doing, it is highly recommended that you prefix the form name with <code>profile_</code> to avoid name clashes with other fields.  Because the form name's usage, spaces or any other special characters except dash (-) and underscore (_) are not allowed.  An example for, name is 'profile_favorite_color' or just 'profile_color'."));
+Unless you know what you are doing, it is highly recommended that you prefix the form name with <code>profile_</code> to avoid name clashes with other fields.  Spaces or any other special characters except dash (-) and underscore (_) are not allowed. An example name is 'profile_favorite_color' or perhaps just 'profile_color'."));
   $output .= form_textarea(t('Explanation'), 'explanation', $edit['explanation'], 70, 3, t("An optional explanation to go with the new field.  The explanation will be shown to the user."));
   $output  .= form_textfield(t('Category'), 'category', $edit['category'], 70, 128, t("The category the new field should be part of.  Categories are used to group fields logically.  An example category is 'Personal information'."));
   $output .= form_weight(t('Weight'), 'weight', $edit['weight'], 5, t("The weights define the order in which the form fields are shown.  Lighter fields \"float up\" towards the top of the category."));
-  $output .= form_checkbox(t('Display this field on member listsings'), 'overview', 1, $edit['overview']);
+  $output .= form_checkbox(t('Display this field in member lists'), 'overview', 1, $edit['overview']);
 
   if ($type == 'selection') {
-    $output .= form_textarea(t('Selection options'), 'options', $edit['options'], 70, 8, t("A list op all options.  Put each option on a separate line.  Example options are 'red', 'blue', 'green', etc."));
+    $output .= form_textarea(t('Selection options'), 'options', $edit['options'], 70, 8, t("A list of all options.  Put each option on a separate line.  Example options are 'red', 'blue', 'green', etc."));
   }
 
   $output .= form_submit(t('Save field'));
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index d9e2604ae..b50678001 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -236,14 +236,14 @@ function _profile_field_form($type, $edit = array()) {
 
   $output  = form_textfield(t('Title'), 'title', $edit['title'], 70, 128, t("The title of the new field.  The title will be shown to the user.  An example title is 'Favorite color'."), NULL, FORM_REQUIRED);
   $output .= form_textfield(t('Form name'), 'name', $edit['name'], 70, 128, t("The name of the field.  The form name is not shown to the user but used internally in the HTML code and URLs.
-Unless you know what you are doing, it is highly recommended that you prefix the form name with <code>profile_</code> to avoid name clashes with other fields.  Because the form name's usage, spaces or any other special characters except dash (-) and underscore (_) are not allowed.  An example for, name is 'profile_favorite_color' or just 'profile_color'."));
+Unless you know what you are doing, it is highly recommended that you prefix the form name with <code>profile_</code> to avoid name clashes with other fields.  Spaces or any other special characters except dash (-) and underscore (_) are not allowed. An example name is 'profile_favorite_color' or perhaps just 'profile_color'."));
   $output .= form_textarea(t('Explanation'), 'explanation', $edit['explanation'], 70, 3, t("An optional explanation to go with the new field.  The explanation will be shown to the user."));
   $output  .= form_textfield(t('Category'), 'category', $edit['category'], 70, 128, t("The category the new field should be part of.  Categories are used to group fields logically.  An example category is 'Personal information'."));
   $output .= form_weight(t('Weight'), 'weight', $edit['weight'], 5, t("The weights define the order in which the form fields are shown.  Lighter fields \"float up\" towards the top of the category."));
-  $output .= form_checkbox(t('Display this field on member listsings'), 'overview', 1, $edit['overview']);
+  $output .= form_checkbox(t('Display this field in member lists'), 'overview', 1, $edit['overview']);
 
   if ($type == 'selection') {
-    $output .= form_textarea(t('Selection options'), 'options', $edit['options'], 70, 8, t("A list op all options.  Put each option on a separate line.  Example options are 'red', 'blue', 'green', etc."));
+    $output .= form_textarea(t('Selection options'), 'options', $edit['options'], 70, 8, t("A list of all options.  Put each option on a separate line.  Example options are 'red', 'blue', 'green', etc."));
   }
 
   $output .= form_submit(t('Save field'));
diff --git a/modules/user.module b/modules/user.module
index 825d698ce..9fd0a971f 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -1037,7 +1037,7 @@ function user_edit($edit = array()) {
       if (file_exists($user->picture)) {
         $group .= '<img src="'. file_create_url($edit['picture']) .'" alt="" title="" />';
       }
-      $group .= form_file(t('Upload picture or picture'), 'picture', 48, t("Your virtual face or picture.  Maximum dimensions are %dimensions and the maximum size is %size kB.", array("%dimensions" => variable_get('user_picture_dimensions', "85x85"), "%size" => variable_get('user_picture_file_size', "30"))) ." ". variable_get('user_picture_guidelines', ''));
+      $group .= form_file(t('Upload picture'), 'picture', 48, t("Your virtual face or picture.  Maximum dimensions are %dimensions and the maximum size is %size kB.", array("%dimensions" => variable_get('user_picture_dimensions', "85x85"), "%size" => variable_get('user_picture_file_size', "30"))) ." ". variable_get('user_picture_guidelines', ''));
       $output .= form_group(t('Picture'), $group);
     }
 
diff --git a/modules/user/user.module b/modules/user/user.module
index 825d698ce..9fd0a971f 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1037,7 +1037,7 @@ function user_edit($edit = array()) {
       if (file_exists($user->picture)) {
         $group .= '<img src="'. file_create_url($edit['picture']) .'" alt="" title="" />';
       }
-      $group .= form_file(t('Upload picture or picture'), 'picture', 48, t("Your virtual face or picture.  Maximum dimensions are %dimensions and the maximum size is %size kB.", array("%dimensions" => variable_get('user_picture_dimensions', "85x85"), "%size" => variable_get('user_picture_file_size', "30"))) ." ". variable_get('user_picture_guidelines', ''));
+      $group .= form_file(t('Upload picture'), 'picture', 48, t("Your virtual face or picture.  Maximum dimensions are %dimensions and the maximum size is %size kB.", array("%dimensions" => variable_get('user_picture_dimensions', "85x85"), "%size" => variable_get('user_picture_file_size', "30"))) ." ". variable_get('user_picture_guidelines', ''));
       $output .= form_group(t('Picture'), $group);
     }