diff -r faef5e62e1e0 -r 90225c988124 language/english/user.json
--- a/language/english/user.json	Tue Aug 25 01:43:11 2009 -0400
+++ b/language/english/user.json	Tue Aug 25 01:43:40 2009 -0400
@@ -317,6 +317,8 @@
       publicinfo_field_changetheme_title: 'Change theme:',
       publicinfo_field_changetheme_hint: 'If you don\'t like the look of the site, need a visual break, or are just curious, we might have some different themes for you to try out!',
       publicinfo_field_changetheme: 'Change my theme...',
+      publicinfo_field_dateformat: 'Date format:',
+      publicinfo_field_timeformat: 'Time format:',
       publicinfo_field_timezone: 'Time zone:',
       publicinfo_field_timezone_hint: 'Select the time zone you live in and when Daylight Savings Time occurs, if at all.',
       publicinfo_field_dst: 'Daylight saving time:',
@@ -357,7 +359,7 @@
       avatar_lbl_url_desc: 'This must start with the <tt>http://</tt> prefix and must be a valid URL. The image will be copied from the existing URL to this server - dynamic avatars are not supported.',
       avatar_lbl_file: 'Upload file:',
       avatar_lbl_file_desc: 'Your browser needs to support file uploads for this option to work.',
-      avatar_limits: 'The image cannot be more than %config.avatar_max_size% bytes in size. The maximum dimensions are %config.avatar_max_width% &#215; %config.avatar_max_height% pixels. Allowed formats are PNG, GIF, and JPEG.',
+      avatar_limits: 'The maximum file size is %config.avatar_max_size% bytes, and maximum dimensions are %config.avatar_max_width% &#215; %config.avatar_max_height% pixels; we\'ll try resizing it if necessary. Allowed formats are PNG, GIF, and JPEG.',
       avatar_delete_success: 'Your avatar has been deleted.',
       avatar_bad_write: 'Either the remote server had trouble finding the image, or your image exceeded the allowed file size.',
       avatar_bad_filetype: 'The file you selected is invalid. You must choose a file in PNG, JPEG, or GIF format.',
@@ -367,6 +369,7 @@
       avatar_move_failed: 'Your image was accepted, but there was a problem moving the image file to the correct location.',
       avatar_upload_success: 'Your avatar has been updated.',
       avatar_file_too_large: 'The image you uploaded exceeds the maximum file size allowed for avatars on this site.',
+      avatar_invalid_url: 'The URL you entered to your avatar image is not valid. Please enter another URL and try again.',
       avatar_gravatar_success: 'Your Gravatar will now be used as your avatar on this site.',
       avatar_gravatar_rating_g: 'The highest allowed rating for your Gravatar image is <b>G</b>. Images must be suitable for display on all websites with any audience type.',
       avatar_gravatar_rating_pg: 'The highest allowed rating for your Gravatar image is <b>PG</b>. Rude gestures, lesser swear words, mild violence, and mildly provocatively dressed individuals are permitted.',