diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/public/locales/en.json b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/public/locales/en.json
index 35ec9afc05d..3bc7a828d77 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/public/locales/en.json
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/public/locales/en.json
@@ -9,22 +9,26 @@
   "Groups" : "Groups",
   "Tags" : "Tags",
   "Platform" : "Platform",
-  "Platforms" : "Platfomrs",
+  "Platforms" : "Platforms",
+  "Applications": "Applications",
   "No.Platform" : "No Platforms",
   "Screenshots" : "Screenshots",
   "Icon" : "Icon",
+  "Info" : "Info",
   "Banner" : "Banner",
   "Create.Application" : "Create Application",
   "Back" : "Back",
   "Cancel" : "Cancel",
   "Finish" : "Finish",
   "Continue" : "Continue",
+  "Name" : "Name",
   "Application.Name" : "Application Name",
   "General" : "General",
   "App.Releases" : "Application Releases",
   "Package.Manager" : "Package Manager",
   "Save" : "Save",
   "Create.Release" : "Create Release",
+  "Release.Channel" : "Release Channel",
   "Release" : "Release",
   "New.Release.For" : "New Release for",
   "Upload.Package.File" : "Upload Package File",
@@ -38,5 +42,20 @@
   "Alpha.Releases" : "Alpha Releases",
   "Version" : "Version",
   "Status" : "Status",
