[zanata/zanata] 492ba7: Revert "rhbz707102 - Remove source locale validati...

Sun Jul 8 23:46:16 UTC 2012

  Branch: refs/heads/LayoutSelection
  Home:   https://github.com/zanata/zanata
  Commit: 492ba79c48e66265bc650d6d5940a8660cfa09d5
      https://github.com/zanata/zanata/commit/492ba79c48e66265bc650d6d5940a8660cfa09d5
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java

  Log Message:
  -----------
  Revert "rhbz707102 - Remove source locale validation when pushing documents."

This reverts commit a23e41582561351f00d77a5540d00c73411b5ddf.

  Commit: eeab735f74408a25d852687ac77ebfeb2c0153c3
      https://github.com/zanata/zanata/commit/eeab735f74408a25d852687ac77ebfeb2c0153c3
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java

  Log Message:
  -----------
  rhbz707102 - Add en-US by default to a Zanata instance, but don't enable it by default.

  Commit: 8923fdec10618781e8fa9df65e7773ce72918a23
      https://github.com/zanata/zanata/commit/8923fdec10618781e8fa9df65e7773ce72918a23
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnitResult.java

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

  Commit: 4d2e2c4dbccb1a5fc01c39199524f942d7891eab
      https://github.com/zanata/zanata/commit/4d2e2c4dbccb1a5fc01c39199524f942d7891eab
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java

  Log Message:
  -----------
  rhbz707102 - Fix functional tests due to changes in essential data creation.

  Commit: ccfd88441ab53b12c27acc642b37f86e4a6b7dbf
      https://github.com/zanata/zanata/commit/ccfd88441ab53b12c27acc642b37f86e4a6b7dbf
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/webapp/iteration/files.xhtml

  Log Message:
  -----------
  rhbz830009 - Source locale is now selectable when uploading documents.

The default language is en-US when enabled, otherwise it will default to the first available language.

  Commit: fe197492717517490bf456ab4dbffe5b29e387e7
      https://github.com/zanata/zanata/commit/fe197492717517490bf456ab4dbffe5b29e387e7
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/webapp/iteration/files.xhtml

  Log Message:
  -----------
  rhbz830009 - Source locale is now selectable when uploading documents.

