diff --git a/build-tools/src/main/resources/zanata-build-tools/versions-rules.xml b/build-tools/src/main/resources/zanata-build-tools/versions-rules.xml
new file mode 100644
index 0000000000..c4e47caf9e
--- /dev/null
+++ b/build-tools/src/main/resources/zanata-build-tools/versions-rules.xml
@@ -0,0 +1,8 @@
+<ruleset comparisonMethod="maven"
+         xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 http://mojo.codehaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+  <!-- Thanks to Michael Piefel and Philip Helger: https://stackoverflow.com/a/22174801/14379 -->
+  <ignoreVersions>
+    <ignoreVersion type="regex">.*[-_\.](alpha|Alpha|ALPHA|b|beta|Beta|BETA|cr|CR|rc|RC|M|EA)[-_\.]?[0-9]*</ignoreVersion>
+  </ignoreVersions>
+</ruleset>
diff --git a/parent/pom.xml b/parent/pom.xml
index b2583cd3ed..a2eec5884d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -596,7 +596,17 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>versions-maven-plugin</artifactId>
-        <version>2.2</version>
+        <version>2.5</version>
+        <configuration>
+          <rulesUri>classpath:///zanata-build-tools/versions-rules.xml</rulesUri>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.zanata</groupId>
+            <artifactId>build-tools</artifactId>
+            <version>${project.version}</version>
+          </dependency>
+        </dependencies>
       </plugin>
 
       <plugin>
@@ -843,6 +853,19 @@
             </executions>
           </plugin>
 
+          <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>nexus-staging-maven-plugin</artifactId>
+            <version>1.1</version>
+            <extensions>true</extensions>
+            <configuration>
+              <!-- The Base URL of Nexus instance where we want to stage -->
+              <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+              <!-- The server "id" element from settings to use authentication from -->
+              <serverId>sonatype-staging</serverId>
+            </configuration>
+          </plugin>
+
           <!-- Deploy javadocs to OSSRH -->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
