[zanata/zanata] 609b0d: plural support - navigation

[GitHub]

  Branch: refs/heads/rhbz803572
  Home:   https://github.com/zanata/zanata
  Commit: 609b0df544bd7a26a26e11e7e4178339cae8111b
      https://github.com/zanata/zanata/commit/609b0df544bd7a26a26e11e7e4178339cae8111b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/HasDocumentId.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  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/TableEditorTableDefinition.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/TransUnitsEditModel.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasDocumentSelectionHandlers.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java

  Log Message:
  -----------
  plural support - navigation


  Commit: 8b6d5450e8048169b9d91cfe4e2ad27abdbdd263
      https://github.com/zanata/zanata/commit/8b6d5450e8048169b9d91cfe4e2ad27abdbdd263
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    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/presenter/TranslationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.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/TargetContentsDisplay.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java


  Commit: d5a434c7ce5f8ec578a112fab81c68b1ba59f164
      https://github.com/zanata/zanata/commit/d5a434c7ce5f8ec578a112fab81c68b1ba59f164
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-26 (Mon, 26 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/TargetContentsPresenter.java

  Log Message:
  -----------
  fix up after merge


  Commit: 758a601603d40394c314e0f2757c1a4e7e6b5fbb
      https://github.com/zanata/zanata/commit/758a601603d40394c314e0f2757c1a4e7e6b5fbb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenterTest.java

  Log Message:
  -----------
  fix OptionPanelPresenterTest


Compare: https://github.com/zanata/zanata/compare/3da257e...758a601