-  "App.Publisher" : "Application Publisher"
+  "App.Publisher" : "Application Publisher",
+  "Search.Apps" : "Search for Applications",
+  "View.In.Store" : "View in Store",
+  "Last.Updated" : "Last updated on",
+  "Installs" : "Installs",
+  "General.Info" : "General Info",
+  "Select.Platform": "Select Platform",
+  "Add.Release" : "Add Release to Application",
+  "Share.With.Tenants" : "Share with Tenants",
+  "Disable" : "Disable",
+  "File.Based" : "File Based",
+  "Activate" : "Activate",
+  "Yes" : "Yes",
+  "No" : "No",
+  "No.Platform.Tags" : "No Platform Tags",
+  "Create.Platform" : "Create Platform"
 }
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/AppPublisherBase/BaseLayout.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/AppPublisherBase/BaseLayout.jsx
index cdf1b82a938..464300be20f 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/AppPublisherBase/BaseLayout.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/AppPublisherBase/BaseLayout.jsx
@@ -42,7 +42,7 @@ class BaseLayout extends Component {
         this.onClickApplications = this.onClickApplications.bind(this);
         this.state = {
             notifications: 0,
-            user: 'Admin',
+            user: '',
             openModal: false,
             currentPage: "",
             logo: {}
@@ -94,7 +94,7 @@ class BaseLayout extends Component {
         if (href.indexOf("apps") !== -1) {
             return "Applications";
         } else if (href.indexOf("platforms") !== -1) {
-            return "Platforms"
+            return "Platforms";
         }
 
     }
@@ -162,11 +162,11 @@ class BaseLayout extends Component {
                                     {this.getCurrentPageTitle() === "Applications" ?
                                         <Button className="custom-flat grey" onClick={this.onClickPlatforms}>
                                             <i className="fw fw-settings"></i>
-                                            Platforms
+                                            <FormattedMessage id="Platforms" defaultMessage="Platforms"/>
                                         </Button> :
                                         <Button className="custom-flat grey" onClick={this.onClickApplications}>
                                             <i className="fw fw-application"></i>
-                                            Applications
+                                            <FormattedMessage id="Applications" defaultMessage="Applications"/>
                                         </Button>
                                     }
                                 </div>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx
index f830c880580..1a79b254a1b 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx
@@ -21,7 +21,6 @@ import {withRouter} from 'react-router-dom';
 import {Button, Col, Row} from 'reactstrap';
 import Drawer from '../UIComponents/Drawer/Drawer';
 import ApplicationView from './View/ApplicationView';
-import {FormattedMessage} from 'react-intl';
 import ApplicationMgtApi from "../../api/applicationMgtApi";
 import AuthHandler from "../../api/authHandler";
 
@@ -249,7 +248,8 @@ class ApplicationListing extends Component {
                                 className="data-table-row-cell">{application.currentLifecycle.lifecycleState.name}
                             </Col>
                             <Col>
-                                <Button className="custom-flat grey rounded" onClick={() => this.onAppEditClick(application.uuid)}>
+                                <Button className="custom-flat grey rounded"
+                                        onClick={() => this.onAppEditClick(application.uuid)}>
                                     <i className="fw fw-edit"></i>
                                 </Button>
                             </Col>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/ApplicationCreate.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/ApplicationCreate.jsx
index 57d7df1d96f..4d03280ff19 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/ApplicationCreate.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/ApplicationCreate.jsx
@@ -250,20 +250,29 @@ class ApplicationCreate extends Component {
                                         <Col>
                                             <div className="stepper-header-content">
                                                 <div className="step-index">1</div>
-                                                <div className="step-header"> General Info</div>
+                                                <div className="step-header">
+                                                    <FormattedMessage id="General.Info" defaultMessage="General.Info"/>
+                                                </div>
                                             </div>
                                         </Col>
                                         <Col>
                                             <span className="step-index">2</span>
-                                            <span className="step-header"> Select Platform</span>
+                                            <span className="step-header">
+                                                <FormattedMessage id="Select.Platform"
+                                                                  defaultMessage="Select.Platform"/>
+                                            </span>
                                         </Col>
                                         <Col>
                                             <span className="step-index">3</span>
-                                            <span className="step-header"> Screenshots</span>
+                                            <span className="step-header">
+                                                <FormattedMessage id="Screenshots" defaultMessage="Screenshots"/>
+                                            </span>
                                         </Col>
                                         <Col>
                                             <span className="step-index">4</span>
-                                            <span className="step-header"> Release</span>
+                                            <span className="step-header">
+                                                <FormattedMessage id="Release" defaultMessage="Release"/>
+                                            </span>
                                         </Col>
                                     </Row>
                                 </div>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step1.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step1.jsx
index ce5fc7f1e12..447c32780e2 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step1.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step1.jsx
@@ -345,8 +345,12 @@ class Step1 extends Component {
                     </div>
                 </div>
                 <ModalFooter>
-                    <Button className="custom-flat danger-flat" onClick={this.onCancelClick}>Cancel</Button>
-                    <Button className="custom-raised primary" onClick={this.setStepData}>Continue</Button>
+                    <Button className="custom-flat danger-flat" onClick={this.onCancelClick}>
+                        <FormattedMessage id="Cancel" defaultMessage="Cancel"/>
+                    </Button>
+                    <Button className="custom-raised primary" onClick={this.setStepData}>
+                        <FormattedMessage id="Continue" defaultMessage="Continue"/>
+                    </Button>
                 </ModalFooter>
             </div>
         );
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step2.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step2.jsx
index f25c0a17c81..f40ca3c6306 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step2.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step2.jsx
@@ -173,9 +173,15 @@ class Step2 extends Component {
                     <FormFeedback id="form-error">{this.state.errors.platform}</FormFeedback>
                 </FormGroup>
                 <ModalFooter>
-                    <Button className="custom-flat primary-flat" onClick={this.onBackClick}>Back</Button>
-                    <Button className="custom-flat danger-flat" onClick={this.onCancelClick}>Cancel</Button>
-                    <Button className="custom-raised primary" onClick={this.setStepData}>Continue</Button>
+                    <Button className="custom-flat primary-flat" onClick={this.onBackClick}>
+                        <FormattedMessage id="Back" defaultMessage="Back"/>
+                    </Button>
+                    <Button className="custom-flat danger-flat" onClick={this.onCancelClick}>
+                        <FormattedMessage id="Cancel" defaultMessage="Cancel"/>
+                    </Button>
+                    <Button className="custom-raised primary" onClick={this.setStepData}>
+                        <FormattedMessage id="Continue" defaultMessage="Continue"/>
+                    </Button>
                 </ModalFooter>
             </div>
         );
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step3.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step3.jsx
index 76cce9508b5..27c9b6fb1e9 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step3.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step3.jsx
@@ -225,9 +225,15 @@ class Step3 extends Component {
                     </div>
                 </div>
                 <ModalFooter>
-                    <Button className="custom-flat primary-flat" onClick={this.onBackClick}>Back</Button>
-                    <Button className="custom-flat danger-flat" onClick={this.onCancelClick}>Cancel</Button>
-                    <Button className="custom-raised primary" onClick={this.setStepData}>Continue</Button>
+                    <Button className="custom-flat primary-flat" onClick={this.onBackClick}>
+                        <FormattedMessage id="Back" defaultMessage="Back"/>
+                    </Button>
+                    <Button className="custom-flat danger-flat" onClick={this.onCancelClick}>
+                        <FormattedMessage id="Cancel" defaultMessage="Cancel"/>
+                    </Button>
+                    <Button className="custom-raised primary" onClick={this.setStepData}>
+                        <FormattedMessage id="Continue" defaultMessage="Continue"/>
+                    </Button>
                 </ModalFooter>
             </div>
         );
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step4.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step4.jsx
index 9672c989867..9cb1b3432cf 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step4.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step4.jsx
@@ -20,6 +20,7 @@ import PropTypes from 'prop-types';
 import React, {Component} from 'react';
 import {Button, Collapse, FormGroup, FormText, Input, Label, ModalFooter} from 'reactstrap';
 import Switch from '../../../UIComponents/Switch/Switch'
+import {FormattedMessage} from 'react-intl';
 
 /**
  * The Third step of application create wizard. {Application Release Step}
@@ -96,7 +97,7 @@ class Step4 extends Component {
                             <div id="app-release-switch-label">
                                 <Label for="app-release-switch">
                                     <strong>
-                                        Add Release to Application
+                                        <FormattedMessage id="Add.Release" defaultMessage="Add.Release"/>
                                     </strong>
                                 </Label>
                             </div>
@@ -111,7 +112,7 @@ class Step4 extends Component {
                     <br/>
                     <div>
                         <FormText color="muted">
-                            <i>Info: </i>
+                            <i><FormattedMessage id="Info" defaultMessage="Info"/> </i>
                             Enabling this will create a release for the current Application.
                             To upload the Application, please visit to the Release management section of
                             Application Edit View.
@@ -120,7 +121,9 @@ class Step4 extends Component {
                     {/*If toggle is true, the release form will be shown.*/}
                     <Collapse isOpen={this.state.showForm}>
                         <FormGroup>
-                            <Label for="release-channel">Release Channel</Label>
+                            <Label for="release-channel">
+                                <FormattedMessage id="Release.Channel" defaultMessage="Release.Channel"/>
+                            </Label>
                             <Input
                                 type="select"
                                 id="release-channel"
@@ -136,7 +139,9 @@ class Step4 extends Component {
                             </Input>
                         </FormGroup>
                         <FormGroup>
-                            <Label for="version">Version*</Label>
+                            <Label for="version">
+                                <FormattedMessage id="Version" defaultMessage="Version"/>*
+                            </Label>
                             <Input
                                 type="text"
                                 id="version input-custom"
@@ -147,9 +152,15 @@ class Step4 extends Component {
                     </Collapse>
                 </div>
                 <ModalFooter>
-                    <Button className="custom-flat primary-flat" onClick={this.onBackClick}>Back</Button>
-                    <Button className="custom-flat danger-flat" onClick={this.onCancelClick}>Cancel</Button>
-                    <Button className="custom-raised primary" onClick={this.onSubmit}>Finish</Button>
+                    <Button className="custom-flat primary-flat" onClick={this.onBackClick}>
+                        <FormattedMessage id="Back" defaultMessage="Back"/>
+                    </Button>
+                    <Button className="custom-flat danger-flat" onClick={this.onCancelClick}>
+                        <FormattedMessage id="Cancel" defaultMessage="Cancel"/>
+                    </Button>
+                    <Button className="custom-raised primary" onClick={this.onSubmit}>
+                        <FormattedMessage id="Finish" defaultMessage="Finish"/>
+                    </Button>
                 </ModalFooter>
             </div>
         );
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/PackageManager.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/PackageManager.jsx
index a08431332e8..6da80be3c98 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/PackageManager.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/PackageManager.jsx
@@ -16,7 +16,6 @@
  * under the License.
  */
 
-import PropTypes from 'prop-types';
 import React, {Component} from 'react';
 
 class PackageManager extends Component {
@@ -26,7 +25,7 @@ class PackageManager extends Component {
     }
 
     render() {
-        return(
+        return (
             <div id="package-mgt-content">
 
             </div>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/CreateRelease.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/CreateRelease.jsx
index 57fc5466093..b1d203f0ee6 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/CreateRelease.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/CreateRelease.jsx
@@ -92,7 +92,9 @@ class CreateRelease extends Component {
                                     </p>
                                 </div>
                                 <div>
-                                    <Button id="create-release-btn" onClick={this.showUploadArtifacts}>Create a {channel} Release</Button>
+                                    <Button id="create-release-btn" onClick={this.showUploadArtifacts}>Create
+                                                                                                       a {channel}
+                                                                                                       Release</Button>
                                 </div>
                             </div>
                         </Row>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/UploadPackage.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/UploadPackage.jsx
index e41bf5a634f..8ffe7bdfdbb 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/UploadPackage.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/UploadPackage.jsx
@@ -41,7 +41,8 @@ class UploadPackage extends Component {
                         <a onClick={this.handleBack}>{"<-"}</a>
                         <span id="create-release-header">
                             <strong>
-                                <FormattedMessage id="New.Release.For" defaultMessage="New Release For"/> {selectedChannel}
+                                <FormattedMessage id="New.Release.For"
+                                                  defaultMessage="New Release For"/> {selectedChannel}
                             </strong>
                         </span>
                     </div>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/View/ApplicationView.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/View/ApplicationView.jsx
index d93a90ee2cc..a2817d4cd32 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/View/ApplicationView.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/View/ApplicationView.jsx
@@ -70,7 +70,9 @@ class ApplicationView extends Component {
                                     <p className="app-view-field">{app.name}</p>
                                 </Row>
                                 <Row>
-                                    <span className="app-updated-date app-view-text">Last updated on {app.modifiedAt}</span>
+                                    <span className="app-updated-date app-view-text">
+                                        <FormattedMessage id="Last.Updated"
+                                                          defaultMessage="Last.Updated"/> {app.modifiedAt}</span>
                                 </Row>
                             </Col>
                         </Row>
@@ -78,7 +80,9 @@ class ApplicationView extends Component {
                     <div id="application-view-row">
                         <Row>
                             <Col>
-                                <span className="app-install-count app-view-text">2k Installs</span>
+                                <span className="app-install-count app-view-text">
+                                    2k <FormattedMessage id="Installs" defaultMessage="Installs"/>
+                                </span>
                             </Col>
                         </Row>
                         <Row>
@@ -89,7 +93,11 @@ class ApplicationView extends Component {
                                 <i className="fw fw-star"></i>
                             </Col>
                             <Col>
-                                <p className="app-view-text"><a href="#">View in Store</a></p>
+                                <p className="app-view-text">
+                                    <a href="#">
+                                        <FormattedMessage id="View.In.Store" defaultMessage="View.In.Store"/>
+                                    </a>
+                                </p>
                             </Col>
                         </Row>
                     </div>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Platform.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Platform.jsx
index fc1ada106fc..44479434ae5 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Platform.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Platform.jsx
@@ -18,6 +18,7 @@
 
 import React, {Component} from 'react';
 import {Button, Col, Collapse, Row} from "reactstrap";
+import {FormattedMessage} from "react-intl";
 
 /**
  * Platform component.
@@ -57,8 +58,13 @@ class Platform extends Component {
                 </Row>
                 <Row>
                     <div className="platform-content-footer">
-                        <Button className="custom-flat grey">{platform.enabled ? "Disable" : "Activate"}</Button>
-                        <Button className="custom-flat grey">Share With Tenants</Button>
+                        <Button className="custom-flat grey">{platform.enabled ?
+                            <FormattedMessage id="Disable" defaultMessage="Disable"/> :
+                            <FormattedMessage id="Activate" defaultMessage="Activate"/>}
+                        </Button>
+                        <Button className="custom-flat grey">
+                            <FormattedMessage id="Share.With.Tenants" defaultMessage="Share.With.Tenants"/>
+                        </Button>
                         <Button className="custom-flat grey circle-button" onClick={this.unFold}>
                             {this.state.isOpen ? <i className="fw fw-up"></i> : <i className="fw fw-down"></i>}
                         </Button>
@@ -71,23 +77,36 @@ class Platform extends Component {
                                 <div className="platform-content-more">
                                     <Row>
                                         <Col>
-                                            <p className="app-view-field">Description</p>
+                                            <p className="app-view-field">
+                                                <FormattedMessage id="Description" defaultMessage="Description"/>
+                                            </p>
                                         </Col>
                                         <Col><p className="app-view-text">{platform.description}</p></Col>
                                     </Row>
                                     <Row>
                                         <Col>
-                                            <p className="app-view-field">File Based</p>
+                                            <p className="app-view-field">
+                                                <FormattedMessage id="File.Based" defaultMessage="File.Based"/>
+                                            </p>
                                         </Col>
                                         <Col>
-                                            <p className="app-view-text">{platform.fileBased ? "Yes" : "No"}</p>
+                                            <p className="app-view-text">{platform.fileBased ?
+                                                <FormattedMessage id="Yes" defaultMessage="Yes"/>
+                                                : <FormattedMessage id="No" defaultMessage="No"/>}</p>
                                         </Col>
                                     </Row>
                                     <Row>
-                                        <Col><p className="app-view-field">Tags</p></Col>
+                                        <Col><p className="app-view-field">
+                                            <FormattedMessage id="Tags" defaultMessage="Tags"/>
+                                        </p></Col>
                                         <Col>
                                             <p className="app-view-text">
-                                                {platform.tags.length > 0 ? platform.tags : "No Platform Tags"}
+                                                {platform.tags.length > 0 ?
+                                                    platform.tags :
+                                                    <FormattedMessage
+                                                        id="No.Platform.Tags"
+                                                        defaultMessage="No.Platform.Tags"/>
+                                                }
                                             </p>
                                         </Col>
                                     </Row>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformCreate.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformCreate.jsx
index 28460613f39..984cb05d66c 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformCreate.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformCreate.jsx
@@ -16,7 +16,8 @@
  * under the License.
  */
 import React, {Component} from 'react';
-import {Button, FormGroup, Label, Modal, ModalBody, ModalFooter, ModalHeader, Input} from "reactstrap";
+import {Button, FormGroup, Input, Label, Modal, ModalBody, ModalFooter, ModalHeader} from "reactstrap";
+import {FormattedMessage} from "react-intl";
 
 /**
  * Platform view component.
@@ -48,20 +49,30 @@ class PlatformCreate extends Component {
         return (
             <div>
                 <Modal isOpen={this.state.open} toggle={this.toggle} id="platform-create-modal" backdrop={'static'}>
-                    <ModalHeader>Create Platform</ModalHeader>
+                    <ModalHeader>
+                        <FormattedMessage id="Create.Platform" defaultMessage="Create.Platform"/>
+                    </ModalHeader>
                     <ModalBody>
                         <FormGroup>
-                            <Label for="platform-name">Name*</Label>
+                            <Label for="platform-name">
+                                <FormattedMessage id="Name" defaultMessage="Name"/>*
+                            </Label>
                             <Input required type="text" name="appName" id="platform-name"/>
                         </FormGroup>
                         <FormGroup>
-                            <Label for="platform-description">Description*</Label>
+                            <Label for="platform-description">
+                                <FormattedMessage id="Description" defaultMessage="Description"/>*
+                            </Label>
                             <Input required type="textarea" name="appName" id="platform-description"/>
                         </FormGroup>
                     </ModalBody>
                     <ModalFooter>
-                        <Button className="custom-flat danger-flat" onClick={this.onCancelClick}>Cancel</Button>
-                        <Button className="custom-raised primary">Create</Button>
+                        <Button className="custom-flat danger-flat" onClick={this.onCancelClick}>
+                            <FormattedMessage id="Cancel" defaultMessage="Cancel"/>
+                        </Button>
+                        <Button className="custom-raised primary">
+                            <FormattedMessage id="Create" defaultMessage="Create"/>
+                        </Button>
                     </ModalFooter>
                 </Modal>
             </div>