----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/24090/ -----------------------------------------------------------
(Updated Sept. 12, 2014, 9:42 a.m.) Review request for cloudstack, Brian Federle and Jessica Wang. Changes ------- Fixed the conflict. Repository: cloudstack-git Description ------- Externalized the hard-coded strings from JavaScript files to resource bundles. Updated the dictionary.jsp file accordingly. Also got the externalized strings translated in JA & SC. Diffs (updated) ----- client/WEB-INF/classes/resources/messages.properties 4655973 client/WEB-INF/classes/resources/messages_ja_JP.properties ed6a1b1 client/WEB-INF/classes/resources/messages_zh_CN.properties 2c497bc ui/dictionary.jsp 0102144 ui/dictionary2.jsp PRE-CREATION ui/index.jsp 48afa6a ui/modules/vnmcAsa1000v/vnmcAsa1000v.js 621c52a ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js c9295a3 ui/scripts/accounts.js cc4624a ui/scripts/autoscaler.js c8963fd ui/scripts/cloudStack.js 38cf501 ui/scripts/configuration.js a70c672 ui/scripts/domains.js 488382e ui/scripts/events.js 2731cb6 ui/scripts/instances.js 4d536e3 ui/scripts/lbStickyPolicy.js 16995f6 ui/scripts/network.js 02dd269 ui/scripts/projects.js 53b7964 ui/scripts/regions.js 368c1bf ui/scripts/sharedFunctions.js 41f5d3a ui/scripts/storage.js f4ab6e1 ui/scripts/system.js 54aafe2 ui/scripts/templates.js 6dcd6da ui/scripts/ui-custom/autoscaler.js 0aa6c77 ui/scripts/ui-custom/healthCheck.js 4e10f1c ui/scripts/ui-custom/physicalResources.js 110945e ui/scripts/ui-custom/regions.js 986e009 ui/scripts/ui-custom/zoneWizard.js f3a1aae ui/scripts/ui/dialog.js 6c77924 ui/scripts/ui/widgets/listView.js c7b4a4d ui/scripts/ui/widgets/multiEdit.js 47e5f43 ui/scripts/vpc.js 786cb26 ui/scripts/zoneWizard.js 4498534 Diff: https://reviews.apache.org/r/24090/diff/ Testing ------- Tested by replacing the modified javascript , dictionary.jsp and properties files. Thanks, Vetrivel Chinnasamy
