[zanata/zanata] 110c48: plural support - work in progress: shortcut keys

[GitHub]

  Branch: refs/heads/rhbz803572
  Home:   https://github.com/zanata/zanata
  Commit: 110c48facebdb856f3dbc31a85c391aae3a1e89b
      https://github.com/zanata/zanata/commit/110c48facebdb856f3dbc31a85c391aae3a1e89b
  Author: Alex Eng <aeng 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/presenter/UserConfigHolder.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java

  Log Message:
  -----------
  plural support - work in progress: shortcut keys


  Commit: fcf730f960401eefc84c2772654aa345005eab97
      https://github.com/zanata/zanata/commit/fcf730f960401eefc84c2772654aa345005eab97
  Author: Alex Eng <aeng 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/TableResources.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/UserConfigHolder.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/Editor.ui.xml
  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/presenter/UserConfigHolder.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java


Compare: https://github.com/zanata/zanata/compare/9c482b4...fcf730f