Replace the word "buddy" by "contact" in Adium Help.
authorRobert Vehse
Wed, 08 Feb 2012 14:30:07 +0100
changeset 3665 06964e2fa63c
parent 3664 fa76f63d5e2a
child 3666 33b9952680d3
Replace the word "buddy" by "contact" in Adium Help.
(transplanted from e2793a0c24bd70e802ad5964f1b4658919bd1c63)
AdiumHelp/pgs/Accounts-BuddyIcons.html
AdiumHelp/pgs/Accounts-ContactIcons.html
AdiumHelp/pgs/Accounts-CreatingAccounts.html
AdiumHelp/pgs/AdiumDocumentation.html
AdiumHelp/pgs/AdvancedFeatures-AddressBookIntegration.html
AdiumHelp/pgs/AdvancedFeatures-SearchForBuddyBy Email.html
AdiumHelp/pgs/Messaging-Mentions.html
AdiumHelp/pgs/Troubleshooting-ICQTextEncoding.html
--- a/AdiumHelp/pgs/Accounts-BuddyIcons.html	Wed Feb 08 15:25:24 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-<title>Buddy icons</title>
-<meta name="keywords" content="buddy, contact, icon, avatar, picture" />
-<meta name="description" content="Buddy icons" />
-<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
-</head>
-<body>
-<div id="banner">
-	<div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
-</div>
-<div id="mainbox">
-	<div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
-	<div id="pagetitle">
-		<h1>Buddy icons</h1>
-	</div>
-	<p>A buddy icon, called an Avatar on some services, is an image which represents a person; while some people use their actual picture, others use something else entirely. You can specify your own, and it will be sent to your contacts. Your contacts' icons are sent to you, though you can choose to override their image with one of your choice.</p>
-	<div class="taskboxline">
-		<div class="taskboxheader">
-			<h3>Buddy icons and the Apple Address Book</h3>
-		</div>
-		<div class="taskboxtext">
-		<p>If you specify contacts' instant messaging information within their Address Book Cards in the Apple Address Book, the icon you set for that will be used automatically if they do not choose one of their own to send you and you don't override it within Adium.</p>
-		<p>If you have a <i>Me</i> card, the icon set for it will be sent by default to your contacts, unless you override it within Adium.</p>
-		<p>You can change these behaviors via Adium → Preferences → Advanced → Address Book.</p>
-		<p>For more details, see <a href="AdvancedFeatures-AddressBookIntegration.html">Address Book Integration</a>.</p>
-		</div>
-	</div>
-	<div class="taskboxline">
-		<div class="taskboxheader">
-			<h3>Setting your own buddy icon</h3>
-		</div>
-		<div class="taskboxtext">
-			<p>Adium supports a buddy icon on most services.</p>
-			<p>If you want to set an icon on all your accounts (a global icon):</p>
-			<ol>
-				<li>Choose Preferences from the Adium menu.</li>
-				<li>Click on the <strong>Personal</strong> tab.</li>
-				<li>Set the icon.</li>
-			</ol>
-			<p>If you want to set a different icon for a specific account:</p>
-			<ol>
-				<li>Choose <strong>Preferences</strong> from the <strong>Adium</strong> menu.</li>
-				<li>Click on Accounts.</li>
-				<li>Double-click on the account.</li>
-				<li>Click on the <strong>Personal</strong> tab.</li>
-				<li>Click on “Use this icon:”.</li>
-				<li>Set the icon.</li>
-			</ol>
-			<p><strong>Note:</strong> Changing the global icon won't change any accounts to which you've assigned their own icon. If you'd like those accounts to use the global icon instead, you'll need to edit each one as described above and set it back to “Use global icon”.</p>
-			<p>There are two ways to set the icon:</p>
-			<p><strong>Drag-and-drop</strong></p>
-			<p>Drag an image or image file into the image well above the &quot;Choose Icon...&quot; button.</p>
-			<p>Drag-and-drop is the only way to set animated buddy icons ("animated GIFs") and keep the animation.</p>
-			<p><strong>Image Picker</strong></p>
-			<ol>
-				<li>Click on &quot;Choose Icon...&quot;.</li>
-				<li>Drag a file into the Image Picker, or click &quot;Choose...&quot; and open an image file.</li> OR
-				<li>Click the camera icon to take a picture (available only if your Mac has a webcam)</li>
-				<li>The image may then be cropped or panned within the image picker.</li>
-				<li>Click OK.</li>
-			</ol>
-			<p>You cannot use the Image Picker to set animated buddy icons. The animation will be removed.</p>
-		</div>
-	</div>
-	<div class="taskboxline">
-		<div class="taskboxheader">
-			<h3>Setting your own animated buddy icon</h3>
-		</div>
-		<div class="taskboxtext">
-			<p>When using AIM and Jabber, Adium supportsanimated buddy icons in the form of .gif files. To set an animated buddy icon, drag the .gif file from the Finder into the image well in the Personal tab of your account's settings. Note that you must drag the file into the image well; you will not be able to use the animation of the icon if you use the Image Picker or press the Choose Icon button to select it.</p>
-			<p>AIM buddy icons must be between 48x48 and 50x50 pixels, Jabber icons have a size limit of 96x96. When an image is resized, its animation is lost, so if Adium has to resize your image, you will lose its animation. AIM animated buddy icons therefore can not be more than 50x50 pixels, Jabber animated icons no more than 96x96.</p>
-		</div>
-	</div>
-	<div class="taskboxline">
-		<div class="taskboxheader">
-			<h3>Setting an icon for a contact</h3>
-		</div>
-		<div class="taskboxtext">
-			<p>If you set an icon for a contact, it will override any icon they may have chosen.</p>
-			<ul>
-				<li>Get Info on the contact by selecting the contact then choosing <strong>Get Info</strong> from the <strong>Contact</strong> menu.</li>
-				<li>Double click the icon space in the top-lefthand corner of the window.</li>
-				<li>Select an icon.</li>
-				<li>Preserving transparency of an icon follows the same rules as setting animated buddy icons.</li>
-			</ul>
-		</div>
-	</div>
-	<div class="taskboxline">
-		<div class="taskboxheader">
-			<h3>Removing a set icon for a contact</h3>
-		</div>
-		<div class="taskboxtext">
-			<ul>
-				<li>Get Info on the contact by selecting the contact then choosing <strong>Get Info</strong> from the <strong>Contact</strong> menu.</li>
-				<li>Click the contact's icon.</li>
-				<li>Press Delete / Backspace.</li>
-			</ul>
-		</div>
-	</div>
-	<div class="taskboxline">
-		<div class="taskboxheader">
-			<h3>Where icons are saved</h3>
-		</div>
-		<div class="taskboxtext">
-			<p>Icons, once retrieved, are cached at ~/Library/Caches/Adium/Default.</p>
-			<p>Recent icons set via the icon picker (both for contacts and for yourself) are cached at ~/Library/Images/iChat Recent Pictures, and such recent icons are shared with iChat.</p>
-			<p>Icons should be retrieved automatically from your contacts when you sign on and when contacts change icons. In AIM, exchanging two messages with a contact may be necessary for the icon to be retrieved, depending upon what messaging client the contact is using. On some services getting info on a contact via Get Info may trigger an icon retrieval.</p>
-		</div>
-	</div>
-</div>
-</body>
-</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/Accounts-ContactIcons.html	Wed Feb 08 14:30:07 2012 +0100
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+<title>Contact icons</title>
+<meta name="keywords" content="buddy, contact, icon, avatar, picture" />
+<meta name="description" content="Contact icons" />
+<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
+</head>
+<body>
+<div id="banner">
+	<div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
+</div>
+<div id="mainbox">
+	<div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
+	<div id="pagetitle">
+		<h1>Contact icons</h1>
+	</div>
+	<p>A contact icon, called an Avatar on some services, is an image which represents a person; while some people use their actual picture, others use something else entirely. You can specify your own, and it will be sent to your contacts. Your contacts' icons are sent to you, though you can choose to override their image with one of your choice.</p>
+	<div class="taskboxline">
+		<div class="taskboxheader">
+			<h3>Contact icons and the Apple Address Book</h3>
+		</div>
+		<div class="taskboxtext">
+		<p>If you specify contacts' instant messaging information within their Address Book Cards in the Apple Address Book, the icon you set for that will be used automatically if they do not choose one of their own to send you and you don't override it within Adium.</p>
+		<p>If you have a <i>Me</i> card, the icon set for it will be sent by default to your contacts, unless you override it within Adium.</p>
+		<p>You can change these behaviors via Adium → Preferences → Advanced → Address Book.</p>
+		<p>For more details, see <a href="AdvancedFeatures-AddressBookIntegration.html">Address Book Integration</a>.</p>
+		</div>
+	</div>
+	<div class="taskboxline">
+		<div class="taskboxheader">
+			<h3>Setting your own contact icon</h3>
+		</div>
+		<div class="taskboxtext">
+			<p>Adium supports a contact icon on most services.</p>
+			<p>If you want to set an icon on all your accounts (a global icon):</p>
+			<ol>
+				<li>Choose Preferences from the Adium menu.</li>
+				<li>Click on the <strong>Personal</strong> tab.</li>
+				<li>Set the icon.</li>
+			</ol>
+			<p>If you want to set a different icon for a specific account:</p>
+			<ol>
+				<li>Choose <strong>Preferences</strong> from the <strong>Adium</strong> menu.</li>
+				<li>Click on Accounts.</li>
+				<li>Double-click on the account.</li>
+				<li>Click on the <strong>Personal</strong> tab.</li>
+				<li>Click on “Use this icon:”.</li>
+				<li>Set the icon.</li>
+			</ol>
+			<p><strong>Note:</strong> Changing the global icon won't change any accounts to which you've assigned their own icon. If you'd like those accounts to use the global icon instead, you'll need to edit each one as described above and set it back to “Use global icon”.</p>
+			<p>There are two ways to set the icon:</p>
+			<p><strong>Drag-and-drop</strong></p>
+			<p>Drag an image or image file into the image well above the &quot;Choose Icon...&quot; button.</p>
+			<p>Drag-and-drop is the only way to set animated contact icons ("animated GIFs") and keep the animation.</p>
+			<p><strong>Image Picker</strong></p>
+			<ol>
+				<li>Click on &quot;Choose Icon...&quot;.</li>
+				<li>Drag a file into the Image Picker, or click &quot;Choose...&quot; and open an image file.</li> OR
+				<li>Click the camera icon to take a picture (available only if your Mac has a webcam)</li>
+				<li>The image may then be cropped or panned within the image picker.</li>
+				<li>Click OK.</li>
+			</ol>
+			<p>You cannot use the Image Picker to set animated contact icons. The animation will be removed.</p>
+		</div>
+	</div>
+	<div class="taskboxline">
+		<div class="taskboxheader">
+			<h3>Setting your own animated contact icon</h3>
+		</div>
+		<div class="taskboxtext">
+			<p>When using AIM and Jabber, Adium supportsanimated contact icons in the form of .gif files. To set an animated contact icon, drag the .gif file from the Finder into the image well in the Personal tab of your account's settings. Note that you must drag the file into the image well; you will not be able to use the animation of the icon if you use the Image Picker or press the Choose Icon button to select it.</p>
+			<p>AIM contact icons must be between 48x48 and 50x50 pixels, Jabber icons have a size limit of 96x96. When an image is resized, its animation is lost, so if Adium has to resize your image, you will lose its animation. AIM animated contact icons therefore can not be more than 50x50 pixels, Jabber animated icons no more than 96x96.</p>
+		</div>
+	</div>
+	<div class="taskboxline">
+		<div class="taskboxheader">
+			<h3>Setting an icon for a contact</h3>
+		</div>
+		<div class="taskboxtext">
+			<p>If you set an icon for a contact, it will override any icon they may have chosen.</p>
+			<ul>
+				<li>Get Info on the contact by selecting the contact then choosing <strong>Get Info</strong> from the <strong>Contact</strong> menu.</li>
+				<li>Double click the icon space in the top-lefthand corner of the window.</li>
+				<li>Select an icon.</li>
+				<li>Preserving transparency of an icon follows the same rules as setting animated contact icons.</li>
+			</ul>
+		</div>
+	</div>
+	<div class="taskboxline">
+		<div class="taskboxheader">
+			<h3>Removing a set icon for a contact</h3>
+		</div>
+		<div class="taskboxtext">
+			<ul>
+				<li>Get Info on the contact by selecting the contact then choosing <strong>Get Info</strong> from the <strong>Contact</strong> menu.</li>
+				<li>Click the contact's icon.</li>
+				<li>Press Delete / Backspace.</li>
+			</ul>
+		</div>
+	</div>
+	<div class="taskboxline">
+		<div class="taskboxheader">
+			<h3>Where icons are saved</h3>
+		</div>
+		<div class="taskboxtext">
+			<p>Icons, once retrieved, are cached at ~/Library/Caches/Adium/Default.</p>
+			<p>Recent icons set via the icon picker (both for contacts and for yourself) are cached at ~/Library/Images/iChat Recent Pictures, and such recent icons are shared with iChat.</p>
+			<p>Icons should be retrieved automatically from your contacts when you sign on and when contacts change icons. In AIM, exchanging two messages with a contact may be necessary for the icon to be retrieved, depending upon what messaging client the contact is using. On some services getting info on a contact via Get Info may trigger an icon retrieval.</p>
+		</div>
+	</div>
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
--- a/AdiumHelp/pgs/Accounts-CreatingAccounts.html	Wed Feb 08 15:25:24 2012 +0200
+++ b/AdiumHelp/pgs/Accounts-CreatingAccounts.html	Wed Feb 08 14:30:07 2012 +0100
@@ -31,7 +31,7 @@
 				<li>Click the plus <strong>(+)</strong> button.</li>
 				<li>Select the service you want to use.</li>
 				<div id="password_explanation"><li>Enter your account name (the specific identifier for which varies by service, e.g. "screen name," "GTalk ID," or "username") and password (as well, as if required by the panel, the server and port) in the <strong>Account</strong> panel. If you enter a password here, it will be stored securely in the Mac OS X keychain, and Adium will continue to use it for future connections. If you do not enter a password, you will be prompted each time you connect.</li></div>
