[zanata/zanata-platform] 022c36: ZNTA-1834 - change to warning message

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-platform
  Commit: 022c366f4da247b5da0fe1fc7d3fa208917c4888
      https://github.com/zanata/zanata-platform/commit/022c366f4da247b5da0fe1fc7d3fa208917c4888
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-04-03 (Mon, 03 Apr 2017)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java

  Log Message:
  -----------
  ZNTA-1834 - change to warning message


  Commit: 8d6efba7ef89f20ed00bd81f87a7cdb1bf5f9ff4
      https://github.com/zanata/zanata-platform/commit/8d6efba7ef89f20ed00bd81f87a7cdb1bf5f9ff4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-04-03 (Mon, 03 Apr 2017)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml

  Log Message:
  -----------
  ZNTA-1834 - ui change


  Commit: 6675310ce32238cc2d65883130304ae0f1d2911f
      https://github.com/zanata/zanata-platform/commit/6675310ce32238cc2d65883130304ae0f1d2911f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java

  Log Message:
  -----------
  Merge pull request #257 from zanata/ZNTA-1834-tm-merge-reword

ZNTA-1834 TM merge reword


Compare: https://github.com/zanata/zanata-platform/compare/2fc0ad108e63...6675310ce322