[zanata/zanata-server] edfb63: Fix NavigationMessages to match with messages in e...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: edfb632bdccaba90f0d4bca92ace9e91e710d020
      https://github.com/zanata/zanata-server/commit/edfb632bdccaba90f0d4bca92ace9e91e710d020
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java

  Log Message:
  -----------
  Fix NavigationMessages to match with messages in editor options


  Commit: ea2150e790057920af8ca711ed0a1e49fbc747cd
      https://github.com/zanata/zanata-server/commit/ea2150e790057920af8ca711ed0a1e49fbc747cd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserScriptCallbackHook.java

  Log Message:
  -----------
  Merge branch 'integration/master' of github.com:zanata/zanata-server into integration/master


Compare: https://github.com/zanata/zanata-server/compare/967f67ed35e5...ea2150e79005