-				<li>Enter your alias and choose an icon in the <strong>Personal</strong> panel. See <a href="Accounts-BuddyIcons.html">Buddy icons</a> for more information.</li>
+				<li>Enter your alias and choose an icon in the <strong>Personal</strong> panel. See <a href="Accounts-ContactIcons.html">Contact icons</a> for more information.</li>
 				<li>Service-specific:
 					<ul>
 						<li>In the <strong>Options</strong> panel check the appropriate boxes, enter your resource and your available/away priority for XMPP,</li>
--- a/AdiumHelp/pgs/AdiumDocumentation.html	Wed Feb 08 15:25:24 2012 +0200
+++ b/AdiumHelp/pgs/AdiumDocumentation.html	Wed Feb 08 14:30:07 2012 +0100
@@ -29,13 +29,13 @@
 			<table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
 				<tr>
 					<td width="150" rowspan="2" valign="top"><img src="../gfx/accounts-sm.png" alt="Image of Adium account types" height="auto" width="150" border="0" /> </td>
-					<td valign="top" colspan="3"><p>Adium supports 21 different IM protocols from AIM to Yahoo. It lets you connect as many names on as many different services as you want all at the same time and gives you the flexibility to maintain all your contacts on a single buddy list.</p></td>
+					<td valign="top" colspan="3"><p>Adium supports 21 different IM protocols from AIM to Yahoo. It lets you connect as many names on as many different services as you want all at the same time and gives you the flexibility to maintain all your contacts on a single contact list.</p></td>
 				</tr>
 				<tr>
 					<td><ul>
 							<li><a href="Accounts-ListOfServices.html">List of services supported and their interoperability ▸</a></li>
 							<li><a href="Accounts-CreatingAccounts.html">Creating accounts ▸</a></li>
