diff --git a/frontend/src/components/dir-view/dir-panel.js b/frontend/src/components/dir-view/dir-panel.js
index cbbdb52c03..29caaaaeac 100644
--- a/frontend/src/components/dir-view/dir-panel.js
+++ b/frontend/src/components/dir-view/dir-panel.js
@@ -142,7 +142,7 @@ class DirPanel extends React.Component {
           <CommonToolbar 
             repoID={this.props.repoID} 
             onSearchedClick={this.props.onSearchedClick} 
-            searchPlaceholder={'Search files in this library'}
+            searchPlaceholder={gettext('Search files in this library')}
           />
         </div>
         <div className="main-panel-center flex-row">
diff --git a/frontend/src/components/dirent-list-view/dirent-list-item.js b/frontend/src/components/dirent-list-view/dirent-list-item.js
index cd6ecb2941..976da6b0a8 100644
--- a/frontend/src/components/dirent-list-view/dirent-list-item.js
+++ b/frontend/src/components/dirent-list-view/dirent-list-item.js
@@ -217,14 +217,14 @@ class DirentListItem extends React.Component {
     }
 
     if (!newName) {
-      let errMessage = 'It is required.';
-      toaster.danger(gettext(errMessage));
+      let errMessage = gettext('Name is required.');
+      toaster.danger(errMessage);
       return false;
     }
 
     if (newName.indexOf('/') > -1) {
-      let errMessage = 'Name should not include ' + '\'/\'' + '.';
-      toaster.danger(gettext(errMessage));
+      let errMessage = gettext('Name should not include ' + '\'/\'' + '.');
+      toaster.danger(errMessage);
       return false;
     }
 
diff --git a/frontend/src/components/file-uploader/upload-progress-dialog.js b/frontend/src/components/file-uploader/upload-progress-dialog.js
index 1284942d46..3b9842e0ae 100644
--- a/frontend/src/components/file-uploader/upload-progress-dialog.js
+++ b/frontend/src/components/file-uploader/upload-progress-dialog.js
@@ -25,7 +25,7 @@ class UploadProgressDialog extends React.Component {
 
   render() {
     let uploadedMessage = gettext('File Upload');
-    let uploadingMessage = gettext('File is upload...') + this.props.totalProgress + '%';
+    let uploadingMessage = gettext('File Uploading...') + this.props.totalProgress + '%';
 
     let uploadingOptions = (<span className="sf2-icon-minus" onClick={this.onMinimizeUpload}></span>);
 
diff --git a/frontend/src/components/main-side-nav.js b/frontend/src/components/main-side-nav.js
index 0f51032d57..c3b3debcfa 100644
--- a/frontend/src/components/main-side-nav.js
+++ b/frontend/src/components/main-side-nav.js
@@ -129,7 +129,7 @@ class MainSideNav extends React.Component {
     return (
       <div className="side-nav">
         <div className="side-nav-con">
-          <h3 className="sf-heading">Files</h3>
+          <h3 className="sf-heading">{gettext('Files')}</h3>
           <ul className="nav nav-pills flex-column nav-container">
             <li className="nav-item">
               <Link to={ siteRoot + 'my-libs/' } className={`nav-link ellipsis ${this.getActiveClass('my-libs') || this.getActiveClass('deleted') }`} title={gettext('My Libraries')} onClick={() => this.tabItemClick('my-libs')}>
@@ -161,7 +161,7 @@ class MainSideNav extends React.Component {
             </li>
           </ul>
 
-          <h3 className="sf-heading">Tools</h3>
+          <h3 className="sf-heading">{gettext('Tools')}</h3>
           <ul className="nav nav-pills flex-column nav-container">
             <li className="nav-item">
               <Link className={`nav-link ellipsis ${this.getActiveClass('starred')}`} to={siteRoot + 'starred/'} title={gettext('Favorites')} onClick={() => this.tabItemClick('starred')}>
diff --git a/frontend/src/components/toolbar/common-toolbar.js b/frontend/src/components/toolbar/common-toolbar.js
index a683ce67dc..e884d7cfb2 100644
--- a/frontend/src/components/toolbar/common-toolbar.js
+++ b/frontend/src/components/toolbar/common-toolbar.js
@@ -13,13 +13,13 @@ const propTypes = {
 
 class  CommonToolbar extends React.Component {
   render() {
-    let searchPlaceholder = this.props.searchPlaceholder || 'Search Files'
+    let searchPlaceholder = this.props.searchPlaceholder || gettext('Search Files');
     return (
       <div className="common-toolbar">
         {isPro && (
           <Search 
             repoID={this.props.repoID}
-            placeholder={gettext(searchPlaceholder)}
+            placeholder={searchPlaceholder}
             onSearchedClick={this.props.onSearchedClick} 
           />
         )}
diff --git a/frontend/src/components/wiki-list-view/wiki-list-item.js b/frontend/src/components/wiki-list-view/wiki-list-item.js
index 0e89f8d035..d4a5ec63cc 100644
--- a/frontend/src/components/wiki-list-view/wiki-list-item.js
+++ b/frontend/src/components/wiki-list-view/wiki-list-item.js
@@ -88,13 +88,13 @@ class WikiListItem extends Component {
       return false;
     }
     if (!newName) {
-      let errMessage = 'Name is required.';
-      Toast.error(gettext(errMessage));
+      let errMessage = gettext('Name is required.');
+      Toast.error(errMessage);
       return false;
     }
     if (newName.indexOf('/') > -1) {
-      let errMessage = 'Name should not include ' + '\'/\'' + '.';
-      Toast.error(gettext(errMessage));
+      let errMessage = gettext('Name should not include ' + '\'/\'' + '.');
+      Toast.error(errMessage);
       return false;
     }
     this.renameWiki(newName);
diff --git a/frontend/src/pages/repo-wiki-mode/main-panel.js b/frontend/src/pages/repo-wiki-mode/main-panel.js
index 0050557155..f8d4cee394 100644
--- a/frontend/src/pages/repo-wiki-mode/main-panel.js
+++ b/frontend/src/pages/repo-wiki-mode/main-panel.js
@@ -206,7 +206,7 @@ class MainPanel extends Component {
             </div>
             <ViewModeToolbar currentMode={this.state.currentMode} switchViewMode={this.switchViewMode}/>
           </div>
-          <CommonToolbar repoID={repoID} onSearchedClick={this.props.onSearchedClick} searchPlaceholder={'Search files in this library'}/>
+          <CommonToolbar repoID={repoID} onSearchedClick={this.props.onSearchedClick} searchPlaceholder={gettext('Search files in this library')}/>
         </div>
         <div className="main-panel-center flex-row">
           <div className="cur-view-container">
diff --git a/frontend/src/pages/wiki/main-panel.js b/frontend/src/pages/wiki/main-panel.js
index 8c320382fb..a62425b36b 100644
--- a/frontend/src/pages/wiki/main-panel.js
+++ b/frontend/src/pages/wiki/main-panel.js
@@ -91,7 +91,7 @@ class MainPanel extends Component {
           <CommonToolbar 
             repoID={repoID}
             onSearchedClick={this.props.onSearchedClick} 
-            searchPlaceholder={'Search files in this library'}
+            searchPlaceholder={gettext('Search files in this library')}
           />
         </div>
         <div className="cur-view-container">