From 0045c5de89c9c964437db1bd7164df0af766cd4a Mon Sep 17 00:00:00 2001
From: David Mason <drdmason@gmail.com>
Date: Tue, 30 Jun 2015 13:33:09 +1000
Subject: [PATCH 1/5] Add explicit dependency on jms.

This was causing a deployment failure on JBoss EAP 6.3.3 with a root cause of

  java.lang.ClassNotFoundException: javax.jms.MessageListener
    from [Module "deployment.zanata.war:main" from Service Module Loader]

Related: https://issues.jboss.org/browse/WFLY-4642
---
 .../src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml b/zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
index 2d2547b92f..ceb0ed0db1 100644
--- a/zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
+++ b/zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
@@ -25,6 +25,7 @@
       <module name="javax.faces.api" />
       <!-- not needed for wildfly: -->
       <module name="javax.interceptor.api" />
+      <module name="javax.jms.api" />
       <module name="javax.mail.api" />
       <module name="javax.servlet.api" />
       <module name="javax.transaction.api"/>

From b5775c51d5c5071beacc01331b0f0c2081d25d9d Mon Sep 17 00:00:00 2001
From: David Mason <drdmason@gmail.com>
Date: Tue, 30 Jun 2015 15:44:11 +1000
Subject: [PATCH 2/5] refactor(jsf): move project translation settings to
 separate files

To reduce project settings template to a more maintainable size.
---
 .../project/settings-tab-translation.xhtml    |  58 ++++++++
 .../WEB-INF/layout/project/settings-tab.xhtml | 119 +----------------
 .../project/validation-settings-block.xhtml   | 124 ++++++++++++++++++
 3 files changed, 183 insertions(+), 118 deletions(-)
 create mode 100644 zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml
 create mode 100644 zanata-war/src/main/webapp/WEB-INF/layout/project/validation-settings-block.xhtml

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml
new file mode 100644
index 0000000000..efd7e97795
--- /dev/null
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml
@@ -0,0 +1,58 @@
+<!--
+  Copyright 2015, Red Hat, Inc. and individual contributors
+  as indicated by the @author tags. See the copyright.txt file in the
+  distribution for a full listing of individual contributors.
+
+  This is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of
+  the License, or (at your option) any later version.
+
+  This software is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this software; if not, write to the Free
+  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:ui="http://java.sun.com/jsf/facelets"
+  xmlns:h="http://java.sun.com/jsf/html"
+  xmlns:a4j="http://richfaces.org/a4j">
+
+<a4j:jsFunction name="bindCopyTransValue"
+    action="#{projectHome.updateCopyTrans(action, value)}">
+  <a4j:param name="val1" assignTo="#{action}"/>
+  <a4j:param name="val2" assignTo="#{value}"/>
+</a4j:jsFunction>
+
+<h2 class="l--push-all-0 gamma d--bottom l--push-bottom-half">
+  #{msgs['jsf.Translation']}
+</h2>
+
+<h:form id="settings-translation-form" styleClass="l--push-bottom-0">
+
+  <h3 class="heading--secondary">#{msgs['jsf.Validation']}</h3>
+  <p>#{msgs['jsf.Validation.messages']}</p>
+  <ui:include src="validation-settings-block.xhtml"/>
+
+  <hr/>
+
+  <h3 class="heading--secondary">#{msgs['jsf.CopyTrans']}</h3>
+
+  <p>#{msgs['jsf.Copytrans.message']}
+    <a href="http://zanata.org/help/reuse/copytrans-explained/"
+        target="_blank"
+        title="#{msgs['jsf.project.CopyTransOpts.tooltip']}">
+      <i class="i i--help"></i>
+    </a>
+  </p>
+
+  <p class="message--highlight">#{msgs['jsf.Copytrans.message2']}</p>
+  <ui:include src="/WEB-INF/layout/copy_trans_inline.xhtml"/>
+</h:form>
+
+</ui:composition>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
index abbb40a266..f6578f43e6 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
@@ -9,11 +9,6 @@
 
 <script type="text/javascript">
   //<![CDATA[
-  function onValidationOptionChange(validationId) {
-    var value = validationId.split('-');
-    bindValidationValue(value[0], value[1]);
-  }
-
   function onRestrictedByRoleValueChanged(key, checked) {
     bindRestrictedByRoleValue(key, checked);
   }
@@ -36,7 +31,6 @@
     jQuery(ele).children('i').addClass('is-hidden');
     zanata.loader.activate(jQuery(ele).children('#loader'));
   }
-
   //]]>
 </script>
 
@@ -48,19 +42,6 @@
   <a4j:param name="val1" assignTo="#{url}"/>
 </a4j:jsFunction>
 
-<a4j:jsFunction name="bindValidationValue"
-  action="#{projectHome.updateValidationOption(name, state)}"
-  render="validation-list">
-  <a4j:param name="val1" assignTo="#{name}"/>
-  <a4j:param name="val2" assignTo="#{state}"/>
-</a4j:jsFunction>
-
-<a4j:jsFunction name="bindCopyTransValue"
-  action="#{projectHome.updateCopyTrans(action, value)}">
-  <a4j:param name="val1" assignTo="#{action}"/>
-  <a4j:param name="val2" assignTo="#{value}"/>
-</a4j:jsFunction>
-
 <a4j:jsFunction name="bindRestrictedByRoleValue" render="user-roles"
   oncomplete="zanata.form.appendCheckboxes(getUserRoleId())"
   action="#{projectHome.setRestrictedByRole(key, checked)}">
@@ -240,105 +221,7 @@
   <ui:include src="settings-tab-languages.xhtml" />
 </li>
 <li id="settings-translation">
-  <h2 class="l--push-all-0 gamma d--bottom l--push-bottom-half">
-    #{msgs['jsf.Translation']}
-  </h2>
-
-  <h:form id="settings-translation-form" styleClass="l--push-bottom-0">
-    <h3 class="heading--secondary">#{msgs['jsf.Validation']}</h3>
-
-    <p>#{msgs['jsf.Validation.messages']}</p>
-
-    <s:div id="validation-list">
-      <ul class="list--slat">
-        <ui:repeat
-          value="#{projectHome.validationList}" var="validationAction">
-          <li class="js-example js-reveal">
-            <div class="g--tight">
-              <div class="g__item w--7-12">
-                <label class="l--push-bottom-0">
-                  #{validationAction.id.displayName}
-                </label>
-
-                <p class="txt--meta l--push-bottom-quarter">
-                  #{validationAction.description}
-                  <a href="#" class="button--link js-reveal__toggle"
-                    data-target="##{validationAction.id.name()}-example"
-                    data-toggle-title="#{msgs['jsf.tooltip.HideExample']}"
-                    title="#{msgs['jsf.tooltip.ShowExample']}">
-                    <span class="js-reveal__toggle__text"
-                      data-toggle-value="Less">
-                      #{msgs['jsf.tooltip.More']}
-                    </span>…
-                  </a>
-                </p>
-              </div>
-              <div class="g__item w--5-12">
-                <div class="button--group txt--align-right">
-                  <ui:repeat value="#{projectHome.validationStates}"
-                    var="state">
-                    <s:fragment rendered="#{validationAction.state == state}">
-                      <input name="#{validationAction.id.name()}"
-                        id="#{validationAction.id.name()}-#{state}"
-                        checked="true"
-                        onchange="onValidationOptionChange(this.id)"
-                        type="radio"
-                        class="form__item__input js-example__setter"
-                        data-example=""/>
-                    </s:fragment>
-                    <s:fragment rendered="#{validationAction.state != state}">
-                      <input name="#{validationAction.id.name()}"
-                        id="#{validationAction.id.name()}-#{state}"
-                        onchange="onValidationOptionChange(this.id)"
-                        type="radio"
-                        class="form__item__input js-example__setter"
-                        data-example=""/>
-                    </s:fragment>
-                    <label for="#{validationAction.id.name()}-#{state}"
-                      class="button button--#{state.name() == 'Error'?'danger':state}">#{state}</label>
-                  </ui:repeat>
-                </div>
-              </div>
-            </div>
-            <div class="g--tight l--push-bottom-half is-hidden"
-              id="#{validationAction.id.name()}-example">
-              <div class="g__item w--1-2 l--push-top-quarter">
-                <h4 class="zeta heading--secondary txt--uppercase">
-                  #{msgs['jsf.validation.source']}
-                </h4>
-              <pre class="l--push-all-0"><code class="txt--mini">
-                <h:outputText value="#{validationAction.sourceExample}"
-                  escape="false"/>
-              </code></pre>
-              </div>
-              <div class="g__item w--1-2 l--push-top-quarter">
-                <h4 class="zeta heading--secondary txt--uppercase">
-                  #{msgs['jsf.validation.target']}
-                </h4>
-              <pre class="l--push-all-0"><code class="txt--mini">
-                <h:outputText value="#{validationAction.targetExample}"
-                  escape="false"/>
-              </code></pre>
-              </div>
-            </div>
-          </li>
-        </ui:repeat>
-      </ul>
-    </s:div>
-    <hr/>
-    <h3 class="heading--secondary">#{msgs['jsf.CopyTrans']}</h3>
-
-    <p>#{msgs['jsf.Copytrans.message']}
-      <a href="http://zanata.org/help/reuse/copytrans-explained/"
-        target="_blank"
-        title="#{msgs['jsf.project.CopyTransOpts.tooltip']}">
-        <i class="i i--help"></i>
-      </a>
-    </p>
-
-    <p class="message--highlight">#{msgs['jsf.Copytrans.message2']}</p>
-    <ui:include src="/WEB-INF/layout/copy_trans_inline.xhtml"/>
-  </h:form>
+  <ui:include src="settings-tab-translation.xhtml" />
 </li>
 
 <li id="settings-permissions">
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project/validation-settings-block.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/validation-settings-block.xhtml
new file mode 100644
index 0000000000..15647a392a
--- /dev/null
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/project/validation-settings-block.xhtml
@@ -0,0 +1,124 @@
+<!--
+  Copyright 2015, Red Hat, Inc. and individual contributors
+  as indicated by the @author tags. See the copyright.txt file in the
+  distribution for a full listing of individual contributors.
+
+  This is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of
+  the License, or (at your option) any later version.
+
+  This software is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this software; if not, write to the Free
+  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:ui="http://java.sun.com/jsf/facelets"
+  xmlns:h="http://java.sun.com/jsf/html"
+  xmlns:a4j="http://richfaces.org/a4j"
+  xmlns:s="http://jboss.org/schema/seam/taglib">
+
+<script type="text/javascript">
+  //<![CDATA[
+  function onValidationOptionChange(validationId) {
+    var value = validationId.split('-');
+    bindValidationValue(value[0], value[1]);
+  }
+  //]]>
+</script>
+
+<a4j:jsFunction name="bindValidationValue"
+    action="#{projectHome.updateValidationOption(name, state)}"
+    render="validation-list">
+  <a4j:param name="val1" assignTo="#{name}"/>
+  <a4j:param name="val2" assignTo="#{state}"/>
+</a4j:jsFunction>
+
+<s:div id="validation-list">
+  <ul class="list--slat">
+    <ui:repeat value="#{projectHome.validationList}"
+        var="validationAction">
+      <li class="js-example js-reveal">
+        <div class="g--tight">
+          <div class="g__item w--7-12">
+            <label class="l--push-bottom-0">
+              #{validationAction.id.displayName}
+            </label>
+
+            <p class="txt--meta l--push-bottom-quarter">
+              #{validationAction.description}
+              <a href="#"
+                  class="button--link js-reveal__toggle"
+                  data-target="##{validationAction.id.name()}-example"
+                  data-toggle-title="#{msgs['jsf.tooltip.HideExample']}"
+                  title="#{msgs['jsf.tooltip.ShowExample']}">
+                <span class="js-reveal__toggle__text"
+                    data-toggle-value="Less">
+                  #{msgs['jsf.tooltip.More']}
+                </span>…
+              </a>
+            </p>
+          </div>
+          <div class="g__item w--5-12">
+            <div class="button--group txt--align-right">
+              <ui:repeat
+                  value="#{projectHome.validationStates}"
+                  var="state">
+                <s:fragment
+                    rendered="#{validationAction.state == state}">
+                  <input name="#{validationAction.id.name()}"
+                      id="#{validationAction.id.name()}-#{state}"
+                      checked="true"
+                      onchange="onValidationOptionChange(this.id)"
+                      type="radio"
+                      class="form__item__input js-example__setter"
+                      data-example=""/>
+                </s:fragment>
+                <s:fragment
+                    rendered="#{validationAction.state != state}">
+                  <input name="#{validationAction.id.name()}"
+                      id="#{validationAction.id.name()}-#{state}"
+                      onchange="onValidationOptionChange(this.id)"
+                      type="radio"
+                      class="form__item__input js-example__setter"
+                      data-example=""/>
+                </s:fragment>
+                <label for="#{validationAction.id.name()}-#{state}"
+                    class="button button--#{state.name() == 'Error'?'danger':state}">#{state}</label>
+              </ui:repeat>
+            </div>
+          </div>
+        </div>
+        <div class="g--tight l--push-bottom-half is-hidden"
+            id="#{validationAction.id.name()}-example">
+          <div class="g__item w--1-2 l--push-top-quarter">
+            <h4 class="zeta heading--secondary txt--uppercase">
+              #{msgs['jsf.validation.source']}
+            </h4>
+            <pre class="l--push-all-0"><code class="txt--mini">
+              <h:outputText value="#{validationAction.sourceExample}"
+                  escape="false"/>
+            </code></pre>
+          </div>
+          <div class="g__item w--1-2 l--push-top-quarter">
+            <h4 class="zeta heading--secondary txt--uppercase">
+              #{msgs['jsf.validation.target']}
+            </h4>
+            <pre class="l--push-all-0"><code class="txt--mini">
+              <h:outputText value="#{validationAction.targetExample}"
+                  escape="false"/>
+            </code></pre>
+          </div>
+        </div>
+      </li>
+    </ui:repeat>
+  </ul>
+</s:div>
+
+</ui:composition>

From e0d4415b9c486eddd7e2cd3ab5703088fd3db6fe Mon Sep 17 00:00:00 2001
From: David Mason <drdmason@gmail.com>
Date: Wed, 1 Jul 2015 11:21:30 +1000
Subject: [PATCH 3/5] refactor(jsf): move project general settings to separate
 file

To reduce project settings template to a more maintainable size.
---
 .../layout/project/settings-tab-general.xhtml | 130 ++++++++++++++++++
 .../WEB-INF/layout/project/settings-tab.xhtml | 105 +-------------
 2 files changed, 131 insertions(+), 104 deletions(-)
 create mode 100644 zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml
new file mode 100644
index 0000000000..db29137b2d
--- /dev/null
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml
@@ -0,0 +1,130 @@
+<!--
+  Copyright 2015, Red Hat, Inc. and individual contributors
+  as indicated by the @author tags. See the copyright.txt file in the
+  distribution for a full listing of individual contributors.
+
+  This is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of
+  the License, or (at your option) any later version.
+
+  This software is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this software; if not, write to the Free
+  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:a4j="http://richfaces.org/a4j"
+        xmlns:rich="http://richfaces.org/rich"
+        xmlns:s="http://jboss.org/schema/seam/taglib">
+
+<h2 class="l--push-all-0 gamma d--bottom">#{msgs['jsf.General']}</h2>
+
+<h:form id="settings-general-form" styleClass="l--constrain-large">
+  <ui:include src="edit_form.xhtml"/>
+
+  <h3 class="heading--secondary">#{msgs['jsf.project.SourceCode']}</h3>
+
+  <div class="g--tight l--push-top-half">
+    <div class="g__item w--1-2">
+      <div class="form__item">
+        <h:outputLabel for="homePage">#{msgs['jsf.project.HomePage']}
+          <span class="txt--meta">#{msgs['jsf.field.optional']}</span>
+        </h:outputLabel>
+        <s:decorate id="homePageField" template="../field.xhtml">
+          <h:inputText id="homePage" required="false"
+              value="#{projectHome.instance.sourceViewURL}">
+            <rich:placeholder value="http://" styleClass="txt--neutral"/>
+            <a4j:ajax event="blur" render="homePageField" execute="@this"/>
+          </h:inputText>
+        </s:decorate>
+
+        <p class="txt--meta">
+          <h:outputText escape="false"
+              value="#{msgs['jsf.Project.sourceurl.message']}"/>
+        </p>
+      </div>
+    </div>
+    <div class="g__item w--1-2">
+      <div class="form__item">
+        <h:outputLabel for="repo">#{msgs['jsf.field.repository']}
+          <span class="txt--meta">#{msgs['jsf.field.optional']}</span>
+        </h:outputLabel>
+        <s:decorate id="repoField" template="../field.xhtml">
+          <h:inputText id="repo" required="false"
+              value="#{projectHome.instance.sourceCheckoutURL}">
+            <a4j:ajax event="blur" render="repoField" execute="@this"/>
+          </h:inputText>
+        </s:decorate>
+
+        <p class="txt--meta">
+          <h:outputText
+              escape="false" value="#{msgs['jsf.Project.repo.message']}"/>
+        </p>
+      </div>
+    </div>
+  </div>
+
+  <div class="l--push-top-1">
+    <a4j:commandLink value="#{msgs['jsf.UpdateGeneralSettings']}"
+        id="button-update-settings"
+        action="#{projectHome.update}"
+        rendered="#{projectHome.managed}"
+        render="project-info"
+        styleClass="l--push-right-half button--primary"/>
+  </div>
+
+  <hr/>
+
+  <s:div styleClass="g--tight" id="status">
+    <s:div styleClass="g__item w--1-2 l--push-bottom-1"
+        rendered="#{projectHome.instance.status eq 'ACTIVE'}">
+      <a4j:commandLink styleClass="button--warning l--push-bottom-half"
+          id="button-lock-project"
+          action="#{projectHome.updateStatus('R')}" render="status">
+        <i class="i--left i--lock"></i> #{msgs['jsf.project.readonly']}
+      </a4j:commandLink>
+
+      <p class="txt--meta">#{msgs['jsf.project.readonly.Message']}</p>
+    </s:div>
+    <s:div styleClass="g__item w--1-2 l--push-bottom-1"
+        rendered="#{projectHome.instance.status ne 'ACTIVE'}">
+      <s:fragment rendered="#{projectHome.instance.status eq 'OBSOLETE'}">
+        <button class="button--success l--push-bottom-half" disabled="disabled">
+          <i class="i--left i--lock"></i> #{msgs['jsf.project.writable']}
+        </button>
+      </s:fragment>
+      <a4j:commandLink styleClass="button--success l--push-bottom-half"
+          id="button-unlock-project"
+          rendered="#{projectHome.instance.status == 'READONLY'}"
+          action="#{projectHome.updateStatus('A')}" render="status">
+        <i class="i--left i--lock"></i> #{msgs['jsf.project.writable']}
+      </a4j:commandLink>
+
+      <p class="txt--meta">#{msgs['jsf.project.writable.Message']}</p>
+    </s:div>
+
+    <s:fragment
+        rendered="#{s:hasPermission(projectHome.instance, 'mark-obsolete')}">
+      <s:div styleClass="g__item w--1-2"
+          rendered="#{projectHome.instance.status ne 'OBSOLETE'}">
+        <a href="javascript:void(0)" id="button-archive-project"
+            class="button--danger l--push-bottom-half"
+            onclick="zanata.modal.show('#delete-confirmation-modal')">
+          #{msgs['jsf.DeleteThisProject']} <i class="i--left i--trash"></i>
+        </a>
+
+        <p class="txt--meta">#{msgs['jsf.DeleteProject.Message']}</p>
+      </s:div>
+    </s:fragment>
+  </s:div>
+</h:form>
+
+</ui:composition>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
index f6578f43e6..5831287b73 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
@@ -4,7 +4,6 @@
   xmlns:a4j="http://richfaces.org/a4j"
   xmlns:rich="http://richfaces.org/rich"
   xmlns:s="http://jboss.org/schema/seam/taglib"