-							<li><a href="Accounts-BuddyIcons.html">Buddy icons ▸</a></li>
+							<li><a href="Accounts-ContactIcons.html">Contact icons ▸</a></li>
 							<li><a href="Accounts-SettingYourStatus.html">Setting your status ▸</a></li>
 							<li>Specific account use
 								<ul>
--- a/AdiumHelp/pgs/AdvancedFeatures-AddressBookIntegration.html	Wed Feb 08 15:25:24 2012 +0200
+++ b/AdiumHelp/pgs/AdvancedFeatures-AddressBookIntegration.html	Wed Feb 08 14:30:07 2012 +0100
@@ -33,7 +33,7 @@
 			<h3>Images</h3>
 		</div>
 		<div class="taskboxtext">
-			<p>Adium can import photos from the Address Book and use them as your Adium contacts' buddy icons, or it can export buddy icons from the contact list to the cards in the Address Book. Again, the matching of cards is determined by IM usernames. All of this is turned off by default.</p>
+			<p>Adium can import photos from the Address Book and use them as your Adium contacts' contact icons, or it can export contact icons from the contact list to the cards in the Address Book. Again, the matching of cards is determined by IM usernames. All of this is turned off by default.</p>
 			<p>In the Preferences, you can set whether to import images from the Address Book (“Use Address Book as contacts' icons”) or export images to the Address Book (“Overwrite Address Book images with contacts' icons”). If you have Adium set to import, you can also allow it to override the Adium contact's icon using the Address Book photo.</p>
 			<p>If you enable both, your Address Book will be populated with the icons your contacts set for themselves, when possible; contacts who do not set their own icons will be displayed with any icon you set within the Address Book.</p>
 		</div>
