diff -r --exclude=fr --exclude=diff.txt ./console/console ../v7p3/console/console 4c4 < # copyright (C) 1999-2006 Mitel Corporation --- > # copyright (C) 1999-2005 Mitel Networks Corporation 18a19,21 > # > # Technical support for this program is available from Mitel Networks > # Please visit our web site www.mitel.com/sme/ for details. 90a94,96 > my $release = esmith::util::determineRelease(); > my $release_string = "Mitel Networks server ${release}"; > 235c241 < title => gettext("Choose administrator password"), --- > title => $release_string, 271c277 < title => gettext("Choose administrator password"), --- > title => $release_string, 1997,2001d2002 < < db_set(\%conf, "EthernetDriver2", < (db_get_prop(\%conf, 'InternalInterface', 'NICBonding', < 'enabled')) < ? db_get(\%conf, "EthernetDriver1") : 'unknown'); 2422c2423,2424 < "--backtitle", $console->backtitle, --- > "--backtitle", > "$release_string Copyright 1999-2005 Mitel Networks Corporation", 2823d2824 < gettext("Reconfigure"), gettext("Reconfigure this server"), 2829c2830 < title => gettext("Reboot, reconfigure or shutdown this server"), --- > title => gettext("Reboot or shutdown this server"), 2831c2832 < gettext("Please select whether you wish to reboot, reconfigure or shutdown. The process will start as soon as you make your selection.") . --- > gettext("Please select whether you wish to reboot or shutdown. The process will start as soon as you make your selection.") . 2848,2853c2849 < elsif ($choice eq gettext('Reboot')) < { < system("/usr/bin/tput", "clear"); < system("/sbin/e-smith/signal-event", "reboot"); < } < elsif ($choice eq gettext('Reconfigure')) --- > else 2856d2851 < system("/sbin/e-smith/signal-event", "post-upgrade"); diff -r --exclude=fr --exclude=diff.txt ./console/console-menu-items/reboot.pl ../v7p3/console/console-menu-items/reboot.pl 7c7 < name => "Reboot, reconfigure or shut down this server", --- > name => "Reboot or shut down this server", diff -r --exclude=fr --exclude=diff.txt ./po/backup.po ../v7p3/po/backup.po 11c11 < "POT-Creation-Date: 2006-02-17 11:09+1100\n" --- > "POT-Creation-Date: 2006-02-02 11:57+1100\n" diff -r --exclude=fr --exclude=diff.txt ./po/foot.tmpl.po ../v7p3/po/foot.tmpl.po 11c11 < "POT-Creation-Date: 2006-03-02 17:26+1100\n" --- > "POT-Creation-Date: 2006-02-13 15:48+1100\n" diff -r --exclude=fr --exclude=diff.txt ./po/server-console.po ../v7p3/po/server-console.po 11c11 < "POT-Creation-Date: 2006-03-02 17:26+1100\n" --- > "POT-Creation-Date: 2006-02-13 15:48+1100\n" 19c19 < #: root/sbin/e-smith/console:128 --- > #: root/sbin/e-smith/console:134 23c23 < #: root/sbin/e-smith/console:132 --- > #: root/sbin/e-smith/console:138 27c27 < #: root/sbin/e-smith/console:133 --- > #: root/sbin/e-smith/console:139 31c31 < #: root/sbin/e-smith/console:136 --- > #: root/sbin/e-smith/console:142 35c35 < #: root/sbin/e-smith/console:172 --- > #: root/sbin/e-smith/console:178 39c39 < #: root/sbin/e-smith/console:174 --- > #: root/sbin/e-smith/console:180 43c43 < #: root/sbin/e-smith/console:176 --- > #: root/sbin/e-smith/console:182 49c49 < #: root/sbin/e-smith/console:178 --- > #: root/sbin/e-smith/console:184 53c53 < #: root/sbin/e-smith/console:183 --- > #: root/sbin/e-smith/console:189 57c57 < #: root/sbin/e-smith/console:185 --- > #: root/sbin/e-smith/console:191 61c61 < #: root/sbin/e-smith/console:187 --- > #: root/sbin/e-smith/console:193 65c65 < #: root/sbin/e-smith/console:189 --- > #: root/sbin/e-smith/console:195 69,73c69 < #: root/sbin/e-smith/console:235 root/sbin/e-smith/console:271 < msgid "Choose administrator password" < msgstr "" < < #: root/sbin/e-smith/console:237 root/sbin/e-smith/console:402 --- > #: root/sbin/e-smith/console:243 root/sbin/e-smith/console:408 77c73 < #: root/sbin/e-smith/console:239 root/sbin/e-smith/console:439 --- > #: root/sbin/e-smith/console:245 root/sbin/e-smith/console:445 83c79 < #: root/sbin/e-smith/console:241 root/sbin/e-smith/console:443 --- > #: root/sbin/e-smith/console:247 root/sbin/e-smith/console:449 89c85 < #: root/sbin/e-smith/console:243 --- > #: root/sbin/e-smith/console:249 95c91 < #: root/sbin/e-smith/console:250 root/sbin/e-smith/console:279 --- > #: root/sbin/e-smith/console:256 root/sbin/e-smith/console:285 99c95 < #: root/sbin/e-smith/console:251 root/sbin/e-smith/console:280 --- > #: root/sbin/e-smith/console:257 root/sbin/e-smith/console:286 103c99 < #: root/sbin/e-smith/console:261 --- > #: root/sbin/e-smith/console:267 107c103 < #: root/sbin/e-smith/console:262 --- > #: root/sbin/e-smith/console:268 111c107 < #: root/sbin/e-smith/console:272 --- > #: root/sbin/e-smith/console:278 115c111 < #: root/sbin/e-smith/console:290 --- > #: root/sbin/e-smith/console:296 119c115 < #: root/sbin/e-smith/console:291 --- > #: root/sbin/e-smith/console:297 123c119 < #: root/sbin/e-smith/console:304 --- > #: root/sbin/e-smith/console:310 127c123 < #: root/sbin/e-smith/console:305 --- > #: root/sbin/e-smith/console:311 131c127 < #: root/sbin/e-smith/console:306 --- > #: root/sbin/e-smith/console:312 135c131 < #: root/sbin/e-smith/console:307 --- > #: root/sbin/e-smith/console:313 139c135 < #: root/sbin/e-smith/console:308 --- > #: root/sbin/e-smith/console:314 143c139 < #: root/sbin/e-smith/console:309 --- > #: root/sbin/e-smith/console:315 147c143 < #: root/sbin/e-smith/console:310 --- > #: root/sbin/e-smith/console:316 151c147 < #: root/sbin/e-smith/console:311 --- > #: root/sbin/e-smith/console:317 155c151 < #: root/sbin/e-smith/console:312 --- > #: root/sbin/e-smith/console:318 159c155 < #: root/sbin/e-smith/console:329 --- > #: root/sbin/e-smith/console:335 163c159 < #: root/sbin/e-smith/console:334 --- > #: root/sbin/e-smith/console:340 167c163 < #: root/sbin/e-smith/console:336 --- > #: root/sbin/e-smith/console:342 171c167 < #: root/sbin/e-smith/console:337 --- > #: root/sbin/e-smith/console:343 175c171 < #: root/sbin/e-smith/console:339 --- > #: root/sbin/e-smith/console:345 179c175 < #: root/sbin/e-smith/console:392 --- > #: root/sbin/e-smith/console:398 183c179 < #: root/sbin/e-smith/console:395 --- > #: root/sbin/e-smith/console:401 187c183 < #: root/sbin/e-smith/console:404 --- > #: root/sbin/e-smith/console:410 191c187 < #: root/sbin/e-smith/console:406 --- > #: root/sbin/e-smith/console:412 195c191 < #: root/sbin/e-smith/console:437 --- > #: root/sbin/e-smith/console:443 199c195 < #: root/sbin/e-smith/console:441 --- > #: root/sbin/e-smith/console:447 206c202 < #: root/sbin/e-smith/console:445 root/sbin/e-smith/console:2740 --- > #: root/sbin/e-smith/console:451 root/sbin/e-smith/console:2742 210c206 < #: root/sbin/e-smith/console:496 --- > #: root/sbin/e-smith/console:502 214c210 < #: root/sbin/e-smith/console:498 --- > #: root/sbin/e-smith/console:504 218c214 < #: root/sbin/e-smith/console:500 --- > #: root/sbin/e-smith/console:506 224c220 < #: root/sbin/e-smith/console:521 --- > #: root/sbin/e-smith/console:527 228c224 < #: root/sbin/e-smith/console:539 --- > #: root/sbin/e-smith/console:545 232c228 < #: root/sbin/e-smith/console:541 --- > #: root/sbin/e-smith/console:547 236c232 < #: root/sbin/e-smith/console:543 --- > #: root/sbin/e-smith/console:549 240c236 < #: root/sbin/e-smith/console:545 --- > #: root/sbin/e-smith/console:551 246c242 < #: root/sbin/e-smith/console:580 --- > #: root/sbin/e-smith/console:586 250c246 < #: root/sbin/e-smith/console:593 --- > #: root/sbin/e-smith/console:599 254c250 < #: root/sbin/e-smith/console:632 --- > #: root/sbin/e-smith/console:638 258c254 < #: root/sbin/e-smith/console:634 --- > #: root/sbin/e-smith/console:640 262c258 < #: root/sbin/e-smith/console:636 --- > #: root/sbin/e-smith/console:642 268c264 < #: root/sbin/e-smith/console:638 --- > #: root/sbin/e-smith/console:644 274c270 < #: root/sbin/e-smith/console:663 --- > #: root/sbin/e-smith/console:669 278c274 < #: root/sbin/e-smith/console:676 --- > #: root/sbin/e-smith/console:682 282c278 < #: root/sbin/e-smith/console:678 --- > #: root/sbin/e-smith/console:684 286c282 < #: root/sbin/e-smith/console:680 --- > #: root/sbin/e-smith/console:686 292c288 < #: root/sbin/e-smith/console:682 --- > #: root/sbin/e-smith/console:688 298c294 < #: root/sbin/e-smith/console:705 --- > #: root/sbin/e-smith/console:711 302c298 < #: root/sbin/e-smith/console:722 root/sbin/e-smith/console:738 --- > #: root/sbin/e-smith/console:728 root/sbin/e-smith/console:744 306c302 < #: root/sbin/e-smith/console:727 root/sbin/e-smith/console:739 --- > #: root/sbin/e-smith/console:733 root/sbin/e-smith/console:745 310c306 < #: root/sbin/e-smith/console:732 root/sbin/e-smith/console:740 --- > #: root/sbin/e-smith/console:738 root/sbin/e-smith/console:746 314c310 < #: root/sbin/e-smith/console:745 --- > #: root/sbin/e-smith/console:751 318c314 < #: root/sbin/e-smith/console:747 --- > #: root/sbin/e-smith/console:753 326c322 < #: root/sbin/e-smith/console:749 --- > #: root/sbin/e-smith/console:755 334,338c330,334 < #: root/sbin/e-smith/console:755 root/sbin/e-smith/console:827 < #: root/sbin/e-smith/console:911 root/sbin/e-smith/console:983 < #: root/sbin/e-smith/console:1189 root/sbin/e-smith/console:1892 < #: root/sbin/e-smith/console:1925 root/sbin/e-smith/console:1957 < #: root/sbin/e-smith/console:1992 root/sbin/e-smith/console:2127 --- > #: root/sbin/e-smith/console:761 root/sbin/e-smith/console:833 > #: root/sbin/e-smith/console:917 root/sbin/e-smith/console:989 > #: root/sbin/e-smith/console:1195 root/sbin/e-smith/console:1898 > #: root/sbin/e-smith/console:1931 root/sbin/e-smith/console:1963 > #: root/sbin/e-smith/console:1998 root/sbin/e-smith/console:2128 342c338 < #: root/sbin/e-smith/console:800 root/sbin/e-smith/console:811 --- > #: root/sbin/e-smith/console:806 root/sbin/e-smith/console:817 346c342 < #: root/sbin/e-smith/console:805 root/sbin/e-smith/console:812 --- > #: root/sbin/e-smith/console:811 root/sbin/e-smith/console:818 350c346 < #: root/sbin/e-smith/console:817 --- > #: root/sbin/e-smith/console:823 354c350 < #: root/sbin/e-smith/console:819 --- > #: root/sbin/e-smith/console:825 360c356 < #: root/sbin/e-smith/console:821 --- > #: root/sbin/e-smith/console:827 367c363 < #: root/sbin/e-smith/console:855 --- > #: root/sbin/e-smith/console:861 371c367 < #: root/sbin/e-smith/console:857 --- > #: root/sbin/e-smith/console:863 377c373 < #: root/sbin/e-smith/console:895 --- > #: root/sbin/e-smith/console:901 381c377 < #: root/sbin/e-smith/console:895 --- > #: root/sbin/e-smith/console:901 385c381 < #: root/sbin/e-smith/console:896 root/sbin/e-smith/console:913 --- > #: root/sbin/e-smith/console:902 root/sbin/e-smith/console:919 389c385 < #: root/sbin/e-smith/console:896 --- > #: root/sbin/e-smith/console:902 393c389 < #: root/sbin/e-smith/console:901 --- > #: root/sbin/e-smith/console:907 397c393 < #: root/sbin/e-smith/console:903 --- > #: root/sbin/e-smith/console:909 407c403 < #: root/sbin/e-smith/console:905 --- > #: root/sbin/e-smith/console:911 411c407 < #: root/sbin/e-smith/console:937 --- > #: root/sbin/e-smith/console:943 415c411 < #: root/sbin/e-smith/console:938 --- > #: root/sbin/e-smith/console:944 419c415 < #: root/sbin/e-smith/console:944 --- > #: root/sbin/e-smith/console:950 423c419 < #: root/sbin/e-smith/console:945 --- > #: root/sbin/e-smith/console:951 427c423 < #: root/sbin/e-smith/console:951 --- > #: root/sbin/e-smith/console:957 431c427 < #: root/sbin/e-smith/console:952 --- > #: root/sbin/e-smith/console:958 435c431 < #: root/sbin/e-smith/console:958 --- > #: root/sbin/e-smith/console:964 439c435 < #: root/sbin/e-smith/console:959 --- > #: root/sbin/e-smith/console:965 443c439 < #: root/sbin/e-smith/console:965 --- > #: root/sbin/e-smith/console:971 447c443 < #: root/sbin/e-smith/console:966 --- > #: root/sbin/e-smith/console:972 451c447 < #: root/sbin/e-smith/console:967 --- > #: root/sbin/e-smith/console:973 455c451 < #: root/sbin/e-smith/console:968 --- > #: root/sbin/e-smith/console:974 459c455 < #: root/sbin/e-smith/console:973 --- > #: root/sbin/e-smith/console:979 463c459 < #: root/sbin/e-smith/console:975 --- > #: root/sbin/e-smith/console:981 467c463 < #: root/sbin/e-smith/console:977 --- > #: root/sbin/e-smith/console:983 475c471 < #: root/sbin/e-smith/console:1035 --- > #: root/sbin/e-smith/console:1041 479c475 < #: root/sbin/e-smith/console:1037 --- > #: root/sbin/e-smith/console:1043 486c482 < #: root/sbin/e-smith/console:1061 --- > #: root/sbin/e-smith/console:1067 490c486 < #: root/sbin/e-smith/console:1063 --- > #: root/sbin/e-smith/console:1069 496c492 < #: root/sbin/e-smith/console:1088 --- > #: root/sbin/e-smith/console:1094 500c496 < #: root/sbin/e-smith/console:1090 --- > #: root/sbin/e-smith/console:1096 504c500 < #: root/sbin/e-smith/console:1116 --- > #: root/sbin/e-smith/console:1122 508c504 < #: root/sbin/e-smith/console:1169 --- > #: root/sbin/e-smith/console:1175 512c508 < #: root/sbin/e-smith/console:1170 root/sbin/e-smith/console:1172 --- > #: root/sbin/e-smith/console:1176 root/sbin/e-smith/console:1178 516c512 < #: root/sbin/e-smith/console:1171 root/sbin/e-smith/console:1173 --- > #: root/sbin/e-smith/console:1177 root/sbin/e-smith/console:1179 520c516 < #: root/sbin/e-smith/console:1179 --- > #: root/sbin/e-smith/console:1185 524c520 < #: root/sbin/e-smith/console:1181 --- > #: root/sbin/e-smith/console:1187 534c530 < #: root/sbin/e-smith/console:1183 --- > #: root/sbin/e-smith/console:1189 538c534 < #: root/sbin/e-smith/console:1240 --- > #: root/sbin/e-smith/console:1246 542c538 < #: root/sbin/e-smith/console:1241 --- > #: root/sbin/e-smith/console:1247 546c542 < #: root/sbin/e-smith/console:1268 --- > #: root/sbin/e-smith/console:1274 550c546 < #: root/sbin/e-smith/console:1269 --- > #: root/sbin/e-smith/console:1275 554c550 < #: root/sbin/e-smith/console:1299 --- > #: root/sbin/e-smith/console:1305 558c554 < #: root/sbin/e-smith/console:1301 --- > #: root/sbin/e-smith/console:1307 565c561 < #: root/sbin/e-smith/console:1303 --- > #: root/sbin/e-smith/console:1309 569c565 < #: root/sbin/e-smith/console:1324 --- > #: root/sbin/e-smith/console:1330 573c569 < #: root/sbin/e-smith/console:1338 --- > #: root/sbin/e-smith/console:1344 577c573 < #: root/sbin/e-smith/console:1340 --- > #: root/sbin/e-smith/console:1346 583c579 < #: root/sbin/e-smith/console:1361 --- > #: root/sbin/e-smith/console:1367 587c583 < #: root/sbin/e-smith/console:1384 root/sbin/e-smith/console:2019 --- > #: root/sbin/e-smith/console:1390 root/sbin/e-smith/console:2020 591c587 < #: root/sbin/e-smith/console:1386 --- > #: root/sbin/e-smith/console:1392 595c591 < #: root/sbin/e-smith/console:1407 root/sbin/e-smith/console:2045 --- > #: root/sbin/e-smith/console:1413 root/sbin/e-smith/console:2046 599,601c595,597 < #: root/sbin/e-smith/console:1421 root/sbin/e-smith/console:1422 < #: root/sbin/e-smith/console:1423 root/sbin/e-smith/console:1424 < #: root/sbin/e-smith/console:1425 --- > #: root/sbin/e-smith/console:1427 root/sbin/e-smith/console:1428 > #: root/sbin/e-smith/console:1429 root/sbin/e-smith/console:1430 > #: root/sbin/e-smith/console:1431 605c601 < #: root/sbin/e-smith/console:1425 root/sbin/e-smith/console:1458 --- > #: root/sbin/e-smith/console:1431 root/sbin/e-smith/console:1464 609c605 < #: root/sbin/e-smith/console:1426 --- > #: root/sbin/e-smith/console:1432 613c609 < #: root/sbin/e-smith/console:1431 --- > #: root/sbin/e-smith/console:1437 617c613 < #: root/sbin/e-smith/console:1433 --- > #: root/sbin/e-smith/console:1439 623c619 < #: root/sbin/e-smith/console:1611 --- > #: root/sbin/e-smith/console:1617 627c623 < #: root/sbin/e-smith/console:1613 --- > #: root/sbin/e-smith/console:1619 632c628 < #: root/sbin/e-smith/console:1629 --- > #: root/sbin/e-smith/console:1635 636c632 < #: root/sbin/e-smith/console:1631 root/sbin/e-smith/console:1695 --- > #: root/sbin/e-smith/console:1637 root/sbin/e-smith/console:1701 640c636 < #: root/sbin/e-smith/console:1633 --- > #: root/sbin/e-smith/console:1639 648c644 < #: root/sbin/e-smith/console:1635 --- > #: root/sbin/e-smith/console:1641 652c648 < #: root/sbin/e-smith/console:1637 --- > #: root/sbin/e-smith/console:1643 656c652 < #: root/sbin/e-smith/console:1639 --- > #: root/sbin/e-smith/console:1645 660c656 < #: root/sbin/e-smith/console:1665 --- > #: root/sbin/e-smith/console:1671 664c660 < #: root/sbin/e-smith/console:1667 --- > #: root/sbin/e-smith/console:1673 673c669 < #: root/sbin/e-smith/console:1677 --- > #: root/sbin/e-smith/console:1683 677c673 < #: root/sbin/e-smith/console:1697 --- > #: root/sbin/e-smith/console:1703 684c680 < #: root/sbin/e-smith/console:1699 --- > #: root/sbin/e-smith/console:1705 693c689 < #: root/sbin/e-smith/console:1702 --- > #: root/sbin/e-smith/console:1708 697c693 < #: root/sbin/e-smith/console:1704 --- > #: root/sbin/e-smith/console:1710 704c700 < #: root/sbin/e-smith/console:1706 --- > #: root/sbin/e-smith/console:1712 710c706 < #: root/sbin/e-smith/console:1708 --- > #: root/sbin/e-smith/console:1714 716c712 < #: root/sbin/e-smith/console:1714 --- > #: root/sbin/e-smith/console:1720 720c716 < #: root/sbin/e-smith/console:1747 --- > #: root/sbin/e-smith/console:1753 724c720 < #: root/sbin/e-smith/console:1750 --- > #: root/sbin/e-smith/console:1756 733c729 < #: root/sbin/e-smith/console:1777 --- > #: root/sbin/e-smith/console:1783 737c733 < #: root/sbin/e-smith/console:1789 --- > #: root/sbin/e-smith/console:1795 741c737 < #: root/sbin/e-smith/console:1791 --- > #: root/sbin/e-smith/console:1797 745c741 < #: root/sbin/e-smith/console:1795 --- > #: root/sbin/e-smith/console:1801 749c745 < #: root/sbin/e-smith/console:1819 --- > #: root/sbin/e-smith/console:1825 753c749 < #: root/sbin/e-smith/console:1821 --- > #: root/sbin/e-smith/console:1827 757c753 < #: root/sbin/e-smith/console:1825 --- > #: root/sbin/e-smith/console:1831 761,762c757,758 < #: root/sbin/e-smith/console:1883 root/sbin/e-smith/console:1917 < #: root/sbin/e-smith/console:1949 --- > #: root/sbin/e-smith/console:1889 root/sbin/e-smith/console:1923 > #: root/sbin/e-smith/console:1955 766c762 < #: root/sbin/e-smith/console:1885 --- > #: root/sbin/e-smith/console:1891 772c768 < #: root/sbin/e-smith/console:1919 --- > #: root/sbin/e-smith/console:1925 778c774 < #: root/sbin/e-smith/console:1951 --- > #: root/sbin/e-smith/console:1957 784c780 < #: root/sbin/e-smith/console:1980 --- > #: root/sbin/e-smith/console:1986 788c784 < #: root/sbin/e-smith/console:1980 --- > #: root/sbin/e-smith/console:1986 792c788 < #: root/sbin/e-smith/console:1981 --- > #: root/sbin/e-smith/console:1987 796c792 < #: root/sbin/e-smith/console:1981 --- > #: root/sbin/e-smith/console:1987 800c796 < #: root/sbin/e-smith/console:1986 --- > #: root/sbin/e-smith/console:1992 804c800 < #: root/sbin/e-smith/console:1988 --- > #: root/sbin/e-smith/console:1994 811c807 < #: root/sbin/e-smith/console:2021 --- > #: root/sbin/e-smith/console:2022 819c815 < #: root/sbin/e-smith/console:2023 --- > #: root/sbin/e-smith/console:2024 825c821 < #: root/sbin/e-smith/console:2084 --- > #: root/sbin/e-smith/console:2085 829,830c825,826 < #: root/sbin/e-smith/console:2105 root/sbin/e-smith/console:2110 < #: root/sbin/e-smith/console:2126 root/sbin/e-smith/console:2127 --- > #: root/sbin/e-smith/console:2106 root/sbin/e-smith/console:2111 > #: root/sbin/e-smith/console:2127 root/sbin/e-smith/console:2128 834,835c830,831 < #: root/sbin/e-smith/console:2105 root/sbin/e-smith/console:2111 < #: root/sbin/e-smith/console:2138 --- > #: root/sbin/e-smith/console:2106 root/sbin/e-smith/console:2112 > #: root/sbin/e-smith/console:2139 839c835 < #: root/sbin/e-smith/console:2110 --- > #: root/sbin/e-smith/console:2111 843c839 < #: root/sbin/e-smith/console:2111 --- > #: root/sbin/e-smith/console:2112 847c843 < #: root/sbin/e-smith/console:2116 --- > #: root/sbin/e-smith/console:2117 851c847 < #: root/sbin/e-smith/console:2118 --- > #: root/sbin/e-smith/console:2119 859c855 < #: root/sbin/e-smith/console:2120 --- > #: root/sbin/e-smith/console:2121 863c859 < #: root/sbin/e-smith/console:2166 --- > #: root/sbin/e-smith/console:2167 867c863 < #: root/sbin/e-smith/console:2168 --- > #: root/sbin/e-smith/console:2169 871c867 < #: root/sbin/e-smith/console:2170 --- > #: root/sbin/e-smith/console:2171 878c874 < #: root/sbin/e-smith/console:2192 root/sbin/e-smith/console:2275 --- > #: root/sbin/e-smith/console:2193 root/sbin/e-smith/console:2276 882c878 < #: root/sbin/e-smith/console:2197 root/sbin/e-smith/console:2280 --- > #: root/sbin/e-smith/console:2198 root/sbin/e-smith/console:2281 886c882 < #: root/sbin/e-smith/console:2203 --- > #: root/sbin/e-smith/console:2204 890c886 < #: root/sbin/e-smith/console:2229 --- > #: root/sbin/e-smith/console:2230 894c890 < #: root/sbin/e-smith/console:2231 --- > #: root/sbin/e-smith/console:2232 901c897 < #: root/sbin/e-smith/console:2263 --- > #: root/sbin/e-smith/console:2264 905c901 < #: root/sbin/e-smith/console:2269 --- > #: root/sbin/e-smith/console:2270 909c905 < #: root/sbin/e-smith/console:2286 --- > #: root/sbin/e-smith/console:2287 913c909 < #: root/sbin/e-smith/console:2306 --- > #: root/sbin/e-smith/console:2307 917c913 < #: root/sbin/e-smith/console:2308 --- > #: root/sbin/e-smith/console:2309 923c919 < #: root/sbin/e-smith/console:2310 --- > #: root/sbin/e-smith/console:2311 929c925 < #: root/sbin/e-smith/console:2312 --- > #: root/sbin/e-smith/console:2313 936c932 < #: root/sbin/e-smith/console:2342 --- > #: root/sbin/e-smith/console:2343 940c936 < #: root/sbin/e-smith/console:2361 --- > #: root/sbin/e-smith/console:2362 944c940 < #: root/sbin/e-smith/console:2363 --- > #: root/sbin/e-smith/console:2364 948c944 < #: root/sbin/e-smith/console:2365 --- > #: root/sbin/e-smith/console:2366 952c948 < #: root/sbin/e-smith/console:2366 --- > #: root/sbin/e-smith/console:2367 956c952 < #: root/sbin/e-smith/console:2379 --- > #: root/sbin/e-smith/console:2380 960c956 < #: root/sbin/e-smith/console:2381 --- > #: root/sbin/e-smith/console:2382 964c960 < #: root/sbin/e-smith/console:2383 --- > #: root/sbin/e-smith/console:2384 968c964 < #: root/sbin/e-smith/console:2398 --- > #: root/sbin/e-smith/console:2399 972c968 < #: root/sbin/e-smith/console:2400 --- > #: root/sbin/e-smith/console:2401 979c975 < #: root/sbin/e-smith/console:2402 --- > #: root/sbin/e-smith/console:2403 983c979 < #: root/sbin/e-smith/console:2423 --- > #: root/sbin/e-smith/console:2425 987c983 < #: root/sbin/e-smith/console:2424 --- > #: root/sbin/e-smith/console:2426 991c987 < #: root/sbin/e-smith/console:2461 --- > #: root/sbin/e-smith/console:2463 995c991 < #: root/sbin/e-smith/console:2463 --- > #: root/sbin/e-smith/console:2465 1003c999 < #: root/sbin/e-smith/console:2465 --- > #: root/sbin/e-smith/console:2467 1007c1003 < #: root/sbin/e-smith/console:2558 --- > #: root/sbin/e-smith/console:2560 1011c1007 < #: root/sbin/e-smith/console:2559 --- > #: root/sbin/e-smith/console:2561 1015c1011 < #: root/sbin/e-smith/console:2567 --- > #: root/sbin/e-smith/console:2569 1020c1016 < #: root/sbin/e-smith/console:2574 --- > #: root/sbin/e-smith/console:2576 1025c1021 < #: root/sbin/e-smith/console:2577 --- > #: root/sbin/e-smith/console:2579 1034c1030 < #: root/sbin/e-smith/console:2580 --- > #: root/sbin/e-smith/console:2582 1038c1034 < #: root/sbin/e-smith/console:2620 --- > #: root/sbin/e-smith/console:2622 1042c1038 < #: root/sbin/e-smith/console:2624 --- > #: root/sbin/e-smith/console:2626 1046c1042 < #: root/sbin/e-smith/console:2625 --- > #: root/sbin/e-smith/console:2627 1050c1046 < #: root/sbin/e-smith/console:2630 --- > #: root/sbin/e-smith/console:2632 1055c1051 < #: root/sbin/e-smith/console:2631 --- > #: root/sbin/e-smith/console:2633 1059c1055 < #: root/sbin/e-smith/console:2651 --- > #: root/sbin/e-smith/console:2653 1064c1060 < #: root/sbin/e-smith/console:2653 --- > #: root/sbin/e-smith/console:2655 1069c1065 < #: root/sbin/e-smith/console:2677 --- > #: root/sbin/e-smith/console:2679 1074c1070 < #: root/sbin/e-smith/console:2678 --- > #: root/sbin/e-smith/console:2680 1079c1075 < #: root/sbin/e-smith/console:2704 --- > #: root/sbin/e-smith/console:2706 1083c1079 < #: root/sbin/e-smith/console:2709 --- > #: root/sbin/e-smith/console:2711 1089c1085 < #: root/sbin/e-smith/console:2730 --- > #: root/sbin/e-smith/console:2732 1093c1089 < #: root/sbin/e-smith/console:2732 --- > #: root/sbin/e-smith/console:2734 1100c1096 < #: root/sbin/e-smith/console:2736 --- > #: root/sbin/e-smith/console:2738 1107c1103 < #: root/sbin/e-smith/console:2738 --- > #: root/sbin/e-smith/console:2740 1111c1107 < #: root/sbin/e-smith/console:2748 --- > #: root/sbin/e-smith/console:2750 1115c1111 < #: root/sbin/e-smith/console:2749 --- > #: root/sbin/e-smith/console:2751 1119c1115 < #: root/sbin/e-smith/console:2805 --- > #: root/sbin/e-smith/console:2807 1123c1119 < #: root/sbin/e-smith/console:2807 --- > #: root/sbin/e-smith/console:2809 1127c1123 < #: root/sbin/e-smith/console:2808 --- > #: root/sbin/e-smith/console:2810 1131c1127 < #: root/sbin/e-smith/console:2809 --- > #: root/sbin/e-smith/console:2811 1135c1131 < #: root/sbin/e-smith/console:2810 --- > #: root/sbin/e-smith/console:2812 1139c1135 < #: root/sbin/e-smith/console:2822 --- > #: root/sbin/e-smith/console:2824 1143c1139 < #: root/sbin/e-smith/console:2822 --- > #: root/sbin/e-smith/console:2824 1147,1155c1143 < #: root/sbin/e-smith/console:2823 < msgid "Reconfigure" < msgstr "" < < #: root/sbin/e-smith/console:2823 < msgid "Reconfigure this server" < msgstr "" < < #: root/sbin/e-smith/console:2824 --- > #: root/sbin/e-smith/console:2825 1159c1147 < #: root/sbin/e-smith/console:2824 --- > #: root/sbin/e-smith/console:2825 1163,1164c1151,1152 < #: root/sbin/e-smith/console:2829 < msgid "Reboot, reconfigure or shutdown this server" --- > #: root/sbin/e-smith/console:2830 > msgid "Reboot or shutdown this server" 1167c1155 < #: root/sbin/e-smith/console:2831 --- > #: root/sbin/e-smith/console:2832 1169,1170c1157,1158 < "Please select whether you wish to reboot, reconfigure or shutdown. The " < "process will start as soon as you make your selection." --- > "Please select whether you wish to reboot or shutdown. The process will start " > "as soon as you make your selection." 1173c1161 < #: root/sbin/e-smith/console:2833 --- > #: root/sbin/e-smith/console:2834 1181c1169 < #: root/sbin/e-smith/console:2835 --- > #: root/sbin/e-smith/console:2836 1187c1175 < #: root/sbin/e-smith/console:2837 --- > #: root/sbin/e-smith/console:2838 1191c1179 < #: root/sbin/e-smith/console:2838 --- > #: root/sbin/e-smith/console:2839 diff -r --exclude=fr --exclude=diff.txt ./root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings ../v7p3/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings 399,401c399,400 < the @ symbol and a domain name. < This field requires a valid e-mail address, which must include < the @ symbol and a domain name. --- > This field must contain only letters, numbers, dots, hypens and > underscores and start with a letter diff -r --exclude=fr --exclude=diff.txt ./root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum ../v7p3/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum 236,246c236,240 < < An automatic reboot will be < initiated as part of this reconfiguration process <

< ]]> < --- > The system needs to be reconfigured > after adding or removing software, > or applying updates. A reboot will be > initiated after this reconfiguration process. > 267,279d260 < < < < ERROR_UPDATING < An error occurred while updating the system. < < < < SYSTEM_BEING_RECONFIGURED < < Your system is being automatically rebooted to < complete the reconfiguraton process. <