The default language is en-US when enabled, otherwise it will default to the first available language.

  Commit: 1f7a5769f64017a226c50895b34a0853f40c7ef9
      https://github.com/zanata/zanata/commit/1f7a5769f64017a226c50895b34a0853f40c7ef9
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Log Message:
  -----------
  Merge branch '1.6' into integration/master

  Commit: 20c8a93dfca8ea29ae90abe184ced9aa85cf4f12
      https://github.com/zanata/zanata/commit/20c8a93dfca8ea29ae90abe184ced9aa85cf4f12
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

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

  Log Message:
  -----------
  Work in progress: moving search and replace notification into top

  Commit: e4c1e351932a9210fdcb1b6cfb0a9310bc780f78
      https://github.com/zanata/zanata/commit/e4c1e351932a9210fdcb1b6cfb0a9310bc780f78
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Move lucene.version into server pom

  Commit: 670b4080494e8e1a953f45c983ee7786be300967
      https://github.com/zanata/zanata/commit/670b4080494e8e1a953f45c983ee7786be300967
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Revert lucene.version to 2.9.2

  Commit: 93dc850985aba8174c58a93bceaf153e4c89f7ed
      https://github.com/zanata/zanata/commit/93dc850985aba8174c58a93bceaf153e4c89f7ed
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java

  Log Message:
  -----------
  Include version group project search through name and slug: https://bugzilla.redhat.com/show_bug.cgi?id=837477

  Commit: ec579952f5c3d09cb18950e799b06b458362809a
      https://github.com/zanata/zanata/commit/ec579952f5c3d09cb18950e799b06b458362809a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M pom.xml

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

  Commit: 8a96d98b918b588cf6e5729be4664d619552f30c
      https://github.com/zanata/zanata/commit/8a96d98b918b588cf6e5729be4664d619552f30c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java

  Log Message:
  -----------
  Make case insensitive for version group search project slug, name and version slug

  Commit: 0f276b09d02b4f8148879bd1e4c620edaccd990a
      https://github.com/zanata/zanata/commit/0f276b09d02b4f8148879bd1e4c620edaccd990a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

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

  Log Message:
  -----------
  Make 'select all' un-select all when uncheck: https://bugzilla.redhat.com/show_bug.cgi?id=826783

  Commit: 3648abc232e519580ae3d8d217fdb0ed97f452c3
      https://github.com/zanata/zanata/commit/3648abc232e519580ae3d8d217fdb0ed97f452c3
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java

  Log Message:
  -----------
  toggle registration of Enter and Esc key shortcuts depending on user config settings

  Commit: fa15a55fe8033705cce4f7ffd3ebf5bb97ff696d
      https://github.com/zanata/zanata/commit/fa15a55fe8033705cce4f7ffd3ebf5bb97ff696d
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java

  Log Message:
  -----------
  rename user config members to describe their intent

  Commit: 222158c16b30be644ccf7dc463348772f397f05f
      https://github.com/zanata/zanata/commit/222158c16b30be644ccf7dc463348772f397f05f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java

  Log Message:
  -----------
  add constant for no modifier in key shortcut

  Commit: 855c986b5eb9d340f3c616fe209b5588e8205e5b
      https://github.com/zanata/zanata/commit/855c986b5eb9d340f3c616fe209b5588e8205e5b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

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

  Log Message:
  -----------
  update test for UserConfigHolder

  Commit: 4aa34395f122392df66ce826cb55065b78ecdb20
      https://github.com/zanata/zanata/commit/4aa34395f122392df66ce826cb55065b78ecdb20
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java

  Log Message:
  -----------
  remove redundant display flag from KeyShortcut

  Commit: 9627145ed63ab8392f7765f3222245de6494f71e
      https://github.com/zanata/zanata/commit/9627145ed63ab8392f7765f3222245de6494f71e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java

  Log Message:
  -----------
  use enum for key event types in KeyShortcut

  Commit: 489e2c86fd51f345f7eca2ba930a84bb9ac688ba
      https://github.com/zanata/zanata/commit/489e2c86fd51f345f7eca2ba930a84bb9ac688ba
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

  Changed paths:
    M functional-test/pom.xml
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java

  Log Message:
  -----------
  update undo unsuccessful message and TranslationServiceImpl to work on null history

  Commit: d00bf4f23fc51ce4935585674da16025f6a071db
      https://github.com/zanata/zanata/commit/d00bf4f23fc51ce4935585674da16025f6a071db
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/java/org/zanata/ExperimentTest.java
    M functional-test/src/test/java/org/zanata/feature/CreateSampleProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/VersionGroupTest.java
    A functional-test/src/test/resources/functional-test.tng.xml

  Log Message:
  -----------
  define testng group and suite

  Commit: 6b1f1472d17ab1f949029adc53d65e6c4126ed99
      https://github.com/zanata/zanata/commit/6b1f1472d17ab1f949029adc53d65e6c4126ed99
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasUndoHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/UndoLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java

  Log Message:
  -----------
  Work in progress: moving search and replace notification into top

  Commit: 458310dbc1f28e97a53d0a9f2b3a025a7e65d8db
      https://github.com/zanata/zanata/commit/458310dbc1f28e97a53d0a9f2b3a025a7e65d8db
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/java/org/zanata/ExperimentTest.java
    M functional-test/src/test/java/org/zanata/feature/CreateSampleProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/VersionGroupTest.java
    A functional-test/src/test/resources/functional-test.tng.xml
    M pom.xml
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java

  Log Message:
  -----------
  Merge branch 'master' into rhbz831042

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
	zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java

  Commit: ac5fea6b762d6d43446918f6b254decb8f364fb5
      https://github.com/zanata/zanata/commit/ac5fea6b762d6d43446918f6b254decb8f364fb5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasUndoHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/UndoLink.java

  Log Message:
  -----------
  Add comment in class

  Commit: f9abcb8f0ae7085b9293ea141736f8b3d3419b85
      https://github.com/zanata/zanata/commit/f9abcb8f0ae7085b9293ea141736f8b3d3419b85
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

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

  Log Message:
  -----------
  Rename method name

  Commit: f6df79ef146ea9caeba9317d0340aa765d5acdd2
      https://github.com/zanata/zanata/commit/f6df79ef146ea9caeba9317d0340aa765d5acdd2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java

  Log Message:
  -----------
  minor

  Commit: 6c82d171580a43b4d5354520246b6d6f9ebdc42d
      https://github.com/zanata/zanata/commit/6c82d171580a43b4d5354520246b6d6f9ebdc42d
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/java/org/zanata/ExperimentTest.java
    M functional-test/src/test/java/org/zanata/feature/CreateSampleProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/VersionGroupTest.java
    A functional-test/src/test/resources/functional-test.tng.xml
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java

  Log Message:
  -----------
  Merge branch 'master' into key-shortcut-aliases

  Commit: 9e37b9b5f2c08e18efc422b2deec30a18d0074f0
      https://github.com/zanata/zanata/commit/9e37b9b5f2c08e18efc422b2deec30a18d0074f0
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/InlineLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Work in progress: increase notification height and scrollbar

  Commit: d1fdda526861a64880d0b505d0974949816e142a
      https://github.com/zanata/zanata/commit/d1fdda526861a64880d0b505d0974949816e142a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/SurplusKeyListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java

  Log Message:
  -----------
  rhbz836051 use separate class to listen for non-shortcut key events

  Commit: 1240f4baabb15fcfc764a7e0985b57fd557b2130
      https://github.com/zanata/zanata/commit/1240f4baabb15fcfc764a7e0985b57fd557b2130
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/ShortcutContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java

  Log Message:
  -----------
  rhbz836051 shorten key shortcut registration method

  Commit: 7f6a8e26b520df84ca8111143e602e4cc72ae041
      https://github.com/zanata/zanata/commit/7f6a8e26b520df84ca8111143e602e4cc72ae041
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-07-04 (Wed, 04 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java

  Log Message:
  -----------
  rhbz836051 arrange key shortcut constructor arguments for readability

  Commit: 301f0edc69240843e33a517a7bfb2510369044b5
      https://github.com/zanata/zanata/commit/301f0edc69240843e33a517a7bfb2510369044b5
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/SurplusKeyListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java

  Log Message:
  -----------
  rhbz836051 replace key code and modifiers in KeyShortcut with Keys object

  Commit: 6c3ffbde82e025c63d36a8653a885d2182d4ae9a
      https://github.com/zanata/zanata/commit/6c3ffbde82e025c63d36a8653a885d2182d4ae9a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfVariablesValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java

  Log Message:
  -----------
  Bug 814599 - RFE: %x validation should support positional printf strings (eg %1$s)
- added error message for specific positional variables related case
- added special check to detect various position related error

  Commit: c243afada98bcb1bc3f17c2baf4681be5e1f0a4e
      https://github.com/zanata/zanata/commit/c243afada98bcb1bc3f17c2baf4681be5e1f0a4e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java

  Log Message:
  -----------
  rhbz836051 change uses of key code and modifiers in KeyShortcut to use Keys objects

  Commit: 51aefaec0d92c18a4b351ab27fdaba01b6c14e8f
      https://github.com/zanata/zanata/commit/51aefaec0d92c18a4b351ab27fdaba01b6c14e8f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java

  Log Message:
  -----------
  Merge branch 'key-shortcut-aliases' into integration/master

  Commit: 47e936200af13ebe5e12730b52a398b412f2a373
      https://github.com/zanata/zanata/commit/47e936200af13ebe5e12730b52a398b412f2a373
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml

  Log Message:
  -----------
  Increase notification messages to keep, moved search and replace messages into top, https://bugzilla.redhat.com/show_bug.cgi?id=831042

  Commit: 3b4b75db78f3f56ad0688d16f446c231bbb51cbf
      https://github.com/zanata/zanata/commit/3b4b75db78f3f56ad0688d16f446c231bbb51cbf
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java

  Log Message:
  -----------
  Fix test, removed test data

  Commit: f417b70b3f3da5c9c9d6e3403739089e688b285d
      https://github.com/zanata/zanata/commit/f417b70b3f3da5c9c9d6e3403739089e688b285d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/resources/pluralforms.properties
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

  Log Message:
  -----------
  rhbz836946 Add plural information for new Indic languages

  Commit: dbdff9c9ad1b3c1e5ed0d9381472ad669da42915
      https://github.com/zanata/zanata/commit/dbdff9c9ad1b3c1e5ed0d9381472ad669da42915
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/resources/pluralforms.properties
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

  Log Message:
  -----------
  Merge branch '1.6' into integration/master

  Commit: f409aff1a023e65b2986c2e6b6856dd46fb15c15
      https://github.com/zanata/zanata/commit/f409aff1a023e65b2986c2e6b6856dd46fb15c15
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/search/LevenshteinUtil.java

  Log Message:
  -----------
  Fix potential OutOfMemoryError in Levenshtein algorithm

  Commit: c55494276451c0e01b944e55035a2b6eb8543d35
      https://github.com/zanata/zanata/commit/c55494276451c0e01b944e55035a2b6eb8543d35
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/search/LevenshteinTokenUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    A zanata-war/src/test/java/org/zanata/search/LevenshteinTokenUtilTest.java

  Log Message:
  -----------
  Add word/token-based Levenshtein distance calculation (not activated yet)

  Commit: 9d6128bbc7086227454869afeaecab78109782aa
      https://github.com/zanata/zanata/commit/9d6128bbc7086227454869afeaecab78109782aa
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasUndoHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/InlineLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/UndoLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java

  Log Message:
  -----------
  Merge branch 'rhbz831042' into integration/master

  Commit: aff69f3628873ee31cc0d4207f5925b6feb40359
      https://github.com/zanata/zanata/commit/aff69f3628873ee31cc0d4207f5925b6feb40359
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/test/java/org/zanata/ExperimentTest.java
    M functional-test/src/test/java/org/zanata/feature/CreateSampleProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/VersionGroupTest.java
    A functional-test/src/test/resources/functional-test.tng.xml
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    A zanata-war/src/main/java/org/zanata/search/LevenshteinTokenUtil.java
    M zanata-war/src/main/java/org/zanata/search/LevenshteinUtil.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/ShortcutContext.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/SurplusKeyListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasUndoHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/InlineLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/UndoLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfVariablesValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/resources/pluralforms.properties
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    A zanata-war/src/test/java/org/zanata/search/LevenshteinTokenUtilTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java

  Log Message:
  -----------
  Merge branch 'master' into LayoutSelection

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java

Compare: https://github.com/zanata/zanata/compare/8a1a36a46d06...aff69f362887