--- a/AdiumHelp/pgs/AdvancedFeatures-SearchForBuddyBy Email.html	Wed Feb 08 15:25:24 2012 +0200
+++ b/AdiumHelp/pgs/AdvancedFeatures-SearchForBuddyBy Email.html	Wed Feb 08 14:30:07 2012 +0100
@@ -19,10 +19,10 @@
 	</div>
 	<div class="taskboxline">
 		<div class="taskboxheader">
-			<h3>Searching for a buddy by his email address</h3>
+			<h3>Searching for a contact by their email address</h3>
 		</div>
 		<div class="taskboxtext">
-			<p>If you want to find one of your AIM contacts by his/her email, just select select Search for Buddy by Email from the submenu off the AIM account in the File menu.</p>
+			<p>If you want to find one of your AIM contacts by his/her email, just select select "Search for Buddy by Email" from the submenu of the AIM account in the File menu.</p>
 		</div>
 	</div>
 </div>
--- a/AdiumHelp/pgs/Messaging-Mentions.html	Wed Feb 08 15:25:24 2012 +0200
+++ b/AdiumHelp/pgs/Messaging-Mentions.html	Wed Feb 08 14:30:07 2012 +0100
@@ -60,7 +60,7 @@
 				<li>Mockie uses a "•" in the margin (may be left or right) (matches variant color).</li>
 				<li>Renkoo uses a colored background (matches variant color).</li>
 				<li>Smooth Operator uses a star in the right margin (matches text color).</li>
