diff --git a/frontend/src/components/dialog/create-repo-dialog.js b/frontend/src/components/dialog/create-repo-dialog.js
index 7928fac024..3ebcdb6c9e 100644
--- a/frontend/src/components/dialog/create-repo-dialog.js
+++ b/frontend/src/components/dialog/create-repo-dialog.js
@@ -191,6 +191,19 @@ class CreateRepoDialog extends React.Component {
                 onChange={this.handleRepoNameChange}
               />
             </FormGroup>
+
+            {libraryTemplates.length > 0 && (
+              <FormGroup>
+                <Label for="library-template">{gettext('Template')}</Label>
+                <Select
+                  id="library-template"
+                  defaultValue={{value: libraryTemplates[0], label: libraryTemplates[0]}}
+                  options={libraryTemplates.map((item, index) => { return {value: item, label: item}; })}
+                  onChange={this.handlelibraryTemplatesInputChange}
+                /> 
+              </FormGroup>
+            )}
+
             {storages.length > 0 && (
               <FormGroup>
                 <Label for="storage-backend">{gettext('Storage Backend')}</Label>
@@ -203,18 +216,6 @@ class CreateRepoDialog extends React.Component {
               </FormGroup>
             )}
 
-            {libraryTemplates.length > 0 && (
-              <FormGroup>
-                <Label for="library-templates">{gettext('Library Templates')}</Label>
-                <Select
-                  id="library-templates"
-                  defaultValue={{value: libraryTemplates[0], label: libraryTemplates[0]}}
-                  options={libraryTemplates.map((item, index) => { return {value: item, label: item}; })}
-                  onChange={this.handlelibraryTemplatesInputChange}
-                /> 
-              </FormGroup>
-            )}
-
             {this.props.libraryType === 'group' && (
               <FormGroup>
                 <Label for="exampleSelect">{gettext('Permission')}</Label>
diff --git a/frontend/src/components/dialog/lib-old-files-auto-del-dialog.js b/frontend/src/components/dialog/lib-old-files-auto-del-dialog.js
index cb48eef6c4..7baddd4cec 100644
--- a/frontend/src/components/dialog/lib-old-files-auto-del-dialog.js
+++ b/frontend/src/components/dialog/lib-old-files-auto-del-dialog.js
@@ -52,10 +52,9 @@ class LibOldFilesAutoDelDialog extends React.Component {
 
     let repoID = this.props.repoID;
 
-    let message = gettext('Library old files auto delete days setted.');
     seafileAPI.setRepoOldFilesAutoDelDays(repoID, daysNeedTobeSet).then(res => {
-      toaster.success(message);
       this.props.toggleDialog();
+      toaster.success(gettext('Successfully set it.'));
     }).catch(error => {
       let errMessage = Utils.getErrorMsg(error);
       toaster.danger(errMessage);
diff --git a/frontend/src/components/file-uploader/file-uploader.js b/frontend/src/components/file-uploader/file-uploader.js
index b83bd3d89a..e99d758c0d 100644
--- a/frontend/src/components/file-uploader/file-uploader.js
+++ b/frontend/src/components/file-uploader/file-uploader.js
@@ -390,7 +390,7 @@ class FileUploader extends React.Component {
 
   getFileServerErrorMessage = (key) => {
     const errorMessage = {
-      'File locked by others.': gettext('File locked by others.'),          // 403
+      'File locked by others.': gettext('File is locked by others.'),       // 403
       'Invalid filename.': gettext('Invalid filename.'),                    // 440
       'File already exists.': gettext('File already exists.'),              // 441
       'File size is too large.': gettext('File size is too large.'),        // 442
diff --git a/seahub/api2/endpoints/admin/virus_scan_records.py b/seahub/api2/endpoints/admin/virus_scan_records.py
index 2e93313027..b8ef713fdc 100644
--- a/seahub/api2/endpoints/admin/virus_scan_records.py
+++ b/seahub/api2/endpoints/admin/virus_scan_records.py
@@ -197,7 +197,7 @@ class AdminVirusFilesBatchView(APIView):
             else:
                 result['failed'].append({
                     'virus_id': virus_id,
-                    'error_msg': _('Virus file not found.')
+                    'error_msg': _('Virus file is not found.')
                 })
                 continue