diff -r --exclude=fr --exclude=diff.txt ./console/console-menu-items/manageRAID.pl ../v7r3/console/console-menu-items/manageRAID.pl
53a54,73
>         $text .= gettext("There should be two RAID devices, not ") . 
>             $text .= gettext("One or more devices is not RAID1") . "\n\n" .
127c148
<         $text .= gettext("The free disk count must equal one.") .
---
>         $text .= gettext("The free and used disk count must equal one.") .
140c162
<         gettext("There is an unused disk drive in your system. Do you want to add it to the existing RAID array(s)?") . 
---
>         gettext("There is an unused disk drive in your system. Do you want to add it to the existing drive to make a RAID pair?") . 


diff -r --exclude=fr --exclude=diff.txt ./po/userOverQuota.po ../v7r3/po/userOverQuota.po
11c11
< "POT-Creation-Date: 2006-12-07 17:14-0700\n"
---
> "POT-Creation-Date: 2006-05-02 11:47+1000\n"
41,45c41
< #: root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl:22
< msgid " no limit set"
< msgstr ""


diff -r --exclude=fr --exclude=diff.txt ./root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains ../v7r3/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains
230,236c230
<         <p>If this server does not have access to the Internet, or you have special
< requirements for DNS resolution, enter the DNS server IP address here.
< 
< You should not enter the address of your ISP's DNS servers here, as the server
< is capable of resolving all Internet DNS names without this additional
< configuration.</p>
<            <p> <a class="button-like"
---
>             <a class="button-like"


diff -r --exclude=fr --exclude=diff.txt ./root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings ../v7r3/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings
488,489c488,489
< 		You can scan incoming and outgoing e-mail for viruses. If scanning is enabled and a virus is detected, the e-mail will be rejected and returned to the
< sender.
---
> 		You can scan e-mail for viruses and either reject 
> 		or quarantine messages containing viruses.


diff -r --exclude=fr --exclude=diff.txt ./root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/quota ../v7r3/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/quota
134c134,135
<        Error: absolute limit must be greater than limit with grace time. 
---
>         Error: absolute limit must be greater than or equal to limit with
>         grace time. 


diff -r --exclude=fr --exclude=diff.txt ./root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum ../v7r3/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum
241,243c241
<                 <p>
< 		Please click on the Reconfigure button at the bottom of
< 		this page to start the reconfiguration process.
---
> 	       <p>