-				<li>Stockholm uses a mention icon to the left of the relevant message (mention icon will replace a buddy icon if the user has chosen to display buddy icons) (matches variant color).</li>
+				<li>Stockholm uses a mention icon to the left of the relevant message (mention icon will replace a contact icon if the user has chosen to display contact icons) (matches variant color).</li>
 				<li>yMous uses a colored block at the right edge of the relevant message (between the message and the timestamp if the timestamp is visible) (matches variant color).</li>
 			</ul>
 		</div>
--- a/AdiumHelp/pgs/Troubleshooting-ICQTextEncoding.html	Wed Feb 08 15:25:24 2012 +0200
+++ b/AdiumHelp/pgs/Troubleshooting-ICQTextEncoding.html	Wed Feb 08 14:30:07 2012 +0100
@@ -17,7 +17,7 @@
 	<div id="pagetitle">
 		<h1>ICQ text encoding</h1>
 	</div>
-		<p>Computer programs use something called an encoding to turn human-language characters into bytes that the computers can swap back and forth, and to turn those bytes back into characters. If one program (your buddy's client) sends text in one encoding, but the other program (your client—that is, Adium) is expecting a different encoding, then the receiving program may show the wrong characters.</p>
+		<p>Computer programs use something called an encoding to turn human-language characters into bytes that the computers can swap back and forth, and to turn those bytes back into characters. If one program (your contact's client) sends text in one encoding, but the other program (your client—that is, Adium) is expecting a different encoding, then the receiving program may show the wrong characters.</p>
 		<p>By default, Adium always uses UTF8 encoding given that both sides support it. You can tell Adium which encoding to expect if your contact a) doesn't support UTF8 and b) doesn't specify its encoding to Adium. The setting for this is to be found in the Options tab of your ICQ account in Adium.</p>
 		<center>
 			<img src="../gfx/ICQEncoding-ICQAccount.png" width="400" alt="Screenshot of the Accounts pane of Adium's Preferences, showing to double-click on the ICQ account." />