diff -r --exclude=fr --exclude=diff.txt ./console/console ../v7p1/console/console 1976,2005d1975 < if (scalar @adapters == 2) < { < my (undef, $driver1, undef) = split (/\s+/, $adapters[0], 3); < my (undef, $driver2, undef) = split (/\s+/, $adapters[1], 3); < if($driver1 eq $driver2) < { < my @args = ( < $console->keep_option(gettext( < db_get_prop(\%conf, 'InternalInterface', < 'NICBonding') || 'disabled')), < gettext("enabled"), gettext("Enable NIC bonding"), < gettext("disabled"), gettext("Disable NIC bonding") < ); < < ($rc, $choice) = $console->menu_page < ( < title => gettext("NIC Bonding"), < text => < gettext("You have more than one network adapter. Would you like to bond them together into a single interface? This can provide greater throughput and/or failure resiliency, depending on your adapters and network configuration."), < argsref => \@args < ); < < unless($choice eq gettext("keep")) < { < db_set_prop(\%conf, 'InternalInterface', 'NICBonding', < ($choice eq gettext('enabled')) ? 'enabled' : 'disabled'); < } < } < } < diff -r --exclude=fr --exclude=diff.txt ./console/console-menu-items/manageRAID.pl ../v7p1/console/console-menu-items/manageRAID.pl 6,9d5 < use Data::Dumper; < < use constant DEBUG_MANAGE_RAID => 1; < 43,45d38 < warn $text if DEBUG_MANAGE_RAID; < warn "devices: " . Dumper(%devices) . "\n" if DEBUG_MANAGE_RAID; < 66c59 < gettext("Manual intervention may be required.") . "\n\n"; --- > gettext("Manual intervention is required.") . "\n\n"; 78c71,73 < $used_disks{$_}++ for (@{$devices{$dev}{UsedDisks}}); --- > my $disk = $devices{$dev}{0}; > $disk =~ s/\d+//; > $used_disks{$disk}++; 80c75 < next if ($devices{$dev}{State} eq "clean"); --- > next if ($devices{$dev}{State} =~ /clean/); 85,88d79 < warn "used_disks: " . Dumper(%used_disks) . "\n" if DEBUG_MANAGE_RAID; < < warn "unclean: @unclean\n" if DEBUG_MANAGE_RAID; < 99c90 < gettext("Manual intervention may be required.") . "\n\n"; --- > gettext("Manual intervention is required.") . "\n\n"; 106d96 < 109,110d98 < warn "free_disks: " . Dumper(%free_disks) . "\n" if DEBUG_MANAGE_RAID; < 124c112 < gettext("Manual intervention may be required.") . "\n\n" . --- > gettext("Manual intervention is required.") . "\n\n" . 147c135 < gettext("This configuration is not yet fully supported in these screens."); --- > gettext("Manual intervention is required."); 199c187 < if ( m:\s+(\d+)\s+(\d+)\s+(\d+).*/dev/(\w+): ) --- > if ( m:\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(.*)/dev/(\w+): ) 201,204c189 < $devices{$dev}{$1} = $_; < my $used_disk = $4; < $used_disk =~ s/\d+//; < push (@{$devices{$dev}{UsedDisks}}, $used_disk); --- > $devices{$dev}{$1} = $6; diff -r --exclude=fr --exclude=diff.txt ./po/backup.po ../v7p1/po/backup.po 11c11 < "POT-Creation-Date: 2006-02-02 11:57+1100\n" --- > "POT-Creation-Date: 2005-12-25 14:37+1100\n" diff -r --exclude=fr --exclude=diff.txt ./po/foot.tmpl.po ../v7p1/po/foot.tmpl.po 11c11 < "POT-Creation-Date: 2006-02-10 06:02+1100\n" --- > "POT-Creation-Date: 2006-01-09 15:29+1100\n" diff -r --exclude=fr --exclude=diff.txt ./po/server-console.po ../v7p1/po/server-console.po 11c11 < "POT-Creation-Date: 2006-02-10 06:02+1100\n" --- > "POT-Creation-Date: 2006-01-09 15:29+1100\n" 202c202 < #: root/sbin/e-smith/console:451 root/sbin/e-smith/console:2742 --- > #: root/sbin/e-smith/console:451 root/sbin/e-smith/console:2712 334c334 < #: root/sbin/e-smith/console:1998 root/sbin/e-smith/console:2128 --- > #: root/sbin/e-smith/console:2098 583c583 < #: root/sbin/e-smith/console:1390 root/sbin/e-smith/console:2020 --- > #: root/sbin/e-smith/console:1390 root/sbin/e-smith/console:1990 591c591 < #: root/sbin/e-smith/console:1413 root/sbin/e-smith/console:2046 --- > #: root/sbin/e-smith/console:1413 root/sbin/e-smith/console:2016 780,795d779 < #: root/sbin/e-smith/console:1986 < msgid "enabled" < msgstr "" < < #: root/sbin/e-smith/console:1986 < msgid "Enable NIC bonding" < msgstr "" < < #: root/sbin/e-smith/console:1987 < msgid "disabled" < msgstr "" < < #: root/sbin/e-smith/console:1987 < msgid "Disable NIC bonding" < msgstr "" < 797,807d780 < msgid "NIC Bonding" < msgstr "" < < #: root/sbin/e-smith/console:1994 < msgid "" < "You have more than one network adapter. Would you like to bond them together " < "into a single interface? This can provide greater throughput and/or failure " < "resiliency, depending on your adapters and network configuration." < msgstr "" < < #: root/sbin/e-smith/console:2022 815c788 < #: root/sbin/e-smith/console:2024 --- > #: root/sbin/e-smith/console:1994 821c794 < #: root/sbin/e-smith/console:2085 --- > #: root/sbin/e-smith/console:2055 825,826c798,799 < #: root/sbin/e-smith/console:2106 root/sbin/e-smith/console:2111 < #: root/sbin/e-smith/console:2127 root/sbin/e-smith/console:2128 --- > #: root/sbin/e-smith/console:2076 root/sbin/e-smith/console:2081 > #: root/sbin/e-smith/console:2097 root/sbin/e-smith/console:2098 830,831c803,804 < #: root/sbin/e-smith/console:2106 root/sbin/e-smith/console:2112 < #: root/sbin/e-smith/console:2139 --- > #: root/sbin/e-smith/console:2076 root/sbin/e-smith/console:2082 > #: root/sbin/e-smith/console:2109 835c808 < #: root/sbin/e-smith/console:2111 --- > #: root/sbin/e-smith/console:2081 839c812 < #: root/sbin/e-smith/console:2112 --- > #: root/sbin/e-smith/console:2082 843c816 < #: root/sbin/e-smith/console:2117 --- > #: root/sbin/e-smith/console:2087 847c820 < #: root/sbin/e-smith/console:2119 --- > #: root/sbin/e-smith/console:2089 855c828 < #: root/sbin/e-smith/console:2121 --- > #: root/sbin/e-smith/console:2091 859c832 < #: root/sbin/e-smith/console:2167 --- > #: root/sbin/e-smith/console:2137 863c836 < #: root/sbin/e-smith/console:2169 --- > #: root/sbin/e-smith/console:2139 867c840 < #: root/sbin/e-smith/console:2171 --- > #: root/sbin/e-smith/console:2141 874c847 < #: root/sbin/e-smith/console:2193 root/sbin/e-smith/console:2276 --- > #: root/sbin/e-smith/console:2163 root/sbin/e-smith/console:2246 878c851 < #: root/sbin/e-smith/console:2198 root/sbin/e-smith/console:2281 --- > #: root/sbin/e-smith/console:2168 root/sbin/e-smith/console:2251 882c855 < #: root/sbin/e-smith/console:2204 --- > #: root/sbin/e-smith/console:2174 886c859 < #: root/sbin/e-smith/console:2230 --- > #: root/sbin/e-smith/console:2200 890c863 < #: root/sbin/e-smith/console:2232 --- > #: root/sbin/e-smith/console:2202 897c870 < #: root/sbin/e-smith/console:2264 --- > #: root/sbin/e-smith/console:2234 901c874 < #: root/sbin/e-smith/console:2270 --- > #: root/sbin/e-smith/console:2240 905c878 < #: root/sbin/e-smith/console:2287 --- > #: root/sbin/e-smith/console:2257 909c882 < #: root/sbin/e-smith/console:2307 --- > #: root/sbin/e-smith/console:2277 913c886 < #: root/sbin/e-smith/console:2309 --- > #: root/sbin/e-smith/console:2279 919c892 < #: root/sbin/e-smith/console:2311 --- > #: root/sbin/e-smith/console:2281 925c898 < #: root/sbin/e-smith/console:2313 --- > #: root/sbin/e-smith/console:2283 932c905 < #: root/sbin/e-smith/console:2343 --- > #: root/sbin/e-smith/console:2313 936c909 < #: root/sbin/e-smith/console:2362 --- > #: root/sbin/e-smith/console:2332 940c913 < #: root/sbin/e-smith/console:2364 --- > #: root/sbin/e-smith/console:2334 944c917 < #: root/sbin/e-smith/console:2366 --- > #: root/sbin/e-smith/console:2336 948c921 < #: root/sbin/e-smith/console:2367 --- > #: root/sbin/e-smith/console:2337 952c925 < #: root/sbin/e-smith/console:2380 --- > #: root/sbin/e-smith/console:2350 956c929 < #: root/sbin/e-smith/console:2382 --- > #: root/sbin/e-smith/console:2352 960c933 < #: root/sbin/e-smith/console:2384 --- > #: root/sbin/e-smith/console:2354 964c937 < #: root/sbin/e-smith/console:2399 --- > #: root/sbin/e-smith/console:2369 968c941 < #: root/sbin/e-smith/console:2401 --- > #: root/sbin/e-smith/console:2371 975c948 < #: root/sbin/e-smith/console:2403 --- > #: root/sbin/e-smith/console:2373 979c952 < #: root/sbin/e-smith/console:2425 --- > #: root/sbin/e-smith/console:2395 983c956 < #: root/sbin/e-smith/console:2426 --- > #: root/sbin/e-smith/console:2396 987c960 < #: root/sbin/e-smith/console:2463 --- > #: root/sbin/e-smith/console:2433 991c964 < #: root/sbin/e-smith/console:2465 --- > #: root/sbin/e-smith/console:2435 999c972 < #: root/sbin/e-smith/console:2467 --- > #: root/sbin/e-smith/console:2437 1003c976 < #: root/sbin/e-smith/console:2560 --- > #: root/sbin/e-smith/console:2530 1007c980 < #: root/sbin/e-smith/console:2561 --- > #: root/sbin/e-smith/console:2531 1011c984 < #: root/sbin/e-smith/console:2569 --- > #: root/sbin/e-smith/console:2539 1016c989 < #: root/sbin/e-smith/console:2576 --- > #: root/sbin/e-smith/console:2546 1021c994 < #: root/sbin/e-smith/console:2579 --- > #: root/sbin/e-smith/console:2549 1030c1003 < #: root/sbin/e-smith/console:2582 --- > #: root/sbin/e-smith/console:2552 1034c1007 < #: root/sbin/e-smith/console:2622 --- > #: root/sbin/e-smith/console:2592 1038c1011 < #: root/sbin/e-smith/console:2626 --- > #: root/sbin/e-smith/console:2596 1042c1015 < #: root/sbin/e-smith/console:2627 --- > #: root/sbin/e-smith/console:2597 1046c1019 < #: root/sbin/e-smith/console:2632 --- > #: root/sbin/e-smith/console:2602 1051c1024 < #: root/sbin/e-smith/console:2633 --- > #: root/sbin/e-smith/console:2603 1055c1028 < #: root/sbin/e-smith/console:2653 --- > #: root/sbin/e-smith/console:2623 1060c1033 < #: root/sbin/e-smith/console:2655 --- > #: root/sbin/e-smith/console:2625 1065c1038 < #: root/sbin/e-smith/console:2679 --- > #: root/sbin/e-smith/console:2649 1070c1043 < #: root/sbin/e-smith/console:2680 --- > #: root/sbin/e-smith/console:2650 1075c1048 < #: root/sbin/e-smith/console:2706 --- > #: root/sbin/e-smith/console:2676 1079c1052 < #: root/sbin/e-smith/console:2711 --- > #: root/sbin/e-smith/console:2681 1085c1058 < #: root/sbin/e-smith/console:2732 --- > #: root/sbin/e-smith/console:2702 1089c1062 < #: root/sbin/e-smith/console:2734 --- > #: root/sbin/e-smith/console:2704 1096c1069 < #: root/sbin/e-smith/console:2738 --- > #: root/sbin/e-smith/console:2708 1103c1076 < #: root/sbin/e-smith/console:2740 --- > #: root/sbin/e-smith/console:2710 1107c1080 < #: root/sbin/e-smith/console:2750 --- > #: root/sbin/e-smith/console:2720 1111c1084 < #: root/sbin/e-smith/console:2751 --- > #: root/sbin/e-smith/console:2721 1115c1088 < #: root/sbin/e-smith/console:2807 --- > #: root/sbin/e-smith/console:2777 1119c1092 < #: root/sbin/e-smith/console:2809 --- > #: root/sbin/e-smith/console:2779 1123c1096 < #: root/sbin/e-smith/console:2810 --- > #: root/sbin/e-smith/console:2780 1127c1100 < #: root/sbin/e-smith/console:2811 --- > #: root/sbin/e-smith/console:2781 1131c1104 < #: root/sbin/e-smith/console:2812 --- > #: root/sbin/e-smith/console:2782 1135c1108 < #: root/sbin/e-smith/console:2824 --- > #: root/sbin/e-smith/console:2794 1139c1112 < #: root/sbin/e-smith/console:2824 --- > #: root/sbin/e-smith/console:2794 1143c1116 < #: root/sbin/e-smith/console:2825 --- > #: root/sbin/e-smith/console:2795 1147c1120 < #: root/sbin/e-smith/console:2825 --- > #: root/sbin/e-smith/console:2795 1151c1124 < #: root/sbin/e-smith/console:2830 --- > #: root/sbin/e-smith/console:2800 1155c1128 < #: root/sbin/e-smith/console:2832 --- > #: root/sbin/e-smith/console:2802 1161c1134 < #: root/sbin/e-smith/console:2834 --- > #: root/sbin/e-smith/console:2804 1169c1142 < #: root/sbin/e-smith/console:2836 --- > #: root/sbin/e-smith/console:2806 1175c1148 < #: root/sbin/e-smith/console:2838 --- > #: root/sbin/e-smith/console:2808 1179c1152 < #: root/sbin/e-smith/console:2839 --- > #: root/sbin/e-smith/console:2809 diff -r --exclude=fr --exclude=diff.txt ./root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings ../v7p1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings 339c339 < Enabled unless you have a specific reason to do otherwise. --- > Disabled unless you have a specific reason to do otherwise. diff -r --exclude=fr --exclude=diff.txt ./root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/online-manual ../v7p1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/online-manual 4c4 < Online manual and other documentation --- > Online manual 10,20c10,14 < <

