[zanata/zanata] 147a2e: plural support - work in progress for cancel butto...

[GitHub]

  Branch: refs/heads/rhbz803572
  Home:   https://github.com/zanata/zanata
  Commit: 147a2ecc8558f094e09973dcf9793eb03631e255
      https://github.com/zanata/zanata/commit/147a2ecc8558f094e09973dcf9793eb03631e255
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    R client/zanata-maven-plugin/demo-glossary/compendium/de.po
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java

  Log Message:
  -----------
  plural support - work in progress for cancel button


  Commit: ea4174db86198e75ef90c1cbfec8309a0dcaf04a
      https://github.com/zanata/zanata/commit/ea4174db86198e75ef90c1cbfec8309a0dcaf04a
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java

  Log Message:
  -----------
  Merge branch 'rhbz803572' of github.com:zanata/zanata into rhbz803572

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java


Compare: https://github.com/zanata/zanata/compare/4e7e270...ea4174d