diff --git a/server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/TransReviewCriteria.java b/server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/TransReviewCriteria.java
index 124fafae31..d2953c8ee0 100644
--- a/server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/TransReviewCriteria.java
+++ b/server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/TransReviewCriteria.java
@@ -35,17 +35,17 @@ public class TransReviewCriteria implements IsSerializable, Serializable {
     private Long id;
     private IssuePriority priority;
     private String description;
-    private boolean editable;
+    private boolean commentRequired;
 
     public TransReviewCriteria() {
     }
 
     public TransReviewCriteria(Long id, IssuePriority priority, String description,
-            boolean editable) {
+            boolean commentRequired) {
         this.id = id;
         this.priority = priority;
         this.description = description;
-        this.editable = editable;
+        this.commentRequired = commentRequired;
     }
 
 
@@ -57,8 +57,8 @@ public String getDescription() {
         return description;
     }
 
-    public boolean isEditable() {
-        return editable;
+    public boolean isCommentRequired() {
+        return commentRequired;
     }
 
     public Long getId() {
diff --git a/server/services/src/main/java/org/zanata/rest/review/ReviewService.java b/server/services/src/main/java/org/zanata/rest/review/ReviewService.java
index 61a94e52d9..3e0156c401 100644
--- a/server/services/src/main/java/org/zanata/rest/review/ReviewService.java
+++ b/server/services/src/main/java/org/zanata/rest/review/ReviewService.java
@@ -80,7 +80,7 @@ protected ReviewService(ReviewCriteriaDAO reviewCriteriaDAO, UriInfo uriInfo, Ur
 
     public static TransReviewCriteria fromModel(ReviewCriteria criteria) {
         return new TransReviewCriteria(criteria.getId(), criteria.getPriority(),
-                criteria.getDescription(), criteria.isEditable());
+                criteria.getDescription(), criteria.isCommentRequired());
     }
 
     @POST
@@ -94,7 +94,7 @@ public Response addCriteria(TransReviewCriteria criteria) {
         }
         ReviewCriteria reviewCriteria =
                 new ReviewCriteria(criteria.getPriority(),
-                        criteria.isEditable(), criteria.getDescription());
+                        criteria.isCommentRequired(), criteria.getDescription());
         reviewCriteriaDAO.makePersistent(reviewCriteria);
         return Response.created(UriBuilder.fromUri(urlUtil.restPath(
                 uriInfo.getPath())).path(reviewCriteria.getId().toString()).build())
@@ -117,7 +117,7 @@ public Response editCriteria(@PathParam("id") Long id, TransReviewCriteria crite
             return Response.status(Response.Status.NOT_FOUND).build();
         }
         reviewCriteria.setDescription(criteria.getDescription());
-        reviewCriteria.setEditable(criteria.isEditable());
+        reviewCriteria.setCommentRequired(criteria.isCommentRequired());
         reviewCriteria.setPriority(criteria.getPriority());
         return Response.ok(fromModel(reviewCriteria)).build();
     }
diff --git a/server/services/src/main/resources/db/changelogs/db.changelog-4.5.xml b/server/services/src/main/resources/db/changelogs/db.changelog-4.5.xml
new file mode 100644
index 0000000000..b9c6910150
--- /dev/null
+++ b/server/services/src/main/resources/db/changelogs/db.changelog-4.5.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<databaseChangeLog
+  xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd">
+
+  <changeSet id="1" author="efloden@redhat.com">
+    <comment>Rename editable to commentRequired</comment>
+    <renameColumn tableName="ReviewCriteria" oldColumnName="editable"
+        newColumnName="commentRequired" columnDataType="boolean" />
+  </changeSet>
+  <changeSet id="2" author="efloden@redhat.com">
+    <comment>Make commentRequired non-null</comment>
+    <sql>
+      update ReviewCriteria set commentRequired = false where commentRequired is null;
+    </sql>
+  </changeSet>
+  <changeSet id="3" author="efloden@redhat.com">
+    <comment>Make commentRequired non-nullable</comment>
+    <addNotNullConstraint tableName="ReviewCriteria"
+        columnName="commentRequired" columnDataType="boolean" />
+  </changeSet>
+
+</databaseChangeLog>
diff --git a/server/services/src/main/resources/db/db.changelog.xml b/server/services/src/main/resources/db/db.changelog.xml
index d0964b384f..ea81060191 100644
--- a/server/services/src/main/resources/db/db.changelog.xml
+++ b/server/services/src/main/resources/db/db.changelog.xml
@@ -51,6 +51,8 @@
     file="changelogs/db.changelog-4.3.xml" />
   <include relativeToChangelogFile="true"
       file="changelogs/db.changelog-4.4.xml" />
+  <include relativeToChangelogFile="true"
+      file="changelogs/db.changelog-4.5.xml" />
 
   <!-- NB: triggers and validations must appear after all table changes -->
   <!-- If the Liquibase version is being updated, please refer to the
diff --git a/server/zanata-frontend/pom.xml b/server/zanata-frontend/pom.xml
index 833dff6616..ad014c5dc8 100644
--- a/server/zanata-frontend/pom.xml
+++ b/server/zanata-frontend/pom.xml
@@ -133,6 +133,7 @@
               <resources>
                 <resource>
                   <directory>src/dist</directory>
+                  <include>messages/*.json</include>
                   <include>editor.*.cache.js</include>
                   <include>editor.*.cache.css</include>
                   <include>editor.*.cache.css.map</include>
diff --git a/server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap b/server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
index 5a885212fe..c1cf7190cf 100644
--- a/server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
+++ b/server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
@@ -27,7 +27,7 @@ exports[`Editor Storyshots ActivityFeedItem approved 1`] = `
     >
       <img
         className="u-round ActivityAvatar"
-        src="http://www.gravatar.com/avatar/a961139da8db88c4ae10d6dacf6bea1e?s=72"
+        src="https://www.gravatar.com/avatar/a961139da8db88c4ae10d6dacf6bea1e?s=72"
       />
     </a>
     <span>
@@ -136,7 +136,7 @@ exports[`Editor Storyshots ActivityFeedItem comment 1`] = `
     >
       <img
         className="u-round ActivityAvatar"
-        src="http://www.gravatar.com/avatar/a961139da8db88c4ae10d6dacf6bea1e?s=72"
+        src="https://www.gravatar.com/avatar/a961139da8db88c4ae10d6dacf6bea1e?s=72"
       />
     </a>
     <span>
@@ -238,7 +238,7 @@ exports[`Editor Storyshots ActivityFeedItem fuzzy 1`] = `
     >
       <img
         className="u-round ActivityAvatar"
-        src="http://www.gravatar.com/avatar/a961139da8db88c4ae10d6dacf6bea1e?s=72"
+        src="https://www.gravatar.com/avatar/a961139da8db88c4ae10d6dacf6bea1e?s=72"
       />
     </a>
     <span>
@@ -347,7 +347,7 @@ exports[`Editor Storyshots ActivityFeedItem rejected - critical priority 1`] = `
     >
       <img
         className="u-round ActivityAvatar"
-        src="http://www.gravatar.com/avatar/a961139da8db88c4ae10d6dacf6bea1e?s=72"
+        src="https://www.gravatar.com/avatar/a961139da8db88c4ae10d6dacf6bea1e?s=72"
       />
     </a>
     <span>
@@ -516,7 +516,7 @@ exports[`Editor Storyshots ActivityFeedItem rejected - major priority 1`] = `
     >
       <img
         className="u-round ActivityAvatar"
-        src="http://www.gravatar.com/avatar/a961139da8db88c4ae10d6dacf6bea1e?s=72"
+        src="https://www.gravatar.com/avatar/a961139da8db88c4ae10d6dacf6bea1e?s=72"
       />
     </a>
     <span>
@@ -685,7 +685,7 @@ exports[`Editor Storyshots ActivityFeedItem rejected - minor priority 1`] = `
     >
       <img
         className="u-round ActivityAvatar"
-        src="http://www.gravatar.com/avatar/a961139da8db88c4ae10d6dacf6bea1e?s=72"
+        src="https://www.gravatar.com/avatar/a961139da8db88c4ae10d6dacf6bea1e?s=72"
       />
     </a>
     <span>
@@ -854,7 +854,7 @@ exports[`Editor Storyshots ActivityFeedItem translated 1`] = `
     >
       <img
         className="u-round ActivityAvatar"
-        src="http://www.gravatar.com/avatar/a961139da8db88c4ae10d6dacf6bea1e?s=72"
+        src="https://www.gravatar.com/avatar/a961139da8db88c4ae10d6dacf6bea1e?s=72"
       />
     </a>
     <span>
diff --git a/server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap b/server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
index 005a478c2c..a633cb01cc 100644
--- a/server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
+++ b/server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
@@ -19902,7 +19902,7 @@ exports[`Frontend Storyshots RejectionsForm admin screen 1`] = `
 </div>
 `;
 
-exports[`Frontend Storyshots RejectionsForm editable 1`] = `
+exports[`Frontend Storyshots RejectionsForm commentRequired 1`] = `
 <form
   className="rejectionsForm form-inline"
 >
diff --git a/server/zanata-frontend/src/app/actions/review-actions.js b/server/zanata-frontend/src/app/actions/review-actions.js
index 7b58788c3b..90f7ad0394 100644
--- a/server/zanata-frontend/src/app/actions/review-actions.js
+++ b/server/zanata-frontend/src/app/actions/review-actions.js
@@ -33,7 +33,7 @@ export function addNewCriterion (criterion) {
     ADD_CRITERION_FAILURE]
   const body = {
     ...criterion,
-    editable: criterion.isEditable
+    commentRequired: criterion.isCommentRequired
   }
   return {
     [CALL_API]: buildAPIRequest(endpoint, 'POST', getJsonHeaders(), apiTypes,
@@ -63,7 +63,7 @@ export function editCriterion (criterion) {
   const endpoint = `${apiUrl}/review/criteria/${criterion.id}`
   const body = {
     ...criterion,
-    editable: criterion.isEditable
+    commentRequired: criterion.isCommentRequired
   }
   return {
     [CALL_API]: buildAPIRequest(endpoint, 'PUT', getJsonHeaders(), types,
diff --git a/server/zanata-frontend/src/app/components/RejectionsForm/index.js b/server/zanata-frontend/src/app/components/RejectionsForm/index.js
index 217bc1ff7f..35957edbf2 100644
--- a/server/zanata-frontend/src/app/components/RejectionsForm/index.js
+++ b/server/zanata-frontend/src/app/components/RejectionsForm/index.js
@@ -46,7 +46,7 @@ class RejectionsForm extends Component {
     description: PropTypes.string.isRequired,
     onSave: PropTypes.func.isRequired,
     onDelete: PropTypes.func,
-    editable: PropTypes.bool,
+    commentRequired: PropTypes.bool,
     // if it's in admin mode, we will allow user to update
     isAdminMode: PropTypes.bool.isRequired,
     // whether delete button shoud be displayed
@@ -57,7 +57,7 @@ class RejectionsForm extends Component {
 
   static defaultProps = {
     criterionId: 'review-criteria',
-    editable: false,
+    commentRequired: false,
     description: '',
     isAdminMode: false,
     displayDelete: true,
@@ -69,7 +69,7 @@ class RejectionsForm extends Component {
     super(props)
     this.state = {
       description: this.props.description,
-      isEditable: this.props.editable,
+      isCommentRequired: this.props.commentRequired,
       priority: this.props.priority
     }
   }
@@ -77,7 +77,7 @@ class RejectionsForm extends Component {
   onEditableChange = e => {
     const checked = e.target.checked
     this.setState(_prevState => ({
-      isEditable: checked
+      isCommentRequired: checked
     }))
   }
   onTextChange = e => {
@@ -95,7 +95,7 @@ class RejectionsForm extends Component {
     this.props.onSave({
       ...this.state,
       id: this.props.entityId,
-      editable: this.state.isEditable
+      commentRequired: this.state.isCommentRequired
     })
   }
   onDelete = () => {
@@ -103,7 +103,7 @@ class RejectionsForm extends Component {
   }
   render () {
     const {
-      editable,
+      commentRequired,
       className,
       isAdminMode,
       displayDelete,
@@ -113,7 +113,7 @@ class RejectionsForm extends Component {
     const textState = priorityToTextState(this.state.priority)
     const error = isEmpty(this.state.description)
     const title = <span className={textState}>{this.state.priority}</span>
-    const priorityDisabled = !isAdminMode && !editable
+    const priorityDisabled = !isAdminMode && !commentRequired
     const deleteBtn = displayDelete
       ? (
       <OverlayTrigger placement='top' overlay={tooltipDelete}>
@@ -126,7 +126,7 @@ class RejectionsForm extends Component {
       <FormGroup id='toggleComment' controlId='formInlineEditable'>
         <ControlLabel>Comment required</ControlLabel><br />
         <Toggle icons={false} onChange={this.onEditableChange}
-          checked={this.state.isEditable} />
+          checked={this.state.isCommentRequired} />
       </FormGroup>
       )
       : DO_NOT_RENDER
@@ -146,7 +146,7 @@ class RejectionsForm extends Component {
       <Form className='rejectionsForm' inline>
         <FormGroup className='u-flexGrow1' controlId='formInlineCriteria'>
           <ControlLabel>Criteria</ControlLabel><br />
-          <TextInput multiline editable={isAdminMode || editable}
+          <TextInput multiline editable={isAdminMode || commentRequired}
             type='text' numberOfLines={2} onChange={this.onTextChange}
             placeholder={criteriaPlaceholder} maxLength={255}
             value={this.state.description} />
@@ -163,7 +163,7 @@ class RejectionsForm extends Component {
             disabled={priorityDisabled}
           />
         </FormGroup>
-        {editableToggle}
+        {commentToggle}
         {formBtn}
       </Form>
     )
diff --git a/server/zanata-frontend/src/app/config.js b/server/zanata-frontend/src/app/config.js
index 2d734e454d..028ff5a369 100644
--- a/server/zanata-frontend/src/app/config.js
+++ b/server/zanata-frontend/src/app/config.js
@@ -8,6 +8,12 @@ const rawConfig = window.config
 const config = mapValues(rawConfig || {}, (value) =>
   isJsonString(value) ? JSON.parse(value) : value)
 
+export const DEFAULT_LOCALE = {
+  localeId: 'en-US',
+  name: 'English',
+  isRTL: false
+}
+
 // URL this app is deployed to
 export const appUrl = config.appUrl || ''
 
@@ -27,3 +33,4 @@ export const isAdmin = config.permission
   : false
 export const user = config.user
 export const allowRegister = config.allowRegister || false
+export const appLocale = config.appLocale || DEFAULT_LOCALE['localeId']
diff --git a/server/zanata-frontend/src/app/containers/Admin/Review.js b/server/zanata-frontend/src/app/containers/Admin/Review.js
index 76b48ae6d9..0e5aa6816c 100644
--- a/server/zanata-frontend/src/app/containers/Admin/Review.js
+++ b/server/zanata-frontend/src/app/containers/Admin/Review.js
@@ -18,7 +18,7 @@ const DO_NOT_RENDER = undefined
 class AdminReview extends Component {
   static propTypes = {
     criteria: PropType.arrayOf(PropType.shape({
-      editable: PropType.bool.isRequired,
+      commentRequired: PropType.bool.isRequired,
       description: PropType.string.isRequired,
       priority: PropType.oneOf([MINOR, MAJOR, CRITICAL]).isRequired
     })).isRequired,
@@ -48,7 +48,7 @@ class AdminReview extends Component {
   render () {
     const {criteria, deleteEntry, editEntry, notification} = this.props
     const criteriaList = criteria.map((c, i) => <RejectionsForm key={i}
-      editable={c.editable} entityId={c.id} onDelete={deleteEntry}
+      commentRequired={c.commentRequired} entityId={c.id} onDelete={deleteEntry}
       criteriaPlaceholder={c.description} isAdminMode displayDelete
       onSave={editEntry} description={c.description}
       priority={c.priority} />)
diff --git a/server/zanata-frontend/src/app/editor/actions/header-action-types.js b/server/zanata-frontend/src/app/editor/actions/header-action-types.js
index cb45a1481c..bf36320d1d 100644
--- a/server/zanata-frontend/src/app/editor/actions/header-action-types.js
+++ b/server/zanata-frontend/src/app/editor/actions/header-action-types.js
@@ -4,8 +4,12 @@ export const TOGGLE_INFO_PANEL = 'TOGGLE_INFO_PANEL'
 export const TOGGLE_HEADER = 'TOGGLE_HEADER'
 export const TOGGLE_KEY_SHORTCUTS = 'TOGGLE_KEY_SHORTCUTS'
 export const UI_LOCALES_FETCHED = 'UI_LOCALES_FETCHED'
+export const APP_LOCALE_FETCHED = 'APP_LOCALE_FETCHED'
 export const CHANGE_UI_LOCALE = 'CHANGE_UI_LOCALE'
 export const DOCUMENT_SELECTED = 'DOCUMENT_SELECTED'
 export const LOCALE_SELECTED = 'LOCALE_SELECTED'
 export const STATS_FETCHED = 'STATS_FETCHED'
 export const HEADER_DATA_FETCHED = 'HEADER_DATA_FETCHED'
+export const LOCALE_MESSAGES_REQUEST = 'LOCALE_MESSAGES_REQUEST'
+export const LOCALE_MESSAGES_SUCCESS = 'LOCALE_MESSAGES_SUCCESS'
+export const LOCALE_MESSAGES_FAILURE = 'LOCALE_MESSAGES_FAILURE'
diff --git a/server/zanata-frontend/src/app/editor/actions/header-actions.js b/server/zanata-frontend/src/app/editor/actions/header-actions.js
index 506baf348f..2f5ce77c38 100644
--- a/server/zanata-frontend/src/app/editor/actions/header-actions.js
+++ b/server/zanata-frontend/src/app/editor/actions/header-actions.js
@@ -2,6 +2,7 @@
 import {
   fetchStatistics,
   fetchLocales,
+  fetchI18nLocale,
   fetchMyInfo,
   fetchProjectInfo,
   fetchDocuments,
@@ -14,6 +15,7 @@ import {
   TOGGLE_HEADER,
   TOGGLE_KEY_SHORTCUTS,
   UI_LOCALES_FETCHED,
+  APP_LOCALE_FETCHED,
   CHANGE_UI_LOCALE,
   DOCUMENT_SELECTED,
   LOCALE_SELECTED,
@@ -39,6 +41,7 @@ const unwrapResponse = (_dispatch, _errorMsg, response) => {
 }
 
 export const uiLocaleFetched = createAction(UI_LOCALES_FETCHED)
+export const appLocaleFetched = createAction(APP_LOCALE_FETCHED)
 
 export function fetchUiLocales () {
   return (dispatch) => {
@@ -53,6 +56,13 @@ export function fetchUiLocales () {
   }
 }
 
+// fetches react-intl translation json files for app i18n
+export function fetchAppLocale (locale) {
+  return (dispatch) => {
+    dispatch(fetchI18nLocale(locale))
+  }
+}
+
 export const changeUiLocale = createAction(CHANGE_UI_LOCALE)
 
 const decodeDocId = (docId) => {
diff --git a/server/zanata-frontend/src/app/editor/api/index.js b/server/zanata-frontend/src/app/editor/api/index.js
index d2d6bc9541..23750e4b19 100644
--- a/server/zanata-frontend/src/app/editor/api/index.js
+++ b/server/zanata-frontend/src/app/editor/api/index.js
@@ -14,7 +14,15 @@ import {
   STATUS_APPROVED,
   STATUS_REJECTED
 } from '../utils/status-util'
-import { apiUrl, serverUrl } from '../../config'
+import {
+  LOCALE_MESSAGES_REQUEST,
+  LOCALE_MESSAGES_SUCCESS,
+  LOCALE_MESSAGES_FAILURE
+} from '../actions/header-action-types'
+import { buildAPIRequest, getJsonHeaders } from '../../actions/common-actions'
+import { CALL_API } from 'redux-api-middleware'
+import { includes } from 'lodash'
+import { apiUrl, serverUrl, appUrl } from '../../config'
 import stableStringify from 'faster-stable-stringify'
 
 export const dashboardUrl = serverUrl + '/dashboard'
@@ -52,6 +60,27 @@ export function fetchLocales () {
   })
 }
 
+export function fetchI18nLocale (locale) {
+  const endpoint = `${appUrl}/messages/${locale}.json`
+  const apiTypes = [
+    LOCALE_MESSAGES_REQUEST,
+    {
+      type: LOCALE_MESSAGES_SUCCESS,
+      payload: (_action, _state, res) => {
+        const contentType = res.headers.get('Content-Type')
+        if (contentType && includes(contentType, 'json')) {
+          return res.json().then((json) => {
+            return json
+          })
+        }
+      }
+    },
+    LOCALE_MESSAGES_FAILURE]
+  return {
+    [CALL_API]: buildAPIRequest(endpoint, 'GET', getJsonHeaders(), apiTypes)
+  }
+}
+
 export function fetchMyInfo () {
   const userUrl = `${apiUrl}/user`
   return fetch(userUrl, {
diff --git a/server/zanata-frontend/src/app/editor/components/ActivityFeedItem/ActivityFeedItem.story.js b/server/zanata-frontend/src/app/editor/components/ActivityFeedItem/ActivityFeedItem.story.js
index 5f61367934..856e645638 100644
--- a/server/zanata-frontend/src/app/editor/components/ActivityFeedItem/ActivityFeedItem.story.js
+++ b/server/zanata-frontend/src/app/editor/components/ActivityFeedItem/ActivityFeedItem.story.js
@@ -33,7 +33,7 @@ const user = {
   username: 'damason',
   name: 'David Mason',
   imageUrl:
-      'http://www.gravatar.com/avatar/a961139da8db88c4ae10d6dacf6bea1e?s=72'
+      'https://www.gravatar.com/avatar/a961139da8db88c4ae10d6dacf6bea1e?s=72'
 }
 
 storiesOf('ActivityFeedItem', module)
diff --git a/server/zanata-frontend/src/app/editor/components/DashboardLink/DashboardLink.test.js b/server/zanata-frontend/src/app/editor/components/DashboardLink/DashboardLink.test.js
index 068d7251a4..1fcc37b657 100644
--- a/server/zanata-frontend/src/app/editor/components/DashboardLink/DashboardLink.test.js
+++ b/server/zanata-frontend/src/app/editor/components/DashboardLink/DashboardLink.test.js
@@ -6,7 +6,7 @@ import DashboardLink from '.'
 describe('DashboardLinkTest', () => {
   it('DashboardLink markup', () => {
     const profilePicSrc =
-      'http://www.emoji-cheat-sheet.com/graphics/emojis/smiling_imp.png'
+      'https://www.webpagefx.com/tools/emoji-cheat-sheet/graphics/emojis/smiling_imp.png'
 
     const actual = ReactDOMServer.renderToStaticMarkup(
       <DashboardLink name="Hades"
diff --git a/server/zanata-frontend/src/app/editor/components/DashboardLink/index.js b/server/zanata-frontend/src/app/editor/components/DashboardLink/index.js
index 33198f1990..ce96b61e3f 100644
--- a/server/zanata-frontend/src/app/editor/components/DashboardLink/index.js
+++ b/server/zanata-frontend/src/app/editor/components/DashboardLink/index.js
@@ -13,7 +13,9 @@ class DashboardLink extends React.Component {
 
   static defaultProps = {
     // default "mystery man" icon
-    gravatarUrl: 'http://www.gravatar.com/avatar/?d=mm'
+    gravatarUrl:
+        'https://www.gravatar.com/avatar/00000000000000000000000000000000?d=' +
+        'mm&f=y'
   }
 
   render () {
diff --git a/server/zanata-frontend/src/app/editor/components/TransUnit/index.js b/server/zanata-frontend/src/app/editor/components/TransUnit/index.js
index 97c3bf4ef3..44089b5dba 100644
--- a/server/zanata-frontend/src/app/editor/components/TransUnit/index.js
+++ b/server/zanata-frontend/src/app/editor/components/TransUnit/index.js
@@ -57,7 +57,7 @@ class TransUnit extends React.Component {
     // ])
     selected: PropTypes.bool.isRequired,
     criteria: PropTypes.arrayOf(PropTypes.shape({
-      editable: PropTypes.bool.isRequired,
+      commentRequired: PropTypes.bool.isRequired,
       description: PropTypes.string.isRequired,
       priority: PropTypes.oneOf([MINOR, MAJOR, CRITICAL]).isRequired
     })),
diff --git a/server/zanata-frontend/src/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js b/server/zanata-frontend/src/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js
index 8f9884dbf7..3c7b3cfef3 100644
--- a/server/zanata-frontend/src/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js
+++ b/server/zanata-frontend/src/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js
@@ -1,27 +1,30 @@
-
 import React from 'react'
 import * as ReactDOMServer from 'react-dom/server'
 import TranslatingIndicator from '.'
 import { Icon } from '../../../components'
 import { Row } from 'react-bootstrap'
+import { IntlProvider } from 'react-intl'
 
-describe('TranslatingIndicatorTest', () => {
-  it('TranslatingIndicator markup', () => {
+/* global describe expect it */
+describe('TranslatingIndicator', () => {
+  it('renders default markup', () => {
     const gettextCatalog = {
       getString: (key) => {
         return key
       }
     }
     const actual = ReactDOMServer.renderToStaticMarkup(
-      <TranslatingIndicator gettextCatalog={gettextCatalog}/>)
+      <IntlProvider locale='en'>
+        <TranslatingIndicator gettextCatalog={gettextCatalog} />
+      </IntlProvider>)
 
     const expected = ReactDOMServer.renderToStaticMarkup(
       /* eslint-disable max-len */
-      <button className="Link--neutral u-sPV-1-6 u-floatLeft u-sizeHeight-1_1-2 u-sMR-1-4">
+      <button className='Link--neutral u-sPV-1-6 u-floatLeft u-sizeHeight-1_1-2 u-sMR-1-4'>
         <Row>
-          <Icon name="translate" className="s2"/> <span
-          className="u-ltemd-hidden TransIndicator u-sMR-1-4">
-          Translating
+          <Icon name='translate' className='s2' /> <span
+            className='u-ltemd-hidden TransIndicator u-sMR-1-4'>
+            <span>Translating</span>
           </span>
         </Row>
       </button>
diff --git a/server/zanata-frontend/src/app/editor/components/TranslatingIndicator/index.js b/server/zanata-frontend/src/app/editor/components/TranslatingIndicator/index.js
index f8aa8dd219..897ef71955 100644
--- a/server/zanata-frontend/src/app/editor/components/TranslatingIndicator/index.js
+++ b/server/zanata-frontend/src/app/editor/components/TranslatingIndicator/index.js
@@ -23,6 +23,7 @@ import React from 'react'
 import * as PropTypes from 'prop-types'
 import { Icon } from '../../../components'
 import { Row } from 'react-bootstrap'
+import { FormattedMessage } from 'react-intl'
 
 /**
  * Indicator that shows 'Translating' when the user is
@@ -41,11 +42,13 @@ class TranslatingIndicator extends React.Component {
   render () {
     return (
       /* eslint-disable max-len */
-      <button className="Link--neutral u-sPV-1-6 u-floatLeft u-sizeHeight-1_1-2 u-sMR-1-4">
+      <button className='Link--neutral u-sPV-1-6 u-floatLeft u-sizeHeight-1_1-2 u-sMR-1-4'>
         <Row>
-          <Icon name="translate" className="s2" /> <span
-            className="u-ltemd-hidden TransIndicator u-sMR-1-4">
-            {this.props.gettextCatalog.getString('Translating')}
+          <Icon name='translate' className='s2' /> <span
+            className='u-ltemd-hidden TransIndicator u-sMR-1-4'>
+            <FormattedMessage id='TranslatingIndicator.translating'
+              description={'Indicator of editor translating mode'}
+              defaultMessage='Translating' />
           </span>
         </Row>
       </button>
diff --git a/server/zanata-frontend/src/app/editor/containers/MainContent.js b/server/zanata-frontend/src/app/editor/containers/MainContent.js
index dbb3787141..d305e66078 100644
--- a/server/zanata-frontend/src/app/editor/containers/MainContent.js
+++ b/server/zanata-frontend/src/app/editor/containers/MainContent.js
@@ -25,7 +25,7 @@ class MainContent extends React.Component {
     toggleReviewModal: PropTypes.func.isRequired,
     fetchAllCriteria: PropTypes.func.isRequired,
     criteriaList: PropTypes.arrayOf(PropTypes.shape({
-      editable: PropTypes.bool.isRequired,
+      commentRequired: PropTypes.bool.isRequired,
       description: PropTypes.string.isRequired,
       priority: PropTypes.oneOf([MINOR, MAJOR, CRITICAL]).isRequired
     })).isRequired,
diff --git a/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/CriteriaDropdown.js b/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/CriteriaDropdown.js
index d26bb9b8ea..d965fadcc2 100644
--- a/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/CriteriaDropdown.js
+++ b/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/CriteriaDropdown.js
@@ -3,7 +3,9 @@ import { Component } from 'react'
 import { Icon } from '../../../components'
 import * as PropTypes from 'prop-types'
 import Dropdown from '../../components/Dropdown'
-import { MINOR, MAJOR, CRITICAL } from '../../utils/reject-trans-util'
+import {
+  MINOR, MAJOR, CRITICAL, UNSPECIFIED
+} from '../../utils/reject-trans-util'
 
 /**
  * A Local Editor Dropdown coponent that selects the Criteria
@@ -12,12 +14,13 @@ import { MINOR, MAJOR, CRITICAL } from '../../utils/reject-trans-util'
 class CriteriaDropdown extends Component {
   static propTypes = {
     criteriaList: PropTypes.arrayOf(PropTypes.shape({
-      editable: PropTypes.bool.isRequired,
+      commentRequired: PropTypes.bool.isRequired,
       description: PropTypes.string.isRequired,
       priority: PropTypes.oneOf([MINOR, MAJOR, CRITICAL]).isRequired
     })).isRequired,
     onCriteriaChange: PropTypes.func.isRequired,
-    selectedCriteria: PropTypes.string.isRequired
+    onUnspecifiedCriteria: PropTypes.func.isRequired,
+    criteriaDescription: PropTypes.string.isRequired
   }
   constructor (props) {
     super(props)
@@ -31,11 +34,15 @@ class CriteriaDropdown extends Component {
     }))
   }
   onCriteriaChange = (event) => {
-    this.props.onCriteriaChange(event)
+    if (event.target.innerText === UNSPECIFIED.description) {
+      this.props.onUnspecifiedCriteria()
+    } else {
+      this.props.onCriteriaChange(event)
+    }
     this.toggleDropdown()
   }
   render () {
-    const { criteriaList, selectedCriteria } = this.props
+    const { criteriaList, criteriaDescription } = this.props
     const options = criteriaList.map((value, index) => {
       return (
         <li key={index}
@@ -51,7 +58,7 @@ class CriteriaDropdown extends Component {
         className='dropdown-menu Criteria'>
         <Dropdown.Button>
           <a className='EditorDropdown-item'>
-            {selectedCriteria}
+            {criteriaDescription}
             <Icon className='n1 u-pullRight' name='chevron-down' />
           </a>
         </Dropdown.Button>
diff --git a/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/CriteriaDropdown.test.js b/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/CriteriaDropdown.test.js
index eeaebf7875..b8acdf172e 100644
--- a/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/CriteriaDropdown.test.js
+++ b/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/CriteriaDropdown.test.js
@@ -7,15 +7,15 @@ import Dropdown from '../../components/Dropdown'
 
 const defaultClick = () => {}
 const criteriaList = [{
-  editable: false,
+  commentRequired: false,
   description: 'One',
   priority: MINOR
 }, {
-  editable: false,
+  commentRequired: false,
   description: 'Two',
   priority: MAJOR
 }, {
-  editable: false,
+  commentRequired: false,
   description: 'Three',
   priority: CRITICAL
 }]
@@ -35,7 +35,8 @@ describe('CriteriaDropdown', () => {
       <CriteriaDropdown
         criteriaList={criteriaList}
         onCriteriaChange={defaultClick}
-        selectedCriteria='One'
+        onUnspecifiedCriteria={defaultClick}
+        criteriaDescription='One'
       />
     )
     const expected = ReactDOMServer.renderToStaticMarkup(
diff --git a/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/RejectTranslationModal.story.js b/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/RejectTranslationModal.story.js
deleted file mode 100644
index e020981be8..0000000000
--- a/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/RejectTranslationModal.story.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// @ts-nocheck
-import React from 'react'
-import { storiesOf } from '@storybook/react'
-import RejectTranslationModal from '.'
-import Lorem from 'react-lorem-component'
-import { MINOR, MAJOR, CRITICAL } from './index.js'
-
-/* eslint-disable max-len */
-/*
- * TODO add stories showing the range of states
- *      for RejectTranslationModal
- */
-storiesOf('RejectTranslationModal', module)
-    .addDecorator((story) => (
-      <div>
-        <h1>Lorem Ipsum</h1>
-        <Lorem count={1} />
-        <Lorem mode="list" />
-        <h2>Dolor Sit Amet</h2>
-        <Lorem />
-        <Lorem mode="list" />
-        <div className="static-modal">
-          {story()}
-        </div>
-      </div>
-    ))
-    .add('Translation errors (critical)', () => (
-      <RejectTranslationModal show
-        criteriaList={
-          ['Translation Errors (terminology, mistranslated addition, omission, un-localized, do not translate, etc)',
-          'Other (reason may be in comment section/history if necessary)']
-        }
-        priority={CRITICAL} textState="u-textDanger" />
-    ))
-    .add('Style Guide and Glossary Violations (minor)', () => (
-      <RejectTranslationModal show
-        criteriaList={
-          ['Translation Errors (terminology, mistranslated addition, omission, un-localized, do not translate, etc)',
-          'Other (reason may be in comment section/history if necessary)']
-        }
-        priority={MINOR} />
-    ))
-
-    .add('Other (major)', () => (
-      <RejectTranslationModal show
-        criteriaList={
-          ['Translation Errors (terminology, mistranslated addition, omission, un-localized, do not translate, etc)',
-          'Other (reason may be in comment section/history if necessary)']
-        }
-        priority={MAJOR} textState="u-textWarning" />
-    ))
diff --git a/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/index.css b/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/index.css
index fcb09d7919..85b34142f5 100644
--- a/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/index.css
+++ b/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/index.css
@@ -7,6 +7,7 @@
   --TM-text-color: rgb(84, 102, 119);
   --TM-icon-vert-alignment: middle;
   --TM-dropdown-text-color: #03a6d7;
+  --Button-color-neutral: color(#416988 tint(50%));
 }
 
 #RejectTranslationModal .flex {
@@ -85,6 +86,11 @@
   visibility: hidden;
 }
 
+#RejectTranslationModal .EditorButton:disabled {
+  color: var(--Button-color-text-invert);
+  background-color: var(--Button-color-neutral);
+}
+
 .EditorRejection-input {
   margin-top: 1rem;
   padding: 0.75rem;
@@ -97,6 +103,6 @@
 .EditorRejection-input p {
   position: relative;
   float: left;
-  bottom: 15px;
+  bottom: -15px;
   left: -5px;
 }
diff --git a/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/index.js b/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/index.js
index 7038fb0030..39293b68c1 100644
--- a/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/index.js
+++ b/server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/index.js
@@ -12,9 +12,8 @@ import { rejectTranslation } from '../../actions/review-trans-actions'
 import update from 'immutability-helper'
 import { isUndefined, isEmpty } from 'lodash'
 import {
-  MINOR, MAJOR, CRITICAL, priorities, textState
+  MINOR, MAJOR, CRITICAL, UNSPECIFIED, priorities, textState
 } from '../../utils/reject-trans-util'
-
 const textLimit = 500
 
 /**
@@ -29,8 +28,8 @@ export class RejectTranslationModal extends Component {
     revision: PropTypes.number,
     localeId: PropTypes.string.isRequired,
     criteriaList: PropTypes.arrayOf(PropTypes.shape({
-      id: PropTypes.number.isRequired,
-      editable: PropTypes.bool.isRequired,
+      id: PropTypes.number,
+      commentRequired: PropTypes.bool.isRequired,
       description: PropTypes.string.isRequired,
       priority: PropTypes.oneOf([MINOR, MAJOR, CRITICAL]).isRequired
     })).isRequired,
@@ -41,11 +40,12 @@ export class RejectTranslationModal extends Component {
     review: {
       selectedPriority: MINOR,
       priorityId: 0,
-      selectedCriteria: '-- Select a predefined criteria --',
+      criteriaDescription: '-- Select a predefined criteria --',
       criteriaId: undefined,
       reviewComment: ''
     },
-    charsLeft: textLimit
+    charsLeft: textLimit,
+    selectedCriteria: UNSPECIFIED
   }
   constructor (props) {
     super(props)
@@ -62,14 +62,25 @@ export class RejectTranslationModal extends Component {
     }))
   }
   onCriteriaChange = (event) => {
-    const selectedCriteria = event.target.innerText
-    const criteriaId = this.props.criteriaList.find(
-      x => x.description === event.target.innerText).id
+    const selectedCriteria = this.props.criteriaList.find(
+      x => x.description === event.target.innerText)
     this.setState(prevState => ({
       review: update(prevState.review, {
-        selectedCriteria: {$set: selectedCriteria},
-        criteriaId: {$set: criteriaId}
-      })
+        criteriaDescription: {$set: selectedCriteria.description},
+        criteriaId: {$set: selectedCriteria.id},
+        selectedPriority: {$set: selectedCriteria.priority}
+      }),
+      selectedCriteria: selectedCriteria
+    }))
+  }
+  onUnspecifiedCriteria = () => {
+    this.setState(prevState => ({
+      review: update(prevState.review, {
+        criteriaDescription: {$set: UNSPECIFIED.description},
+        criteriaId: {$set: undefined},
+        selectedPriority: {$set: UNSPECIFIED.priority}
+      }),
+      selectedCriteria: UNSPECIFIED
     }))
   }
   setReviewComment = (event) => {
@@ -106,7 +117,7 @@ export class RejectTranslationModal extends Component {
   /* eslint-disable max-len */
   render () {
     const { show, criteriaList } = this.props
-    const { review } = this.state
+    const { review, selectedCriteria } = this.state
     const priorityTextState = textState(review.selectedPriority)
     const criteriaTile = (!isEmpty(criteriaList))
         ? <div className='flex'>
@@ -116,13 +127,20 @@ export class RejectTranslationModal extends Component {
           <CriteriaDropdown
             criteriaList={criteriaList}
             onCriteriaChange={this.onCriteriaChange}
-            selectedCriteria={review.selectedCriteria} />
+            onUnspecifiedCriteria={this.onUnspecifiedCriteria}
+            criteriaDescription={review.criteriaDescription} />
           <PriorityDropdown
             textState={priorityTextState}
             priority={review.selectedPriority}
             priorityChange={this.onPriorityChange} />
         </div>
         : undefined
+    const cantReject = (
+      (isEmpty(review.reviewComment)) &&
+      (selectedCriteria.commentRequired === true))
+    const commentPlaceholder = (selectedCriteria.commentRequired === true)
+      ? 'You must provide a comment for why this translation has been rejected'
+      : 'Provide a comment for why this translation has been rejected'
     return (
       <Modal show={show}
         onHide={this.onHideResetState}
@@ -136,7 +154,7 @@ export class RejectTranslationModal extends Component {
           <div className='EditorRejection-input'>
             <textarea ref='input'
               type='comment'
-              placeholder='Provide a comment for why this translation has been rejected'
+              placeholder={commentPlaceholder}
               cols='50'
               onChange={this.setReviewComment}
               rows='10'
@@ -157,7 +175,8 @@ export class RejectTranslationModal extends Component {
               </Button>
               <Button
                 className='EditorButton Button--large u-rounded Button--primary'
-                onClick={this.saveTransReview}>
+                onClick={this.saveTransReview}
+                disabled={cantReject}>
                 Reject translation
               </Button>
             </Row>
diff --git a/server/zanata-frontend/src/app/editor/containers/Root/index.js b/server/zanata-frontend/src/app/editor/containers/Root/index.js
index b05f8be711..618e1adae4 100644
--- a/server/zanata-frontend/src/app/editor/containers/Root/index.js
+++ b/server/zanata-frontend/src/app/editor/containers/Root/index.js
@@ -9,12 +9,15 @@ import EditorHeader from '../EditorHeader'
 import KeyShortcutCheatSheet from '../KeyShortcutCheatSheet'
 import KeyShortcutDispatcher from '../KeyShortcutDispatcher'
 import SuggestionsPanel from '../SuggestionsPanel'
-import { getSuggestionsPanelVisible } from '../../reducers'
-import { fetchUiLocales } from '../../actions/header-actions'
+import { getSuggestionsPanelVisible, getAppLocale } from '../../reducers'
+import { fetchUiLocales, fetchAppLocale } from '../../actions/header-actions'
 import { saveSuggestionPanelHeight } from '../../actions/suggestions-actions'
 import SplitPane from 'react-split-pane'
 import { Icons } from '../../../components'
 import Sidebar from '../Sidebar'
+import { locale, formats } from '../../config/intl'
+import { appLocale } from '../../../config'
+import { IntlProvider } from 'react-intl'
 
 /**
  * Top level of Zanata view hierarchy.
@@ -24,7 +27,13 @@ class Root extends Component {
     percentHeight: PropTypes.number.isRequired,
     showSuggestion: PropTypes.bool,
     requestUiLocales: PropTypes.func.isRequired,
-    saveSuggestionPanelHeight: PropTypes.func.isRequired
+    requestAppLocale: PropTypes.func.isRequired,
+    saveSuggestionPanelHeight: PropTypes.func.isRequired,
+    localeMessages: PropTypes.object
+  }
+
+  componentWillMount () {
+    this.props.requestAppLocale()
   }
 
   componentDidMount () {
@@ -68,26 +77,31 @@ class Root extends Component {
     const pixelHeight = this.props.showSuggestion
       ? this.props.percentHeight * window.innerHeight
       : 0
-
     // TODO adjust scrollbar width on div like Angular template editor.html
     return (
-      <ParamPropDispatcher {...this.props}>
-        <KeyShortcutDispatcher className="Editor is-suggestions-active">
-          <Icons />
-          <EditorHeader />
-          <Sidebar>
-            <SplitPane ref="suggestionResizer"
-              split="horizontal"
-              defaultSize={pixelHeight}
-              primary="second"
-              onDragFinished={this.resizeFinished}>
-              <MainContent />
-              {this.props.showSuggestion && <SuggestionsPanel />}
-            </SplitPane>
-          </Sidebar>
-          <KeyShortcutCheatSheet />
-        </KeyShortcutDispatcher>
-      </ParamPropDispatcher>
+      <IntlProvider defaultLocale={locale}
+        locale={appLocale}
+        formats={formats}
+        key={this.props.localeMessages}
+        messages={this.props.localeMessages}>
+        <ParamPropDispatcher {...this.props}>
+          <KeyShortcutDispatcher className='Editor is-suggestions-active'>
+            <Icons />
+            <EditorHeader />
+            <Sidebar>
+              <SplitPane ref='suggestionResizer'
+                split='horizontal'
+                defaultSize={pixelHeight}
+                primary='second'
+                onDragFinished={this.resizeFinished}>
+                <MainContent />
+                {this.props.showSuggestion && <SuggestionsPanel />}
+              </SplitPane>
+            </Sidebar>
+            <KeyShortcutCheatSheet />
+          </KeyShortcutDispatcher>
+        </ParamPropDispatcher>
+      </IntlProvider>
     )
   }
 }
@@ -97,12 +111,16 @@ function mapStateToProps (state) {
   return {
     percentHeight: suggestions.heightPercent,
     showSidebar: sidebar.visible,
-    showSuggestion: getSuggestionsPanelVisible(state)
+    showSuggestion: getSuggestionsPanelVisible(state),
+    localeMessages: getAppLocale(state)
   }
 }
 
 function mapDispatchToProps (dispatch) {
   return {
+    requestAppLocale: () => {
+      dispatch(fetchAppLocale(appLocale))
+    },
     saveSuggestionPanelHeight: (pixelHeight) => {
       const percent = pixelHeight / window.innerHeight
       dispatch(saveSuggestionPanelHeight(percent))
diff --git a/server/zanata-frontend/src/app/editor/entrypoint/index.js b/server/zanata-frontend/src/app/editor/entrypoint/index.js
index b78cee56b0..83651e9f13 100644
--- a/server/zanata-frontend/src/app/editor/entrypoint/index.js
+++ b/server/zanata-frontend/src/app/editor/entrypoint/index.js
@@ -3,17 +3,15 @@ import 'babel-polyfill'
 import React from 'react'
 import * as ReactDOM from 'react-dom'
 import { appUrl, serverUrl } from '../../config'
-import { locale, formats } from '../config/intl'
 import createStoreWithMiddleware from '../middlewares'
-import { addLocaleData, IntlProvider } from 'react-intl'
-import enLocaleData from 'react-intl/locale-data/en.js'
+import { addLocaleData } from 'react-intl'
 import { Provider } from 'react-redux'
 import { browserHistory, Router, Route } from 'react-router'
 import { syncHistoryWithStore } from 'react-router-redux'
 import rootReducer from '../reducers'
 import addWatchers from '../watchers'
 import { isEmpty } from 'lodash'
-
+import { appLocale } from '../../config'
 import Root from '../containers/Root'
 import NeedSlugMessage from '../containers/NeedSlugMessage'
 import { fetchSettings } from '../actions/settings-actions'
@@ -36,19 +34,8 @@ import '../index.css'
  *  - ensuring the required css for the React component tree is available
  */
 function runApp () {
-  // TODO add all the relevant locale data
-  // Something like:
-  //  import en from './react-intl/locale-data/en'
-  //  import de from './react-intl/locale-data/de'
-  //    ... then just addLocaleData(en) etc.
-  // See https://github.com/yahoo/react-intl/blob/master/UPGRADE.md
-  // if ('ReactIntlLocaleData' in window) {
-  //   Object.keys(window.ReactIntlLocaleData).forEach(lang => {
-  //     addLocaleData(window.ReactIntlLocaleData[lang])
-  //   })
-  // }
-
-  addLocaleData([...enLocaleData])
+  // Dynamically load the locale data of the selected appLocale
+  addLocaleData(require(`react-intl/locale-data/${appLocale}`))
 
   const history = browserHistory
   history.basename = appUrl
@@ -75,15 +62,13 @@ function runApp () {
   //   require.ensure and pass to IntlProvider as messages={...}
   // defaultLocale will use the default messages with no errors
   ReactDOM.render(
-    <IntlProvider defaultLocale={locale} locale={locale} formats={formats}>
-      <Provider store={store}>
-        <Router history={enhancedHistory}>
-          {/* The ** is docId, captured as params.splat by react-router. */}
-          <Route path={path} component={Root} />
-          <Route path="/*" component={NeedSlugMessage} />
-        </Router>
-      </Provider>
-    </IntlProvider>, rootElement)
+    <Provider store={store}>
+      <Router history={enhancedHistory}>
+        {/* The ** is docId, captured as params.splat by react-router. */}
+        <Route path={path} component={Root} />
+        <Route path="/*" component={NeedSlugMessage} />
+      </Router>
+    </Provider>, rootElement)
 }
 
 if (window.Intl) {
diff --git a/server/zanata-frontend/src/app/editor/index.html b/server/zanata-frontend/src/app/editor/index.html
index 8956f7949c..309da0b3d2 100644
--- a/server/zanata-frontend/src/app/editor/index.html
+++ b/server/zanata-frontend/src/app/editor/index.html
@@ -19,7 +19,7 @@
   <link rel="icon" type="image/x-icon" href="http://zanata.org/images/logo/logo.ico">
   <link rel="stylesheet" type="text/css" href="/editor.css">
   <link rel="stylesheet" type="text/css" async
-    href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,400italic'>
+    href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,400italic'>
 </head>
 
 <body class="new-zanata">
@@ -43,7 +43,8 @@
   data-links='{
     "loginUrl": "http://localhost:8080/account/sign_in",
     "registerUrl": "http://localhost:8080/account/register"
-  }'>
+  }'
+  data-app-locale='ja'>
 </div>
 <script type="application/javascript">
   window.config = document.getElementById('config').dataset
diff --git a/server/zanata-frontend/src/app/editor/reducers/context-reducer.js b/server/zanata-frontend/src/app/editor/reducers/context-reducer.js
index 87e5c5f82b..9fd0b8ef4a 100644
--- a/server/zanata-frontend/src/app/editor/reducers/context-reducer.js
+++ b/server/zanata-frontend/src/app/editor/reducers/context-reducer.js
@@ -1,6 +1,6 @@
 import { handleAction } from 'redux-actions'
 import { ROUTING_PARAMS_CHANGED } from '../actions/action-types'
-import { DEFAULT_LOCALE } from './ui-reducer'
+import { DEFAULT_LOCALE } from '../../config'
 
 const defaultState = {
   sourceLocale: DEFAULT_LOCALE
diff --git a/server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js b/server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
index 9a9c0022d5..79983f6353 100644
--- a/server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
+++ b/server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
@@ -2,7 +2,7 @@
 
 import contextReducer from './context-reducer'
 import { ROUTING_PARAMS_CHANGED } from '../actions/action-types'
-import { DEFAULT_LOCALE } from './ui-reducer'
+import { DEFAULT_LOCALE } from '../../config'
 
 describe('context-reducer test', () => {
   it('generates initial state', () => {
diff --git a/server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js b/server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
index 3cda4cb45a..669ec6d97e 100644
--- a/server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
+++ b/server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
@@ -5,7 +5,8 @@ import {
   DOCUMENT_SELECTED,
   HEADER_DATA_FETCHED,
   LOCALE_SELECTED,
-  STATS_FETCHED
+  STATS_FETCHED,
+  LOCALE_MESSAGES_SUCCESS
 } from '../actions/header-action-types'
 import update from 'immutability-helper'
 import {prepareLocales, prepareStats, prepareDocs} from '../utils/Util'
@@ -39,12 +40,13 @@ const defaultState = {
       },
       id: ''
     },
-    selectedLocale: ''
+    selectedLocale: '',
+    localeMessages: {}
   }
 }
 
 const gravatarUrl = (hash, size) => {
-  return `http://www.gravatar.com/avatar/${hash}?d=mm&ampr=g&amps=${size}`
+  return `https://www.gravatar.com/avatar/${hash}?d=mm&r=g&s=${size}`
 }
 
 const headerDataReducer = handleActions({
@@ -79,6 +81,9 @@ const headerDataReducer = handleActions({
   [LOCALE_SELECTED]: (state, { payload }) =>
     update(state, { context: { selectedLocale: {$set: payload} } }),
 
+  [LOCALE_MESSAGES_SUCCESS]: (state, { payload }) =>
+    update(state, { localeMessages: {$set: payload} }),
+
   [STATS_FETCHED]: (state, { payload }) => update(state, {
     context: { selectedDoc: { counts: {$set: prepareStats(payload)} } } })
 }, defaultState)
diff --git a/server/zanata-frontend/src/app/editor/reducers/header-data-reducer.test.js b/server/zanata-frontend/src/app/editor/reducers/header-data-reducer.test.js
index ca27586367..a39cbab8a9 100644
--- a/server/zanata-frontend/src/app/editor/reducers/header-data-reducer.test.js
+++ b/server/zanata-frontend/src/app/editor/reducers/header-data-reducer.test.js
@@ -1,11 +1,12 @@
 // @ts-nocheck
-/* global jest describe it expect */
+/* global describe it expect */
 
 import {
   DOCUMENT_SELECTED,
   HEADER_DATA_FETCHED,
   LOCALE_SELECTED,
-  STATS_FETCHED
+  STATS_FETCHED,
+  LOCALE_MESSAGES_SUCCESS
 } from '../actions/header-action-types'
 import headerDataReducer from './header-data-reducer'
 
@@ -42,6 +43,13 @@ const EXAMPLE_HEADER_DATA = {
   }
 }
 
+const EXAMPLE_LOCALE_MESSAGES = {
+  'ActivityFeedItem.comment': {
+    'defaultMessage': '{name} has commented on a translation',
+    'description': 'Title for a comment in the activity feed.'
+  }
+}
+
 describe('header-data-reducer test', () => {
   it('generates initial state', () => {
     const initialState = headerDataReducer(undefined, {})
@@ -73,7 +81,8 @@ describe('header-data-reducer test', () => {
           },
           id: ''
         },
-        selectedLocale: ''
+        selectedLocale: '',
+        localeMessages: {}
       }
     })
   })
@@ -100,7 +109,7 @@ describe('header-data-reducer test', () => {
     expect(withData).toEqual({
       user: {
         name: 'rick',
-        gravatarUrl: 'http://www.gravatar.com/avatar/12345?d=mm&ampr=g&amps=72',
+        gravatarUrl: 'https://www.gravatar.com/avatar/12345?d=mm&r=g&s=72',
         dashboardUrl: '/dashboard'
       },
       context: {
@@ -140,7 +149,8 @@ describe('header-data-reducer test', () => {
           },
           id: ''
         },
-        selectedLocale: ''
+        selectedLocale: '',
+        localeMessages: {}
       }
     })
   })
@@ -156,7 +166,13 @@ describe('header-data-reducer test', () => {
     })
     expect(selected.context.selectedLocale).toEqual('de')
   })
-
+  it('can recieve locale messages', () => {
+    const withMessages = headerDataReducer(undefined, {
+      type: LOCALE_MESSAGES_SUCCESS,
+      payload: EXAMPLE_LOCALE_MESSAGES
+    })
+    expect(withMessages.localeMessages).toEqual(EXAMPLE_LOCALE_MESSAGES)
+  })
   it('can receive stats', () => {
     const withStats = headerDataReducer(undefined, {
       type: STATS_FETCHED,
diff --git a/server/zanata-frontend/src/app/editor/reducers/index.js b/server/zanata-frontend/src/app/editor/reducers/index.js
index 794106b877..c07b2f75c0 100644
--- a/server/zanata-frontend/src/app/editor/reducers/index.js
+++ b/server/zanata-frontend/src/app/editor/reducers/index.js
@@ -56,3 +56,4 @@ export const getInfoPanelVisible = createSelector(
   getUi, uiSelectors.getInfoPanelVisible)
 export const getKeyShortcutsVisible = createSelector(
   getUi, uiSelectors.getKeyShortcutsVisible)
+export const getAppLocale = state => state.headerData.localeMessages
diff --git a/server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js b/server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
index 68e4504638..b3b2c23a8b 100644
--- a/server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
+++ b/server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
@@ -5,6 +5,7 @@ import {
   GET_ALL_CRITERIA_FAILURE,
   TOGGLE_REVIEW_MODAL
 } from '../actions/review-trans-actions'
+import { UNSPECIFIED } from '../utils/reject-trans-util'
 
 const defaultState = {
   notification: undefined,
@@ -25,6 +26,8 @@ const getErrorMessage = action => {
 
 const review = handleActions({
   [GET_ALL_CRITERIA_SUCCESS]: (state, action) => {
+    // Add the unspecified option to the criteria list
+    action.payload.unshift(UNSPECIFIED)
     return update(state, {
       criteria: { $set: action.payload }
     })
diff --git a/server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js b/server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
index aa974031b0..8ea5d5104b 100644
--- a/server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
+++ b/server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
@@ -19,15 +19,21 @@ describe('review-trans-reducer', () => {
     expect(review(undefined, {
       type: GET_ALL_CRITERIA_SUCCESS,
       payload: [{
-        editable: true,
+        id: 1,
+        commentRequired: true,
         description: 'invariable invariant variable',
         priority: 'Critical'
       }]
     })).toEqual({
       notification: undefined,
-      criteria: [{
-        editable: true,
+      criteria: [
+        {commentRequired: true,
+        description: 'Unspecified Criteria',
+        id: undefined,
+        priority: 'Minor'},
+        {commentRequired: true,
         description: 'invariable invariant variable',
+        id: 1,
         priority: 'Critical'
       }],
       showReviewModal: false
diff --git a/server/zanata-frontend/src/app/editor/reducers/ui-reducer.js b/server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
index 512192225b..152226984e 100644
--- a/server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
+++ b/server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
@@ -13,20 +13,15 @@ import {
   TOGGLE_INFO_PANEL,
   TOGGLE_HEADER,
   TOGGLE_KEY_SHORTCUTS,
-  UI_LOCALES_FETCHED
+  UI_LOCALES_FETCHED,
+  APP_LOCALE_FETCHED
 } from '../actions/header-action-types'
 import {
   SUGGESTION_PANEL_HEIGHT_CHANGE
 } from '../actions/suggestions-action-types'
 import { prepareLocales } from '../utils/Util'
 import update from 'immutability-helper'
-
-// TODO extract this to a common config
-export const DEFAULT_LOCALE = {
-  localeId: 'en-US',
-  name: 'English',
-  isRTL: false
-}
+import { DEFAULT_LOCALE } from '../../config'
 
 export const GLOSSARY_TAB = 'GLOSSARY_TAB'
 export const identity = (key/*: any*/) => {
@@ -139,6 +134,12 @@ export default handleActions({
     uiLocales: {$set: prepareLocales(payload)}
   }),
 
+  [APP_LOCALE_FETCHED]: (state, { payload }) => update(state, {
+    appLocaleData: {
+      $set: payload
+    }
+  }),
+
   [TOGGLE_KEY_SHORTCUTS]: state => update(state, {
     panels: {
       keyShortcuts: {
diff --git a/server/zanata-frontend/src/app/editor/utils/reject-trans-util.js b/server/zanata-frontend/src/app/editor/utils/reject-trans-util.ts
similarity index 54%
rename from server/zanata-frontend/src/app/editor/utils/reject-trans-util.js
rename to server/zanata-frontend/src/app/editor/utils/reject-trans-util.ts
index 87db2dd00d..ac4b75d29c 100644
--- a/server/zanata-frontend/src/app/editor/utils/reject-trans-util.js
+++ b/server/zanata-frontend/src/app/editor/utils/reject-trans-util.ts
@@ -2,6 +2,21 @@ export const MINOR = 'Minor'
 export const MAJOR = 'Major'
 export const CRITICAL = 'Critical'
 export const priorities = [MINOR, MAJOR, CRITICAL]
+export const UNSPECIFIEDTEXT = 'Unspecified Criteria'
+
+export interface Criteria {
+  id?: number,
+  commentRequired: boolean,
+  description: string,
+  priority: any
+}
+
+export const UNSPECIFIED: Criteria = {
+  id: undefined,
+  commentRequired: true,
+  description: UNSPECIFIEDTEXT,
+  priority: MINOR
+}
 
 export const textState = (selectedPriority) => {
   if (selectedPriority === MAJOR) {
diff --git a/server/zanata-frontend/src/app/reducers/admin-reducer.test.js b/server/zanata-frontend/src/app/reducers/admin-reducer.test.js
index 781c639c58..46e328514c 100644
--- a/server/zanata-frontend/src/app/reducers/admin-reducer.test.js
+++ b/server/zanata-frontend/src/app/reducers/admin-reducer.test.js
@@ -22,7 +22,7 @@ describe('admin-reducer test', () => {
       id: 1,
       priority: 'Major',
       description: 'bad grammar',
-      editable: false
+      commentRequired: false
     }]
     const getAll = adminReducer(initial, {
       type: GET_ALL_CRITERIA_SUCCESS,
@@ -53,7 +53,7 @@ describe('admin-reducer test', () => {
       id: 1,
       priority: 'Major',
       description: 'bad grammar',
-      editable: false
+      commentRequired: false
     }
     const added = adminReducer(initial, {
       type: ADD_CRITERION_SUCCESS,
@@ -83,7 +83,7 @@ describe('admin-reducer test', () => {
       id: 1,
       priority: 'Major',
       description: 'bad grammar',
-      editable: false
+      commentRequired: false
     }
     const updatedCriteria = update(criteria,
       {description: {$set: 'new reason'}})
@@ -119,7 +119,7 @@ describe('admin-reducer test', () => {
       id: 1,
       priority: 'Major',
       description: 'bad grammar',
-      editable: false
+      commentRequired: false
     }
     const withSomething = adminReducer(initial, {
       type: ADD_CRITERION_SUCCESS,
diff --git a/server/zanata-frontend/src/index.html b/server/zanata-frontend/src/index.html
index 1fb28d6a12..8a8f747492 100644
--- a/server/zanata-frontend/src/index.html
+++ b/server/zanata-frontend/src/index.html
@@ -24,12 +24,13 @@
       data-server-url="http://localhost:8080"
       data-api-server-url="http://localhost:8080/rest"
 
-      data-user='{"username": "admin", "email":"zanata@zanata.org", "name": "admin-name", "imageUrl":"//www.gravatar.com/avatar/dda6e90e3f2a615fb8b31205e8b4894b?d=mm&r=g&s=115", "languageTeams": ["English, French, German, Yodish (Yoda English)"]}'
+      data-user='{"username": "admin", "email":"zanata@zanata.org", "name": "admin-name", "imageUrl":"https://www.gravatar.com/avatar/dda6e90e3f2a615fb8b31205e8b4894b?d=mm&r=g&s=115", "languageTeams": ["English, French, German, Yodish (Yoda English)"]}'
       data-permission='{"updateGlossary":true, "insertGlossary":true, "deleteGlossary":true, "downloadGlossary":true, "isAdmin": true, "isLoggedIn": true}'
       data-dev='false'
       data-links='{"loginUrl": "/login",
                    "registerUrl": "/register"
                   }'
+      data-app-locale='en-us'
     />
     <script type="application/javascript">
       window.config = document.getElementById('config').dataset
diff --git a/server/zanata-frontend/src/messages/en-us.json b/server/zanata-frontend/src/messages/en-us.json
index 4459345f81..68ef5f61ed 100644
--- a/server/zanata-frontend/src/messages/en-us.json
+++ b/server/zanata-frontend/src/messages/en-us.json
@@ -1,46 +1,6 @@
 {
-  "ActivityFeedItem.comment": {
-    "defaultMessage": "{name} has commented on a translation",
-    "description": "Title for a comment in the activity feed."
-  },
-  "ActivityFeedItem.approved.approvedTranslation": {
-    "defaultMessage": "approved a translation",
-    "description": "Highlighted section inserted into ActivityFeedItem.approved"
-  },
-  "ActivityFeedItem.approved": {
-    "defaultMessage": "{name} has {approvedTranslation}",
-    "description": "Title for an item in the activity feed showing a reviewer approved the translation. The inserted section is from ActivityFeedItem.approved.approvedTranslation"
-  },
-  "ActivityFeedItem.rejected.rejectedTranslation": {
-    "defaultMessage": "rejected a translation",
-    "description": "Highlighted section inserted into ActivityFeedItem.rejected"
-  },
-  "ActivityFeedItem.rejected": {
-    "defaultMessage": "{name} has {rejectedTranslation} for the reason: {criteria} - {priority} priority. {comment}",
-    "description": "Title for an item in the activity feed showing a reviewer rejected the translation. The inserted section is from ActivityFeedItem.rejected.rejectedTranslation"
-  },
-  "ActivityFeedItem.translated.translatedRevision": {
-    "defaultMessage": "created a translation revision",
-    "description": "Highlighted section inserted into ActivityFeedItem.translated"
-  },
-  "ActivityFeedItem.translated": {
-    "defaultMessage": "{name} has {translatedRevision}",
-    "description": "Title for an item in the activity feed showing a translator added a translation. The inserted section is from ActivityFeedItem.translated.translatedRevision"
-  },
-  "ActivityFeedItem.fuzzy.fuzzyRevision": {
-    "defaultMessage": "created a fuzzy revision",
-    "description": "Highlighted section inserted into ActivityFeedItem.fuzzy"
-  },
-  "ActivityFeedItem.fuzzy": {
-    "defaultMessage": "{name} has {fuzzyRevision}",
-    "description": "Title for an item in the activity feed showing a translator saved a fuzzy translation (a translation that still needs to be edited). The inserted section is from ActivityFeedItem.fuzzy.fuzzyRevision"
-  },
-  "ActivityFeedItem.deleted.deletedTranslation": {
-    "defaultMessage": "deleted a translation",
-    "description": "Highlighted section inserted into ActivityFeedItem.deleted"
-  },
-  "ActivityFeedItem.deleted": {
-    "defaultMessage": "{name} has {deletedTranslation}",
-    "description": "Title for an item in the activity feed showing a translator has deleted the translation. The inserted section is from ActivityFeedItem.deleted.deletedTranslation"
+  "TranslatingIndicator.translating": {
+    "defaultMessage": "Translating",
+    "description": "Indicator of editor translating mode"
   }
 }
\ No newline at end of file
diff --git a/server/zanata-frontend/src/messages/en.json b/server/zanata-frontend/src/messages/en.json
new file mode 100644
index 0000000000..e96ddba3a0
--- /dev/null
+++ b/server/zanata-frontend/src/messages/en.json
@@ -0,0 +1,6 @@
+{
+  "TranslatingIndicator.translating": {
+    "defaultMessage": "Translating",
+    "description": "Indicator of editor translating mode"
+  }
+}
diff --git a/server/zanata-frontend/src/messages/ja.json b/server/zanata-frontend/src/messages/ja.json
new file mode 100644
index 0000000000..cea3e5f36c
--- /dev/null
+++ b/server/zanata-frontend/src/messages/ja.json
@@ -0,0 +1,6 @@
+{
+  "TranslatingIndicator.translating": {
+    "defaultMessage": "翻訳中",
+    "description": "翻訳モードを示す"
+  }
+}
diff --git a/server/zanata-model/src/main/java/org/zanata/model/ReviewCriteria.java b/server/zanata-model/src/main/java/org/zanata/model/ReviewCriteria.java
index 5b70e2ee94..82360b4e5e 100644
--- a/server/zanata-model/src/main/java/org/zanata/model/ReviewCriteria.java
+++ b/server/zanata-model/src/main/java/org/zanata/model/ReviewCriteria.java
@@ -50,10 +50,11 @@ public class ReviewCriteria extends ModelEntityBase {
     public static final int DESCRIPTION_MAX_LENGTH = 255;
 
     @Enumerated(EnumType.STRING)
-    @Column(columnDefinition = "varchar(32)")
+    @Column(columnDefinition = "varchar(32)", nullable = false)
     private IssuePriority priority;
-    private boolean editable;
-    @Column(columnDefinition = "varchar(255)")
+    @Column(nullable = false)
+    private boolean commentRequired;
+    @Column(columnDefinition = "varchar(255)", nullable = false)
     @Size(max = 255)
     @NotEmpty
     private String description;
@@ -62,18 +63,18 @@ public IssuePriority getPriority() {
         return priority;
     }
 
-    public boolean isEditable() {
-        return editable;
+    public boolean isCommentRequired() {
+        return commentRequired;
     }
 
     public String getDescription() {
         return description;
     }
 
-    public ReviewCriteria(IssuePriority priority, boolean editable,
+    public ReviewCriteria(IssuePriority priority, boolean commentRequired,
             String description) {
         this.priority = priority;
-        this.editable = editable;
+        this.commentRequired = commentRequired;
         this.description = description;
     }
 
@@ -84,8 +85,8 @@ public void setPriority(IssuePriority priority) {
         this.priority = priority;
     }
 
-    public void setEditable(boolean editable) {
-        this.editable = editable;
+    public void setCommentRequired(boolean commentRequired) {
+        this.commentRequired = commentRequired;
     }
 
     public void setDescription(String description) {
@@ -98,13 +99,13 @@ public boolean equals(Object o) {
         if (!(o instanceof ReviewCriteria)) return false;
         if (!super.equals(o)) return false;
         ReviewCriteria that = (ReviewCriteria) o;
-        return editable == that.editable &&
+        return commentRequired == that.commentRequired &&
                 priority == that.priority &&
                 Objects.equals(description, that.description);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), priority, editable, description);
+        return Objects.hash(super.hashCode(), priority, commentRequired, description);
     }
 }
diff --git a/server/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml b/server/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
index 0fb4fea02f..4248baa1d6 100755
--- a/server/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
+++ b/server/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
@@ -95,6 +95,7 @@
       data-links='{"loginUrl": "#{applicationConfigurationAction.getLoginUrl(request)}",
                    "registerUrl": "#{applicationConfigurationAction.registerUrl}"}'
       data-allow-register="#{allowPublicRegistration}"
+      data-app-locale="#{localeSelectorAction.getLocale()}"
     >
     </div>
     <script type="application/javascript">
diff --git a/server/zanata-war/src/main/webapp/a/index.xhtml b/server/zanata-war/src/main/webapp/a/index.xhtml
index 9e529d6261..15f02df3a7 100644
--- a/server/zanata-war/src/main/webapp/a/index.xhtml
+++ b/server/zanata-war/src/main/webapp/a/index.xhtml
@@ -37,6 +37,7 @@
       data-links='{"loginUrl": "#{applicationConfigurationAction.getLoginUrl(request)}",
                      "registerUrl": "#{applicationConfigurationAction.registerUrl}"}'
       data-allow-register="#{allowPublicRegistration}"
+      data-app-locale="#{localeSelectorAction.getLocale()}"
     >
     </div>
     <script type="application/javascript">
diff --git a/server/zanata-war/src/main/webapp/editor/index.xhtml b/server/zanata-war/src/main/webapp/editor/index.xhtml
index 01cfd3546c..0e859e6614 100644
--- a/server/zanata-war/src/main/webapp/editor/index.xhtml
+++ b/server/zanata-war/src/main/webapp/editor/index.xhtml
@@ -53,7 +53,8 @@
        data-user="#{authenticatedAccountHome.getUser()}"
        data-permission="#{authenticatedAccountHome.getUserPermission().getJSON()}"
        data-links='{"loginUrl": "#{applicationConfigurationAction.getLoginUrl(request)}",
-                     "registerUrl": "#{applicationConfigurationAction.registerUrl}"}'>
+                     "registerUrl": "#{applicationConfigurationAction.registerUrl}"}'
+       data-app-locale="#{localeSelectorAction.getLocale()}">
   </div>