# HG changeset patch # User Neal Gompa # Date 1270237695 18000 # Node ID 446f1fad8dd4c3143fff75779aece641df51bdf8 # Parent 25e13d35cd769788339fe3fc268996842e97531a# Parent f76cf260e9faae23d2c62aa4a8e0da87c36d7f56 Merge in changes about legal marks diff -r 25e13d35cd76 -r 446f1fad8dd4 language/english/admin.json --- a/language/english/admin.json Fri Apr 02 15:12:02 2010 -0400 +++ b/language/english/admin.json Fri Apr 02 14:48:15 2010 -0500 @@ -425,14 +425,14 @@ heading_avatars: 'Avatars', avatars_intro: 'Avatars are small images that users can display on their profiles and in comments.', field_avatar_enable: 'Enable avatar support:', - field_avatar_enable_hint: 'Supported formats are JPEG, PNG, and GIF™.', + field_avatar_enable_hint: 'Supported formats are JPEG, PNG, and GIF℠.', field_avatar_enable_label: 'Enabled', field_avatar_max_filesize: 'Maximum avatar file size:', field_avatar_max_filesize_hint: 'For smaller sites, the highest value for this should be about 50KB, 51200. Larger sites with more visitors will likely want to use something much smaller, such as 10KB.', field_avatar_max_dimensions: 'Maximum avatar dimensions:', field_avatar_max_dimensions_hint: 'The format is width × height. Typically you want to have this square (the same width and height). These are only maximum dimensions; users are not prevented from having smaller images.', field_avatar_allow_anim_title: 'Allow animated avatars:', - field_avatar_allow_anim_hint: 'If this is checked, users can upload APNG and Animated GIF™ avatars. Sometimes such images can be specifically made to be distracting, like rapidly flashing images. If this is unchecked, these formats will be blocked, and only still PNGs and GIFs will be allowed.', + field_avatar_allow_anim_hint: 'If this is checked, users can upload APNG and Animated GIF℠ avatars. Sometimes such images can be specifically made to be distracting, like rapidly flashing images. If this is unchecked, these formats will be blocked, and only still PNGs and GIFs will be allowed.', field_avatar_allow_anim: 'Don\'t block animated images', field_avatar_upload_methods: 'Allowed upload methods:', field_avatar_upload_file: 'Allow users to upload image files from their computers', @@ -935,11 +935,11 @@ heading_imcontact: 'Instant messenger contact information', - field_aim: 'AIM handle:', - field_wlm: 'WLM handle:', + field_aim: 'AIM® handle:', + field_wlm: 'WLM handle:', field_wlm_hint: 'If you don\'t specify the domain (@whatever.com), "@hotmail.com" will be assumed.', - field_yim: 'Yahoo! IM handle:', - field_xmpp: 'Jabber™/XMPP handle:', + field_yim: 'Yahoo!® IM handle:', + field_xmpp: 'Jabber®/XMPP handle:', heading_contact_extra: 'Extra contact information', diff -r 25e13d35cd76 -r 446f1fad8dd4 language/english/install.json --- a/language/english/install.json Fri Apr 02 15:12:02 2010 -0400 +++ b/language/english/install.json Fri Apr 02 14:48:15 2010 -0500 @@ -405,7 +405,7 @@

The last option, Tiny URLs, is the most friendly URL scheme for search engines, because your URLs won\'t have any special characters at all in them. However, this only works if your webhost has configured Apache with support for mod_rewrite. Most of the time if your host supports this you will see a listing for it in their feature matrix. None of the popular Linux distributions (such as Ubuntu, - Debian, Red Hat Enterprise Linux™, Fedora, openSUSE™, or CentOS) come with mod_rewrite enabled, so if you run a + Debian®, Red Hat® Enterprise Linux®, Fedora™, openSUSE™, or CentOS) come with mod_rewrite enabled, so if you run a home-brew server, you should consult your distribution\'s documentation for enabling mod_rewrite before selecting this option. With this scheme, URLs at your site will look like http://yoursite.com/path-to-enano/Main_Page.

',