-  xmlns:f="http://java.sun.com/jsf/core"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata">
 
 <script type="text/javascript">
@@ -113,109 +112,7 @@
 </ul>
 <ul class="tabs__content js-tabs-content">
 <li class="is-active" id="settings-general">
-  <h2 class="l--push-all-0 gamma d--bottom">#{msgs['jsf.General']}</h2>
-  <h:form id="settings-general-form" styleClass="l--constrain-large">
-    <ui:include src="edit_form.xhtml"/>
-
-    <h3 class="heading--secondary">#{msgs['jsf.project.SourceCode']}</h3>
-
-    <div class="g--tight l--push-top-half">
-      <div class="g__item w--1-2">
-        <div class="form__item">
-          <h:outputLabel for="homePage">#{msgs['jsf.project.HomePage']}
-            <span class="txt--meta">#{msgs['jsf.field.optional']}</span>
-          </h:outputLabel>
-          <s:decorate id="homePageField" template="../field.xhtml">
-            <h:inputText id="homePage" required="false"
-              value="#{projectHome.instance.sourceViewURL}">
-              <rich:placeholder value="http://" styleClass="txt--neutral"/>
-              <a4j:ajax event="blur" render="homePageField" execute="@this"/>
-            </h:inputText>
-          </s:decorate>
-
-          <p class="txt--meta">
-            <h:outputText escape="false"
-              value="#{msgs['jsf.Project.sourceurl.message']}"/>
-          </p>
-        </div>
-      </div>
-      <div class="g__item w--1-2">
-        <div class="form__item">
-          <h:outputLabel for="repo">#{msgs['jsf.field.repository']}
-            <span class="txt--meta">#{msgs['jsf.field.optional']}</span>
-          </h:outputLabel>
-          <s:decorate id="repoField" template="../field.xhtml">
-            <h:inputText id="repo" required="false"
-              value="#{projectHome.instance.sourceCheckoutURL}">
-              <a4j:ajax event="blur" render="repoField" execute="@this"/>
-            </h:inputText>
-          </s:decorate>
-
-          <p class="txt--meta">
-            <h:outputText
-              escape="false" value="#{msgs['jsf.Project.repo.message']}"/>
-          </p>
-        </div>
-      </div>
-    </div>
-
-    <div class="l--push-top-1">
-      <a4j:commandLink value="#{msgs['jsf.UpdateGeneralSettings']}"
-        id="button-update-settings"
-        action="#{projectHome.update}"
-        rendered="#{projectHome.managed}"
-        render="project-info"
-        styleClass="l--push-right-half button--primary"/>
-    </div>
-    <hr/>
-    <s:div styleClass="g--tight" id="status">
-      <s:div styleClass="g__item w--1-2 l--push-bottom-1"
-        rendered="#{projectHome.instance.status eq 'ACTIVE'}">
-        <a4j:commandLink styleClass="button--warning l--push-bottom-half"
-          id="button-lock-project"
-          action="#{projectHome.updateStatus('R')}" render="status">
-          <i
-            class="i--left i--lock"></i> #{msgs['jsf.project.readonly']}
-        </a4j:commandLink>
-
-        <p class="txt--meta">#{msgs['jsf.project.readonly.Message']}</p>
-      </s:div>
-      <s:div styleClass="g__item w--1-2 l--push-bottom-1"
-        rendered="#{projectHome.instance.status ne 'ACTIVE'}">
-        <s:fragment rendered="#{projectHome.instance.status eq 'OBSOLETE'}">
-          <button class="button--success l--push-bottom-half"
-            disabled="true">
-            <i class="i--left i--lock"></i>
-            #{msgs['jsf.project.writable']}
-          </button>
-        </s:fragment>
-        <a4j:commandLink styleClass="button--success l--push-bottom-half"
-          id="button-unlock-project"
-          rendered="#{projectHome.instance.status == 'READONLY'}"
-          action="#{projectHome.updateStatus('A')}" render="status">
-          <i
-            class="i--left i--lock"></i> #{msgs['jsf.project.writable']}
-        </a4j:commandLink>
-
-        <p class="txt--meta">#{msgs['jsf.project.writable.Message']}</p>
-      </s:div>
-
-      <s:fragment
-        rendered="#{s:hasPermission(projectHome.instance, 'mark-obsolete')}">
-        <s:div styleClass="g__item w--1-2"
-          rendered="#{projectHome.instance.status ne 'OBSOLETE'}">
-          <a href="javascript:void(0)" id="button-archive-project"
-            class="button--danger l--push-bottom-half"
-            onclick="zanata.modal.show('#delete-confirmation-modal')">
-            #{msgs['jsf.DeleteThisProject']}
-            <i class="i--left i--trash"></i>
-          </a>
-
-          <p class="txt--meta">#{msgs['jsf.DeleteProject.Message']}</p>
-        </s:div>
-      </s:fragment>
-    </s:div>
-  </h:form>
+  <ui:include src="settings-tab-general.xhtml"/>
 </li>
 <li id="settings-languages" class="js-static-element">
   <ui:include src="settings-tab-languages.xhtml" />

From 70e87501e4b0bdbc8c03be446e384184dfa61285 Mon Sep 17 00:00:00 2001
From: Alex Eng <aeng@redhat.com>
Date: Thu, 2 Jul 2015 15:58:13 +1000
Subject: [PATCH 4/5] Add metadata of how translation is being input:

https://bugzilla.redhat.com/show_bug.cgi?id=1235070

Squashed commit of the following:

commit 4af776a092935490089944e8ea84a66316303c8b
Author: Alex Eng <aeng@redhat.com>
Date:   Thu Jul 2 12:02:17 2015 +1000

    fix unit test

commit 289ea093666888121d212a70dec320683d0157d0
Author: Alex Eng <aeng@redhat.com>
Date:   Thu Jul 2 08:43:26 2015 +1000

    Set entity properties for HTextFlowTargetHistory when copy version

commit 618c5e057fd46749ed0bf61713f7b53809764207
Author: Alex Eng <aeng@redhat.com>
Date:   Wed Jul 1 13:11:58 2015 +1000

    Set automatedEntry when update in HTextFlowTarget

commit e0d3eada4565ef0e1f8e3afbe791668ce8824920
Author: Alex Eng <aeng@redhat.com>
Date:   Tue Jun 30 08:13:13 2015 +1000

    Add javadoc for new type

commit d493b441e61a74954ba9bab19e2c7168979d42ba
Author: Alex Eng <aeng@redhat.com>
Date:   Mon Jun 29 11:07:07 2015 +1000

    Update release notes

commit 0fc402133864a2ea4fb65407f0ef8b950a7dad86
Merge: 0eb64ff 158ad02
Author: Alex Eng <aeng@redhat.com>
Date:   Mon Jun 29 11:06:26 2015 +1000

    Merge branch 'integration/master' into rhbz1235070-stats

commit 0eb64ff68323140c333388d6606ecba071e07272
Author: Alex Eng <aeng@redhat.com>
Date:   Mon Jun 29 10:55:39 2015 +1000

    Merge MessageGenerator with TranslationUtil

commit f74a132f551edac954f7d0a660fe79ee54ecd598
Author: Alex Eng <aeng@redhat.com>
Date:   Fri Jun 26 16:03:59 2015 +1000

    Add automatedEntry condition for user statistic query

commit 23deb7ace51ba8f6a14069039b3ae407ebcc7fe8
Author: Alex Eng <aeng@redhat.com>
Date:   Fri Jun 26 13:24:15 2015 +1000

    Add revision comment in editor history

commit bd98cc73c36adf836d98b90615e368ad231d0463
Author: Alex Eng <aeng@redhat.com>
Date:   Thu Jun 25 16:27:22 2015 +1000

    Add sourceType for all translation update

commit dbb4efbbe49f59fd13e7a820fc3dbbf66400b20e
Author: Alex Eng <aeng@redhat.com>
Date:   Thu Jun 25 15:12:32 2015 +1000

    Add entityType, sourceType, entityId and automatedEntry to HTextFlowTarget and HTextFlowTargetHistory

commit ae9cd703553dbb63b1cb6e1f8d9cf760084620a1
Author: Alex Eng <aeng@redhat.com>
Date:   Thu Jun 25 11:40:25 2015 +1000

    Add revision comment from TM Merge action
---
 docs/release-notes.md                         |   2 +
 .../main/java/org/zanata/model/Activity.java  |   6 +-
 .../main/java/org/zanata/model/HDocument.java |   2 +-
 .../org/zanata/model/HProjectIteration.java   |   2 +-
 .../org/zanata/model/HTextFlowTarget.java     |  54 ++++-
 .../zanata/model/HTextFlowTargetHistory.java  |  66 +++++-
 .../zanata/model/ITextFlowTargetHistory.java  |  11 +
 .../org/zanata/model/IsEntityWithType.java    |   2 +-
 .../model/type/TranslationEntityType.java     |  51 +++++
 .../model/type/TranslationSourceType.java     | 101 +++++++++
 .../model/type/TranslationSourceTypeType.java |  67 ++++++
 .../TranslationSourceTypeTypeDescriptor.java  |  74 +++++++
 .../model/type/TranslationSourceTypeTest.java |  47 +++++
 .../org/zanata/action/VersionHomeAction.java  |   4 +-
 .../zanata/dao/TextFlowTargetHistoryDAO.java  |  39 ++--
 .../file/TranslationDocumentUpload.java       |   5 +-
 .../editor/service/TranslationService.java    |   8 +-
 .../AsynchronousProcessResourceService.java   |  16 +-
 .../org/zanata/rest/service/FileService.java  |   4 +-
 .../service/TranslatedDocResourceService.java |   4 +-
 .../zanata/service/TranslationService.java    |   9 +-
 .../service/impl/ActivityServiceImpl.java     |   8 +-
 .../zanata/service/impl/CopyTransWork.java    |   9 +-
 .../service/impl/CopyVersionServiceImpl.java  |   9 +-
 .../service/impl/MergeTranslationsWork.java   |   7 +-
 .../impl/TransMemoryMergeServiceImpl.java     |  19 +-
 .../service/impl/TranslationServiceImpl.java  |  85 +++++++-
 .../org/zanata/util/MessageGenerator.java     | 117 -----------
 .../java/org/zanata/util/TranslationUtil.java | 196 ++++++++++++++++++
 .../presenter/TransMemoryMergePresenter.java  |   7 +-
 .../presenter/TransUnitsTablePresenter.java   |   3 +-
 .../TranslationHistoryPresenter.java          |   2 +-
 .../client/service/TransUnitSaveService.java  |   7 +-
 .../client/ui/TransHistoryItemLine.java       |  25 ++-
 .../client/ui/TransHistoryItemLine.ui.xml     |   3 +
 .../rpc/GetTranslationHistoryHandler.java     |   6 +-
 .../server/rpc/TransUnitTransformer.java      |  11 +-
 .../shared/model/TransHistoryItem.java        |  10 +-
 .../webtrans/shared/model/TransUnit.java      |  17 ++
 .../shared/model/TransUnitUpdateRequest.java  |  39 +++-
 .../webtrans/shared/rpc/ReplaceText.java      |   7 +-
 .../db/changelogs/db.changelog-3.8.xml        |  53 +++++
 .../src/main/resources/db/db.changelog.xml    |   2 +
 .../org/zanata/dao/TextFlowTargetDAOTest.java | 119 +++++++++++
 .../file/TranslationDocumentUploadTest.java   |   3 +-
 .../zanata/rest/service/FileServiceTest.java  |   5 +-
 .../impl/CopyTransServiceImplTest.java        |   8 +-
 .../impl/CopyVersionServiceImplTest.java      |  14 ++
 .../MergeTranslationsServiceImplTest.java     |  17 +-
 .../impl/TransMemoryMergeServiceImplTest.java |  16 +-
 .../impl/TranslationServiceImplJpaTest.java   |   3 +-
 .../impl/TranslationServiceImplTest.java      |  46 ++--
 .../org/zanata/util/TranslationUtilTest.java  | 140 +++++++++++++
 .../client/presenter/ComparingPairTest.java   |   2 +-
 .../TranslationHistoryPresenterTest.java      |   6 +-
 .../TransMemoryMergeStatusResolverTest.java   |   4 +-
 56 files changed, 1364 insertions(+), 235 deletions(-)
 create mode 100644 zanata-model/src/main/java/org/zanata/model/type/TranslationEntityType.java
 create mode 100644 zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
 create mode 100644 zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeType.java
 create mode 100644 zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeTypeDescriptor.java
 create mode 100644 zanata-model/src/test/java/org/zanata/model/type/TranslationSourceTypeTest.java
 delete mode 100644 zanata-war/src/main/java/org/zanata/util/MessageGenerator.java
 create mode 100644 zanata-war/src/main/java/org/zanata/util/TranslationUtil.java
 create mode 100644 zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml
 create mode 100644 zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
 create mode 100644 zanata-war/src/test/java/org/zanata/util/TranslationUtilTest.java

