www/adium.im 600:f73ddbbb0cf0: Define acronyms for accessibility...
commits at adium.im
commits at adium.im
Sat Mar 3 12:35:56 UTC 2012
details: http://hg.adium.im/www/adium.im/rev/f73ddbbb0cf0
revision: 600:f73ddbbb0cf0
branch: rewrite
author: Paul Wilde <me at paulwilde.co.uk>
date: Sat Mar 03 12:35:42 2012 +0000
Define acronyms for accessibility and SEO.
diffs (925 lines):
diff -r d056a7a5bd6d -r f73ddbbb0cf0 about/index.php
--- a/about/index.php Sat Mar 03 10:44:45 2012 +0000
+++ b/about/index.php Sat Mar 03 12:35:42 2012 +0000
@@ -77,7 +77,7 @@
</ul>
<li><a href="/rewrite/help/documentation/contact-list-combining-contacts">Combined Contacts</a>: Merge your contacts so that each one represents a person, not an account</li>
<li>A sophisticated events system (including <a href="/rewrite/help/documentation/advanced-features-growl-support">Growl notifications</a>)</li>
- <li><a href="http://trac.adium.im/wiki/OTREncryption">OTR Encryption</a></li>
+ <li><a href="http://trac.adium.im/wiki/OTREncryption"><attr title="Off-the-Record">OTR</attr> Encryption</a></li>
<li><a href="/rewrite/help/documentation/advanced-features-file-transfer">File Transfer</a></li>
<li><a href="/rewrite/help/documentation/advanced-features-adium-xtras">Xtras</a> and many, many other customization options</li>
<li>A beautiful icon, the "<a href="http://trac.adium.im/wiki/Adiumy">Adiumy</a>" duck</li>
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/accounts-aim.htmlfrag
--- a/help/documentation/accounts-aim.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/accounts-aim.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -1,4 +1,4 @@
-<h1>AOL Instant Messenger</h1>
+<h1><attr title="America Online, Inc">AOL</attr> Instant Messenger</h1>
<hr>
@@ -15,7 +15,7 @@
</tr>
<tr>
<td class="side">Identity</td>
- <td>user name (called "screen name" by AOL)</td>
+ <td>user name (called "screen name" by <attr title="America Online, Inc">AOL</attr>)</td>
</tr>
<tr>
<td class="side">Interoperability</td>
@@ -23,7 +23,7 @@
</tr>
<tr>
<td class="side">Popularity</td>
- <td>USA</td>
+ <td><attr title="United States of America">USA</attr></td>
</tr>
<tr>
<td class="side">Default server port</td>
@@ -34,12 +34,12 @@
<hr>
<h2>History</h2>
-<p>Being the second modern client after ICQ, AIM was initially released in 1997.</p>
+<p>Being the second modern client after ICQ, <attr title="AOL Instant Messenger">AIM</attr> was initially released in 1997.</p>
<hr>
<h2>Censorship</h2>
-<p>AIM servers filter strings containing <em><img</em> and <em><script</em>, which are tags in the Hypertext Markup Language (HTML) AIM uses to encode messages (so as to support fonts, colors, etc.).</p>
-<p>HTML tags that you put into the inputline are "escaped" by Adium, so that the recipient's client will not attempt to use the HTML tag; it will simply display the text of the tag. However, it appears that the AIM server drops messages containing even escaped HTML (but only those two tags—other tags work fine).</p>
-<p>AIM will also drop any message containing a link to a file: address. These addresses are intended to refer to files on the sender's or your computer. (The file need not actually exist on one end or the other. A perfectly valid file: link can refer to a path that does not exist on anyone's machine, such as this one.)</p>
+<p><attr title="AOL Instant Messenger">AIM</attr> servers filter strings containing <em><img</em> and <em><script</em>, which are tags in the Hypertext Markup Language (HTML) <attr title="AOL Instant Messenger">AIM</attr> uses to encode messages (so as to support fonts, colors, etc.).</p>
+<p><attr title="Hypertext Markup Language">HTML</attr> tags that you put into the inputline are "escaped" by Adium, so that the recipient's client will not attempt to use the <attr title="Hypertext Markup Language">HTML</attr> tag; it will simply display the text of the tag. However, it appears that the <attr title="AOL Instant Messenger">AIM</attr> server drops messages containing even escaped <attr title="Hypertext Markup Language">HTML</attr> (but only those two tags—other tags work fine).</p>
+<p><attr title="AOL Instant Messenger">AIM</attr> will also drop any message containing a link to a file: address. These addresses are intended to refer to files on the sender's or your computer. (The file need not actually exist on one end or the other. A perfectly valid file: link can refer to a path that does not exist on anyone's machine, such as this one.)</p>
<p>On the other hand, it will allow the message if the address is plain text instead of a link. So, for example, "Check out what I just wrote: file:///Users/me/Documents/Why-Adium-is-awesome.txt" will go through, but "Check out <a href="file:///Users/me/Documents/Why-Adium-is-awesome.txt">what I just wrote</a>" will not.</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/accounts-bonjour.htmlfrag
--- a/help/documentation/accounts-bonjour.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/accounts-bonjour.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -18,4 +18,4 @@
<td>None</td>
</tr>
</table>
-<p>Formerly known as "Rendezvous", Bonjour is a local-network service that uses XMPP for chat. Unlike most services, you don't need to sign up anywhere to use Bonjour messaging; you only need a local network.</p>
\ No newline at end of file
+<p>Formerly known as "Rendezvous", Bonjour is a local-network service that uses <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> for chat. Unlike most services, you don't need to sign up anywhere to use Bonjour messaging; you only need a local network.</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/accounts-contact-icons.htmlfrag
--- a/help/documentation/accounts-contact-icons.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/accounts-contact-icons.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -32,7 +32,7 @@
<p>There are two ways to set the icon:</p>
<h3>Drag-and-drop</h3>
<p>Drag an image or image file into the image well above the "Choose Icon.." button.</p>
-<p>Drag-and-drop is the only way to set animated contact icons ("animated GIFs") and keep the animation.</p>
+<p>Drag-and-drop is the only way to set animated contact icons ("animated <attr title="Graphics Interchange Format">GIF</attr>s") and keep the animation.</p>
<h3 class="list-header">Image Picker</h3>
<ol>
<li>Click on "Choose Icon...".</li>
@@ -49,8 +49,8 @@
<hr>
<h2>Setting your own animated contact icon</h2>
-<p>When using AIM and Jabber, Adium supports animated 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 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 contact icons therefore can not be more than 50x50 pixels, Jabber animated icons no more than 96x96.</p>
+<p>When using <attr title="AOL Instant Messenger">AIM</attr> and Jabber, Adium supports animated 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><attr title="AOL Instant Messenger">AIM</attr> 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. <attr title="AOL Instant Messenger">AIM</attr> animated contact icons therefore can not be more than 50x50 pixels, Jabber animated icons no more than 96x96.</p>
<hr>
@@ -77,4 +77,4 @@
<h2>Where icons are saved</h2>
<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>
\ No newline at end of file
+<p>Icons should be retrieved automatically from your contacts when you sign on and when contacts change icons. In <attr title="AOL Instant Messenger">AIM</attr>, 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>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/accounts-creating-accounts.htmlfrag
--- a/help/documentation/accounts-creating-accounts.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/accounts-creating-accounts.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -1,6 +1,6 @@
<h1>Creating accounts</h1>
-<p>To use Adium, you'll need an account on one or more of the IM services that it supports. Before proceeding, you should either have an existing name and password, or you need to sign up for an account on the service of your choice. Note that Adium will offer to <a href="account-registering-jabber-account">register your account on the Jabber service</a> when setting up a Jabber account.</p>
-<p>You'll only be able to communicate with contacts (also called 'buddies' or 'users') on a service if you have an account on that service. In other words, you'll need an AIM account to talk to AIM contacts, an MSN account to talk to MSN contacts, etc. You can have as many accounts, on as many services, as you want, and they can all be signed on with Adium simultaneously.</p>
+<p>To use Adium, you'll need an account on one or more of the <attr title="Instant Messaging">IM</attr> services that it supports. Before proceeding, you should either have an existing name and password, or you need to sign up for an account on the service of your choice. Note that Adium will offer to <a href="account-registering-jabber-account">register your account on the Jabber service</a> when setting up a Jabber account.</p>
+<p>You'll only be able to communicate with contacts (also called 'buddies' or 'users') on a service if you have an account on that service. In other words, you'll need an <attr title="AOL Instant Messenger">AIM</attr> account to talk to <attr title="AOL Instant Messenger">AIM</attr> contacts, an MSN account to talk to MSN contacts, etc. You can have as many accounts, on as many services, as you want, and they can all be signed on with Adium simultaneously.</p>
<hr>
@@ -15,7 +15,7 @@
<li>Enter your alias and choose an icon in the <strong>Personal</strong> panel. See <a href="accounts-contact-icons">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>
+ <li>In the <strong>Options</strong> panel check the appropriate boxes, enter your resource and your available/away priority for <attr title="Extensible Messaging and Presence Protocol">XMPP</attr>,</li>
<li>In the <strong>Privacy</strong> panel, choose whether you would like to send typing notices and choose your preferred encryption level.</li>
<li>In the <strong>Proxy</strong> panel, setup your proxy configuration if you need to (if you don't know what proxy configuration details to enter you don't need to enter any).</li>
</ul>
@@ -31,7 +31,7 @@
<ol class="service-list">
<li class="left">Free Services
<ul>
- <li><a href="http://products.aim.com/">AIM</a></li>
+ <li><a href="http://products.aim.com/" title="AOL Instant Messenger">AIM</a></li>
<li><a href="http://www.apple.com/support/bonjour/">Bonjour</a> No Signup Needed.</li>
<li><a href="http://talk.google.com/">Google Talk</a></li>
<li><a href="http://www.icq.com/register/">ICQ</a></li>
@@ -44,8 +44,8 @@
</li>
<li>Paid Services
<ul>
- <li><a href="http://www.aol.com/">AOL</a> - compatible with AIM, ICQ</li>
- <li><a href="http://www.me.com/">MobileMe</a> (formerly known as .Mac), compatible with AIM, ICQ</li>
+ <li><a href="http://www.aol.com/" title="America Online, Inc">AOL</a> - compatible with <attr title="AOL Instant Messenger">AIM</attr>, ICQ</li>
+ <li><a href="http://www.me.com/">MobileMe</a> (formerly known as .Mac), compatible with <attr title="AOL Instant Messenger">AIM</attr>, ICQ</li>
</ul>
</li>
<li>Non-English Free Services
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/accounts-facebook-chat.htmlfrag
--- a/help/documentation/accounts-facebook-chat.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/accounts-facebook-chat.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -9,7 +9,7 @@
<td class="top"><a href="http://www.facebook.com">http://www.facebook.com</a></td>
</tr>
<td class="side"><strong>Type</td>
- <td>Proprietary, XMPP-based</td>
+ <td>Proprietary, <attr title="Extensible Messaging and Presence Protocol">XMPP</attr>-based</td>
</tr>
<tr>
<td class="side">Identity</td>
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/accounts-gizmo5.htmlfrag
--- a/help/documentation/accounts-gizmo5.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/accounts-gizmo5.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -10,7 +10,7 @@
</tr>
<tr>
<td class="side">Type</td>
- <td>XMPP-based, proprietary</td>
+ <td><attr title="Extensible Messaging and Presence Protocol">XMPP</attr>-based, proprietary</td>
</tr>
<tr>
<td class="side">Identity</td>
@@ -18,8 +18,8 @@
</tr>
<tr>
<td class="side">Interoperability</td>
- <td>XMPP, LiveJournal, Google Talk</td>
+ <td><attr title="Extensible Messaging and Presence Protocol">XMPP</attr>, LiveJournal, Google Talk</td>
</tr>
</table>
-<p>Apart from using and being compatible with XMPP, Gizmo5 also has proprietary elements.</p>
-<p>Gizmo's chat system is simply XMPP, so all you need to do is add the account as a Jabber account. For example, if your Gizmo Project username is "jdoe", your Jabber ID is "jdoe at chat.gizmoproject.com".</p>
\ No newline at end of file
+<p>Apart from using and being compatible with <attr title="Extensible Messaging and Presence Protocol">XMPP</attr>, Gizmo5 also has proprietary elements.</p>
+<p>Gizmo's chat system is simply <attr title="Extensible Messaging and Presence Protocol">XMPP</attr>, so all you need to do is add the account as a Jabber account. For example, if your Gizmo Project username is "jdoe", your Jabber ID is "jdoe at chat.gizmoproject.com".</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/accounts-google-talk.htmlfrag
--- a/help/documentation/accounts-google-talk.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/accounts-google-talk.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -10,7 +10,7 @@
</tr>
<tr>
<td class="side">Type</td>
- <td>XMPP-based, proprietary</td>
+ <td><attr title="Extensible Messaging and Presence Protocol">XMPP</attr>-based, proprietary</td>
</tr>
<tr>
<td class="side">Identity</td>
@@ -18,9 +18,9 @@
</tr>
<tr>
<td class="side">Interoperability</td>
- <td>XMPP, LiveJournal, Gizmo, AIM</td>
+ <td><attr title="Extensible Messaging and Presence Protocol">XMPP</attr>, LiveJournal, Gizmo, AIM</td>
</tr>
</table>
-<p>To add someone using AIM to your GTalk account, add <strong><screenname>@aol.com</strong>. If their screen name is an email, add <strong><username>(<domain>)@aol.com</strong>. For example, to add bob at me.com use bob(me.com)@aol.com. Note that if your GTalk address and AIM screen name are the same, messages from your AIM contacts will be received by both.</p>
-<p>Apart from using and being compatible with <a href="accounts-xmpp">XMPP</a>, Google Talk also has proprietary elements.</p>
+<p>To add someone using <attr title="AOL Instant Messenger">AIM</attr> to your GTalk account, add <strong><screenname>@aol.com</strong>. If their screen name is an email, add <strong><username>(<domain>)@aol.com</strong>. For example, to add bob at me.com use bob(me.com)@aol.com. Note that if your GTalk address and <attr title="AOL Instant Messenger">AIM</attr> screen name are the same, messages from your <attr title="AOL Instant Messenger">AIM</attr> contacts will be received by both.</p>
+<p>Apart from using and being compatible with <a href="accounts-xmpp" title="Extensible Messaging and Presence Protocol">XMPP</a>, Google Talk also has proprietary elements.</p>
<p>Note that "a Gmail account is required to use Google Talk or other download clients" (<a href="http://google.com/support/chat/bin/answer.py?hl=en&answer=159495">says Google</a>).</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/accounts-icq.htmlfrag
--- a/help/documentation/accounts-icq.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/accounts-icq.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -18,7 +18,7 @@
</tr>
<tr>
<td class="side">Interoperability</td>
- <td>AIM, MobileMe (formerly known as .Mac)</td>
+ <td><attr title="AOL Instant Messenger">AIM</attr>, MobileMe (formerly known as .Mac)</td>
</tr>
<tr>
<td class="side">Popularity</td>
@@ -33,11 +33,11 @@
<hr>
<h2>History</h2>
-<p>When it was released in 1996 by a company called Mirabilis, ICQ was the first real popular Instant Messaging service. In 1998, AOL bought Mirabilis and later made the ICQ protocol more similar to the AIM protocol.</p>
-<p>In 2010, AOL sold ICQ to the proprietors of Mail.ru. The new owners changed the login server address to login.icq.com; 1.4.1 is the first version of Adium to use the new address by default, but older versions can be reconfigured by double-clicking on each ICQ account in the Preferences window and changing each account's Login Server in the Options tab.</p>
+<p>When it was released in 1996 by a company called Mirabilis, ICQ was the first real popular Instant Messaging service. In 1998, <attr title="America Online, Inc">AOL</attr> bought Mirabilis and later made the ICQ protocol more similar to the <attr title="AOL Instant Messenger">AIM</attr> protocol.</p>
+<p>In 2010, <attr title="America Online, Inc">AOL</attr> sold ICQ to the proprietors of Mail.ru. The new owners changed the login server address to login.icq.com; 1.4.1 is the first version of Adium to use the new address by default, but older versions can be reconfigured by double-clicking on each ICQ account in the Preferences window and changing each account's Login Server in the Options tab.</p>
<hr>
<h2>Censorship</h2>
-<p>ICQ servers filter strings containing <script, a tag in the Hypertext Markup Language (HTML), which AIM and ICQ use to encode messages (so as to support fonts, colors, etc.).</p>
-<p>HTML tags that you put into the inputline are "escaped" by Adium, so that the recipient's client will not attempt to use the HTML tag; it will simply display the text of the tag. However, it appears that the AIM/ICQ server drops messages containing even escaped HTML (but only that tag — other tags work fine).</p>
\ No newline at end of file
+<p>ICQ servers filter strings containing <script, a tag in the Hypertext Markup Language (HTML), which <attr title="AOL Instant Messenger">AIM</attr> and ICQ use to encode messages (so as to support fonts, colors, etc.).</p>
+<p><attr title="Hypertext Markup Language">HTML</attr> tags that you put into the inputline are "escaped" by Adium, so that the recipient's client will not attempt to use the <attr title="Hypertext Markup Language">HTML</attr> tag; it will simply display the text of the tag. However, it appears that the <attr title="AOL Instant Messenger">AIM</attr>/ICQ server drops messages containing even escaped HTML (but only that tag — other tags work fine).</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/accounts-itunes-integration.htmlfrag
--- a/help/documentation/accounts-itunes-integration.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/accounts-itunes-integration.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -16,7 +16,7 @@
<hr>
<h2>Profiles</h2>
-<p>You can also add the current playing song in iTunes in your AOL Instant Messenger or MobileMe (formerly known as .Mac) profile by editing your profile and then selecting your choice of iTunes script from the "Insert Script" submenu of the "Edit" menu.</p>
+<p>You can also add the current playing song in iTunes in your <attr title="America Online, Inc">AOL</attr> Instant Messenger or MobileMe (formerly known as .Mac) profile by editing your profile and then selecting your choice of iTunes script from the "Insert Script" submenu of the "Edit" menu.</p>
<hr>
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/accounts-list-of-services.htmlfrag
--- a/help/documentation/accounts-list-of-services.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/accounts-list-of-services.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -1,13 +1,13 @@
<h1>List of services supported and their interoperability</h1>
<p>This page lists all services Adium supports. Clicking on a service will lead you to a dedicated page with more information on the specific service, e.g. history and censorship.</p>
<p>Further down, you can find out which services interoperate ("which service can talk to which") as most services don't interoperate with most other services—this is not an Adium thing.</p>
-<p><strong>Note:</strong> We do not host any IM services ourselves. Adium is a third-party client for connecting to services run by other people (mostly companies).</p>
+<p><strong>Note:</strong> We do not host any <attr title="Instant Messaging">IM</attr> services ourselves. Adium is a third-party client for connecting to services run by other people (mostly companies).</p>
<hr>
<h2>Supported services</h2>
<ul>
- <li><a href="accounts-xmpp">XMPP ("Jabber")</a>, including:</li>
+ <li><a href="accounts-xmpp"><attr title="Extensible Messaging and Presence Protocol">XMPP</attr> ("Jabber")</a>, including:</li>
<ul>
<li><a href="accounts-google-talk">Google Talk</a></li>
<li><a href="accounts-lj-talk">LJ (LiveJournal) Talk</a></li>
@@ -15,7 +15,7 @@
<li><a href="accounts-gizmo5">Gizmo5</a></li>
</ul>
<li><a href="accounts-msn">MSN Messenger</a></li>
- <li><a href="accounts-aim">AOL Instant Messenger (AIM)</a>, including:</li>
+ <li><a href="accounts-aim"><attr title="America Online, Inc">AOL</attr> Instant Messenger (AIM)</a>, including:</li>
<ul>
<li><a href="accounts-mobileme">MobileMe</a> (formerly known as .Mac)</li>
</ul>
@@ -26,7 +26,7 @@
<li><a href="accounts-icq">ICQ</a></li>
<li><a href="accounts-bonjour">Bonjour</a>, compatible with iChat</li>
<li><a href="accounts-twitter">Twitter</a></li>
- <li><a href="accounts-irc">IRC</a></li>
+ <li><a href="accounts-irc" title="Internet Relay Chat">IRC</a></li>
<li><a href="accounts-myspace">MySpace IM</a></li>
<li><a href="accounts-gadu-gadu">Gadu-Gadu</a></li>
<li><a href="accounts-sametime">IBM Lotus Sametime</a></li>
@@ -38,9 +38,9 @@
<h2 id="signing_up_for_an_account">Service interoperability</h2>
<p class="list-header">No service can talk to all services. This means in order to talk to contact X, you must have an account on the same service as contact X, or on any compatible service.</p>
<ul>
- <li>If you have an account on AIM, ICQ, or MobileMe, you can chat with anybody who uses AIM, ICQ, MobileMe, or SMS.</li>
- <li>If you have an account on Google Talk, XMPP ("Jabber"), LiveJournal, or Gizmo, you can chat with anybody who uses Google Talk, XMPP ("Jabber"), LiveJournal, or Gizmo.</li>
+ <li>If you have an account on <attr title="AOL Instant Messenger">AIM</attr>, ICQ, or MobileMe, you can chat with anybody who uses <attr title="AOL Instant Messenger">AIM</attr>, ICQ, MobileMe, or SMS.</li>
+ <li>If you have an account on Google Talk, <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> ("Jabber"), LiveJournal, or Gizmo, you can chat with anybody who uses Google Talk, <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> ("Jabber"), LiveJournal, or Gizmo.</li>
<li>In the official clients, MSN users can chat with Yahoo! users but this is not yet supported by Adium.</li>
</ul>
-<h3>XMPP transports</h3>
-<p>Some XMPP ("Jabber") servers (mostly private ones) allow chats with proprietary services such as AIM, MSN, and Yahoo! via a mechanism called "XMPP transports". In Adium, you should be able to chat through transports transparently (that is, it should work just like chatting with users who actually are on the same server). However, you will need to contact the administrator of your Jabber server to find out what services it has transports for. The public servers for Jabber.org and Google Talk do not support transports.</p>
\ No newline at end of file
+<h3><attr title="Extensible Messaging and Presence Protocol">XMPP</attr> transports</h3>
+<p>Some <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> ("Jabber") servers (mostly private ones) allow chats with proprietary services such as <attr title="AOL Instant Messenger">AIM</attr>, MSN, and Yahoo! via a mechanism called "<attr title="Extensible Messaging and Presence Protocol">XMPP</attr> transports". In Adium, you should be able to chat through transports transparently (that is, it should work just like chatting with users who actually are on the same server). However, you will need to contact the administrator of your Jabber server to find out what services it has transports for. The public servers for Jabber.org and Google Talk do not support transports.</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/accounts-lj-talk.htmlfrag
--- a/help/documentation/accounts-lj-talk.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/accounts-lj-talk.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -1,4 +1,4 @@
-<h1>LJ Talk</h1>
+<h1><attr title="Live Journal">LJ</attr> Talk</h1>
<hr>
@@ -10,7 +10,7 @@
</tr>
<tr>
<td class="side">Type</td>
- <td>Open standard (XMPP)</td>
+ <td>Open standard (<attr title="Extensible Messaging and Presence Protocol">XMPP</attr>)</td>
</tr>
<tr>
<td class="side">Identity</td>
@@ -21,4 +21,4 @@
<td>Google Talk, LiveJournal, Gizmo</td>
</tr>
</table>
-<p>LiveJournal is Six Apart's blogging service. Its XMPP-based instant-messaging service is called "LJ Talk".</p>
\ No newline at end of file
+<p>LiveJournal is Six Apart's blogging service. Its <attr title="Extensible Messaging and Presence Protocol">XMPP</attr>-based instant-messaging service is called "<attr title="Live Journal">LJ</attr> Talk".</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/accounts-mobileme.htmlfrag
--- a/help/documentation/accounts-mobileme.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/accounts-mobileme.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -14,29 +14,29 @@
</tr>
<tr>
<td class="side">Identity</td>
- <td>user name (called "screen name" by AOL)</td>
+ <td>user name (called "screen name" by <attr title="America Online, Inc">AOL</attr>)</td>
</tr>
<tr>
<td class="side">Interoperability</td>
- <td>AIM, ICQ</td>
+ <td><attr title="AOL Instant Messenger">AIM</attr>, ICQ</td>
</tr>
<tr>
<td class="side">Popularity</td>
- <td>USA</td>
+ <td><attr title="United States of America">USA</attr></td>
</tr>
<tr>
<td class="side">Default server port</td>
<td>login.oscar.aol.com; 5190</td>
</tr>
</table>
-<p>Formerly known as ".Mac", MobileMe is Apple's bundle of online services, including AIM-compatible instant-messaging.</p>
+<p>Formerly known as ".Mac", MobileMe is Apple's bundle of online services, including <attr title="AOL Instant Messenger">AIM</attr>-compatible instant-messaging.</p>
<hr>
<h2>History</h2>
-<p>Being the second modern client after ICQ, AIM was initially released in 1997.</p>
+<p>Being the second modern client after ICQ, <attr title="AOL Instant Messenger">AIM</attr> was initially released in 1997.</p>
<hr>
<h2>Censorship</h2>
-<p>See <a href="accounts-aim">AOL Instant Messenger</a>.</p>
\ No newline at end of file
+<p>See <a href="accounts-aim"><attr title="America Online, Inc">AOL</attr> Instant Messenger</a>.</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/accounts-registering-jabber-account.htmlfrag
--- a/help/documentation/accounts-registering-jabber-account.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/accounts-registering-jabber-account.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -1,9 +1,9 @@
-<h1>Registering a Jabber (XMPP) account</h1>
+<h1>Registering a Jabber (<attr title="Extensible Messaging and Presence Protocol">XMPP</attr>) account</h1>
<hr>
<h2>Setting up an account via Adium</h2>
-<p>On most XMPP (previously known as "Jabber") servers, Adium can register your account with the server for you. Just set up your account as if you were already registered by following the steps described in <a href="accounts-creating-accounts">Creating An Account</a>, including your desired Jabber ID and password. When the account attempts to connect, Adium will notify you that the account is not yet registered and will offer to register it.</p>
+<p>On most <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> (previously known as "Jabber") servers, Adium can register your account with the server for you. Just set up your account as if you were already registered by following the steps described in <a href="accounts-creating-accounts">Creating An Account</a>, including your desired Jabber ID and password. When the account attempts to connect, Adium will notify you that the account is not yet registered and will offer to register it.</p>
<hr>
@@ -20,14 +20,14 @@
<li>> (close angle bracket)</li>
<li>& (ampersand)</li>
<li>space, carriage-return, line-feed, horizontal tab, and any other whitespace</li>
- <li>ASCII control characters</li>
+ <li><attr title="American Standard Code for Information Interchange">ASCII</attr> control characters</li>
</ul>
</li>
</ul>
<hr>
-<h2>How to specify an XMPP server</h2>
+<h2>How to specify an <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> server</h2>
<p>Jabber IDs are in the form <em>name at server</em>.</p>
<p>The name <em>adiumuser</em> on <em>jabber.org</em> would be <em>adiumuser at jabber.org</em>.</p>
<p><em>adiumuser</em> on <em>jabber-fr.net</em> would be <em>adiumuser at jabber-fr.net</em>.</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/accounts-sametime.htmlfrag
--- a/help/documentation/accounts-sametime.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/accounts-sametime.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -1,4 +1,4 @@
-<h1>IBM Lotus Sametime</h1>
+<h1><attr title="International Business Machines Corporation">IBM</attr> Lotus Sametime</h1>
<hr>
@@ -13,6 +13,6 @@
<td>Proprietary</td>
</tr>
</table>
-<p>IBM Lotus Sametime is a messaging protocol used primarily in corporate environments.
-<p>Adium's Sametime support is provided via the <a href="http://meanwhile.sf.net/">Meanwhile</a> library and Pidgin plugin, an open re-implementation of the protocol developed by Christopher (siege) O'Brien. Sametime-specific issues and requests are best directed to the appropriate <a href="http://sf.net/tracker/?group_id=110565">Meanwhile project trackers</a>. Questions regarding the Meanwhile library and Pidgin plugin may be answered on the <a href="http://meanwhile.sourceforge.net/faq/">Meanwhile FAQ</a> page.
-<p><strong>Technical note</strong>: The Meanwhile library's client ID is 0x1700. If you can connect with the official Lotus client but receive a "Not Authorized" error when connecting with Adium, you may need to ask your IT department to enable access for the Meanwhile client ID. Alternately, in Adium 1.0 or later, select "Hide client identity" in the Options of tab of your Sametime account's preferences within Adium.</p>
\ No newline at end of file
+<p><attr title="International Business Machines Corporation">IBM</attr> Lotus Sametime is a messaging protocol used primarily in corporate environments.
+<p>Adium's Sametime support is provided via the <a href="http://meanwhile.sf.net/">Meanwhile</a> library and Pidgin plugin, an open re-implementation of the protocol developed by Christopher (siege) O'Brien. Sametime-specific issues and requests are best directed to the appropriate <a href="http://sf.net/tracker/?group_id=110565">Meanwhile project trackers</a>. Questions regarding the Meanwhile library and Pidgin plugin may be answered on the <a href="http://meanwhile.sourceforge.net/faq/">Meanwhile <attr title="Frequently Asked Questions">FAQ</attr></a> page.
+<p><strong>Technical note</strong>: The Meanwhile library's client ID is 0x1700. If you can connect with the official Lotus client but receive a "Not Authorized" error when connecting with Adium, you may need to ask your <attr title="Information Technology">IT</attr> department to enable access for the Meanwhile client ID. Alternately, in Adium 1.0 or later, select "Hide client identity" in the Options of tab of your Sametime account's preferences within Adium.</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/accounts-setting-your-status.htmlfrag
--- a/help/documentation/accounts-setting-your-status.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/accounts-setting-your-status.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -16,8 +16,8 @@
<hr>
<h2>Status messages</h2>
-<p>AIM, ICQ, Jabber, Sametime, and Yahoo allow you to set a status message. AIM and Yahoo available messages are "Plain Text" which means they can not support formatting such as bold or italic, nor can they support links. If you set such attributes, it will be stripped before the available message is set.</p>
-<p class="list-header">AIM available messages are limited to approximately 60 characters by the AIM server. Messages longer than this will be truncated automatically.</p>
+<p><attr title="AOL Instant Messenger">AIM</attr>, ICQ, Jabber, Sametime, and Yahoo allow you to set a status message. <attr title="AOL Instant Messenger">AIM</attr> and Yahoo available messages are "Plain Text" which means they can not support formatting such as bold or italic, nor can they support links. If you set such attributes, it will be stripped before the available message is set.</p>
+<p class="list-header"><attr title="AOL Instant Messenger">AIM</attr> available messages are limited to approximately 60 characters by the <attr title="AOL Instant Messenger">AIM</attr> server. Messages longer than this will be truncated automatically.</p>
<ol>
<li>Available</li>
<li>iTunes
@@ -28,7 +28,7 @@
<li>Away</li>
<li>Invisible/Stealth
<ul>
- <li>AIM, Jabber, MSN, and Yahoo support invisibility. Simply choose "Invisible" from the State menu in the Custom... status window. If you use Invisible often, we suggest checking "Save Custom Status" so the Invisible state will be in your Status menus</li>
+ <li><attr title="AOL Instant Messenger">AIM</attr>, Jabber, MSN, and Yahoo support invisibility. Simply choose "Invisible" from the State menu in the Custom... status window. If you use Invisible often, we suggest checking "Save Custom Status" so the Invisible state will be in your Status menus</li>
<li>In versions prior to 1.0, there is no Invisible status in Adium by default. You have to create such a status by choosing either of the two "Custom…" menu items in the Status menu, and changing the custom status's state to Invisible. Remember to choose "Save Custom Status" if you want to keep the Invisible status around.</li>
</ul>
</li>
@@ -61,7 +61,7 @@
<h2>Autoreply messages</h2>
<p>Any status can have an "autoreply" which is sent in response to the first incoming message you receive from a contact. By default, Custom Away messages have an autoreply and other statuses do not. This can be controlled in the Custom Status dialogue box by toggling the Autoreply checkbox. Unless you specify otherwise, the autoreply is the same as your Status Message.</p>
-<p>AIM, ICQ, and Jabber contacts will be informed seamlessly that the message is an autoreply; on other services, Adium will add the "(Autoreply) " before your message so that the other side can tell the message's origin.</p>
+<p><attr title="AOL Instant Messenger">AIM</attr>, ICQ, and Jabber contacts will be informed seamlessly that the message is an autoreply; on other services, Adium will add the "(Autoreply) " before your message so that the other side can tell the message's origin.</p>
<hr>
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/accounts-xmpp.htmlfrag
--- a/help/documentation/accounts-xmpp.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/accounts-xmpp.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -1,4 +1,4 @@
-<h1>XMPP</h1>
+<h1><attr title="Extensible Messaging and Presence Protocol">XMPP</attr></h1>
<hr>
@@ -21,7 +21,7 @@
<td>Google Talk, LiveJournal, Gizmo</td>
</tr>
</table>
-<p>Note that XMPP is special, due to being an open protocol. There is no central XMPP server, the structure is like e-mail. Everybody (with a static IP) can host an XMPP server, optionally linking it up to the global XMPP network (otherwise, only local users on the same server are accessible).</p>
-<p>There are already several larger XMPP installations, like Google Talk, LiveJournal and Gizmo.</p>
-<p>This openness also means that unless you want to install your own server (not recommended), you also have to choose a hoster for your account (just like for email). Besides the three mentioned in the previous paragraph, the community portal jabber.org also has a <a href="http://www.jabber.org/web/Services">list</a>.</p>
-<p>More technical information can be found at <a href="http://www.xmpp.org">the XMPP Standards Foundation</a>.</p>
\ No newline at end of file
+<p>Note that <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> is special, due to being an open protocol. There is no central <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> server, the structure is like e-mail. Everybody (with a static IP) can host an XMPP server, optionally linking it up to the global <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> network (otherwise, only local users on the same server are accessible).</p>
+<p>There are already several larger <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> installations, like Google Talk, LiveJournal and Gizmo.</p>
+<p>This openness also means that unless you want to install your own server (not recommended), you also have to choose a hoster for your account (just like for email). Besides the three mentioned in the previous paragraph, the community portal jabber.org also has a <a href="http://www.xmpp.net">list</a>.</p>
+<p>More technical information can be found at <a href="http://www.xmpp.org">the <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> Standards Foundation</a>.</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/advanced-features-address-book-integration.htmlfrag
--- a/help/documentation/advanced-features-address-book-integration.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/advanced-features-address-book-integration.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -4,8 +4,8 @@
<hr>
<h2>Names</h2>
-<p>By default, Adium will import contacts' names from the Address Book. It does this using the IM usernames listed on each AB card; if a username in your Contact List is found on one of the Address Book cards, the name on that card will be shown on that contact's row in the contact list in place of their username (unless you have the Contact List explicitly set to display usernames rather than display names).</p>
-<p>For example, if you have user "jdoe" on your AIM contact list, and a card for John Doe in your Address Book that has jdoe listed as his AIM screen name, then Adium will display John Doe rather than jdoe on that row of its Contact List.</p>
+<p>By default, Adium will import contacts' names from the Address Book. It does this using the <attr title="Instant Messenger">IM</attr> usernames listed on each <attr title="Address Book">AB</attr> card; if a username in your Contact List is found on one of the Address Book cards, the name on that card will be shown on that contact's row in the contact list in place of their username (unless you have the Contact List explicitly set to display usernames rather than display names).</p>
+<p>For example, if you have user "jdoe" on your <attr title="AOL Instant Messenger">AIM</attr> contact list, and a card for John Doe in your Address Book that has jdoe listed as his <attr title="AOL Instant Messenger">AIM</attr> screen name, then Adium will display John Doe rather than jdoe on that row of its Contact List.</p>
<p>By default, Adium imports nicknames and does not import middle names. You can change these settings, as well as the order in which names are displayed (First Last or Last First), via the Address Book Preferences.</p>
<hr>
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/advanced-features-direct-connect.htmlfrag
--- a/help/documentation/advanced-features-direct-connect.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/advanced-features-direct-connect.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -1,10 +1,10 @@
-<h1>AIM: Direct Connect</h1>
+<h1><attr title="AOL Instant Messenger">AIM</attr>: Direct Connect</h1>
<hr>
<h2>Using Direct Connect</h2>
-<p>When using the AIM and Mobile Me services (including when talking to contacts using iChat), you can "directly connect" to send a contact inline pictures and large blocks of text. Images dragged and dropped – or pasted – into a chat which is directly connected are sent and displayed inside that window rather than via a separate file transfer.</p>
+<p>When using the <attr title="AOL Instant Messenger">AIM</attr> and MobileMe services (including when talking to contacts using iChat), you can "directly connect" to send a contact inline pictures and large blocks of text. Images dragged and dropped – or pasted – into a chat which is directly connected are sent and displayed inside that window rather than via a separate file transfer.</p>
<p>To initiate a Direct Connect, simply drag or paste an image into the text entry area. Adium will invite the remote user to accept a direct connection (iChat automatically accepts such invitations) and then display the picture inline in both your message window and the other user's message window.</p>
-<p>Direct Connect faces the same difficulties as <a href="advanced-features-file-transfer">file transfer</a> (e.g. NAT traversal).
+<p>Direct Connect faces the same difficulties as <a href="advanced-features-file-transfer">file transfer</a> (e.g. <attr title="Network Address Translation">NAT</attr> traversal).
<p>Direct Connect is also called "direct messaging", "direct IM", or "direct chat".</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/advanced-features-file-transfer.htmlfrag
--- a/help/documentation/advanced-features-file-transfer.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/advanced-features-file-transfer.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -1,18 +1,18 @@
<h1>File transfer</h1>
-<p>Adium supports file transfers over AIM, Jabber, MSN, and Yahoo protocols.</p>
+<p>Adium supports file transfers over <attr title="AOL Instant Messenger">AIM</attr>, Jabber, MSN, and Yahoo protocols.</p>
<hr>
<h2>Which protocols support file transfer?</h2>
<p class="list-header">Sending and receiving files is currently supported on:</p>
<ul>
- <li>AIM (hard limit of 4 GB)</li>
- <li>ICQ (hard limit of 4 GB)</li>
- <li>IRC</li>
+ <li><attr title="AOL Instant Messenger">AIM</attr> (hard limit of 4 <attr title="Gigabyte">GB</attr>)</li>
+ <li>ICQ (hard limit of 4 <attr title="Gigabyte">GB</attr>)</li>
+ <li><attr title="Internet Relay Chat">IRC</attr></li>
<li>MSN</li>
- <li>SILC (not yet in Adium)</li>
- <li>Yahoo when not using an HTTP proxy (is relayed via a file transfer server).</li>
- <li>XMPP (Jabber) when neither side is behind a NAT device.</li>
+ <li><attr title="Secure Internet Live Conferencing">SILC</attr> (not yet in Adium)</li>
+ <li>Yahoo when not using an <attr title="Hypertext Transfer Protocol">HTTP</attr> proxy (is relayed via a file transfer server).</li>
+ <li><attr title="Extensible Messaging and Presence Protocol">XMPP</attr> (Jabber) when neither side is behind a <attr title="Network Address Translation">NAT</attr> device.</li>
<li>Bonjour</li>
</ul>
@@ -28,22 +28,22 @@
<hr>
-<h2>AIM/ICQ file transfer ports</h2>
-<p class="list-header">Users behind a router or a firewall may have better luck with AIM file transfer after forwarding ports <strong>5190 - 5200</strong> to their machine.</p>
+<h2><attr title="AOL Instant Messenger">AIM</attr>/ICQ file transfer ports</h2>
+<p class="list-header">Users behind a router or a firewall may have better luck with <attr title="AOL Instant Messenger">AIM</attr> file transfer after forwarding ports <strong>5190 - 5200</strong> to their machine.</p>
<ul>
<li>Mac OS X 10.5 users: Add Adium to the allowed programs list in the software firewall. Go to <strong>System Preferences → Security → Firewall</strong>. If <strong>Allow all incoming connections</strong> is not selected, choose <strong>Set access for specific services and applications</strong>, click the <strong>+</strong> button, and select <strong>Adium</strong> from your Applications folder.</li>
- <li>Mac OS X 10.4 users: The OS X software firewall can be controlled via <strong>System Preferences → Sharing → Firewall</strong>. Click on <strong>New</strong>, change Port Name to <strong>Other</strong>, then <strong>enter 5190-5200 for TCP port</strong> and "AIM" for the description.)</li>
+ <li>Mac OS X 10.4 users: The OS X software firewall can be controlled via <strong>System Preferences → Sharing → Firewall</strong>. Click on <strong>New</strong>, change Port Name to <strong>Other</strong>, then <strong>enter 5190-5200 for <attr title="Transmission Control Protocol">TCP</attr> port</strong> and "<attr title="AOL Instant Messenger">AIM</attr>" for the description.)</li>
</ul>
<hr>
-<h2>Why does AIM/ICQ file transfer sometimes work better in iChat?</h2>
+<h2>Why does <attr title="AOL Instant Messenger">AIM</attr>/ICQ file transfer sometimes work better in iChat?</h2>
<ul>
- <li>When the sender is behind a firewall or router, libpurple's AIM file transfer implementation may fail. See the previous section for more information.</li>
+ <li>When the sender is behind a firewall or router, libpurple's <attr title="AOL Instant Messenger">AIM</attr> file transfer implementation may fail. See the previous section for more information.</li>
<li>libpurple does not support transferring of entire folders yet. Such transfers will fail.</li>
</ul>
<hr>
<h2>Improving Bonjour file transfer</h2>
-<p>For Bonjour file transfer to work when sending it is required to allow port 5298 TCP and UDP in.</p>
\ No newline at end of file
+<p>For Bonjour file transfer to work when sending it is required to allow port 5298 <attr title="Transmission Control Protocol">TCP</attr> and <attr title="User Datagram Protocol">UDP</attr> in.</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/advanced-features-search-for-buddy-by-email.htmlfrag
--- a/help/documentation/advanced-features-search-for-buddy-by-email.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/advanced-features-search-for-buddy-by-email.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -1,6 +1,6 @@
-<h1>AIM: search for buddy by email address</h1>
+<h1><attr title="AOL Instant Messenger">AIM</attr>: search for buddy by email address</h1>
<hr>
<h2>Searching for a contact by their email address</h2>
-<p>If you want to find one of your AIM contacts by their email address, just select "Search for Buddy by Email" from the submenu of the AIM account in the File menu.</p>
\ No newline at end of file
+<p>If you want to find one of your <attr title="AOL Instant Messenger">AIM</attr> contacts by their email address, just select "Search for Buddy by Email" from the submenu of the <attr title="AOL Instant Messenger">AIM</attr> account in the File menu.</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/contact-list-blocking-unblocking.htmlfrag
--- a/help/documentation/contact-list-blocking-unblocking.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/contact-list-blocking-unblocking.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -62,7 +62,7 @@
<hr>
<h2>Services and the Privacy Settings they support</h2>
-<h3 class="list-header">AIM</h3>
+<h3 class="list-header"><attr title="AOL Instant Messenger">AIM</attr></h3>
<ul>
<li>Supports: All privacy settings displayed by Adium.</li>
</ul>
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/contact-list-managing-contacts.htmlfrag
--- a/help/documentation/contact-list-managing-contacts.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/contact-list-managing-contacts.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -48,9 +48,9 @@
<li>Select <strong>Get Info</strong> from the <strong>Contact</strong> menu.</li>
<li>Fill in the <strong>Alias</strong> field under the <strong>Settings</strong> tab.</li>
</ol>
-<p>Alternatively, add a card for that person in the Address Book (making sure to include their IM usernames), and Adium's <a href="advanced-features-address-book-integration">Address Book integration</a> feature (on by default) will automatically use that information in the Contact List. This has other benefits; Apple Mail, among other applications, makes use of Address Book's contents for better display as well.</p>
+<p>Alternatively, add a card for that person in the Address Book (making sure to include their <attr title="Instant Messaging">IM</attr> usernames), and Adium's <a href="advanced-features-address-book-integration">Address Book integration</a> feature (on by default) will automatically use that information in the Contact List. This has other benefits; Apple Mail, among other applications, makes use of Address Book's contents for better display as well.</p>
<hr>
<h2>Contact list limits</h2>
-<p>Most services allow an unlimited number of contacts. Each individual AIM, ICQ, or MobileMe account can have a maximum of 500 contacts. This limit is set by the AOL servers; Adium itself places no limits.</p>
\ No newline at end of file
+<p>Most services allow an unlimited number of contacts. Each individual <attr title="AOL Instant Messenger">AIM</attr>, ICQ, or MobileMe account can have a maximum of 500 contacts. This limit is set by the <attr title="America Online, Inc">AOL</attr> servers; Adium itself places no limits.</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/contact-list-managing-groups.htmlfrag
--- a/help/documentation/contact-list-managing-groups.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/contact-list-managing-groups.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -35,7 +35,7 @@
<h2>Renaming groups</h2>
<p>This isn't currently possible. As a workaround, you can Get Info on the group and set an alias. The procedure is the same for setting an alias for a contact.</p>
-<p class="list-header">If you really want to rename the group on the server, you'll need to do it yourself. Be aware that this is risky, as some services flake out when you try to move a lot of contacts at once, and may drop some of your contacts (AIM used to be notorious for this). You should write down all the contact names in TextEdit first.</p>
+<p class="list-header">If you really want to rename the group on the server, you'll need to do it yourself. Be aware that this is risky, as some services flake out when you try to move a lot of contacts at once, and may drop some of your contacts (<attr title="AOL Instant Messenger">AIM</attr> used to be notorious for this). You should write down all the contact names in TextEdit first.</p>
<ol>
<li>Add a group with the new group name.</li>
<li>Move all the contacts from the old group to the new group. To select multiple contacts, click on the first one, then hold down ⇧ (shift) and click on the last one. Remember to show offline contacts first, so that you don't forget anybody.</li>
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/contact-list-status-icons.htmlfrag
--- a/help/documentation/contact-list-status-icons.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/contact-list-status-icons.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -23,7 +23,7 @@
<hr>
<h2>What is the "Unknown" status?</h2>
-<p>The "Unknown" status is used when Adium doesn't know the status of a contact. Depending on the IM service, contacts not on your contact list and users invisible to you may display a status of unknown.</p>
+<p>The "Unknown" status is used when Adium doesn't know the status of a contact. Depending on the <attr title="Instant Messaging">IM</attr> service, contacts not on your contact list and users invisible to you may display a status of unknown.</p>
<hr>
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/index.htmlfrag
--- a/help/documentation/index.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/index.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -8,7 +8,7 @@
<h2>Accounts</h2>
<img src="../gfx/accounts-sm.png" alt="Image of Adium account types">
-<p class="list-header">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>
+<p class="list-header">Adium supports 21 different IM protocols from <attr title="AOL Instant Messenger">AIM</attr> 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>
<ul class="arrow">
<li><a href="accounts-list-of-services">List of services supported and their interoperability</a></li>
<li><a href="accounts-creating-accounts">Creating accounts</a></li>
@@ -61,8 +61,8 @@
<li><a href="advanced-features-growl-support">Growl support</a></li>
<li><a href="advanced-features-address-book-integration">Address Book integration</a></li>
<li><a href="advanced-features-file-transfer">File transfer</a></li>
- <li><a href="advanced-features-direct-connect">AIM: Direct Connect</a></li>
- <li><a href="advanced-features-search-for-buddy-by-email">AIM: Search for buddy by email address</a></li>
+ <li><a href="advanced-features-direct-connect"><attr title="AOL Instant Messenger">AIM</attr>: Direct Connect</a></li>
+ <li><a href="advanced-features-search-for-buddy-by-email"><attr title="AOL Instant Messenger">AIM</attr>: Search for buddy by email address</a></li>
<li><a href="advanced-features-nudge-buzz">MSN: Nudge / Yahoo: Buzz</a></li>
</ul>
@@ -84,7 +84,7 @@
<h2>Information about the services supported</h2>
<p class="list-header">On the following pages you can find some information on the different service supported, e.g. history and censorship.</p>
<ul>
- <li><a href="accounts-xmpp">XMPP ("Jabber")</a>, including:</li>
+ <li><a href="accounts-xmpp"><attr title="Extensible Messaging and Presence Protocol">XMPP</attr> ("Jabber")</a>, including:</li>
<ul>
<li><a href="accounts-google-talk">Google Talk</a></li>
<li><a href="accounts-lj-talk">LJ (LiveJournal) Talk</a></li>
@@ -92,7 +92,7 @@
<li><a href="accounts-gizmo5">Gizmo5</a></li>
</ul>
<li><a href="accounts-msn">MSN Messenger</a></li>
- <li><a href="accounts-aim">AOL Instant Messenger (AIM)</a>, including:</li>
+ <li><a href="accounts-aim"><attr title="America Online, Inc">AOL</attr> Instant Messenger (AIM)</a>, including:</li>
<ul>
<li><a href="accounts-mobileme">MobileMe</a> (formerly known as .Mac)</li>
</ul>
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/messaging-group-chat.htmlfrag
--- a/help/documentation/messaging-group-chat.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/messaging-group-chat.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -5,7 +5,7 @@
<hr>
<h2>Initiating/joining a group chat</h2>
-<h3>AIM, Jabber, SameTime, Yahoo, Zephyr</h3>
+<h3><attr title="AOL Instant Messenger">AIM</attr>, Jabber, SameTime, Yahoo, Zephyr</h3>
<p>Choose <strong>File</strong> → <strong>Join Group</strong> Chat and enter the details for the chat. You may invite contacts to join you in the chat immediately via the Join Group Chat window, and you may invite them later by:</p>
<ul>
<li>Selecting them in the contact list and choosing <strong>Contact</strong> → <strong>Invite to Chat</strong> and selecting the chat, or</li>
@@ -26,10 +26,10 @@
<hr>
<h2>Ranks and icons</h2>
-<p class="list-header">In IRC group chats, or XMPP MUCs, a number of ranks exists. While their usage and permissions can vary per server or channel, usually they mean the following:</p>
+<p class="list-header">In <attr title="Internet Relay Chat">IRC</attr> group chats, or <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> <attr title="Multi User Chat">MUC</attr>s, a number of ranks exists. While their usage and permissions can vary per server or channel, usually they mean the following:</p>
<ul class="list-type-image ranks">
<li class="rank-founder">
- The <strong>founder</strong>. Only exists on XMPP. Can change the configuration of the room.
+ The <strong>founder</strong>. Only exists on <attr title="Extensible Messaging and Presence Protocol">XMPP</attr>. Can change the configuration of the room.
</li>
<li class="rank-op">
<strong>Operators</strong> (mode <tt>+o</tt>). Have the ability to kick, ban or change the rank of other users, and can change the channel's topic.
@@ -78,7 +78,7 @@
<li>Select the "Group Chats" tab.</li>
<li>Activate "Show Header".</li>
</ol>
-<p>For message styles that do not support the topic header, you can type '''/topic''' to show the topic.</p>
+<p>For message styles that do not support the topic header, you can type "'/topic'" to show the topic.</p>
<h3>Editing topics </h3>
<p class="list-header">To edit a topic either</p>
<ul>
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/messaging-sending-messages.htmlfrag
--- a/help/documentation/messaging-sending-messages.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/messaging-sending-messages.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -15,7 +15,7 @@
<h2>Sending messages</h2>
<p>Type a message, then press Enter or Return. You can control whether Enter or Return inserts a new line instead of sending a message in the General Preferences. Option+Enter always inserts a new line. If the contact is online, the message will be sent immediately.</p>
-<p>If the contact is offline, the behavior depends on the instant messaging service you are using. In Yahoo, AIM/ICQ, and Jabber, the message is sent to the server and will be immediately received by the contact when next she signs online. On other services, Adium will give you the option to "Send Later". This will send the message the next time you are online with Adium and the contact is also online.</p>
+<p>If the contact is offline, the behavior depends on the instant messaging service you are using. In Yahoo, <attr title="AOL Instant Messenger">AIM</attr>/ICQ, and Jabber, the message is sent to the server and will be immediately received by the contact when next she signs online. On other services, Adium will give you the option to "Send Later". This will send the message the next time you are online with Adium and the contact is also online.</p>
<p>You can specify your <a href="messaging-fonts-and-colors">font or color</a> if you like.</p>
<hr>
@@ -25,5 +25,5 @@
<hr>
-<h2>Entering HTML</h2>
-<p>Adium doesn't natively support direct HTML entry; you will need the <a href="http://xtras.adium.im/index.php?a=xtras&xtra_id=1260">Raw HTML</a> script from the AdiumXtras website.</p>
\ No newline at end of file
+<h2>Entering <attr title="Hypertext Markup Language">HTML</attr></h2>
+<p>Adium doesn't natively support direct <attr title="Hypertext Markup Language">HTML</attr> entry; you will need the <a href="http://xtras.adium.im/index.php?a=xtras&xtra_id=1260">Raw HTML</a> script from the AdiumXtras website.</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/messaging-transcript-viewer.htmlfrag
--- a/help/documentation/messaging-transcript-viewer.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/messaging-transcript-viewer.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -41,7 +41,7 @@
<ol>
<li>Press ⇧⌘H. This opens your Home folder.</li>
<li>Navigate to Library/Application Support/Adium 2.0/Users/Default/Logs.</li>
- <li>The contents of that folder are subfolders, one per account; the contents of each subfolder are more subfolders, one per contact. So, for example, if your AIM username is jdoe and you have a contact named jsmith, the logs folder will contain a folder named "AIM.jdoe" that contains a subfolder named "jsmith".</li>
+ <li>The contents of that folder are subfolders, one per account; the contents of each subfolder are more subfolders, one per contact. So, for example, if your <attr title="AOL Instant Messenger">AIM</attr> username is jdoe and you have a contact named jsmith, the logs folder will contain a folder named "AIM.jdoe" that contains a subfolder named "jsmith".</li>
<li>Move each chat-log file from the Trash to the appropriate subfolder of the Logs folder. (It is important that you put it in the right folder. Otherwise, Adium won't be able to find those transcripts correctly in the Transcript Viewer window.)</li>
</ol>
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/miscellaneous-av-skype-support.htmlfrag
--- a/help/documentation/miscellaneous-av-skype-support.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/miscellaneous-av-skype-support.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -10,9 +10,9 @@
<h2>Skype support</h2>
<p>Yes and no.</p>
-<p><strong>Yes:</strong> The third-party <a href="http://xtras.adium.im/index.php?a=xtras&xtra_id=5011">Skype Plugin</a> allows Adium to use the <a href="https://developer.skype.com/Docs/ApiDoc">Skype API</a> to display your Skype contacts within Adium and let you chat with them via text-based instant messaging. By the nature of the Skype API, it requires that the Skype program be installed and running.</p>
+<p><strong>Yes:</strong> The third-party <a href="http://xtras.adium.im/index.php?a=xtras&xtra_id=5011">Skype Plugin</a> allows Adium to use the <a href="https://developer.skype.com/Docs/ApiDoc">Skype <attr title="Application Programming Interface">API</attr></a> to display your Skype contacts within Adium and let you chat with them via text-based instant messaging. By the nature of the Skype API, it requires that the Skype program be installed and running.</p>
<p><strong>No:</strong> It's not supported natively within Adium (i.e., without a plugin). The library that we use to support most protocols, <a href="http://trac.adium.im/wiki/LibPurple">libpurple</a>, doesn't support Skype at all right now, not even for chat. Until it does Adium most likely won't, either.</p>
-<p>Keep in mind that Skype is a proprietary, closed protocol, so it must be reverse-engineered before third-party clients like Pidgin and Adium can use it. Protocols like OSCAR (which AIM and ICQ are based on) and MSN have already been reverse-engineered, but they're much older than Skype, and reverse-engineering is hard. It will take a long time and won't happen at all unless someone chooses to take interest in it and dedicate significant time to the effort.</p>
-<h3>What about the Skype API?</h3>
-<p>We can't package the Skype API with Adium because of licensing issues, as the API's files are not open source. Also, using the Skype API, as the Skype Plugin, means that Skype needs to be running.</p>
+<p>Keep in mind that Skype is a proprietary, closed protocol, so it must be reverse-engineered before third-party clients like Pidgin and Adium can use it. Protocols like OSCAR (which <attr title="AOL Instant Messenger">AIM</attr> and ICQ are based on) and MSN have already been reverse-engineered, but they're much older than Skype, and reverse-engineering is hard. It will take a long time and won't happen at all unless someone chooses to take interest in it and dedicate significant time to the effort.</p>
+<h3>What about the Skype <attr title="Application Programming Interface">API</attr>?</h3>
+<p>We can't package the Skype <attr title="Application Programming Interface">API</attr> with Adium because of licensing issues, as the <attr title="Application Programming Interface">API</attr>'s files are not open source. Also, using the Skype <attr title="Application Programming Interface">API</attr>, as the Skype Plugin, means that Skype needs to be running.</p>
<p>We want to do it right, with first-class support for the protocol in Adium, whether it's by a reverse-engineered implementation (of sufficient quality) or by an official embeddable library published by Skype. The former hasn't happened yet and we don't foresee the latter happening either, and we don't accept piggybacking on the official client as a substitute. So until one of those two happens, Adium will not have support for Skype.</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/miscellaneous-os-support.htmlfrag
--- a/help/documentation/miscellaneous-os-support.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/miscellaneous-os-support.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -6,7 +6,7 @@
<hr>
<h2>Windows</h2>
-<p class="list-header">Several multi-protocol IM clients already exist for Windows. We recommended <a href="http://pidgin.im/">Pidgin for Windows</a>; it is open-source and free and Adium uses Pidgin's core (libpurple) for most protocols. Other options include:</p>
+<p class="list-header">Several multi-protocol <attr title="Instant Messaging">IM</attr> clients already exist for Windows. We recommended <a href="http://pidgin.im/">Pidgin for Windows</a>; it is open-source and free and Adium uses Pidgin's core (libpurple) for most protocols. Other options include:</p>
<ul>
<li><a href="http://www.trillian.im/">Trillian</a> (commercial; free 'lite' version available)</li>
<li><a href="http://www.miranda-im.org/">Miranda</a> (open source; free).</li>
@@ -16,11 +16,11 @@
<hr>
<h2>Linux</h2>
-<p>Several multi-protocol IM clients already exist for Linux operating systems.</p>
-<p>If you're using <a href="http://www.gtk.org/">GTK+</a>, we recommend <a href="http://pidgin.im/">Pidgin</a>. Adium uses Pidgin's core (libpurple) for most protocols.</p>
-<p>If you're using <a href="http://www.kde.org/">KDE</a>, we recommend <a href="http://kopete.kde.org/">Kopete</a>. Kopete even works with <a href="http://xtras.adium.im/index.php?a=search&cat_id=5">Adium message view styles</a>.</p>
+<p>Several multi-protocol <attr title="Instant Messaging">IM</attr> clients already exist for Linux operating systems.</p>
+<p>If you're using <a href="http://www.gtk.org/" title="GIMP Toolkit">GTK+</a>, we recommend <a href="http://pidgin.im/">Pidgin</a>. Adium uses Pidgin's core (libpurple) for most protocols.</p>
+<p>If you're using <a href="http://www.kde.org/" title="K Desktop Environment">KDE</a>, we recommend <a href="http://kopete.kde.org/">Kopete</a>. Kopete even works with <a href="http://xtras.adium.im/index.php?a=search&cat_id=5">Adium message view styles</a>.</p>
<h3>But couldn't you use <a href="http://www.gnustep.org/">GNUStep</a>?</h3>
-<p>We use Cocoa Bindings, Carbon, Quartz, Core Foundation, and Search Kit, among other APIs. These features are not available in GNUStep.</p>
+<p>We use Cocoa Bindings, Carbon, Quartz, Core Foundation, and Search Kit, among other <attr title="Application Programming Interface">API</attr>s. These features are not available in GNUStep.</p>
<p>There was a GNUStep implementation very long ago, but it fell out of date and was missing features.</p>
<hr>
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/service-information-irc-support.htmlfrag
--- a/help/documentation/service-information-irc-support.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/service-information-irc-support.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -1,23 +1,23 @@
-<h1>IRC in Adium</h1>
-<p>This page deals with IRC specialities. General group chat features are explained in <a href="messaging-group-chat">Group Chat</a>.</p>
+<h1><attr title="Internet Relay Chat">IRC</attr> in Adium</h1>
+<p>This page deals with <attr title="Internet Relay Chat">IRC</attr> specialities. General group chat features are explained in <a href="messaging-group-chat">Group Chat</a>.</p>
<hr>
<h2>Joining a chat room</h2>
<ol>
- <li>Add your account on an IRC server to Adium.</li>
+ <li>Add your account on an <attr title="Internet Relay Chat">IRC</attr> server to Adium.</li>
<li>Select "Join Chat..." (⇧⌘J) from the File menu.</li>
</ol>
<hr>
<h2>Passwords</h2>
-<p>You only need to enter a password for IRC servers requiring one to connect. In the case of freenode, identify to nickserv by entering "msg nickserv identify <your-password>", putting your password in the account's preferences will result in a "you are already connected" nickserv error.</p>
+<p>You only need to enter a password for <attr title="Internet Relay Chat">IRC</attr> servers requiring one to connect. In the case of freenode, identify to nickserv by entering "msg nickserv identify <your-password>", putting your password in the account's preferences will result in a "you are already connected" nickserv error.</p>
<hr>
<h2>Commands</h2>
-<p>Many widely-used IRC commands like /join and /msg work in Adium too, but for ease of use these are accessible from the interface as well:</p>
+<p>Many widely-used <attr title="Internet Relay Chat">IRC</attr> commands like /join and /msg work in Adium too, but for ease of use these are accessible from the interface as well:</p>
<table class="margin-fix">
<tr>
<th class="side">Command</th>
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/troubleshooting-connection-Problems.htmlfrag
--- a/help/documentation/troubleshooting-connection-Problems.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/troubleshooting-connection-Problems.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -21,15 +21,15 @@
<h2>Common disconnection errors</h2>
<h3>"Socket is not connected"</h3>
<p>This occurs when the server you're trying to connect to is offline, or the port you connecting on is blocked. This is generally a temporary issue, but it may also be a firewall. If you think you are not behind a firewall, you might be limited by your internet service provider.</p>
-<p>For AIM, you can try changing the port Adium connects to in the Accounts preferences to "80". The AIM server listens on every port, and since port 80 is unlikely to be blocked, you will probably be able to get online if it is a firewall issue.</p>
+<p>For <attr title="AOL Instant Messenger">AIM</attr>, you can try changing the port Adium connects to in the Accounts preferences to "80". The <attr title="AOL Instant Messenger">AIM</attr> server listens on every port, and since port 80 is unlikely to be blocked, you will probably be able to get online if it is a firewall issue.</p>
<h3>"Error resolving…"</h3>
<p>The login server the account is set to connect to could not be resolved. This typically means that your DNS server is having temporary issues, and is a problem you cannot correct. This may also be your proxy server having issues or the login server set incorrectly, see the above steps to try and correct this.</p>
<h3>"Incorrect username or password"</h3>
-<p>This means the username and password combination that you log in with is invalid. For all services but AIM, there is not a separate error message for an invalid username. You should double-check your username as well as your password, and try again.</p>
+<p>This means the username and password combination that you log in with is invalid. For all services but <attr title="AOL Instant Messenger">AIM</attr>, there is not a separate error message for an invalid username. You should double-check your username as well as your password, and try again.</p>
<p>Occasionally, servers will report your login information as invalid when it isn't. If this is the case, it's likely a temporary issue which you will have to wait to correct itself.</p>
<hr>
<h2>Temporary workaround for MSN server problems</h2>
-<h3>Turning HTTP connection on and off</h3>
-<p>Adium allows you to connect to the MSN service using HTTP, for situations when the MSN server is not reachable by normal means. This feature can be turned on and off in the Account's Options which you can access by double-clicking on the account in the Accounts list in Adium's Preferences.</p>
\ No newline at end of file
+<h3>Turning <attr title="Hypertext Transfer Protocol">HTTP</attr> connection on and off</h3>
+<p>Adium allows you to connect to the MSN service using <attr title="Hypertext Transfer Protocol">HTTP</attr>, for situations when the MSN server is not reachable by normal means. This feature can be turned on and off in the Account's Options which you can access by double-clicking on the account in the Accounts list in Adium's Preferences.</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/troubleshooting-icq-text-encoding.htmlfrag
--- a/help/documentation/troubleshooting-icq-text-encoding.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/troubleshooting-icq-text-encoding.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -12,7 +12,7 @@
<h2>Which encoding to use</h2>
<h3>The encodings listed here are only first guesses. If one encoding doesn't work, try another.</h3>
-<p class="list-header">The table below is derived from Wikipedia's table of ISO 8859 encodings. As you may notice, it doesn't currently cover other encodings, such as Shift-JIS.</p>
+<p class="list-header">The table below is derived from Wikipedia's table of <attr title="International Organization for Standardization">ISO</attr> 8859 encodings. As you may notice, it doesn't currently cover other encodings, such as Shift-JIS.</p>
<table class="text-encoding-wide margin-fix">
<tr>
<th style="text-align: right" class="side">Language</th>
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/troubleshooting-persistent-password-prompts.htmlfrag
--- a/help/documentation/troubleshooting-persistent-password-prompts.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/troubleshooting-persistent-password-prompts.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -8,4 +8,4 @@
<hr>
<h2>Re-download Adium</h2>
-<p>If you run an application "slimmer" that removes code from your applications that does not match your computer's CPU architecture, it can cause the same symptoms as described here. Re-downloading and installing a fresh, un-slimmed Adium should solve that problem.</p>
\ No newline at end of file
+<p>If you run an application "slimmer" that removes code from your applications that does not match your computer's <attr title="Central Processing Unit">CPU</attr> architecture, it can cause the same symptoms as described here. Re-downloading and installing a fresh, un-slimmed Adium should solve that problem.</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/troubleshooting-recovering-deleted-transcripts.htmlfrag
--- a/help/documentation/troubleshooting-recovering-deleted-transcripts.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/troubleshooting-recovering-deleted-transcripts.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -9,7 +9,7 @@
<ol>
<li>Press ⇧⌘H. This opens your Home folder.</li>
<li>Navigate to Library/Application Support/Adium 2.0/Users/Default/Logs.</li>
- <li>The contents of that folder are subfolders, one per account; the contents of each subfolder are more subfolders, one per contact. So, for example, if your AIM username is jdoe and you have a contact named jsmith, the logs folder will contain a folder named "AIM.jdoe" that contains a subfolder named "jsmith".</li>
+ <li>The contents of that folder are subfolders, one per account; the contents of each subfolder are more subfolders, one per contact. So, for example, if your <attr title="AOL Instant Messenger">AIM</attr> username is jdoe and you have a contact named jsmith, the logs folder will contain a folder named "AIM.jdoe" that contains a subfolder named "jsmith".</li>
<li>Move each chatlog file from the Trash to the appropriate subfolder of the Logs folder. (It is important that you put it in the right folder. Otherwise, Adium won't be able to find those transcripts correctly in the Transcript Viewer window.)</li>
</ol>
diff -r d056a7a5bd6d -r f73ddbbb0cf0 help/documentation/troubleshooting-recovering-lost-passwords.htmlfrag
--- a/help/documentation/troubleshooting-recovering-lost-passwords.htmlfrag Sat Mar 03 10:44:45 2012 +0000
+++ b/help/documentation/troubleshooting-recovering-lost-passwords.htmlfrag Sat Mar 03 12:35:42 2012 +0000
@@ -12,7 +12,7 @@
<img src="/rewrite/assets/images/help/keychain_access.png" title="Path to Keychain Access" alt="Path to Keychain Access">
</figure>
</li>
- <li>Look for a keychain item named "service-name.your-username". For example, if your username on AIM is "jdoe", the keychain item you'd need to look for would be "AIM.jdoe".</li>
+ <li>Look for a keychain item named "service-name.your-username". For example, if your username on <attr title="AOL Instant Messenger">AIM</attr> is "jdoe", the keychain item you'd need to look for would be "AIM.jdoe".</li>
<li>Double-click on the keychain item.</li>
<li>Check the box labeled "Show password".</li>
<li>Enter your Keychain password. This is probably the same password you use to log into Mac OS X.</li>
@@ -23,14 +23,14 @@
</ol>
<p>If you have multiple keychain items for the same service, you'll need to go through each one looking for the right password, assuming you didn't use the same password on all of them (and you shouldn't).</p>
<h3>But wait—there's more!</h3>
-<p>If you use any other IM clients, such as the official client for your IM service, you should look through the Keychain for keychain items saved by those clients.</p>
+<p>If you use any other <attr title="Instant Messaging">IM</attr> clients, such as the official client for your <attr title="Instant Messaging">IM</attr> service, you should look through the Keychain for keychain items saved by those clients.</p>
<hr>
<h2>Getting your password changed</h2>
-<p>If you can't find any IM-service passwords in the Keychain, or none of them work, you'll have to have the IM service change your password.</p>
+<p>If you can't find any <attr title="Instant Messaging">IM</attr>-service passwords in the Keychain, or none of them work, you'll have to have the <attr title="Instant Messaging">IM</attr> service change your password.</p>
<p>Most services, if not all, don't keep a clear-text copy of your password to send you because if they lost that database (by accident or by theft), people's accounts could be compromised. They keep only an encrypted version of the password, which is more secure, but inconvenient because it leaves changing it as your only option.</p>
-<p><em>Again, note that Adium is a third-party client; we don't run any of the instant-messaging services that Adium supports. If you want your password sent to you or changed, you'll need to contact the IM service that you're using.</em></p>
+<p><em>Again, note that Adium is a third-party client; we don't run any of the instant-messaging services that Adium supports. If you want your password sent to you or changed, you'll need to contact the <attr title="Instant Messaging">IM</attr> service that you're using.</em></p>
<p>We maintain a list of contact information for various services on the <a href="accounts-creating-an-account">Creating an Account</a> page. We're not recommending that you throw away your old account and create a new one—it just happens to be the same contact information.</p>
<p>Once you have your password up and running, we recommend that you turn on the "Remember Password" option in Adium. This saves your password in the Mac OS X Keychain, so that you won't have to enter it every time you launch Adium. The Keychain encrypts the password, so it is secure, and it allows you to look it up if you ever need it again.
</p>
\ No newline at end of file
diff -r d056a7a5bd6d -r f73ddbbb0cf0 index.php
--- a/index.php Sat Mar 03 10:44:45 2012 +0000
+++ b/index.php Sat Mar 03 12:35:42 2012 +0000
@@ -137,8 +137,7 @@
<div id="banner-content">
<h1><span></span>Adium</h1>
<div class="version"><?php echo $os == 'iPhone' ? 'iPhone' : $releases[$os]['ver']; ?></div>
- <h2>Adium is a free instant messaging application for Mac OS X that can connect to MSN,
- Google Talk, AIM, Yahoo, ICQ, XMPP, Facebook, Twitter, MobileMe and more.</h2>
+ <h2>Adium is a free instant messaging application for Mac OS X that can connect to <attr title="Microsoft Network">MSN</attr>, Google Talk, <attr title="AOL Instant Messenger">AIM</attr>, Yahoo, <attr title="I Seek You">ICQ</attr>, <attr title="Extensible Messaging and Presence Protocol">XMPP</attr>, Facebook, Twitter, MobileMe and more.</h2>
<div class="button-container">
<a class="button download" href="<?php echo $releases[$os]['link']; ?>">Download</a>
More information about the commits
mailing list