diff -r --exclude=fr --exclude=diff.txt ./console/console ../v7p4/console/console
2003,2020d2002
< 
<         # SME 935 - edit NIC bonding option string
<         if(db_get_prop(\%conf, 'InternalInterface', 'NICBonding') eq 'enabled')
<         {
<             my $msg = gettext("The NIC bonding driver allows various modes and performance options. Edit the option string below if the defaults are not suitable.\n\nMost users do not need to change this setting.\n");
<             my $bond_opts = db_get_prop(\%conf, "InternalInterface", "NICBondingOptions") || '';
<             ($rc, $choice) = $console->input_page
<                 (
<                  title   => gettext("NIC Bonding Options"),
<                  text    => $msg,
<                  value   => $bond_opts
<                 );
< 
<             goto SERVER_ONLY unless ($rc == 0);
< 
<             db_set_prop(\%conf, 'InternalInterface', 'NICBondingOptions', 
<                 $choice);
<         }
diff -r --exclude=fr --exclude=diff.txt ./console/console-menu-items/manageRAID.pl ../v7p4/console/console-menu-items/manageRAID.pl
74d73
<     my @recovering = ();
81,86d79
<         if ($devices{$dev}{State} =~ /recovering/)
<         {
<             push @recovering, "$dev => " . $devices{$dev}{State};
<             next;
<         }
< 
96,104d88
<     warn "recovering: @recovering\n" if DEBUG_MANAGE_RAID;
< 
<     if (scalar @recovering)
<     {
<         $text .= gettext("A RAID resynchronization is in progress.");
<         my ($rc, $choice) = $console->message_page(title => $title, text => $text);
<         return;
<     }
< 
114,115c98
<         $text .= gettext("Only some of the RAID devices are unclean.") . 
< 		"\n\n" .
---
>         $text .= gettext("Only some of the RAID devices are unclean.") . " " .
136,143d118
<     if (scalar keys %used_disks == 1 and scalar keys %free_disks == 0)
<     {
<         $text .= gettext("Your system only has a single disk drive installed or is using hardware mirroring. If you would like to enable software mirroring, please shut down, install a second disk drive (of the same capacity) and then return to this screen.");
< 
<         my ($rc, $choice) = $console->message_page(title => $title, text => $text);
<         return;
<     }
< 
161,162c136,138
<         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?") . 
<         "\n\n";
---
>         gettext("Do you wish to run the following command?") . 
>         "\n\n" .
>         "@cmd";
diff -r --exclude=fr --exclude=diff.txt ./po/adminQuotaSummary.po ../v7p4/po/adminQuotaSummary.po
11c11
< "POT-Creation-Date: 2006-03-16 18:37+1100\n"
---
> "POT-Creation-Date: 2005-11-30 15:04+1100\n"
diff -r --exclude=fr --exclude=diff.txt ./po/backup.po ../v7p4/po/backup.po
11c11
< "POT-Creation-Date: 2006-03-15 11:07+1100\n"
---
> "POT-Creation-Date: 2006-02-17 11:09+1100\n"
diff -r --exclude=fr --exclude=diff.txt ./po/foot.tmpl.po ../v7p4/po/foot.tmpl.po
11c11
< "POT-Creation-Date: 2006-03-15 10:06+1100\n"
---
> "POT-Creation-Date: 2006-03-02 17:26+1100\n"
diff -r --exclude=fr --exclude=diff.txt ./po/server-console.po ../v7p4/po/server-console.po
11c11
< "POT-Creation-Date: 2006-03-15 10:06+1100\n"
---
> "POT-Creation-Date: 2006-03-02 17:26+1100\n"
206c206
< #: root/sbin/e-smith/console:445 root/sbin/e-smith/console:2758
---
> #: root/sbin/e-smith/console:445 root/sbin/e-smith/console:2740
338c338
< #: root/sbin/e-smith/console:1992 root/sbin/e-smith/console:2145
---
> #: root/sbin/e-smith/console:1992 root/sbin/e-smith/console:2127
587c587
< #: root/sbin/e-smith/console:1384 root/sbin/e-smith/console:2037
---
> #: root/sbin/e-smith/console:1384 root/sbin/e-smith/console:2019
595c595
< #: root/sbin/e-smith/console:1407 root/sbin/e-smith/console:2063
---
> #: root/sbin/e-smith/console:1407 root/sbin/e-smith/console:2045
811,823c811
< #: root/sbin/e-smith/console:2007
< msgid ""
< "The NIC bonding driver allows various modes and performance options. Edit "
< "the option string below if the defaults are not suitable.\n"
< "\n"
< "Most users do not need to change this setting.\n"
< msgstr ""
< 
< #: root/sbin/e-smith/console:2011
< msgid "NIC Bonding Options"
< msgstr ""
< 
< #: root/sbin/e-smith/console:2039
---
> #: root/sbin/e-smith/console:2021
831c819
< #: root/sbin/e-smith/console:2041
---
> #: root/sbin/e-smith/console:2023
837c825
< #: root/sbin/e-smith/console:2102
---
> #: root/sbin/e-smith/console:2084
841,842c829,830
< #: root/sbin/e-smith/console:2123 root/sbin/e-smith/console:2128
< #: root/sbin/e-smith/console:2144 root/sbin/e-smith/console:2145
---
> #: root/sbin/e-smith/console:2105 root/sbin/e-smith/console:2110
> #: root/sbin/e-smith/console:2126 root/sbin/e-smith/console:2127
846,847c834,835
< #: root/sbin/e-smith/console:2123 root/sbin/e-smith/console:2129
< #: root/sbin/e-smith/console:2156
---
> #: root/sbin/e-smith/console:2105 root/sbin/e-smith/console:2111
> #: root/sbin/e-smith/console:2138
851c839
< #: root/sbin/e-smith/console:2128
---
> #: root/sbin/e-smith/console:2110
855c843
< #: root/sbin/e-smith/console:2129
---
> #: root/sbin/e-smith/console:2111
859c847
< #: root/sbin/e-smith/console:2134
---
> #: root/sbin/e-smith/console:2116
863c851
< #: root/sbin/e-smith/console:2136
---
> #: root/sbin/e-smith/console:2118
871c859
< #: root/sbin/e-smith/console:2138
---
> #: root/sbin/e-smith/console:2120
875c863
< #: root/sbin/e-smith/console:2184
---
> #: root/sbin/e-smith/console:2166
879c867
< #: root/sbin/e-smith/console:2186
---
> #: root/sbin/e-smith/console:2168
883c871
< #: root/sbin/e-smith/console:2188
---
> #: root/sbin/e-smith/console:2170
890c878
< #: root/sbin/e-smith/console:2210 root/sbin/e-smith/console:2293
---
> #: root/sbin/e-smith/console:2192 root/sbin/e-smith/console:2275
894c882
< #: root/sbin/e-smith/console:2215 root/sbin/e-smith/console:2298
---
> #: root/sbin/e-smith/console:2197 root/sbin/e-smith/console:2280
898c886
< #: root/sbin/e-smith/console:2221
---
> #: root/sbin/e-smith/console:2203
902c890
< #: root/sbin/e-smith/console:2247
---
> #: root/sbin/e-smith/console:2229
906c894
< #: root/sbin/e-smith/console:2249
---
> #: root/sbin/e-smith/console:2231
913c901
< #: root/sbin/e-smith/console:2281
---
> #: root/sbin/e-smith/console:2263
917c905
< #: root/sbin/e-smith/console:2287
---
> #: root/sbin/e-smith/console:2269
921c909
< #: root/sbin/e-smith/console:2304
---
> #: root/sbin/e-smith/console:2286
925c913
< #: root/sbin/e-smith/console:2324
---
> #: root/sbin/e-smith/console:2306
929c917
< #: root/sbin/e-smith/console:2326
---
> #: root/sbin/e-smith/console:2308
935c923
< #: root/sbin/e-smith/console:2328
---
> #: root/sbin/e-smith/console:2310
941c929
< #: root/sbin/e-smith/console:2330
---
> #: root/sbin/e-smith/console:2312
948c936
< #: root/sbin/e-smith/console:2360
---
> #: root/sbin/e-smith/console:2342
952c940
< #: root/sbin/e-smith/console:2379
---
> #: root/sbin/e-smith/console:2361
956c944
< #: root/sbin/e-smith/console:2381
---
> #: root/sbin/e-smith/console:2363
960c948
< #: root/sbin/e-smith/console:2383
---
> #: root/sbin/e-smith/console:2365
964c952
< #: root/sbin/e-smith/console:2384
---
> #: root/sbin/e-smith/console:2366
968c956
< #: root/sbin/e-smith/console:2397
---
> #: root/sbin/e-smith/console:2379
972c960
< #: root/sbin/e-smith/console:2399
---
> #: root/sbin/e-smith/console:2381
976c964
< #: root/sbin/e-smith/console:2401
---
> #: root/sbin/e-smith/console:2383
980c968
< #: root/sbin/e-smith/console:2416
---
> #: root/sbin/e-smith/console:2398
984c972
< #: root/sbin/e-smith/console:2418
---
> #: root/sbin/e-smith/console:2400
991c979
< #: root/sbin/e-smith/console:2420
---
> #: root/sbin/e-smith/console:2402
995c983
< #: root/sbin/e-smith/console:2441
---
> #: root/sbin/e-smith/console:2423
999c987
< #: root/sbin/e-smith/console:2442
---
> #: root/sbin/e-smith/console:2424
1003c991
< #: root/sbin/e-smith/console:2479
---
> #: root/sbin/e-smith/console:2461
1007c995
< #: root/sbin/e-smith/console:2481
---
> #: root/sbin/e-smith/console:2463
1015c1003
< #: root/sbin/e-smith/console:2483
---
> #: root/sbin/e-smith/console:2465
1019c1007
< #: root/sbin/e-smith/console:2576
---
> #: root/sbin/e-smith/console:2558
1023c1011
< #: root/sbin/e-smith/console:2577
---
> #: root/sbin/e-smith/console:2559
1027c1015
< #: root/sbin/e-smith/console:2585
---
> #: root/sbin/e-smith/console:2567
1032c1020
< #: root/sbin/e-smith/console:2592
---
> #: root/sbin/e-smith/console:2574
1037c1025
< #: root/sbin/e-smith/console:2595
---
> #: root/sbin/e-smith/console:2577
1046c1034
< #: root/sbin/e-smith/console:2598
---
> #: root/sbin/e-smith/console:2580
1050c1038
< #: root/sbin/e-smith/console:2638
---
> #: root/sbin/e-smith/console:2620
1054c1042
< #: root/sbin/e-smith/console:2642
---
> #: root/sbin/e-smith/console:2624
1058c1046
< #: root/sbin/e-smith/console:2643
---
> #: root/sbin/e-smith/console:2625
1062c1050
< #: root/sbin/e-smith/console:2648
---
> #: root/sbin/e-smith/console:2630
1067c1055
< #: root/sbin/e-smith/console:2649
---
> #: root/sbin/e-smith/console:2631
1071c1059
< #: root/sbin/e-smith/console:2669
---
> #: root/sbin/e-smith/console:2651
1076c1064
< #: root/sbin/e-smith/console:2671
---
> #: root/sbin/e-smith/console:2653
1081c1069
< #: root/sbin/e-smith/console:2695
---
> #: root/sbin/e-smith/console:2677
1086c1074
< #: root/sbin/e-smith/console:2696
---
> #: root/sbin/e-smith/console:2678
1091c1079
< #: root/sbin/e-smith/console:2722
---
> #: root/sbin/e-smith/console:2704
1095c1083
< #: root/sbin/e-smith/console:2727
---
> #: root/sbin/e-smith/console:2709
1101c1089
< #: root/sbin/e-smith/console:2748
---
> #: root/sbin/e-smith/console:2730
1105c1093
< #: root/sbin/e-smith/console:2750
---
> #: root/sbin/e-smith/console:2732
1112c1100
< #: root/sbin/e-smith/console:2754
---
> #: root/sbin/e-smith/console:2736
1119c1107
< #: root/sbin/e-smith/console:2756
---
> #: root/sbin/e-smith/console:2738
1123c1111
< #: root/sbin/e-smith/console:2766
---
> #: root/sbin/e-smith/console:2748
1127c1115
< #: root/sbin/e-smith/console:2767
---
> #: root/sbin/e-smith/console:2749
1131c1119
< #: root/sbin/e-smith/console:2823
---
> #: root/sbin/e-smith/console:2805
1135c1123
< #: root/sbin/e-smith/console:2825
---
> #: root/sbin/e-smith/console:2807
1139c1127
< #: root/sbin/e-smith/console:2826
---
> #: root/sbin/e-smith/console:2808
1143c1131
< #: root/sbin/e-smith/console:2827
---
> #: root/sbin/e-smith/console:2809
1147c1135
< #: root/sbin/e-smith/console:2828
---
> #: root/sbin/e-smith/console:2810
1151c1139
< #: root/sbin/e-smith/console:2840
---
> #: root/sbin/e-smith/console:2822
1155c1143
< #: root/sbin/e-smith/console:2840
---
> #: root/sbin/e-smith/console:2822
1159c1147
< #: root/sbin/e-smith/console:2841
---
> #: root/sbin/e-smith/console:2823
1163c1151
< #: root/sbin/e-smith/console:2841
---
> #: root/sbin/e-smith/console:2823
1167c1155
< #: root/sbin/e-smith/console:2842
---
> #: root/sbin/e-smith/console:2824
1171c1159
< #: root/sbin/e-smith/console:2842
---
> #: root/sbin/e-smith/console:2824
1175c1163
< #: root/sbin/e-smith/console:2847
---
> #: root/sbin/e-smith/console:2829
1179c1167
< #: root/sbin/e-smith/console:2849
---
> #: root/sbin/e-smith/console:2831
1185c1173
< #: root/sbin/e-smith/console:2851
---
> #: root/sbin/e-smith/console:2833
1193c1181
< #: root/sbin/e-smith/console:2853
---
> #: root/sbin/e-smith/console:2835
1199c1187
< #: root/sbin/e-smith/console:2855
---
> #: root/sbin/e-smith/console:2837
1203c1191
< #: root/sbin/e-smith/console:2856
---
> #: root/sbin/e-smith/console:2838
diff -r --exclude=fr --exclude=diff.txt ./po/userOverQuota.po ../v7p4/po/userOverQuota.po
11c11
< "POT-Creation-Date: 2006-03-16 18:37+1100\n"
---
> "POT-Creation-Date: 2005-11-30 15:04+1100\n"
diff -r --exclude=fr --exclude=diff.txt ./root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup ../v7p4/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup
451,461d450
<   <entry>
< 	<base>BACKUP_DESKTOP_TOO_BIG</base>
< 	<trans>
< 	<![CDATA[
< 	<div class="error">
< 	Your server has too much data for a reliable backup to desktop.
< 	</div>
< 	]]>
< 	</trans>
<   </entry>
< 
diff -r --exclude=fr --exclude=diff.txt ./root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings ../v7p4/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings
398a399
> 	    the @ symbol and a domain name.