Support and licensing

< This software is released under the terms listed in the < Support and Licensing page. --- >

> The online manual is available at: > > http://edocs.mitel.com/ >

diff -r --exclude=fr --exclude=diff.txt ./root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/pseudonyms ../v7p1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/pseudonyms 42,57c42 <

Pseudonyms also allow you to create e-mail aliases for valid < (virtual) domains & users. For example you can forward < "sales@virtualdomain1.com" to user "mary" and < "sales@virtualdomain2.com" to user "john". < You must create the domains and user accounts before creating < the email aliases.

< <

Pseudonyms can also forward to other pseudonyms, although this < is limited to one further level. For example the pseudonym < "webmaster" can forward to the pseudonym "techsupport" which < then forwards to a specified user "ray". This is useful where < one user is responsible for multiple roles and saves having < to change the pseudonym's associated with that user many times < in the event that the user departs the organisation.

< <

You can modify or remove a --- >

You can modify or remove a 124,128d108 < <

You can also create email aliases for accounts and (virtual) < domains that are valid on this server. For example < "fred@virtualdomain.com" can be forwarded to "mary" < (or to another valid user account).

diff -r --exclude=fr --exclude=diff.txt ./root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts ../v7p1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts 41c41 < letters, numbers, hyphens, periods, underscores and should start with a --- > letters, numbers, and hyphens, and should start with a 315c315 < only lower case letters, numbers, hyphens, periods and underscores. --- > only lower case letters, numbers, and hyphens. diff -r --exclude=fr --exclude=diff.txt ./root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum ../v7p1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum 239c239 < initiated after this reconfiguration process. --- > required after this reconfiguration process.