diff --git a/docs/release-notes.md b/docs/release-notes.md
index f5ab84f0e7..dc80bd1811 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -2,12 +2,14 @@
 
 <h5>Bug fixes</h5>
 * [1233524](https://bugzilla.redhat.com/show_bug.cgi?id=1233524) - Update project search page to include user
+* [1235070](https://bugzilla.redhat.com/show_bug.cgi?id=1235070) - Copied translations (using copy trans) should not be taken into account as contributions in the stats
 
 -----------------------
 
 <h5>New Features</h5>
 
 
+
 ## 3.7
 
 <h5>Deployment</h5>
diff --git a/zanata-model/src/main/java/org/zanata/model/Activity.java b/zanata-model/src/main/java/org/zanata/model/Activity.java
index 69139616ed..72cf0d7b86 100644
--- a/zanata-model/src/main/java/org/zanata/model/Activity.java
+++ b/zanata-model/src/main/java/org/zanata/model/Activity.java
@@ -100,9 +100,9 @@ public class Activity extends ModelEntityBase implements Serializable {
     public Activity(HPerson actor, IsEntityWithType context,
             IsEntityWithType target, ActivityType activityType, int wordCount) {
         this.actor = actor;
-        this.contextType = context.getEntityType();
+        this.contextType = context.getType();
         this.contextId = context.getId();
-        this.lastTargetType = target.getEntityType();
+        this.lastTargetType = target.getType();
         this.lastTargetId = target.getId();
         this.activityType = activityType;
         this.wordCount = wordCount;
@@ -113,7 +113,7 @@ public void updateActivity(Date currentTime, IsEntityWithType target,
         this.endOffsetMillis = currentTime.getTime() - approxTime.getTime();
         this.wordCount += wordCount;
         this.eventCount++;
-        this.lastTargetType = target.getEntityType();
+        this.lastTargetType = target.getType();
         this.lastTargetId = target.getId();
     }
 
diff --git a/zanata-model/src/main/java/org/zanata/model/HDocument.java b/zanata-model/src/main/java/org/zanata/model/HDocument.java
index af3a3ddfa1..9fcb1f9408 100644
--- a/zanata-model/src/main/java/org/zanata/model/HDocument.java
+++ b/zanata-model/src/main/java/org/zanata/model/HDocument.java
@@ -303,7 +303,7 @@ public HRawDocument getRawDocument() {
 
     @Override
     @Transient
-    public EntityType getEntityType() {
+    public EntityType getType() {
         return EntityType.HDocument;
     }
 
diff --git a/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java b/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
index 96f8a67bc6..565bf0a719 100644
--- a/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
+++ b/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
@@ -164,7 +164,7 @@ public Iterator<DocumentWithId> iterator() {
 
     @Override
     @Transient
-    public EntityType getEntityType() {
+    public EntityType getType() {
         return EntityType.HProjectIteration;
     }
 
diff --git a/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java b/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
index ce95bcab76..57022d6bb7 100644
--- a/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
+++ b/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
@@ -32,6 +32,8 @@
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityListeners;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
@@ -41,6 +43,7 @@
 import javax.persistence.PostLoad;
 import javax.persistence.PostPersist;
 import javax.persistence.PostUpdate;
+import javax.persistence.PrePersist;
 import javax.persistence.PreUpdate;
 import javax.persistence.Transient;
 import javax.validation.constraints.NotNull;
@@ -53,6 +56,8 @@
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.NaturalId;
+import org.hibernate.annotations.Type;
+import org.hibernate.annotations.TypeDef;
 import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.AnalyzerDiscriminator;
 import org.hibernate.search.annotations.Field;
@@ -69,10 +74,13 @@
 import org.zanata.hibernate.search.StringListBridge;
 import org.zanata.hibernate.search.TextContainerAnalyzerDiscriminator;
 import org.zanata.model.type.EntityType;
+import org.zanata.model.type.TranslationEntityType;
+import org.zanata.model.type.TranslationSourceType;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.collect.Lists;
+import org.zanata.model.type.TranslationSourceTypeType;
 
 /**
  * Represents a flow of translated text that should be processed as a
@@ -85,6 +93,7 @@
 @Entity
 @EntityListeners({ HTextFlowTarget.EntityListener.class })
 @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+@TypeDef(name = "sourceType", typeClass = TranslationSourceTypeType.class)
 @Indexed
 @Setter
 @NoArgsConstructor
@@ -121,12 +130,28 @@ public class HTextFlowTarget extends ModelEntityBase implements HasContents,
     @Getter
     private String revisionComment;
 
+    private TranslationEntityType entityType;
+
+    @Getter
+    private Long entityId;
+
+    private TranslationSourceType sourceType;
+
+    @Getter
+    @Setter(AccessLevel.PRIVATE)
+    private Boolean automatedEntry;
+
     private boolean revisionCommentSet = false;
 
     // Only for internal use (persistence transient)
     @Setter(AccessLevel.PRIVATE)
     private Integer oldVersionNum;
 
+    @Type(type = "sourceType")
+    public TranslationSourceType getSourceType() {
+        return sourceType;
+    }
+
     public void setRevisionComment(String revisionComment) {
         this.revisionComment = revisionComment;
         revisionCommentSet = true;
@@ -242,6 +267,11 @@ public void setContent(String content) {
         this.setContents(Arrays.asList(content));
     }
 
+    @Enumerated(EnumType.STRING)
+    public TranslationEntityType getEntityType() {
+        return entityType;
+    }
+
     @Override
     @Transient
     // TODO extend HTextContainer and remove this
@@ -416,6 +446,10 @@ public void clear() {
         setLastModifiedBy(null);
         setTranslator(null);
         setReviewer(null);
+        setRevisionComment(null);
+        setSourceType(null);
+        setEntityId(null);
+        setEntityType(null);
     }
 
     protected boolean logPersistence() {
@@ -424,7 +458,7 @@ protected boolean logPersistence() {
 
     @Override
     @Transient
-    public EntityType getEntityType() {
+    public EntityType getType() {
         return EntityType.HTexFlowTarget;
     }
 
@@ -433,11 +467,29 @@ public static class EntityListener {
         private void preUpdate(HTextFlowTarget tft) {
             // insert history if this has changed from its initial state
             if (tft.initialState != null && tft.initialState.hasChanged(tft)) {
+                if (tft.initialState.getSourceType() == null) {
+                    tft.initialState.setSourceType(TranslationSourceType.UNKNOWN);
+                }
+                tft.initialState.setAutomatedEntry(tft.initialState
+                        .getSourceType().isAutomatedEntry());
                 tft.getHistory().put(tft.oldVersionNum, tft.initialState);
                 if (!tft.isRevisionCommentSet()) {
                     tft.setRevisionComment(null);
                 }
             }
+            setAutomatedEntry(tft);
+        }
+
+        @PrePersist
+        private void prePersist(HTextFlowTarget tft) {
+            setAutomatedEntry(tft);
+        }
+
+        private void setAutomatedEntry(HTextFlowTarget tft) {
+            if (tft.getSourceType() == null) {
+                tft.setSourceType(TranslationSourceType.UNKNOWN);
+            }
+            tft.setAutomatedEntry(tft.getSourceType().isAutomatedEntry());
         }
 
         @PostUpdate
diff --git a/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java b/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
index 35e8c28ffb..abed4fdc99 100644
--- a/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
+++ b/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
@@ -29,6 +29,9 @@
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
@@ -37,17 +40,26 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
+import javax.persistence.PostLoad;
+import javax.persistence.PostPersist;
+import javax.persistence.PostUpdate;
+import javax.persistence.PrePersist;
+import javax.persistence.PreUpdate;
 
 import org.hibernate.annotations.AccessType;
 import org.hibernate.annotations.Immutable;
 import org.hibernate.annotations.IndexColumn;
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.annotations.Type;
+import org.hibernate.annotations.TypeDef;
 import org.zanata.common.ContentState;
+import org.zanata.model.type.TranslationEntityType;
+import org.zanata.model.type.TranslationSourceType;
 
 import com.google.common.base.Objects;
 import lombok.Getter;
 import lombok.Setter;
+import org.zanata.model.type.TranslationSourceTypeType;
 
 @Entity
 @Immutable
@@ -76,6 +88,8 @@
                 name = HTextFlowTargetHistory.QUERY_MATCHING_HISTORY + 6,
                 query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = :tft and size(t.contents) = :contentCount "
                         + "and contents[0] = :content0 and contents[1] = :content1 and contents[2] = :content2 and contents[3] = :content3 and contents[4] = :content4 and contents[5] = :content5") })
+@TypeDef(name = "sourceType", typeClass = TranslationSourceTypeType.class)
+@EntityListeners({ HTextFlowTargetHistory.EntityListener.class })
 public class HTextFlowTargetHistory extends HTextContainer implements
         Serializable, ITextFlowTargetHistory {
     static final String QUERY_MATCHING_HISTORY =
@@ -107,6 +121,20 @@ public static String getQueryNameMatchingHistory(int size) {
 
     private HPerson reviewer;
 
+    @Setter
+    private TranslationEntityType entityType;
+
+    @Getter
+    @Setter
+    private Long entityId;
+
+    @Setter
+    private TranslationSourceType sourceType;
+
+    @Getter
+    @Setter
+    private Boolean automatedEntry;
+
     @Getter
     @Setter
     private String revisionComment;
@@ -125,7 +153,10 @@ public HTextFlowTargetHistory(HTextFlowTarget target) {
         this.reviewer = target.getReviewer();
         this.setContents(target.getContents());
         this.revisionComment = target.getRevisionComment();
-
+        this.automatedEntry = target.getAutomatedEntry();
+        this.sourceType = target.getSourceType();
+        this.entityId = target.getEntityId();
+        this.entityType = target.getEntityType();
     }
 
     @Id
@@ -238,6 +269,35 @@ public void setReviewer(HPerson reviewer) {
         this.reviewer = reviewer;
     }
 
+    @Type(type = "sourceType")
+    public TranslationSourceType getSourceType() {
+        return sourceType;
+    }
+
+    @Enumerated(EnumType.STRING)
+    public TranslationEntityType getEntityType() {
+        return entityType;
+    }
+
+    public static class EntityListener {
+        @PreUpdate
+        private void preUpdate(HTextFlowTargetHistory tfth) {
+            setAutomatedEntry(tfth);
+        }
+
+        @PrePersist
+        private void prePersist(HTextFlowTargetHistory tfth) {
+            setAutomatedEntry(tfth);
+        }
+
+        private void setAutomatedEntry(HTextFlowTargetHistory tfth) {
+            if (tfth.getSourceType() == null) {
+                tfth.setSourceType(TranslationSourceType.UNKNOWN);
+            }
+            tfth.setAutomatedEntry(tfth.getSourceType().isAutomatedEntry());
+        }
+    }
+
     /**
      * Determines whether a Text Flow Target has changed when compared to this
      * history object.
@@ -261,6 +321,8 @@ public boolean hasChanged(HTextFlowTarget current) {
                 || !Objects.equal(current.getTextFlow().getId(),
                         this.textFlowTarget.getId())
                 || !Objects.equal(current.getVersionNum(), this.versionNum)
-                || !Objects.equal(current.getRevisionComment(), this.revisionComment);
+                || !Objects.equal(current.getRevisionComment(), this.revisionComment)
+                || !Objects.equal(current.getEntityId(), this.entityId)
+                || !Objects.equal(current.getEntityType(), this.entityType);
     }
 }
diff --git a/zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java b/zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java
index e49ca2e06d..769caf0afd 100644
--- a/zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java
+++ b/zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java
@@ -24,6 +24,7 @@
 import java.util.List;
 
 import org.zanata.common.ContentState;
+import org.zanata.model.type.TranslationEntityType;
 
 public interface ITextFlowTargetHistory {
 
@@ -42,4 +43,14 @@ public interface ITextFlowTargetHistory {
     HPerson getTranslator();
 
     HPerson getReviewer();
+
+    Long getId();
+
+    Long getEntityId();
+
+    TranslationEntityType getEntityType();
+
+    void setEntityType(TranslationEntityType entityType);
+
+    void setEntityId(Long id);
 }
diff --git a/zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java b/zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
index 9f728e7a71..cdd7608b9e 100644
--- a/zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
+++ b/zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
@@ -28,5 +28,5 @@
 public interface IsEntityWithType {
     Long getId();
 
-    EntityType getEntityType();
+    EntityType getType();
 }
diff --git a/zanata-model/src/main/java/org/zanata/model/type/TranslationEntityType.java b/zanata-model/src/main/java/org/zanata/model/type/TranslationEntityType.java
new file mode 100644
index 0000000000..b4cee7f45a
--- /dev/null
+++ b/zanata-model/src/main/java/org/zanata/model/type/TranslationEntityType.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015, Red Hat, Inc. and individual contributors as indicated by the
+ * @author tags. See the copyright.txt file in the distribution for a full
+ * listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+
+package org.zanata.model.type;
+
+import lombok.Getter;
+import org.zanata.model.HTextFlowTarget;
+import org.zanata.model.HTextFlowTargetHistory;
+import org.zanata.model.tm.TransMemoryUnit;
+
+import java.io.Serializable;
+
+/**
+ * Entity type of origin for translation copied.
+ *
+ * Usage {@link org.zanata.model.HTextFlowTarget.entityType} and
+ * {@link org.zanata.model.HTextFlowTargetHistory.entityType}
+ *
+ * @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>
+ */
+public enum TranslationEntityType implements Serializable {
+    TMX(TransMemoryUnit.class),
+    TFT(HTextFlowTarget.class),
+    TTH(HTextFlowTargetHistory.class);
+    //    MT(null);
+
+    @Getter
+    private final Class clazz;
+
+    private TranslationEntityType(Class clazz) {
+        this.clazz = clazz;
+    }
+}
diff --git a/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java b/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
new file mode 100644
index 0000000000..902764cb36
--- /dev/null
+++ b/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2015, Red Hat, Inc. and individual contributors as indicated by the
+ * @author tags. See the copyright.txt file in the distribution for a full
+ * listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+
+package org.zanata.model.type;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+import lombok.Getter;
+
+/**
+ * Source of action on how translation are being copied.
+ *
+ * Usage {@link org.zanata.model.HTextFlowTarget.sourceType} and
+ * {@link org.zanata.model.HTextFlowTargetHistory.sourceType}
+ *
+ * @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>
+ */
+public enum TranslationSourceType implements Serializable {
+    COPY_TRANS("CT"),
+    COPY_VERSION("CV"),
+    MERGE_VERSION("MV"),
+    TM_MERGE("TM"),
+    MACHINE_TRANS("MT"),
+    GWT_EDITOR_ENTRY("GWT"),
+    JS_EDITOR_ENTRY("JS"),
+    API_UPLOAD("API"),
+    WEB_UPLOAD("WEB"),
+    UNKNOWN("UNK");
+
+    public static final Collection<TranslationSourceType> AUTOMATED_ENTRIES;
+
+    static {
+        AUTOMATED_ENTRIES =
+                ImmutableSet.of(TranslationSourceType.COPY_TRANS,
+                        TranslationSourceType.COPY_VERSION,
+                        TranslationSourceType.MERGE_VERSION,
+                        TranslationSourceType.TM_MERGE);
+    }
+
+    @Getter
+    private final String abbr;
+
+    private TranslationSourceType(String abbr) {
+        this.abbr = abbr;
+    }
+
+    public static TranslationSourceType getValueOf(String abbr) {
+        switch (abbr) {
+            case "CT":
+                return TranslationSourceType.COPY_TRANS;
+            case "CV":
+                return TranslationSourceType.COPY_VERSION;
+            case "MV":
+                return TranslationSourceType.MERGE_VERSION;
+            case "TM":
+                return TranslationSourceType.TM_MERGE;
+            case "GWT":
+                return TranslationSourceType.GWT_EDITOR_ENTRY;
+            case "JS":
+                return TranslationSourceType.JS_EDITOR_ENTRY;
+            case "API":
+                return TranslationSourceType.API_UPLOAD;
+            case "WEB":
+                return TranslationSourceType.WEB_UPLOAD;
+            case "MT":
+                return TranslationSourceType.MACHINE_TRANS;
+            case "UNK":
+                return TranslationSourceType.UNKNOWN;
+            default:
+                throw new IllegalArgumentException(String.valueOf(abbr));
+        }
+    }
+
+    public boolean isAutomatedEntry() {
+        return AUTOMATED_ENTRIES.contains(this);
+    }
+}
diff --git a/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeType.java b/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeType.java
new file mode 100644
index 0000000000..9e3214033f
--- /dev/null
+++ b/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeType.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2015, Red Hat, Inc. and individual contributors as indicated by the
+ * @author tags. See the copyright.txt file in the distribution for a full
+ * listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+
+package org.zanata.model.type;
+
+import org.hibernate.MappingException;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.type.AbstractSingleColumnStandardBasicType;
+import org.hibernate.type.DiscriminatorType;
+import org.hibernate.type.StringType;
+
+
+public class TranslationSourceTypeType extends AbstractSingleColumnStandardBasicType<TranslationSourceType>
+    implements DiscriminatorType<TranslationSourceType> {
+
+    public TranslationSourceTypeType() {
+        super(StringType.INSTANCE.getSqlTypeDescriptor(),
+            TranslationSourceTypeTypeDescriptor.INSTANCE);
+    }
+
+    @Override
+    public String toString(TranslationSourceType value) {
+        return String.valueOf((value).getAbbr());
+    }
+
+    @Override
+    public String getName() {
+        return "sourceType";
+    }
+
+    @Override
+    public String objectToSQLString(TranslationSourceType value, Dialect dialect)
+            throws Exception {
+        return "\'" + toString(value) + "\'";
+    }
+
+    public TranslationSourceType stringToObject(String xml) throws Exception {
+        if (xml.length() < 1) {
+            throw new MappingException(
+                    "multiple or zero characters found parsing string");
+        }
+        return TranslationSourceType.getValueOf(xml);
+    }
+
+    public TranslationSourceType fromStringValue(String xml) {
+        return TranslationSourceType.getValueOf(xml);
+    }
+
+}
diff --git a/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeTypeDescriptor.java b/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeTypeDescriptor.java
new file mode 100644
index 0000000000..77a987d298
--- /dev/null
+++ b/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeTypeDescriptor.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2015, Red Hat, Inc. and individual contributors as indicated by the
+ * @author tags. See the copyright.txt file in the distribution for a full
+ * listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+
+package org.zanata.model.type;
+
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.AbstractTypeDescriptor;
+import org.zanata.common.ContentType;
+
+public class TranslationSourceTypeTypeDescriptor extends
+        AbstractTypeDescriptor<TranslationSourceType> {
+    private static final long serialVersionUID = 1L;
+    public static final TranslationSourceTypeTypeDescriptor INSTANCE =
+            new TranslationSourceTypeTypeDescriptor();
+
+    public TranslationSourceTypeTypeDescriptor() {
+        super(TranslationSourceType.class);
+    }
+
+    @Override
+    public TranslationSourceType fromString(String string) {
+        if (string == null) {
+            return null;
+        } else {
+            return TranslationSourceType.getValueOf(string);
+        }
+    }
+
+    @Override
+    public String toString(TranslationSourceType value) {
+        return value.getAbbr();
+    }
+
+    @Override
+    public <X> X
+            unwrap(TranslationSourceType value, Class<X> type, WrapperOptions options) {
+        if (value == null) {
+            return null;
+        }
+        if (String.class.isAssignableFrom(type)) {
+            return (X) String.valueOf(value.getAbbr());
+        }
+        throw unknownUnwrap(type);
+    }
+
+    @Override
+    public <X> TranslationSourceType wrap(X value, WrapperOptions options) {
+        if (value == null) {
+            return null;
+        }
+        if (String.class.isInstance(value)) {
+            return TranslationSourceType.getValueOf((String) value);
+        }
+        throw unknownWrap(value.getClass());
+    }
+}
diff --git a/zanata-model/src/test/java/org/zanata/model/type/TranslationSourceTypeTest.java b/zanata-model/src/test/java/org/zanata/model/type/TranslationSourceTypeTest.java
new file mode 100644
index 0000000000..db8a2d6eb1
--- /dev/null
+++ b/zanata-model/src/test/java/org/zanata/model/type/TranslationSourceTypeTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015, Red Hat, Inc. and individual contributors as indicated by the
+ * @author tags. See the copyright.txt file in the distribution for a full
+ * listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+
+package org.zanata.model.type;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>
+ */
+public class TranslationSourceTypeTest {
+
+    @Test
+    public void testGetFromAbbr() {
+        for (TranslationSourceType type : TranslationSourceType.values()) {
+            TranslationSourceType.getValueOf(type.getAbbr());
+            assertThat(TranslationSourceType.getValueOf(type.getAbbr()))
+                    .isEqualTo(type);
+        }
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testGetFromAbbrException() {
+        TranslationSourceType.getValueOf("non-exist-abbr");
+    }
+
+}
diff --git a/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java b/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
index 28e28765b9..8812af29eb 100644
--- a/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
@@ -64,6 +64,7 @@
 import org.zanata.model.HLocale;
 import org.zanata.model.HProjectIteration;
 import org.zanata.model.HRawDocument;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.rest.StringSet;
 import org.zanata.rest.dto.extensions.ExtensionType;
 import org.zanata.rest.dto.resource.Resource;
@@ -1009,7 +1010,8 @@ public void uploadTranslationFile(HLocale hLocale) {
                             translationFileUpload.isMergeTranslations() ?
                                     MergeType.AUTO
                                     : MergeType.IMPORT,
-                            translationFileUpload.isAssignCreditToUploader());
+                            translationFileUpload.isAssignCreditToUploader(),
+                            TranslationSourceType.WEB_UPLOAD);
 
             StringBuilder infoMsg =
                     new StringBuilder("File ").append(
diff --git a/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java b/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
index ed390c487e..a2214fc80f 100644
--- a/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
+++ b/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
@@ -78,25 +78,28 @@ public TextFlowTargetHistoryDAO(Session session) {
      */
     @NativeQuery
     public List<Object[]> getUserContributionStatisticInVersion(
-            Long versionId, Long personId, Date from, Date to) {
+            Long versionId, Long personId, Date fromDate, Date toDate) {
 
         StringBuilder queryString = new StringBuilder();
         queryString
                 .append("select sum(wordCount), state, localeId from ")
                     .append("(select wordCount, id, state, localeId from ")
-                        .append("(select h.state, tft.id, h.translated_by_id, tf.wordCount, locale.localeId ")
+                        .append(
+                            "(select h.state, tft.id, h.translated_by_id, tf.wordCount, locale.localeId ")
                         .append("from HTextFlowTargetHistory h ")
                         .append("JOIN HTextFlowTarget tft ON tft.id = h.target_id ")
                         .append("JOIN HLocale locale ON locale.id = tft.locale ")
                         .append("JOIN HTextFlow tf ON tf.id = tft.tf_id ")
                         .append("JOIN HDocument doc ON doc.id = tf.document_Id ")
                         .append("where doc.project_iteration_id =:versionId ")
-                        .append("and h.state <> 0 ")
+                        .append("and h.state <> :untranslated ")
                         .append("and h.translated_by_id =:personId ")
-                        .append("and h.lastChanged between :from and :to ")
+                        .append("and h.lastChanged between :fromDate and :toDate ")
+                        .append("and h.automatedEntry =:automatedEntry ")
                         .append("and tft.translated_by_id <> h.translated_by_id ")
                         .append("and h.lastChanged = ")
-                            .append("(select max(lastChanged) from HTextFlowTargetHistory where h.target_id = target_id) ")
+                            .append(
+                                "(select max(lastChanged) from HTextFlowTargetHistory where h.target_id = target_id) ")
                         .append("union all ")
                         .append("select tft.state, tft.id, tft.translated_by_id, tf.wordCount, locale.localeId ")
                         .append("from HTextFlowTarget tft ")
@@ -104,9 +107,10 @@ public List<Object[]> getUserContributionStatisticInVersion(
                         .append("JOIN HTextFlow tf ON tf.id = tft.tf_id ")
                         .append("JOIN HDocument doc ON doc.id = tf.document_Id ")
                         .append("where doc.project_iteration_id =:versionId ")
-                        .append("and tft.state <> 0 ")
+                        .append("and tft.state <> :untranslated ")
+                        .append("and tft.automatedEntry =:automatedEntry ")
                         .append("and tft.translated_by_id =:personId ")
-                        .append("and tft.lastChanged between :from and :to ")
+                        .append("and tft.lastChanged between :fromDate and :toDate ")
                         .append(") as target_history_union ")
                     .append("group by state, id, localeId, wordCount) as target_history_group ")
                 .append("group by state, localeId");
@@ -115,8 +119,10 @@ public List<Object[]> getUserContributionStatisticInVersion(
         Query query = getSession().createSQLQuery(queryString.toString());
         query.setParameter("versionId", versionId);
         query.setParameter("personId", personId);
-        query.setTimestamp("from", from);
-        query.setTimestamp("to", to);
+        query.setInteger("untranslated", ContentState.New.ordinal());
+        query.setBoolean("automatedEntry", false);
+        query.setTimestamp("fromDate", fromDate);
+        query.setTimestamp("toDate", toDate);
         query.setComment("textFlowTargetHistoryDAO.getUserContributionStatisticInVersion");
         return query.list();
     }
@@ -211,7 +217,7 @@ public <T> List<T> getUserTranslationMatrix(
                 "    join HProjectIteration iter on iter.id = doc.project_iteration_id " +
                 "  where history.lastChanged >= :fromDate and history.lastChanged <= :toDate " +
                 "    and history.last_modified_by_id = :user and (history.translated_by_id is not null or history.reviewed_by_id is not null)" +
-                "    and history.state <> :untranslated and history.state <> :rejected";
+                "    and history.state <> :untranslated and history.state <> :rejected and history.automatedEntry =:automatedEntry";
 
         String queryTarget = "select tft.id, iter.id as iteration, tft.locale as locale, tf.wordCount as wordCount, tft.state as state, tft.lastChanged as lastChanged " +
                 "  from HTextFlowTarget tft " +
@@ -220,7 +226,7 @@ public <T> List<T> getUserTranslationMatrix(
                 "    join HProjectIteration iter on iter.id = doc.project_iteration_id " +
                 "  where tft.lastChanged >= :fromDate and tft.lastChanged <= :toDate " +
                 "    and tft.last_modified_by_id = :user and (tft.translated_by_id is not null or tft.reviewed_by_id is not null)" +
-                "    and tft.state <> :untranslated and tft.state <> :rejected";
+                "    and tft.state <> :untranslated and tft.state <> :rejected and tft.automatedEntry =:automatedEntry";
 
         String convertedLastChanged = convertTimeZoneFunction("lastChanged",
                 userZoneOpt, systemZone);
@@ -234,12 +240,13 @@ public <T> List<T> getUserTranslationMatrix(
                         "  group by " + dateOfLastChanged + ", iteration, locale, state " +
                         "  order by lastChanged, iteration, locale, state";
         Query query = getSession().createSQLQuery(queryString)
-                .setParameter("user", user.getId())
-                .setInteger("untranslated", ContentState.New.ordinal())
+            .setParameter("user", user.getId())
+            .setInteger("untranslated", ContentState.New.ordinal())
                 .setInteger("rejected", ContentState.Rejected.ordinal())
-                .setTimestamp("fromDate", fromDate.toDate())
-                .setTimestamp("toDate", toDate.toDate())
-                .setResultTransformer(resultTransformer);
+            .setBoolean("automatedEntry", false)
+            .setTimestamp("fromDate", fromDate.toDate())
+            .setTimestamp("toDate", toDate.toDate())
+            .setResultTransformer(resultTransformer);
         return query.list();
     }
 
diff --git a/zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java b/zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
index cdccec2a76..df9aa31821 100644
--- a/zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
+++ b/zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
@@ -48,6 +48,7 @@
 import org.zanata.model.HDocumentUpload;
 import org.zanata.model.HLocale;
 import org.zanata.model.HProjectIteration;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.rest.DocumentFileUploadForm;
 import org.zanata.rest.StringSet;
 import org.zanata.rest.dto.ChunkUploadResponse;
@@ -83,7 +84,7 @@ public class TranslationDocumentUpload {
     public Response
             tryUploadTranslationFile(GlobalDocumentId id, String localeId,
                     String mergeType, boolean assignCreditToUploader,
-            DocumentFileUploadForm uploadForm) {
+            DocumentFileUploadForm uploadForm, TranslationSourceType translationSourceType) {
         try {
             failIfTranslationUploadNotValid(id, localeId, uploadForm);
 
@@ -156,7 +157,7 @@ public class TranslationDocumentUpload {
                             id.getProjectSlug(), id.getVersionSlug(),
                             id.getDocId(), locale.getLocaleId(), transRes,
                             extensions, mergeTypeFromString(mergeType),
-                            assignCreditToUploader);
+                            assignCreditToUploader, translationSourceType);
 
             return transUploadResponse(totalChunks, warnings);
         } catch (FileNotFoundException e) {
diff --git a/zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java b/zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java
index 9dd1873bd5..6dc52192a9 100644
--- a/zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java
+++ b/zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java
@@ -74,6 +74,11 @@ public class TranslationService implements TranslationResource {
     @In
     private LocaleService localeServiceImpl;
 
+    /**
+     * See {@link org.zanata.model.type.TranslationSourceType#JS_EDITOR_ENTRY}
+     */
+    private final String sourceType = "JS";
+
     @Override
     public Response get(String localeId, String ids) {
         TransUnits transUnits = new TransUnits();
@@ -129,7 +134,8 @@ public Response put(String localeId, TranslationData data) {
         TransUnitUpdateRequest request =
                 new TransUnitUpdateRequest(new TransUnitId(requestData.getId()
                         .longValue()), requestData.getContents(),
-                        requestData.getStatus(), requestData.getRevision());
+                        requestData.getStatus(), requestData.getRevision(),
+                        sourceType);
 
         List<TranslationResult> translationResults =
                 translationServiceImpl.translate(new LocaleId(localeId),
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java b/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
index f444dbdf9d..109dca9e05 100644
--- a/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
+++ b/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
@@ -39,6 +39,7 @@
 import org.zanata.model.HDocument;
 import org.zanata.model.HProject;
 import org.zanata.model.HProjectIteration;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.rest.NoSuchEntityException;
 import org.zanata.rest.ReadOnlyEntityException;
 import org.zanata.rest.dto.ProcessStatus;
@@ -156,6 +157,18 @@ public ProcessStatus startSourceDocCreationOrUpdate(final String idNoSlash,
                                                     // progress
     }
 
+    /**
+     *
+     * @param idNoSlash
+     * @param projectSlug
+     * @param iterationSlug
+     * @param locale
+     * @param translatedDoc
+     * @param extensions
+     * @param merge
+     * @param assignCreditToUploader
+     * @return
+     */
     @Override
     public ProcessStatus startTranslatedDocCreationOrUpdate(
             final String idNoSlash, final String projectSlug,
@@ -187,7 +200,8 @@ public ProcessStatus startTranslatedDocCreationOrUpdate(
         Serializable taskId = asyncTaskHandleManager.registerTaskHandle(handle);
         translationServiceImpl.translateAllInDocAsync(projectSlug,
                 iterationSlug, id, locale, translatedDoc, extensions,
-                finalMergeType, assignCreditToUploader, true, handle);
+                finalMergeType, assignCreditToUploader, true, handle,
+                TranslationSourceType.API_UPLOAD);
 
         return this.getProcessStatus(taskId.toString());
     }
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/FileService.java b/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
index 524ee0c56b..bed32acd8a 100644
--- a/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
+++ b/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
@@ -62,6 +62,7 @@
 import org.zanata.file.TranslationDocumentUpload;
 import org.zanata.model.HDocument;
 import org.zanata.model.HRawDocument;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.rest.DocumentFileUploadForm;
 import org.zanata.rest.StringSet;
 import org.zanata.rest.dto.resource.Resource;
@@ -153,7 +154,8 @@ public Response uploadTranslationFile(String projectSlug,
         GlobalDocumentId id =
                 new GlobalDocumentId(projectSlug, iterationSlug, docId);
         return translationUploader.tryUploadTranslationFile(id, localeId,
-            merge, assignCreditToUploader, uploadForm);
+            merge, assignCreditToUploader, uploadForm,
+            TranslationSourceType.API_UPLOAD);
     }
 
     @Override
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java b/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
index 6812554912..7ba34c6a63 100644
--- a/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
+++ b/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
@@ -54,6 +54,7 @@
 import org.zanata.model.HLocale;
 import org.zanata.model.HProjectIteration;
 import org.zanata.model.HTextFlowTarget;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.rest.dto.resource.TranslationsResource;
 import org.zanata.security.ZanataIdentity;
 import org.zanata.service.CopyTransService;
@@ -271,7 +272,8 @@ public Response putTranslations(String idNoSlash, LocaleId locale,
         List<String> warnings =
                 this.translationServiceImpl.translateAllInDoc(projectSlug,
                         iterationSlug, id, locale, messageBody, extensions,
-                        mergeType, assignCreditToUploader);
+                        mergeType, assignCreditToUploader,
+                        TranslationSourceType.API_UPLOAD);
 
         // Regenerate etag in case it has changed
         etag =
diff --git a/zanata-war/src/main/java/org/zanata/service/TranslationService.java b/zanata-war/src/main/java/org/zanata/service/TranslationService.java
index 736984c8cb..0b02db922c 100644
--- a/zanata-war/src/main/java/org/zanata/service/TranslationService.java
+++ b/zanata-war/src/main/java/org/zanata/service/TranslationService.java
@@ -29,6 +29,7 @@
 import org.zanata.common.LocaleId;
 import org.zanata.common.MergeType;
 import org.zanata.model.HTextFlowTarget;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.rest.dto.resource.TranslationsResource;
 import org.zanata.webtrans.shared.model.TransUnitUpdateInfo;
 import org.zanata.webtrans.shared.model.TransUnitUpdateRequest;
@@ -106,7 +107,7 @@ public Future<List<String>> translateAllInDocAsync(String projectSlug,
             String iterationSlug, String docId, LocaleId locale,
             TranslationsResource translations, Set<String> extensions,
             MergeType mergeType, boolean assignCreditToUploader, boolean lock,
-            AsyncTaskHandle handle);
+            AsyncTaskHandle handle, TranslationSourceType translationSourceType);
 
     /**
      * Translates all text flows in a document.
@@ -137,12 +138,14 @@ public Future<List<String>> translateAllInDocAsync(String projectSlug,
     List<String> translateAllInDoc(String projectSlug, String iterationSlug,
             String docId, LocaleId locale, TranslationsResource translations,
             Set<String> extensions, MergeType mergeType,
-            boolean assignCreditToUploader, AsyncTaskHandle handle);
+            boolean assignCreditToUploader, AsyncTaskHandle handle,
+            TranslationSourceType translationSourceType);
 
     List<String> translateAllInDoc(String projectSlug, String iterationSlug,
             String docId, LocaleId locale, TranslationsResource translations,
             Set<String> extensions, MergeType mergeType,
-            boolean assignCreditToUploader);
+            boolean assignCreditToUploader,
+            TranslationSourceType translationSourceType);
 
     public interface TranslationResult {
         boolean isTranslationSuccessful();
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
index 2fc2a4019e..4c84b82740 100644
--- a/zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
+++ b/zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
@@ -54,12 +54,6 @@
 import org.zanata.model.IsEntityWithType;
 import org.zanata.model.type.EntityType;
 import org.zanata.service.ActivityService;
-import org.zanata.util.DateUtil;
-import org.zanata.util.StatisticsUtil;
-
-import com.google.common.collect.Lists;
-
-import com.google.common.collect.Lists;
 
 /**
  * @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>
@@ -156,7 +150,7 @@ private void logActivityAlreadyLocked(long actorId,
         if (context != null && activityType != null) {
             Date currentActionTime = new Date();
             Activity activity =
-                    findActivity(actorId, context.getEntityType(),
+                    findActivity(actorId, context.getType(),
                             context.getId(), activityType, currentActionTime);
             if (activity != null) {
                 activity.updateActivity(currentActionTime, target, wordCount);
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java b/zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
index c88e80fd46..947c3a4d87 100644
--- a/zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
+++ b/zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
@@ -13,13 +13,13 @@
 import org.zanata.model.HSimpleComment;
 import org.zanata.model.HTextFlow;
 import org.zanata.model.HTextFlowTarget;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.service.TranslationFinder;
 import org.zanata.service.ValidationService;
 import org.zanata.service.VersionStateCache;
-import org.zanata.util.MessageGenerator;
+import org.zanata.util.TranslationUtil;
 import org.zanata.webtrans.shared.model.ValidationAction;
 import com.google.common.base.Optional;
-import com.google.common.base.Stopwatch;
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
 
@@ -258,8 +258,11 @@ public Boolean get() {
                 }
                 hComment.setComment(matchingTarget.getComment().getComment());
             }
-            hTarget.setRevisionComment(MessageGenerator
+            hTarget.setRevisionComment(TranslationUtil
                 .getCopyTransMessage(matchingTarget));
+            hTarget.setSourceType(TranslationSourceType.COPY_TRANS);
+
+            TranslationUtil.copyEntity(matchingTarget, hTarget);
 
             // TODO Maybe we should think about registering a Hibernate
             // integrator for these updates
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
index 380a7ed764..b333154d0b 100644
--- a/zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
+++ b/zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
@@ -30,11 +30,12 @@
 import org.zanata.model.po.HPoHeader;
 import org.zanata.model.po.HPoTargetHeader;
 import org.zanata.model.po.HPotEntryData;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.security.ZanataIdentity;
 import org.zanata.service.CopyVersionService;
 import org.zanata.service.VersionStateCache;
 import org.zanata.util.JPACopier;
-import org.zanata.util.MessageGenerator;
+import org.zanata.util.TranslationUtil;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -355,7 +356,9 @@ JPACopier.<HTextFlowTarget> copyBean(tft, "textFlow",
         if(tft.getComment() != null) {
             copy.setComment(new HSimpleComment(tft.getComment().getComment()));
         }
-        copy.setRevisionComment(MessageGenerator.getCopyVersionMessage(tft));
+        copy.setRevisionComment(TranslationUtil.getCopyVersionMessage(tft));
+        copy.setSourceType(TranslationSourceType.COPY_VERSION);
+        TranslationUtil.copyEntity(tft, copy);
 
         // copy review comment
         copy.setReviewComments(Lists
@@ -370,6 +373,8 @@ JPACopier.<HTextFlowTarget> copyBean(tft, "textFlow",
                     JPACopier.<HTextFlowTargetHistory> copyBean(history,
                             "textFlowTarget", "content");
             newHistory.setTextFlowTarget(copy);
+            newHistory.setSourceType(TranslationSourceType.COPY_VERSION);
+            TranslationUtil.copyEntity(history, newHistory);
             copy.getHistory().put(newHistory.getVersionNum(), newHistory);
         }
         return copy;
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java b/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
index b51939a255..d1fbfca509 100644
--- a/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
+++ b/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
@@ -34,10 +34,11 @@
 import org.zanata.model.HSimpleComment;
 import org.zanata.model.HTextFlow;
 import org.zanata.model.HTextFlowTarget;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.service.TranslationStateCache;
-import org.zanata.util.MessageGenerator;
 
 import com.google.common.base.Stopwatch;
+import org.zanata.util.TranslationUtil;
 
 /**
  * Merge translation and persist in transaction.
@@ -137,8 +138,10 @@ private void mergeTextFlowTarget(HTextFlowTarget sourceTft,
             }
             hComment.setComment(sourceTft.getComment().getComment());
         }
-        targetTft.setRevisionComment(MessageGenerator
+        targetTft.setRevisionComment(TranslationUtil
             .getMergeTranslationMessage(sourceTft));
+        targetTft.setSourceType(TranslationSourceType.MERGE_VERSION);
+        TranslationUtil.copyEntity(sourceTft, targetTft);
 
         raiseSuccessEvent(targetTft, oldState);
     }
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
index 90f8c251b4..1a4c55cd84 100644
--- a/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
+++ b/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
@@ -36,12 +36,15 @@
 import org.zanata.model.HTextFlow;
 import org.zanata.model.HTextFlowTarget;
 import org.zanata.model.tm.TransMemoryUnit;
+import org.zanata.model.type.TranslationEntityType;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.service.LocaleService;
 import org.zanata.service.SecurityService;
 import org.zanata.service.TransMemoryMergeService;
 import org.zanata.service.TranslationMemoryService;
 import org.zanata.service.TranslationService;
 import org.zanata.util.Event;
+import org.zanata.util.TranslationUtil;
 import org.zanata.webtrans.server.rpc.TransMemoryMergeStatusResolver;
 import org.zanata.webtrans.shared.model.TransMemoryDetails;
 import org.zanata.webtrans.shared.model.TransMemoryResultItem;
@@ -182,13 +185,17 @@ private TransUnitUpdateRequest createRequest(TransMemoryMerge action,
 
         Long tmSourceId = tmResult.getSourceIdList().get(0);
         ContentState statusToSet;
-        String comment;
+        String comment, revisionComment, entityType;
+        Long entityId;
         if (tmResult.getMatchType() == TransMemoryResultItem.MatchType.Imported) {
             TransMemoryUnit tu = transMemoryUnitDAO.findById(tmSourceId);
             statusToSet =
                     TransMemoryMergeStatusResolver.newInstance().decideStatus(
                             action, tmResult, oldTarget);
             comment = buildTargetComment(tu);
+            revisionComment = TranslationUtil.getTMMergeMessage(tu);
+            entityId = tu.getId();
+            entityType = TranslationEntityType.TMX.name();
         } else {
             HTextFlow tmSource = textFlowDAO.findById(tmSourceId, false);
             TransMemoryDetails tmDetail =
@@ -199,16 +206,24 @@ private TransUnitUpdateRequest createRequest(TransMemoryMerge action,
                             action, hTextFlowToBeFilled, tmDetail, tmResult,
                             oldTarget);
             comment = buildTargetComment(tmDetail);
+            revisionComment = TranslationUtil.getTMMergeMessage(tmDetail);
+
+            HTextFlowTarget target = tmSource.getTargets().get(hLocale.getId());
+            entityId = TranslationUtil.getEntityId(target);
+            entityType = TranslationUtil.getEntityType(target).name();
         }
 
         if (statusToSet != null) {
             TransUnitUpdateRequest unfilledRequest =
                     requestMap.get(hTextFlowToBeFilled.getId());
+
             TransUnitUpdateRequest request =
                     new TransUnitUpdateRequest(
                             unfilledRequest.getTransUnitId(),
                             tmResult.getTargetContents(), statusToSet,
-                            unfilledRequest.getBaseTranslationVersion());
+                            unfilledRequest.getBaseTranslationVersion(),
+                            revisionComment, entityId, entityType,
+                            TranslationSourceType.TM_MERGE.getAbbr());
             request.addTargetComment(comment);
             log.debug("auto translate from translation memory {}", request);
             return request;
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
index 3400c781e5..45fd50fcf5 100644
--- a/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
+++ b/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
@@ -73,6 +73,8 @@
 import org.zanata.model.HTextFlow;
 import org.zanata.model.HTextFlowTarget;
 import org.zanata.model.HTextFlowTargetHistory;
+import org.zanata.model.type.TranslationEntityType;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.rest.dto.resource.TextFlowTarget;
 import org.zanata.rest.dto.resource.TranslationsResource;
 import org.zanata.rest.service.ResourceUtils;
@@ -236,7 +238,9 @@ private List<TranslationResult> translate(LocaleId localeId,
                     result.targetChanged =
                             translate(hTextFlowTarget,
                                     request.getNewContents(),
-                                    request.getNewContentState(), nPlurals);
+                                    request.getNewContentState(),
+                                    nPlurals,
+                                    new TranslationDetails(request));
                     result.isSuccess = true;
                 } catch (HibernateException e) {
                     result.isSuccess = false;
@@ -328,9 +332,54 @@ private void signalPostTranslateEvent(Long actorId,
         }
     }
 
+    public class TranslationDetails {
+        private final String revisionComment;
+        private final TranslationEntityType entityType;
+        private final TranslationSourceType sourceType;
+        private final Long entityId;
+
+        public TranslationDetails(String revisionComment,
+            TranslationEntityType entityType, TranslationSourceType sourceType,
+            Long entityId) {
+            this.revisionComment = revisionComment;
+            this.entityType = entityType;
+            this.sourceType = sourceType;
+            this.entityId = entityId;
+        }
+
+        public TranslationDetails(TransUnitUpdateRequest request) {
+            this.revisionComment = request.getRevisionComment();
+            this.entityId = request.getEntityId();
+            entityType =
+                    StringUtils.isEmpty(request.getEntityType()) ? null
+                            : TranslationEntityType.valueOf(request
+                                    .getEntityType());
+            sourceType =
+                    StringUtils.isEmpty(request.getSourceType()) ? null
+                            : TranslationSourceType.getValueOf(request
+                                    .getSourceType());
+        }
+
+        public String getRevisionComment() {
+            return revisionComment;
+        }
+
+        public TranslationEntityType getEntityType() {
+            return entityType;
+        }
+
+        public TranslationSourceType getSourceType() {
+            return sourceType;
+        }
+
+        public Long getEntityId() {
+            return entityId;
+        }
+    }
+
     private boolean translate(@Nonnull HTextFlowTarget hTextFlowTarget,
             @Nonnull List<String> contentsToSave, ContentState requestedState,
-            int nPlurals) {
+            int nPlurals, TranslationDetails details) {
         boolean targetChanged = false;
         ContentState currentState = hTextFlowTarget.getState();
         targetChanged |= setContentIfChanged(hTextFlowTarget, contentsToSave);
@@ -343,6 +392,12 @@ private boolean translate(@Nonnull HTextFlowTarget hTextFlowTarget,
             hTextFlowTarget.setVersionNum(hTextFlowTarget.getVersionNum() + 1);
             hTextFlowTarget.setTextFlowRevision(textFlow.getRevision());
             hTextFlowTarget.setLastModifiedBy(authenticatedAccount.getPerson());
+
+            hTextFlowTarget.setRevisionComment(details.getRevisionComment());
+            hTextFlowTarget.setEntityType(details.getEntityType());
+            hTextFlowTarget.setSourceType(details.getSourceType());
+            hTextFlowTarget.setEntityId(details.getEntityId());
+
             log.debug("last modified by :{}", authenticatedAccount.getPerson()
                     .getName());
         }
@@ -496,7 +551,7 @@ Future<List<String>> translateAllInDocAsync(String projectSlug,
             String iterationSlug, String docId, LocaleId locale,
             TranslationsResource translations, Set<String> extensions,
             MergeType mergeType, boolean assignCreditToUploader, boolean lock,
-            AsyncTaskHandle handle) {
+            AsyncTaskHandle handle, TranslationSourceType translationSourceType) {
         // Lock this document for push
         Lock transLock = null;
         if (lock) {
@@ -510,7 +565,7 @@ Future<List<String>> translateAllInDocAsync(String projectSlug,
             messages =
                     this.translateAllInDoc(projectSlug, iterationSlug, docId,
                             locale, translations, extensions, mergeType,
-                            assignCreditToUploader, handle);
+                            assignCreditToUploader, handle, translationSourceType);
         } finally {
             if (lock) {
                 lockManagerServiceImpl.release(transLock);
@@ -559,10 +614,11 @@ public List<String> translateAllInDoc(final String projectSlug,
             final String iterationSlug, final String docId,
             final LocaleId locale, final TranslationsResource translations,
             final Set<String> extensions, final MergeType mergeType,
-            final boolean assignCreditToUploader) {
+            final boolean assignCreditToUploader,
+            final TranslationSourceType translationSourceType) {
         return translateAllInDoc(projectSlug, iterationSlug, docId, locale,
                 translations, extensions, mergeType, assignCreditToUploader,
-                null);
+                null, translationSourceType);
     }
 
     @Override
@@ -570,7 +626,8 @@ public List<String> translateAllInDoc(final String projectSlug,
             final String iterationSlug, final String docId,
             final LocaleId locale, final TranslationsResource translations,
             final Set<String> extensions, final MergeType mergeType,
-            final boolean assignCreditToUploader, AsyncTaskHandle handle) {
+            final boolean assignCreditToUploader, AsyncTaskHandle handle,
+            final TranslationSourceType translationSourceType) {
         final HProjectIteration hProjectIteration =
                 projectIterationDAO.getBySlug(projectSlug, iterationSlug);
 
@@ -659,6 +716,7 @@ protected Boolean work() throws Exception {
                 work.setProjectIterationId(hProjectIteration.getId());
                 work.setBatch(batch);
                 work.setAssignCreditToUploader(assignCreditToUploader);
+                work.setTranslationSourceType(translationSourceType);
                 changed |= work.workInTransaction();
             } catch (Exception e) {
                 log.error("exception in SaveBatchWork:{}", e.getMessage());
@@ -727,6 +785,7 @@ private final class SaveBatchWork extends Work<Boolean> {
         private Long projectIterationId;
         private List<TextFlowTarget> batch;
         private boolean assignCreditToUploader;
+        private TranslationSourceType translationSourceType;
 
         @Override
         protected Boolean work() throws Exception {
@@ -837,6 +896,9 @@ public String apply(TextFlowTarget input) {
                             hTarget.setLastModifiedBy(authenticatedAccount.getPerson());
                             actorId = null;
                         }
+                        hTarget.setSourceType(translationSourceType);
+                        hTarget.setEntityId(null);
+                        hTarget.setEntityId(null);
                         textFlowTargetDAO.makePersistent(hTarget);
                         signalPostTranslateEvent(actorId, hTarget, currentState);
                     }
@@ -942,7 +1004,11 @@ public List<TranslationResult> revertTranslations(LocaleId localeId,
                         ContentState oldState = oldTarget.getState();
                         TransUnitUpdateRequest request =
                                 new TransUnitUpdateRequest(tuId, oldContents,
-                                        oldState, versionNum);
+                                        oldState, versionNum,
+                                        oldTarget.getRevisionComment(),
+                                        oldTarget.getEntityId(), oldTarget
+                                                .getEntityType().name(),
+                                        oldTarget.getSourceType().getAbbr());
                         // add to list
                         updateRequests.add(request);
                     } else {
@@ -956,7 +1022,8 @@ public List<TranslationResult> revertTranslations(LocaleId localeId,
                         }
                         TransUnitUpdateRequest request =
                                 new TransUnitUpdateRequest(tuId, emptyContents,
-                                        ContentState.New, versionNum);
+                                        ContentState.New, versionNum,
+                                        TranslationSourceType.UNKNOWN.getAbbr());
                         updateRequests.add(request);
                     }
                 } else {
diff --git a/zanata-war/src/main/java/org/zanata/util/MessageGenerator.java b/zanata-war/src/main/java/org/zanata/util/MessageGenerator.java
deleted file mode 100644
index 85b6d2b075..0000000000
--- a/zanata-war/src/main/java/org/zanata/util/MessageGenerator.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2015, Red Hat, Inc. and individual contributors as indicated by the
- * @author tags. See the copyright.txt file in the distribution for a full
- * listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this software; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
- * site: http://www.fsf.org.
- */
-
-package org.zanata.util;
-
-import org.apache.commons.lang.StringUtils;
-import org.zanata.model.HDocument;
-import org.zanata.model.HTextFlowTarget;
-
-/**
- * Generate messages/comments of Zanata business actions
- *
- * @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>
- */
-public class MessageGenerator {
-
-    /**
-     * Prefix of action type for generated message
-     */
-    public static final String PREFIX_MERGE_TRANS = "Merge translations";
-    public static final String PREFIX_COPY_TRANS = "Copy translation";
-    public static final String PREFIX_COPY_VERSION = "Copy version";
-
-    /**
-     * Create revision comment for translation that is copied by merge
-     * translation
-     *
-     * @see org.zanata.service.MergeTranslationsService
-     *
-     * @param tft - HTextFlowTarget to copy from
-     */
-    public static final String getMergeTranslationMessage(
-            HTextFlowTarget tft) {
-        HDocument document = tft.getTextFlow().getDocument();
-        String author = "";
-        if (tft.getLastModifiedBy() != null) {
-            author = tft.getLastModifiedBy().getName();
-        }
-
-        return generateAutoCopiedMessage(PREFIX_MERGE_TRANS,
-                document.getProjectIteration().getProject().getName(),
-                document.getProjectIteration()
-                        .getSlug(), document.getDocId(), author);
-    }
-
-    /**
-     * Create revision comment for translation that is copied by copy trans
-     * @see org.zanata.service.CopyTransService
-     *
-     * @param tft - HTextFlowTarget to copy from
-     */
-    public static final String getCopyTransMessage(HTextFlowTarget tft) {
-        HDocument document = tft.getTextFlow().getDocument();
-        String author = "";
-        if (tft.getLastModifiedBy() != null) {
-            author = tft.getLastModifiedBy().getName();
-        }
-        return generateAutoCopiedMessage(PREFIX_COPY_TRANS,
-                document.getProjectIteration()
-                        .getProject().getName(), document.getProjectIteration()
-                        .getSlug(), document.getDocId(), author);
-    }
-
-    /**
-     * Create revision comment for translation that is copied by copy version
-     * @see org.zanata.service.CopyVersionService
-     *
-     * @param tft - HTextFlowTarget to copy from
-     */
-    public static final String getCopyVersionMessage(HTextFlowTarget tft) {
-        HDocument document = tft.getTextFlow().getDocument();
-        String author = "";
-        if (tft.getLastModifiedBy() != null) {
-            author = tft.getLastModifiedBy().getName();
-        }
-        return generateAutoCopiedMessage(PREFIX_COPY_VERSION,
-                document.getProjectIteration().getProject().getName(),
-                document.getProjectIteration()
-                        .getSlug(), document.getDocId(), author);
-    }
-
-    private static final String generateAutoCopiedMessage(String prefix,
-        String projectName, String versionSlug, String docId, String author) {
-        StringBuilder comment = new StringBuilder();
-
-        comment.append(prefix + ": translation auto-copied from project ")
-                .append(projectName)
-                .append(", version ")
-                .append(versionSlug)
-                .append(", document ")
-                .append(docId);
-
-        if (!StringUtils.isEmpty(author)) {
-            comment.append(", author ")
-                    .append(author);
-        }
-        return comment.toString();
-    }
-}
diff --git a/zanata-war/src/main/java/org/zanata/util/TranslationUtil.java b/zanata-war/src/main/java/org/zanata/util/TranslationUtil.java
new file mode 100644
index 0000000000..012c5dc3ae
--- /dev/null
+++ b/zanata-war/src/main/java/org/zanata/util/TranslationUtil.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2015, Red Hat, Inc. and individual contributors as indicated by the
+ * @author tags. See the copyright.txt file in the distribution for a full
+ * listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+
+package org.zanata.util;
+
+import org.apache.commons.lang.StringUtils;
+import org.zanata.model.HDocument;
+import org.zanata.model.HPerson;
+import org.zanata.model.HTextFlowTarget;
+import org.zanata.model.HTextFlowTargetHistory;
+import org.zanata.model.ITextFlowTargetHistory;
+import org.zanata.model.tm.TransMemoryUnit;
+import org.zanata.model.type.TranslationEntityType;
+import org.zanata.webtrans.shared.model.TransMemoryDetails;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>
+ */
+public class TranslationUtil {
+    /**
+     * Prefix of action type for generated message
+     */
+    public static final String PREFIX_MERGE_VERSION = "Merge version";
+    public static final String PREFIX_COPY_TRANS = "Copy translation";
+    public static final String PREFIX_COPY_VERSION = "Copy version";
+    public static final String PREFIX_TM_MERGE = "TM Merge";
+
+    /**
+     * Copy entityId and entityType from copyFrom to copyTo
+     *
+     * copyFrom.id will be used if copyFrom.entityId = null
+     * {@link org.zanata.model.type.TranslationEntityType#TFT} be used if
+     * copyFrom.entityType = null
+     *
+     *
+     * @param copyFrom
+     * @param copyTo
+     */
+    public static void copyEntity(@Nonnull ITextFlowTargetHistory copyFrom,
+        @Nonnull ITextFlowTargetHistory copyTo) {
+        if (copyFrom != null && copyTo != null) {
+            copyTo.setEntityType(getEntityType(copyFrom));
+            copyTo.setEntityId(getEntityId(copyFrom));
+        }
+    }
+
+    /**
+     * Create revision comment for translation that is copied by merge
+     * translation
+     *
+     * @see org.zanata.service.MergeTranslationsService
+     *
+     * @param tft - HTextFlowTarget to copy from
+     */
+    public static final String getMergeTranslationMessage(
+        HTextFlowTarget tft) {
+        HDocument document = tft.getTextFlow().getDocument();
+        return generateAutoCopiedMessage(PREFIX_MERGE_VERSION,
+            document.getProjectIteration().getProject().getName(),
+            document.getProjectIteration()
+                .getSlug(), document.getDocId(),
+            getAuthor(tft.getLastModifiedBy()));
+    }
+
+    /**
+     * Create revision comment for translation that is copied by copy trans
+     * @see org.zanata.service.CopyTransService
+     *
+     * @param tft - HTextFlowTarget to copy from
+     */
+    public static final String getCopyTransMessage(HTextFlowTarget tft) {
+        HDocument document = tft.getTextFlow().getDocument();
+        return generateAutoCopiedMessage(PREFIX_COPY_TRANS,
+            document.getProjectIteration()
+                .getProject().getName(), document.getProjectIteration()
+                .getSlug(), document.getDocId(),
+            getAuthor(tft.getLastModifiedBy()));
+    }
+
+    /**
+     * Create revision comment for translation that is copied by copy version
+     * @see org.zanata.service.CopyVersionService
+     *
+     * @param tft - HTextFlowTarget to copy from
+     */
+    public static final String getCopyVersionMessage(HTextFlowTarget tft) {
+        HDocument document = tft.getTextFlow().getDocument();
+        return generateAutoCopiedMessage(PREFIX_COPY_VERSION,
+            document.getProjectIteration().getProject().getName(),
+            document.getProjectIteration()
+                .getSlug(), document.getDocId(),
+            getAuthor(tft.getLastModifiedBy()));
+    }
+
+    /**
+     * Create revision comment for translation that is copied by TM Merge
+     * @see org.zanata.service.TransMemoryMergeService
+     *
+     * @param tu
+     */
+    public static final String getTMMergeMessage(TransMemoryUnit tu) {
+        StringBuilder comment = new StringBuilder();
+
+        comment.append(PREFIX_TM_MERGE)
+            .append(": translation copied from translation memory '")
+            .append(tu.getTranslationMemory().getSlug())
+            .append("', description '")
+            .append(tu.getTranslationMemory().getDescription())
+            .append("'");
+
+        return comment.toString();
+    }
+
+    /**
+     * Create revision comment for translation that is copied by TM Merge
+     * @see org.zanata.service.TransMemoryMergeService
+     *
+     * @param tmDetails
+     */
+    public static final String getTMMergeMessage(TransMemoryDetails tmDetails) {
+        return generateAutoCopiedMessage(PREFIX_TM_MERGE,
+            tmDetails.getProjectName(),
+            tmDetails.getIterationName(), tmDetails.getDocId(),
+            tmDetails.getLastModifiedBy());
+    }
+
+    private static String getAuthor(HPerson person) {
+        if (person != null) {
+            return person.getName();
+        }
+        return null;
+    }
+
+    private static final String generateAutoCopiedMessage(String prefix,
+        String projectName, String versionSlug, String docId, String author) {
+        StringBuilder comment = new StringBuilder();
+
+        comment.append(prefix)
+            .append(": translation copied from project '")
+            .append(projectName)
+            .append("', version '")
+            .append(versionSlug)
+            .append("', document '")
+            .append(docId)
+            .append("'");
+
+        if (!StringUtils.isEmpty(author)) {
+            comment.append(", author '").append(author).append("'");
+        }
+        return comment.toString();
+    }
+
+    public static Long getEntityId(@Nonnull ITextFlowTargetHistory from) {
+        if (from == null) {
+            return null;
+        }
+        return from.getEntityId() == null ? from.getId() : from
+                .getEntityId();
+    }
+
+    public static TranslationEntityType getEntityType(
+            @Nonnull ITextFlowTargetHistory from) {
+        if (from != null) {
+            if(from.getEntityType() != null) {
+                return from.getEntityType();
+            } else {
+                if(from instanceof HTextFlowTarget) {
+                    return TranslationEntityType.TFT;
+                } else if(from instanceof HTextFlowTargetHistory) {
+                    return TranslationEntityType.TTH;
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
index 84bd4544b0..6e44e14c73 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
@@ -148,6 +148,11 @@ public boolean apply(TransUnit input) {
         });
     }
 
+    /**
+     * See {@link org.zanata.model.type.TranslationSourceType#TM_MERGE}
+     */
+    private final String sourceType = "TM";
+
     private TransMemoryMerge prepareTMMergeAction(
             Collection<TransUnit> untranslatedTUs, int threshold,
             MergeOptions mergeOptions) {
@@ -157,7 +162,7 @@ private TransMemoryMerge prepareTMMergeAction(
                             @Override
                             public TransUnitUpdateRequest apply(TransUnit from) {
                                 return new TransUnitUpdateRequest(from.getId(),
-                                        null, null, from.getVerNum());
+                                        null, null, from.getVerNum(), sourceType);
                             }
                         }));
         return new TransMemoryMerge(threshold, updateRequests, mergeOptions);
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
index 60295d0563..ba331e6c7c 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
@@ -275,7 +275,8 @@ && fromDifferentUser(editorClientId)) {
                                 .toString(), updatedTransUnit.getTargets(),
                                 updatedTransUnit.getStatus(),
                                 updatedTransUnit.getLastModifiedBy(),
-                                updatedTransUnit.getLastModifiedTime());
+                                updatedTransUnit.getLastModifiedTime(),
+                                updatedTransUnit.getRevisionComment());
                 translationHistoryPresenter.displayEntries(latest,
                         Collections.<TransHistoryItem> emptyList(),
                         Collections.<ReviewComment> emptyList());
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
index 109ae2b473..5069f2b26b 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
@@ -135,7 +135,7 @@ protected void displayEntries(TransHistoryItem latest,
             List<String> newTargets = targetContentsPresenter.getNewTargets();
             if (!Objects.equal(latest.getContents(), newTargets)) {
                 all.add(new TransHistoryItem(messages.unsaved(), newTargets,
-                        null, messages.you(), new Date()));
+                        null, messages.you(), new Date(), latest.getRevisionComment()));
             }
         }
         all.addAll(otherEntries);
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java b/zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
index f4a92b026e..b51675f1ef 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
@@ -111,6 +111,11 @@ public void onTransUnitSave(TransUnitSaveEvent event) {
         performSave(idToSave);
     }
 
+    /**
+     * See {@link org.zanata.model.type.TranslationSourceType#GWT_EDITOR_ENTRY}
+     */
+    private final String sourceType = "GWT";
+
     private void performSave(TransUnitId idToSave) {
         TransUnitSaveEvent forSaving = queue.getNextPendingForSaving(idToSave);
         if (forSaving == null) {
@@ -124,7 +129,7 @@ private void performSave(TransUnitId idToSave) {
         UpdateTransUnit updateTransUnit =
                 new UpdateTransUnit(new TransUnitUpdateRequest(idToSave,
                         forSaving.getTargets(), forSaving.getAdjustedStatus(),
-                        forSaving.getVerNum()),
+                        forSaving.getVerNum(), sourceType),
                         TransUnitUpdated.UpdateType.WebEditorSave);
         Log.info("about to save translation: " + updateTransUnit);
         dispatcher.execute(
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
index dd821256fb..f0331a5996 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
@@ -26,6 +26,9 @@
 import org.zanata.webtrans.client.util.ContentStateToStyleUtil;
 import org.zanata.webtrans.client.util.DateUtil;
 import org.zanata.webtrans.shared.model.TransHistoryItem;
+
+import com.allen_sauer.gwt.log.client.Log;
+import com.google.common.base.Strings;
 import com.google.gwt.core.shared.GWT;
 import com.google.gwt.dom.client.SpanElement;
 import com.google.gwt.event.dom.client.ClickEvent;
@@ -65,6 +68,9 @@ public class TransHistoryItemLine extends Composite {
     Anchor copyIntoEditor;
     @UiField
     SpanElement icon;
+    @UiField(provided = true)
+    InlineHTML revisionComment;
+
 
     public TransHistoryItemLine(TransHistoryItem item,
             TranslationHistoryDisplay.Listener listener,
@@ -85,9 +91,21 @@ public TransHistoryItemLine(TransHistoryItem item,
         targetContents =
                 new InlineHTML(template.targetContent(TextContentsDisplay
                         .asSyntaxHighlight(item.getContents()).toSafeHtml()));
-        revision =
+        if(!Strings.isNullOrEmpty(item.getOptionalTag())) {
+            revision =
                 new InlineHTML(template.targetRevision(item.getVersionNum(),
-                        item.getOptionalTag()));
+                    item.getOptionalTag()));
+        } else {
+            revision = new InlineHTML("");
+        }
+
+        if(!Strings.isNullOrEmpty(item.getRevisionComment())) {
+            revisionComment = new InlineHTML(template.revisionComment(
+                    item.getRevisionComment()));
+        } else {
+            revisionComment = new InlineHTML("");
+        }
+
         initWidget(ourUiBinder.createAndBindUi(this));
 
         if (item.getStatus() == ContentState.Approved
@@ -132,5 +150,8 @@ SafeHtml heading(SafeHtml person, String contentStateStyle,
 
         @Template("<span class='txt--neutral'>{0}</span>")
         SafeHtml anonymousUser(String anonymous);
+
+        @Template("<span class='txt--meta'>{0}</span>")
+        SafeHtml revisionComment(String comment);
     }
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
index 0d9c0c3d0b..6d4f2e8819 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
@@ -45,6 +45,9 @@
             <g:Anchor ui:field="copyIntoEditor" text="Copy to Editor" />
           </li>
         </ul>
+        <div>
+          <g:InlineHTML ui:field="revisionComment"/>
+        </div>
       </div>
     </div>
   </g:HTMLPanel>
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
index cca7f2da74..0655f0ec7d 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
@@ -101,7 +101,8 @@ public GetTranslationHistoryResult execute(
                             GwtRpcUtil.getTargetContentsWithPadding(hTextFlow,
                                     hTextFlowTarget, nPlurals),
                             hTextFlowTarget.getState(), lastModifiedBy,
-                            hTextFlowTarget.getLastChanged());
+                            hTextFlowTarget.getLastChanged(),
+                            hTextFlowTarget.getRevisionComment());
             // history translation
             history = hTextFlowTarget.getHistory();
         }
@@ -162,7 +163,8 @@ public TransHistoryItem apply(HTextFlowTargetHistory targetHistory) {
                     .toString(), targetHistory.getContents(),
                     targetHistory.getState(),
                     nameOrEmptyString(targetHistory.getLastModifiedBy()),
-                    targetHistory.getLastChanged());
+                    targetHistory.getLastChanged(),
+                    targetHistory.getRevisionComment());
         }
     }
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
index 51cd0e7d0b..9cf80eb30b 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
@@ -82,16 +82,16 @@ public TransUnit transform(HTextFlow hTextFlow, HTextFlowTarget target,
                         .setPlural(hTextFlow.isPlural())
                         .setSources(sourceContents)
                         .setSourceComment(
-                                commentToString(hTextFlow.getComment()))
+                            commentToString(hTextFlow.getComment()))
                         .setTargets(targetContents)
                         .setTargetComment(
-                                target == null ? null : commentToString(target
-                                        .getComment()))
+                            target == null ? null : commentToString(target
+                                .getComment()))
                         .setMsgContext(msgContext)
                         .setRowIndex(hTextFlow.getPos())
                         .setVerNum(
-                                target == null ? NULL_TARGET_VERSION_NUM
-                                        : target.getVersionNum())
+                            target == null ? NULL_TARGET_VERSION_NUM
+                                : target.getVersionNum())
                         .setCommentsCount(getCommentCount(target));
 
         if (target != null) {
@@ -100,6 +100,7 @@ public TransUnit transform(HTextFlow hTextFlow, HTextFlowTarget target,
                 builder.setLastModifiedBy(target.getLastModifiedBy().getName());
             }
             builder.setLastModifiedTime(target.getLastChanged());
+            builder.setRevisionComment(target.getRevisionComment());
         }
         return builder.build();
     }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
index 5a6beebc1a..46351dd77d 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
@@ -22,13 +22,15 @@ public class TransHistoryItem extends ComparableByDate implements
     private String modifiedBy;
     private Date modifiedDate;
     private String optionalTag = "";
+    private String revisionComment;
 
     @SuppressWarnings("unused")
     private TransHistoryItem() {
     }
 
     public TransHistoryItem(String versionNum, List<String> contents,
-            ContentState status, String modifiedBy, Date modifiedDate) {
+            ContentState status, String modifiedBy, Date modifiedDate,
+            String revisionComment) {
         this.versionNum = versionNum;
         // targetHistory.getContents will return Hibernate persistentList which
         // RPC can't handle
@@ -36,6 +38,7 @@ public TransHistoryItem(String versionNum, List<String> contents,
         this.status = status;
         this.modifiedBy = modifiedBy;
         this.modifiedDate = modifiedDate;
+        this.revisionComment = revisionComment;
     }
 
     public String getVersionNum() {
@@ -58,6 +61,10 @@ public Date getModifiedDate() {
         return modifiedDate;
     }
 
+    public String getRevisionComment() {
+        return revisionComment;
+    }
+
     @Override
     protected Date getDate() {
         return modifiedDate;
@@ -72,6 +79,7 @@ public String toString() {
             add("status", status).
             add("modifiedBy", modifiedBy).
             add("modifiedDate", modifiedDate).
+            add("revisionComment", revisionComment).
             toString();
       // @formatter:on
     }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
index 24668b7add..5ade324d0b 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
@@ -32,6 +32,7 @@ public class TransUnit implements IsSerializable, HasTransUnitId {
     private int verNum;
     private String targetComment;
     private int commentsCount;
+    private String revisionComment;
 
     // for GWT
     @SuppressWarnings("unused")
@@ -54,6 +55,7 @@ private TransUnit(Builder builder) {
         this.verNum = builder.verNum;
         this.targetComment = builder.targetComment;
         this.commentsCount = builder.commentsCount;
+        this.revisionComment = builder.revisionComment;
     }
 
     @Override
@@ -172,6 +174,14 @@ void setCommentsCount(int commentsCount) {
         this.commentsCount = commentsCount;
     }
 
+    public String getRevisionComment() {
+        return revisionComment;
+    }
+
+    public void setRevisionComment(String revisionComment) {
+        this.revisionComment = revisionComment;
+    }
+
     public String debugString() {
         // @formatter:off
         return Objects.toStringHelper(this)
@@ -208,6 +218,7 @@ public static class Builder {
         private int verNum = -1; // to fail check if not set before build
         private String targetComment;
         private int commentsCount;
+        private String revisionComment;
 
         private Builder(TransUnit transUnit) {
             this.status = transUnit.status;
@@ -224,6 +235,7 @@ private Builder(TransUnit transUnit) {
             this.rowIndex = transUnit.rowIndex;
             this.verNum = transUnit.verNum;
             this.commentsCount = transUnit.commentsCount;
+            this.revisionComment = transUnit.revisionComment;
         }
 
         private Builder() {
@@ -349,5 +361,10 @@ public Builder setCommentsCount(int commentsCount) {
             this.commentsCount = commentsCount;
             return this;
         }
+
+        public Builder setRevisionComment(String revisionComment) {
+            this.revisionComment = revisionComment;
+            return this;
+        }
     }
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
index f4f77f2118..14f0b8eb15 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
@@ -42,6 +42,10 @@ public class TransUnitUpdateRequest implements IsSerializable {
     private ContentState newContentState;
     private int baseTranslationVersion;
     private String targetComment;
+    private String revisionComment;
+    private Long entityId;
+    private String entityType;
+    private String sourceType;
 
     // required for GWT rpc serialization
     @SuppressWarnings("unused")
@@ -49,12 +53,23 @@ private TransUnitUpdateRequest() {
     }
 
     public TransUnitUpdateRequest(TransUnitId transUnitId,
-            List<String> newContents, ContentState newContentState,
-            int baseTranslationVersion) {
+        List<String> newContents, ContentState newContentState,
+        int baseTranslationVersion, String sourceType) {
         this.transUnitId = transUnitId;
         this.newContents = newContents;
         this.newContentState = newContentState;
         this.baseTranslationVersion = baseTranslationVersion;
+        this.sourceType = sourceType;
+    }
+
+    public TransUnitUpdateRequest(TransUnitId transUnitId,
+            List<String> newContents, ContentState newContentState,
+            int baseTranslationVersion, String revisionComment, Long entityId,
+            String entityType, String sourceType) {
+        this(transUnitId, newContents, newContentState, baseTranslationVersion, sourceType);
+        this.revisionComment = revisionComment;
+        this.entityId = entityId;
+        this.entityType = entityType;
     }
 
     public TransUnitUpdateRequest addTargetComment(String comment) {
@@ -78,6 +93,22 @@ public int getBaseTranslationVersion() {
         return baseTranslationVersion;
     }
 
+    public String getRevisionComment() {
+        return revisionComment;
+    }
+
+    public Long getEntityId() {
+        return entityId;
+    }
+
+    public String getEntityType() {
+        return entityType;
+    }
+
+    public String getSourceType() {
+        return sourceType;
+    }
+
     public boolean hasTargetComment() {
         return !Strings.isNullOrEmpty(targetComment);
     }
@@ -95,6 +126,10 @@ public String toString() {
             add("newContentState", newContentState).
             add("baseTranslationVersion", baseTranslationVersion).
             add("targetComment", targetComment).
+            add("revisionComment", revisionComment).
+            add("entityId", entityId).
+            add("entityType", entityType).
+            add("sourceType", sourceType).
             toString();
       // @formatter:on
     }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
index 8cc294096c..d5567863a1 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
@@ -34,6 +34,11 @@ public class ReplaceText extends UpdateTransUnit {
     private String replaceText;
     private boolean caseSensitive;
 
+    /**
+     * See {@link org.zanata.model.type.TranslationSourceType#GWT_EDITOR_ENTRY}
+     */
+    private String sourceType = "GWT";
+
     private ReplaceText() {
         super(UpdateType.NonEditorSave);
     }
@@ -52,7 +57,7 @@ public ReplaceText(List<TransUnit> transUnits, String searchText,
         this.replaceText = replaceText;
         for (TransUnit tu : transUnits) {
             addTransUnit(new TransUnitUpdateRequest(tu.getId(),
-                    tu.getTargets(), tu.getStatus(), tu.getVerNum()));
+                    tu.getTargets(), tu.getStatus(), tu.getVerNum(), sourceType));
         }
     }
 
diff --git a/zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml b/zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml
new file mode 100644
index 0000000000..4f4b53c1de
--- /dev/null
+++ b/zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml
@@ -0,0 +1,53 @@
+<?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="aeng@redhat.com">
+    <comment>Add entityType, entityId, sourceType and automatedEntry to HTextFlowTarget</comment>
+    <addColumn tableName="HTextFlowTarget">
+      <column name="entityType" type="char(3)">
+        <constraints nullable="true" />
+      </column>
+    </addColumn>
+    <addColumn tableName="HTextFlowTarget">
+      <column name="entityId" type="longtext">
+        <constraints nullable="true" />
+      </column>
+    </addColumn>
+    <addColumn tableName="HTextFlowTarget">
+      <column name="sourceType" type="char(3)" defaultValue="UNK"/>
+    </addColumn>
+    <addColumn tableName="HTextFlowTarget">
+      <column name="automatedEntry" type="boolean" defaultValueBoolean="false"/>
+    </addColumn>
+    <createIndex tableName="HTextFlowTarget" indexName="Idx_AutomatedEntry">
+      <column name="automatedEntry"/>
+    </createIndex>
+  </changeSet>
+
+  <changeSet id="2" author="aeng@redhat.com">
+    <comment>Add entityType, entityId, sourceType and automatedEntry to HTextFlowTargetHistory</comment>
+    <addColumn tableName="HTextFlowTargetHistory">
+      <column name="entityType" type="char(3)">
+        <constraints nullable="true" />
+      </column>
+    </addColumn>
+    <addColumn tableName="HTextFlowTargetHistory">
+      <column name="entityId" type="longtext">
+        <constraints nullable="true" />
+      </column>
+    </addColumn>
+    <addColumn tableName="HTextFlowTargetHistory">
+      <column name="sourceType" type="char(3)" defaultValue="UNK"/>
+    </addColumn>
+    <addColumn tableName="HTextFlowTargetHistory">
+      <column name="automatedEntry" type="boolean" defaultValueBoolean="false"/>
+    </addColumn>
+    <createIndex tableName="HTextFlowTargetHistory" indexName="Idx_AutomatedEntry">
+      <column name="automatedEntry"/>
+    </createIndex>
+  </changeSet>
+
+</databaseChangeLog>
diff --git a/zanata-war/src/main/resources/db/db.changelog.xml b/zanata-war/src/main/resources/db/db.changelog.xml
index 1d49801c8e..4ded2d897f 100644
--- a/zanata-war/src/main/resources/db/db.changelog.xml
+++ b/zanata-war/src/main/resources/db/db.changelog.xml
@@ -39,6 +39,8 @@
     file="changelogs/db.changelog-3.6.xml" />
   <include relativeToChangelogFile="true"
     file="changelogs/db.changelog-3.7.xml" />
+  <include relativeToChangelogFile="true"
+    file="changelogs/db.changelog-3.8.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/zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java b/zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
new file mode 100644
index 0000000000..c6f47d3f9e
--- /dev/null
+++ b/zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2015, Red Hat, Inc. and individual contributors as indicated by the
+ * @author tags. See the copyright.txt file in the distribution for a full
+ * listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+
+package org.zanata.dao;
+
+import org.dbunit.operation.DatabaseOperation;
+import org.junit.Before;
+import org.junit.Test;
+import org.zanata.ZanataDbunitJpaTest;
+import org.zanata.common.LocaleId;
+import org.zanata.model.HLocale;
+import org.zanata.model.HTextFlowTarget;
+import org.zanata.model.HTextFlowTargetHistory;
+import org.zanata.model.type.TranslationEntityType;
+import org.zanata.model.type.TranslationSourceType;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>
+ */
+public class TextFlowTargetDAOTest extends ZanataDbunitJpaTest {
+
+    private HLocale as;
+    private HLocale de;
+
+    private TextFlowTargetDAO textFlowTargetDAO;
+
+    private LocaleDAO localeDAO;
+
+    @Before
+    public void setup() {
+        textFlowTargetDAO = new TextFlowTargetDAO(getSession());
+        localeDAO = new LocaleDAO(getSession());
+        as = localeDAO.findByLocaleId(new LocaleId("as"));
+        de = localeDAO.findByLocaleId(new LocaleId("de"));
+    }
+
+    @Override
+    protected void prepareDBUnitOperations() {
+        beforeTestOperations.add(new DataSetOperation(
+            "org/zanata/test/model/ClearAllTables.dbunit.xml",
+            DatabaseOperation.CLEAN_INSERT));
+        beforeTestOperations.add(new DataSetOperation(
+            "org/zanata/test/model/AccountData.dbunit.xml",
+            DatabaseOperation.CLEAN_INSERT));
+        beforeTestOperations.add(new DataSetOperation(
+            "org/zanata/test/model/ProjectsData.dbunit.xml",
+            DatabaseOperation.CLEAN_INSERT));
+        beforeTestOperations.add(new DataSetOperation(
+            "org/zanata/test/model/TextFlowTestData.dbunit.xml",
+            DatabaseOperation.CLEAN_INSERT));
+        beforeTestOperations.add(new DataSetOperation(
+            "org/zanata/test/model/LocalesData.dbunit.xml",
+            DatabaseOperation.CLEAN_INSERT));
+    }
+
+    @Test
+    public void entityTypeAndSourceTypeTest() {
+        //get target with no history, revision = 0
+        HTextFlowTarget target = textFlowTargetDAO.findById(1L);
+
+        //create revision = 1
+        TranslationEntityType entityType1 = TranslationEntityType.TFT;
+        TranslationSourceType sourceType1 = TranslationSourceType.COPY_TRANS;
+        Long entityId1 = 2L;
+
+        target.setEntityType(entityType1);
+        target.setSourceType(sourceType1);
+        target.setEntityId(entityId1);
+
+        target = textFlowTargetDAO.makePersistent(target);
+        textFlowTargetDAO.flush();
+
+        assertThat(target.getEntityType()).isEqualTo(entityType1);
+        assertThat(target.getSourceType()).isEqualTo(sourceType1);
+        assertThat(target.getEntityId()).isEqualTo(entityId1);
+
+        //Create new revision = 2
+        TranslationSourceType sourceType2 = TranslationSourceType.COPY_VERSION;
+
+        target.setContents("new content");
+        target.setSourceType(sourceType2);
+        target.setEntityId(null);
+        target.setEntityType(null);
+
+        textFlowTargetDAO.makePersistent(target);
+        textFlowTargetDAO.flush();
+
+        target = textFlowTargetDAO.findById(1L);
+
+        assertThat(target.getEntityType()).isEqualTo(null);
+        assertThat(target.getEntityId()).isEqualTo(null);
+        assertThat(target.getSourceType()).isEqualTo(sourceType2);
+
+        HTextFlowTargetHistory history1 = target.getHistory().get(2);
+        assertThat(history1.getEntityType()).isEqualTo(entityType1);
+        assertThat(history1.getSourceType()).isEqualTo(sourceType1);
+        assertThat(history1.getEntityId()).isEqualTo(entityId1);
+    }
+}
diff --git a/zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java b/zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
index 3a6dcec851..9733364234 100644
--- a/zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
+++ b/zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
@@ -29,6 +29,7 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.zanata.exception.ChunkUploadException;
+import org.zanata.model.type.TranslationSourceType;
 
 public class TranslationDocumentUploadTest extends DocumentUploadTest {
 
@@ -63,7 +64,7 @@ public void checksValidityAndFailsIfNotValid() {
                 conf.uploadForm);
         response =
                 transUpload.tryUploadTranslationFile(conf.id, ANY_LOCALE,
-                        ANY_MERGETYPE, false, conf.uploadForm);
+                        ANY_MERGETYPE, false, conf.uploadForm, TranslationSourceType.API_UPLOAD);
         assertResponseHasStatus(NOT_ACCEPTABLE);
         assertResponseHasErrorMessage("Test message");
         assertUploadTerminated();
diff --git a/zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java b/zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
index 8343e688f5..8351011b5e 100644
--- a/zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
+++ b/zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
@@ -40,6 +40,7 @@
 import org.zanata.file.GlobalDocumentId;
 import org.zanata.file.SourceDocumentUpload;
 import org.zanata.file.TranslationDocumentUpload;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.rest.DocumentFileUploadForm;
 import org.zanata.seam.SeamAutowire;
 
@@ -117,7 +118,7 @@ public void sourceUploadResponseReturnedDirectly() {
     public void translationUploadParamsHandledCorrectly() {
         when(
                 transUploader.tryUploadTranslationFile(eq(id), eq(LOCALE),
-                        eq(MERGE), eq(false), formCaptor.capture()))
+                        eq(MERGE), eq(false), formCaptor.capture(), eq(TranslationSourceType.API_UPLOAD)))
                 .thenReturn(okResponse);
         fileService.uploadTranslationFile(PROJ_SLUG, VER_SLUG, LOCALE, DOC_ID,
                 MERGE, form);
@@ -126,7 +127,7 @@ public void translationUploadParamsHandledCorrectly() {
 
     @Test
     public void translationUploadResponseReturnedDirectly() {
-        when(transUploader.tryUploadTranslationFile(id, LOCALE, MERGE, false, form))
+        when(transUploader.tryUploadTranslationFile(id, LOCALE, MERGE, false, form, TranslationSourceType.API_UPLOAD))
                 .thenReturn(okResponse);
         response =
                 fileService.uploadTranslationFile(PROJ_SLUG, VER_SLUG, LOCALE,
diff --git a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
index 5624323d7a..6d6452035d 100644
--- a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
+++ b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
@@ -54,6 +54,7 @@
 import org.zanata.model.HProjectIteration;
 import org.zanata.model.HTextFlow;
 import org.zanata.model.HTextFlowTarget;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.seam.AutowireTransaction;
 import org.zanata.seam.SeamAutowire;
 import org.zanata.service.CopyTransService;
@@ -62,6 +63,8 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.zanata.common.ContentState.Approved;
 import static org.zanata.common.ContentState.NeedReview;
 import static org.zanata.common.ContentState.New;
@@ -225,7 +228,10 @@ public void testCopyTrans(CopyTransExecution execution) {
                         .getSingleResult();
         // Id: 3L for Locale de
         HTextFlowTarget target = targetTextFlow.getTargets().get(3L);
-
+        if(target != null) {
+            assertThat(target.getSourceType())
+                .isEqualTo(TranslationSourceType.COPY_TRANS);
+        }
         if (execution.isExpectUntranslated()) {
             if (target != null && target.getState() != ContentState.New) {
                 throw new AssertionError(
diff --git a/zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
index 3fcff86dff..dbd7fdd7ce 100644
--- a/zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
+++ b/zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
@@ -59,10 +59,12 @@
 import org.zanata.model.HTextFlowTargetHistory;
 import org.zanata.model.HTextFlowTargetReviewComment;
 import org.zanata.model.po.HPoTargetHeader;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.seam.SeamAutowire;
 import org.zanata.security.ZanataCredentials;
 import org.zanata.security.ZanataIdentity;
 import com.google.common.collect.Lists;
+import org.zanata.util.TranslationUtil;
 
 public class CopyVersionServiceImplTest extends ZanataDbunitJpaTest {
     private SeamAutowire seam = SeamAutowire.instance();
@@ -423,6 +425,12 @@ private void assertTextFlowTargetHistoryAndReview(
                     existingHistory.getTextFlowRevision());
             assertThat(newHistory.getState()).isEqualTo(
                     existingHistory.getState());
+            assertThat(newHistory.getEntityId()).isEqualTo(
+                TranslationUtil.getEntityId(existingHistory));
+            assertThat(newHistory.getEntityType()).isEqualTo(
+                TranslationUtil.getEntityType(existingHistory));
+            assertThat(newHistory.getSourceType()).isEqualTo(
+                TranslationSourceType.COPY_VERSION);
             assertThat(newHistory.getVersionNum()).isEqualTo(
                     existingHistory.getVersionNum());
         }
@@ -571,6 +579,12 @@ private void assertTextFlowTarget(HTextFlowTarget existingTarget,
                 existingTarget.getLocale());
         assertThat(newTarget.getLastModifiedBy()).isEqualTo(
                 existingTarget.getLastModifiedBy());
+        assertThat(newTarget.getEntityId()).isEqualTo(
+            TranslationUtil.getEntityId(existingTarget));
+        assertThat(newTarget.getEntityType()).isEqualTo(
+            TranslationUtil.getEntityType(existingTarget));
+        assertThat(newTarget.getSourceType()).isEqualTo(
+            TranslationSourceType.COPY_VERSION);
         if (existingTarget.getTranslator() != null) {
             assertThat(newTarget.getTranslator()).isEqualToIgnoringGivenFields(
                     existingTarget.getTranslator(), "id");
diff --git a/zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
index 6b4cdcae54..e75efb0fe7 100644
--- a/zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
+++ b/zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
@@ -21,23 +21,19 @@
 package org.zanata.service.impl;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.longThat;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.verifyZeroInteractions;
 
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
-import java.util.concurrent.Future;
 
 import org.dbunit.operation.DatabaseOperation;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
@@ -51,11 +47,10 @@
 import org.zanata.model.HProjectIteration;
 import org.zanata.model.HTextFlow;
 import org.zanata.model.HTextFlowTarget;
-import org.zanata.rest.editor.service.LocalesService;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.seam.SeamAutowire;
 import org.zanata.security.ZanataIdentity;
-import org.zanata.service.LocaleService;
-import org.zanata.util.MessageGenerator;
+import org.zanata.util.TranslationUtil;
 
 import com.google.common.collect.Lists;
 
@@ -204,11 +199,13 @@ public void testMergeTranslations1() {
         // check use latest translated if enabled
         for(HTextFlowTarget[] data: expectedMergeData) {
             assertThat(data[0].getState()).isIn(ContentState.TRANSLATED_STATES);
-            assertThat(data[1].getState()).isIn(ContentState.TRANSLATED_STATES);
+            assertThat(data[1].getState()).isEqualTo(data[0].getState());
+
             assertThat(data[0].getContents()).isEqualTo(data[1].getContents());
-            assertThat(data[0].getState()).isEqualTo(data[1].getState());
             assertThat(data[1].getRevisionComment()).contains(
-                MessageGenerator.PREFIX_MERGE_TRANS);
+                TranslationUtil.PREFIX_MERGE_VERSION);
+            assertThat(data[1].getSourceType()).isEqualTo(
+                TranslationSourceType.MERGE_VERSION);
         }
     }
 
diff --git a/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
index 162fb7a224..903c356cd4 100644
--- a/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
+++ b/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
@@ -39,7 +39,6 @@
 import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
@@ -54,6 +53,7 @@
 import org.zanata.model.HTextFlow;
 import org.zanata.model.TestFixture;
 import org.zanata.model.tm.TransMemoryUnit;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.seam.SeamAutowire;
 import org.zanata.service.LocaleService;
 import org.zanata.service.SecurityService;
@@ -150,7 +150,8 @@ private TransMemoryMerge prepareAction(int threshold,
         List<TransUnitUpdateRequest> requests = newArrayList();
         for (long tranUnitId : tranUnitIds) {
             requests.add(new TransUnitUpdateRequest(
-                    new TransUnitId(tranUnitId), null, null, 0));
+                    new TransUnitId(tranUnitId), null, null, 0,
+                TranslationSourceType.TM_MERGE.getAbbr()));
         }
         // we have TransMemoryMergeStatusResolverTest to cover various different
         // merge options so here we don't test that
@@ -271,6 +272,8 @@ public void willTranslateIfMatches() throws ActionException {
         TransUnitUpdateRequest transUnitUpdateRequest = updateRequest.get(0);
         assertThat(transUnitUpdateRequest.getNewContents(),
                 Matchers.equalTo(mostSimilarTM.getTargetContents()));
+        assertThat(transUnitUpdateRequest.getSourceType(),
+            Matchers.equalTo(TranslationSourceType.TM_MERGE.getAbbr()));
         assertThat(
                 transUnitUpdateRequest.getTargetComment(),
                 Matchers.equalTo("auto translated by TM merge from project: project a, version: master, DocId: pot/msg.pot"));
@@ -410,6 +413,13 @@ public void canHandleMultipleTextFlows() throws ActionException {
                 Matchers.equalTo(tm90.get().getTargetContents()));
         assertThat(updateRequest.get(2).getNewContents(),
                 Matchers.equalTo(tm80.get().getTargetContents()));
+
+        assertThat(updateRequest.get(0).getSourceType(),
+            Matchers.equalTo(TranslationSourceType.TM_MERGE.getAbbr()));
+        assertThat(updateRequest.get(1).getSourceType(),
+            Matchers.equalTo(TranslationSourceType.TM_MERGE.getAbbr()));
+        assertThat(updateRequest.get(2).getSourceType(),
+            Matchers.equalTo(TranslationSourceType.TM_MERGE.getAbbr()));
     }
 
     @Test
@@ -473,5 +483,7 @@ public void canAutoTranslateImportedTMResults() throws Exception {
         assertThat(
                 transUnitUpdateRequest.getTargetComment(),
                 Matchers.equalTo("auto translated by TM merge from translation memory: test-tm, unique id: uid10"));
+        assertThat(transUnitUpdateRequest.getSourceType(),
+            Matchers.equalTo(TranslationSourceType.TM_MERGE.getAbbr()));
     }
 }
diff --git a/zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java b/zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
index 3fcefa7367..bd1ee0a3e4 100644
--- a/zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
+++ b/zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
@@ -30,6 +30,7 @@
 import org.zanata.model.HProjectIteration;
 import org.zanata.model.HTextFlowBuilder;
 import org.zanata.model.HTextFlowTargetHistory;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.rest.dto.resource.TextFlowTarget;
 import org.zanata.rest.dto.resource.TranslationsResource;
 import org.zanata.seam.SeamAutowire;
@@ -123,7 +124,7 @@ public void pushTranslation() {
         log.info("==== start translateAllInDoc");
         service.translateAllInDoc(projectSlug, versionSlug, document.getDocId(),
                 transLocale.getLocaleId(), translations,
-                extensions, MergeType.AUTO, false);
+                extensions, MergeType.AUTO, false, TranslationSourceType.API_UPLOAD);
         log.info("==== stop translateAllInDoc: {}", mon.stop());
         getEm().getTransaction().commit();
         getEm().getTransaction().begin();
diff --git a/zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
index c5993d0578..4a31a2b7dd 100644
--- a/zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
+++ b/zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
@@ -37,6 +37,7 @@
 import org.zanata.dao.AccountDAO;
 import org.zanata.model.HLocale;
 import org.zanata.model.HProject;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.seam.SeamAutowire;
 import org.zanata.security.ZanataIdentity;
 import org.zanata.service.TranslationService;
@@ -102,7 +103,8 @@ public void translate() throws Exception {
         newContents.add("translated 2");
         TransUnitUpdateRequest translateReq =
                 new TransUnitUpdateRequest(transUnitId, newContents,
-                        ContentState.Approved, 1);
+                    ContentState.Approved, 1,
+                    TranslationSourceType.UNKNOWN.getAbbr());
 
         List<TranslationResult> result =
                 transService.translate(new LocaleId("de"),
@@ -114,6 +116,8 @@ public void translate() throws Exception {
                 is(ContentState.Translated));
         assertThat(result.get(0).getTranslatedTextFlowTarget().getVersionNum(),
                 is(2)); // moved up a version
+        assertThat(result.get(0).getTranslatedTextFlowTarget().getSourceType(),
+            is(TranslationSourceType.UNKNOWN));
     }
 
     @Test
@@ -130,7 +134,8 @@ public void translateMultiple() throws Exception {
         newContents.add("translated 1");
         newContents.add("translated 2");
         translationReqs.add(new TransUnitUpdateRequest(transUnitId,
-                newContents, ContentState.Approved, 1));
+                newContents, ContentState.Approved, 1,
+                TranslationSourceType.COPY_VERSION.getAbbr()));
 
         // Request 2 (different documents)
         transUnitId = new TransUnitId(2L);
@@ -138,7 +143,8 @@ public void translateMultiple() throws Exception {
         newContents.add("translated 1");
         newContents.add("translated 2");
         translationReqs.add(new TransUnitUpdateRequest(transUnitId,
-                newContents, ContentState.NeedReview, 0));
+                newContents, ContentState.NeedReview, 0,
+                TranslationSourceType.COPY_TRANS.getAbbr()));
 
         List<TranslationResult> results =
                 transService.translate(new LocaleId("de"), translationReqs);
@@ -147,25 +153,23 @@ public void translateMultiple() throws Exception {
         TranslationResult result = results.get(0);
         assertThat(result.isTranslationSuccessful(), is(true));
         assertThat(result.getBaseVersionNum(), is(1));
-        assertThat(result.getBaseContentState(), is(ContentState.Translated)); // there
-                                                                               // was
-                                                                               // a
-                                                                               // prvious
-                                                                               // translation
-        assertThat(result.getTranslatedTextFlowTarget().getVersionNum(), is(2)); // moved
-                                                                                 // up
-                                                                                 // a
-                                                                                 // version
+        assertThat(result.getBaseContentState(), is(ContentState.Translated));
+
+        //there was a previous translation, moved up to a version
+        assertThat(result.getTranslatedTextFlowTarget().getVersionNum(), is(2));
+        assertThat(result.getTranslatedTextFlowTarget().getSourceType(),
+            is(TranslationSourceType.COPY_VERSION));
 
         // Second result
         result = results.get(1);
         assertThat(result.isTranslationSuccessful(), is(true));
         assertThat(result.getBaseVersionNum(), is(0));
-        assertThat(result.getBaseContentState(), is(ContentState.New)); // no
-                                                                        // previous
-                                                                        // translation
-        assertThat(result.getTranslatedTextFlowTarget().getVersionNum(), is(1)); // first
-                                                                                 // version
+        assertThat(result.getBaseContentState(), is(ContentState.New));
+
+        //no previous translation, first version
+        assertThat(result.getTranslatedTextFlowTarget().getVersionNum(), is(1));
+        assertThat(result.getTranslatedTextFlowTarget().getSourceType(),
+            is(TranslationSourceType.COPY_TRANS));
     }
 
     @Test
@@ -179,7 +183,8 @@ public void incorrectBaseVersion() throws Exception {
         newContents.add("translated 2");
         TransUnitUpdateRequest translateReq =
                 new TransUnitUpdateRequest(transUnitId, newContents,
-                        ContentState.Approved, 1);
+                        ContentState.Approved, 1,
+                        TranslationSourceType.MERGE_VERSION.getAbbr());
 
         // Should not pass as the base version (1) does not match
         List<TransUnitUpdateRequest> translationRequests =
@@ -199,7 +204,8 @@ public void willCheckPermissionForReviewState() {
         TransUnitId transUnitId = new TransUnitId(3L);
         TransUnitUpdateRequest translateReq =
                 new TransUnitUpdateRequest(transUnitId, Lists.newArrayList("a",
-                        "b"), ContentState.Approved, 0);
+                        "b"), ContentState.Approved, 0,
+                        TranslationSourceType.MERGE_VERSION.getAbbr());
 
         List<TranslationResult> result =
                 transService.translate(new LocaleId("de"),
@@ -213,5 +219,7 @@ public void willCheckPermissionForReviewState() {
                 is(1)); // moved up only one version
         assertThat(result.get(0).getTranslatedTextFlowTarget().getState(),
                 is(ContentState.Approved));
+        assertThat(result.get(0).getTranslatedTextFlowTarget().getSourceType(),
+            is(TranslationSourceType.MERGE_VERSION));
     }
 }
diff --git a/zanata-war/src/test/java/org/zanata/util/TranslationUtilTest.java b/zanata-war/src/test/java/org/zanata/util/TranslationUtilTest.java
new file mode 100644
index 0000000000..f4e97288c3
--- /dev/null
+++ b/zanata-war/src/test/java/org/zanata/util/TranslationUtilTest.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2015, Red Hat, Inc. and individual contributors as indicated by the
+ * @author tags. See the copyright.txt file in the distribution for a full
+ * listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+
+package org.zanata.util;
+
+import org.junit.Test;
+import org.zanata.model.HTextFlowTarget;
+import org.zanata.model.HTextFlowTargetHistory;
+import org.zanata.model.type.TranslationEntityType;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>
+ */
+public class TranslationUtilTest {
+
+    @Test
+    public void getEntityIdNullTarget() {
+        assertThat(TranslationUtil.getEntityId(null)).isNull();
+    }
+
+    @Test
+    public void getEntityIdNullId() {
+        Long id = 10L;
+        Long entityId = null;
+
+        HTextFlowTarget target = generateTarget(id, entityId);
+        assertThat(TranslationUtil.getEntityId(target)).isEqualTo(id);
+    }
+
+    @Test
+    public void getEntityId() {
+        Long id = 10L;
+        Long entityId = 1L;
+
+        HTextFlowTarget target = generateTarget(id, entityId);
+        assertThat(TranslationUtil.getEntityId(target)).isEqualTo(entityId);
+    }
+
+    @Test
+    public void getEntityTypeNullTarget() {
+        assertThat(TranslationUtil.getEntityType(null)).isNull();
+    }
+
+    @Test
+    public void getEntityTypeNullType() {
+        Long id = 10L;
+        Long entityId = 1L;
+        TranslationEntityType entityType = null;
+
+        HTextFlowTarget target = generateTarget(id, entityId, entityType);
+        assertThat(TranslationUtil.getEntityType(target)).isEqualTo(
+            TranslationEntityType.TFT);
+    }
+
+    @Test
+    public void getEntityType() {
+        Long id = 10L;
+        Long entityId = 1L;
+        TranslationEntityType entityType = TranslationEntityType.TMX;
+
+        HTextFlowTarget target = generateTarget(id, entityId, entityType);
+        assertThat(TranslationUtil.getEntityType(target)).isEqualTo(
+            entityType);
+    }
+
+    @Test
+    public void getEntityTypeWithNullTarget() {
+        Long id = 10L;
+        Long entityId = 1L;
+
+        HTextFlowTarget target = generateTarget(id, entityId, null);
+        assertThat(TranslationUtil.getEntityType(target)).isEqualTo(
+            TranslationEntityType.TFT);
+    }
+
+    @Test
+    public void getEntityTypeWithNullTargetHistory() {
+        Long entityId = 1L;
+
+        HTextFlowTargetHistory history = generateTargetHistory(entityId, null);
+        assertThat(TranslationUtil.getEntityType(history)).isEqualTo(
+            TranslationEntityType.TTH);
+    }
+
+    @Test
+    public void copyHTextFlowTargetEntity() {
+        Long id = 10L;
+        Long entityId = 1L;
+        TranslationEntityType entityType = TranslationEntityType.TMX;
+
+        HTextFlowTarget from = generateTarget(id, entityId, entityType);
+        HTextFlowTarget to = new HTextFlowTarget();
+
+        TranslationUtil.copyEntity(from, to);
+        assertThat(to.getEntityId()).isEqualTo(entityId);
+        assertThat(to.getEntityType()).isEqualTo(entityType);
+    }
+
+    public HTextFlowTarget generateTarget(Long id, Long entityId) {
+        HTextFlowTarget target = new HTextFlowTarget();
+        target.setEntityId(entityId);
+        target.setId(id);
+        return target;
+    }
+
+    public HTextFlowTarget generateTarget(Long id, Long entityId,
+            TranslationEntityType entityType) {
+        HTextFlowTarget target = generateTarget(id, entityId);
+        target.setEntityType(entityType);
+        return target;
+    }
+
+    public HTextFlowTargetHistory generateTargetHistory(Long entityId,
+        TranslationEntityType entityType) {
+        HTextFlowTargetHistory history = new HTextFlowTargetHistory();
+        history.setEntityId(entityId);
+        history.setEntityType(entityType);
+        return history;
+    }
+}
diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java
index df6476c9d8..24801c5709 100644
--- a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java
+++ b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java
@@ -47,7 +47,7 @@ public void setUp() throws Exception {
 
     private static TransHistoryItem newItem(String versionNum) {
         return new TransHistoryItem(versionNum, Lists.newArrayList("a"),
-                ContentState.Approved, "", new Date());
+                ContentState.Approved, "", new Date(), "");
     }
 
     @Test
diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
index 832668eca6..abd5977e0d 100644
--- a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
+++ b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
@@ -96,7 +96,7 @@ public void beforeMethod() {
 
     private static TransHistoryItem historyItem(String versionNum) {
         return new TransHistoryItem(versionNum, Lists.newArrayList("a"),
-                ContentState.Approved, "admin", new Date());
+                ContentState.Approved, "admin", new Date(), "comment");
     }
 
     @Test
@@ -232,10 +232,10 @@ public void canDisplayEntriesInOrder() {
         // items in time order
         TransHistoryItem latest =
                 new TransHistoryItem("5", Lists.newArrayList("a"),
-                        ContentState.Approved, "admin", new Date(now - 1000));
+                        ContentState.Approved, "admin", new Date(now - 1000), "comment");
         TransHistoryItem item =
                 new TransHistoryItem("4", Lists.newArrayList("a"),
-                        ContentState.Approved, "admin", new Date(now - 2000));
+                        ContentState.Approved, "admin", new Date(now - 2000), "comment");
         ReviewComment comment =
                 new ReviewComment(new ReviewCommentId(1L), "comment", "admin",
                         new Date(now), 5);
diff --git a/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java b/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
index 425568f78b..9f48def015 100644
--- a/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
+++ b/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
@@ -32,6 +32,7 @@
 import org.zanata.model.HProjectIteration;
 import org.zanata.model.HTextFlow;
 import org.zanata.model.HTextFlowTarget;
+import org.zanata.model.type.TranslationSourceType;
 import org.zanata.webtrans.shared.model.TransMemoryDetails;
 import org.zanata.webtrans.shared.model.TransMemoryResultItem;
 import org.zanata.webtrans.shared.model.TransUnitId;
@@ -98,7 +99,8 @@ private static TransMemoryDetails tmDetail(String projectName,
 
     private static TransMemoryMerge mergeTMAction(MergeOptions mergeOptions) {
         TransUnitUpdateRequest updateRequest =
-                new TransUnitUpdateRequest(new TransUnitId(1), null, null, 0);
+                new TransUnitUpdateRequest(new TransUnitId(1), null, null, 0,
+                    TranslationSourceType.TM_MERGE.getAbbr());
         return new TransMemoryMerge(80, Lists.newArrayList(updateRequest),
                 mergeOptions);
     }

From 2c1c7ab78c7047dd5b566a86a379d45619f29276 Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dingyichen@gmail.com>
Date: Fri, 3 Jul 2015 15:08:22 +1000
Subject: [PATCH 5/5] pom.xml: Update to latest snapshot

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 24344bc930..5b07daa2ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,12 +55,12 @@
     <gwteventservice.version>1.2.1</gwteventservice.version>
     <okapi.version>0.22</okapi.version>
 
-    <zanata.assets.version>7.0-SNAPSHOT</zanata.assets.version>
-    <zanata.api.version>3.7.2</zanata.api.version>
+    <zanata.assets.version>7.4-SNAPSHOT</zanata.assets.version>
+    <zanata.api.version>3.7.4-SNAPSHOT</zanata.api.version>
     <!-- This should always be the previous version of the used api version above (but only 3.0.1 or later will work) -->
     <zanata.api.compat.version>3.4.1</zanata.api.compat.version>
-    <zanata.client.version>3.7.0</zanata.client.version>
-    <zanata.common.version>3.7.1</zanata.common.version>
+    <zanata.client.version>3.7.3-SNAPSHOT</zanata.client.version>
+    <zanata.common.version>3.7.3-SNAPSHOT</zanata.common.version>
 
     <richfaces.version>4.5.4.Final</richfaces.version>