[zanata/zanata] ab03d1: TM merge UI change

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: ab03d1663b2cde43307053e57fba1a223560a0c7
      https://github.com/zanata/zanata/commit/ab03d1663b2cde43307053e57fba1a223560a0c7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  TM merge UI change