[zanata/zanata] a05194: implement server storage of selected transunit for...

GitHub noreply at github.com
Fri May 4 01:29:00 UTC 2012


  Branch: refs/heads/search-replace
  Home:   https://github.com/zanata/zanata
  Commit: a0519477b0c478d0b2e8c25183581cedd89253db
      https://github.com/zanata/zanata/commit/a0519477b0c478d0b2e8c25183581cedd89253db
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    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/TranslationPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenter.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
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspace.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TranslatorStatusUpdateHandler.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/PersonSessionDetails.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslatorListResult.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslatorListCommand.java

  Log Message:
  -----------
  implement server storage of selected transunit for single user


  Commit: ffaa7644c2a8b3f2a53d9d19067d9c747db8c017
      https://github.com/zanata/zanata/commit/ffaa7644c2a8b3f2a53d9d19067d9c747db8c017
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M server/functional-test/src/main/java/org/zanata/page/AddLanguagePage.java
    M server/functional-test/src/main/java/org/zanata/page/AdministrationPage.java
    M server/functional-test/src/main/java/org/zanata/page/CreateProjectPage.java
    M server/functional-test/src/main/java/org/zanata/page/CreateVersionPage.java
    M server/functional-test/src/main/java/org/zanata/page/HomePage.java
    M server/functional-test/src/main/java/org/zanata/page/ManageLanguagePage.java
    M server/functional-test/src/main/java/org/zanata/page/ProjectPage.java
    M server/functional-test/src/main/java/org/zanata/page/ProjectVersionPage.java
    M server/functional-test/src/main/java/org/zanata/page/ProjectsPage.java
    M server/functional-test/src/main/java/org/zanata/page/SignInPage.java
    M server/functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M server/functional-test/src/main/java/org/zanata/page/WebTranPage.java
    M server/functional-test/src/main/java/org/zanata/util/Constants.java
    M server/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M server/functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M server/functional-test/src/main/java/org/zanata/workflow/ClientPushWorkFlow.java
    M server/functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M server/functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M server/functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M server/functional-test/src/test/java/org/zanata/ExperimentTest.java
    M server/functional-test/src/test/java/org/zanata/feature/CreateSampleProjectTest.java
    M server/functional-test/src/test/java/org/zanata/feature/LoginTest.java
    M server/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M server/zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
    M server/zanata-war/src/main/java/org/zanata/security/AuthenticationType.java
    M server/zanata-war/src/main/java/org/zanata/security/FedoraOpenId.java
    M server/zanata-war/src/main/java/org/zanata/security/FedoraOpenIdPhaseListener.java
    M server/zanata-war/src/main/java/org/zanata/security/FixedClientUidSelector.java
    M server/zanata-war/src/main/java/org/zanata/security/FixedRememberMe.java
    M server/zanata-war/src/main/java/org/zanata/security/KeyNotFoundException.java
    M server/zanata-war/src/main/java/org/zanata/security/OpenIdLoginModule.java
    M server/zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java
    M server/zanata-war/src/main/java/org/zanata/security/ZanataExternalLoginBean.java
    M server/zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java
    M server/zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.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/presenter/UserConfigHolder.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/shared/auth/Permission.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentId.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossary.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasSearchType.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilterImpl.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/JavaVariablesValidation.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java

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


  Commit: 75ed648fd69c096d660d1f328bb4f5211ed8e780
      https://github.com/zanata/zanata/commit/75ed648fd69c096d660d1f328bb4f5211ed8e780
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    R brew.repo
    R client/.gitignore
    R client/pom.xml
    R client/zanata-client-ant-po/.gitignore
    R client/zanata-client-ant-po/eclipse/DownloadPoTask --help.launch	
    R client/zanata-client-ant-po/eclipse/DownloadPoTask.launch
    R client/zanata-client-ant-po/eclipse/UploadPoTask --help.launch	
    R client/zanata-client-ant-po/eclipse/UploadPoTask localhost.launch	
    R client/zanata-client-ant-po/flies-ant-demo/build.xml
    R client/zanata-client-ant-po/flies-ant-demo/pom.xml
    R client/zanata-client-ant-po/flies-ant-demo/taskdefs.xml
    R client/zanata-client-ant-po/flies-ant-demo/test1/foo/foo.properties
    R client/zanata-client-ant-po/flies-ant-demo/test1/foo/foo_de.properties
    R client/zanata-client-ant-po/flies-ant-demo/test1/test.properties
    R client/zanata-client-ant-po/flies-ant-demo/test1/test_fr.properties
    R client/zanata-client-ant-po/pom.xml
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableProjectTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/CreateIterationTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/CreateProjectTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/DownloadPoTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/PutUserTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/UploadPoTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/Utility.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ZanataTask.java
    R client/zanata-client-ant-po/src/main/resources/log4j.xml
    R client/zanata-client-ant-po/src/main/resources/org/zanata/client/ant/po/antlib.xml
    R client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/AbstractBuildTest.java
    R client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/LocalTest.java
    R client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/RemoteTest.java
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/build.xml
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/downloadpo.xml
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/roundtrip.xml
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/sample/documents/documents.xml
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/taskdefs.xml
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/uploadpo.xml
    R client/zanata-client-ant-po/src/test/resources/test-input/en-US/Book_Info.xml
    R client/zanata-client-ant-po/src/test/resources/test-input/ja-JP/Book_Info.po
    R client/zanata-client-ant-po/src/test/resources/test-input/ja-JP/RPM.po
    R client/zanata-client-ant-po/src/test/resources/test-input/pot/RPM.pot
    R client/zanata-client-ant-po/src/test/resources/test-input/publican.cfg
    R client/zanata-client-ant-properties/.gitignore
    R client/zanata-client-ant-properties/README-TESTING.txt
    R client/zanata-client-ant-properties/pom.xml
    R client/zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/BasePropertiesSelector.java
    R client/zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/BaseTask.java
    R client/zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/Docs2PropsTask.java
    R client/zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/Props2DocsTask.java
    R client/zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/Utility.java
    R client/zanata-client-ant-properties/src/main/resources/org/zanata/client/ant/properties/antlib.xml
    R client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/AbstractBuildTest.java
    R client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/LocalTest.java
    R client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/RemoteTest.java
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/build.xml
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/roundtrip.xml
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/taskdefs.xml
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test1/foo/foo.properties
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test1/foo/foo_de.properties
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test1/test.properties
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test1/test_fr.properties
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test2/documents.xml
    R client/zanata-client-ant-properties/zanata-ant-demo/build.xml
    R client/zanata-client-ant-properties/zanata-ant-demo/pom.xml
    R client/zanata-client-ant-properties/zanata-ant-demo/taskdefs.xml
    R client/zanata-client-ant-properties/zanata-ant-demo/test1/foo/foo.properties
    R client/zanata-client-ant-properties/zanata-ant-demo/test1/foo/foo_de.properties
    R client/zanata-client-ant-properties/zanata-ant-demo/test1/test.properties
    R client/zanata-client-ant-properties/zanata-ant-demo/test1/test_fr.properties
    R client/zanata-client-commands/.gitignore
    R client/zanata-client-commands/pom.xml
    R client/zanata-client-commands/src/main/java/org/zanata/client/ZanataClient.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/AppAbortStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ArgsUtil.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/BasicOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/BasicOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ListLocalCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ListLocalOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/RuntimeExceptionStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/StringUtil.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/SystemExitStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ZanataCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/gettext/GettextUtils.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/gettext/PublicanUtil.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/AbstractGlossaryPushReader.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryCSVReader.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPoReader.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextDirStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XmlStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/AbstractPushStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushType.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/XliffStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/XmlStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/ConfigUtil.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/LocaleList.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/LocaleMapping.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/StringTrimAdapter.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/ZanataConfig.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/package-info.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/exceptions/ConfigException.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/ZanataClientTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPullCommandTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPushCommandTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/glossary/push/GlossaryCSVReaderTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/glossary/push/GlossaryPoReaderTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullPropertiesStrategyTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushPropertiesStrategyTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/XliffStrategyTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/config/ConfigUtilTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/config/ZanataConfigTest.java
    R client/zanata-client-commands/src/test/resources/glossary/fuel_hi.po
    R client/zanata-client-commands/src/test/resources/glossary/translate1.csv
    R client/zanata-client-commands/src/test/resources/glossary/translate2.csv
    R client/zanata-client-commands/src/test/resources/log4j.xml
    R client/zanata-client-commands/src/test/resources/test1/ja-JP/RPM.po
    R client/zanata-client-commands/src/test/resources/test1/pot/RPM.pot
    R client/zanata-client-commands/src/test/resources/test1/pot/sub/RPM.pot
    R client/zanata-client-commands/src/test/resources/test2/zanata.xml
    R client/zanata-client-commands/src/test/resources/testdir/placeholder.txt
    R client/zanata-client-commands/src/test/resources/xliffDir/dir1/StringResource_de.xml
    R client/zanata-client-commands/src/test/resources/xliffDir/dir1/StringResource_en_US.xml
    R client/zanata-client-commands/src/test/resources/xliffDir/dir1/dir2/StringResource_en_US.xml
    R client/zanata-client-commands/src/test/resources/xliffDir/dir1/dir2/StringResource_fr.xml
    R client/zanata-client-commands/src/test/resources/xliffDir/dir2/StringResource_en_US.xml
    R client/zanata-client-commands/src/test/resources/xliffDir/dir2/StringResource_fr.xml
    R client/zanata-client-commands/src/test/resources/zanata.ini
    R client/zanata-client-commands/src/test/resources/zanata.xml
    R client/zanata-maven-plugin/.gitignore
    R client/zanata-maven-plugin/README.txt
    R client/zanata-maven-plugin/demo-glossary/compendium/fr.po
    R client/zanata-maven-plugin/demo-glossary/compendium/pom.xml
    R client/zanata-maven-plugin/demo-glossary/compendium/zanata.xml
    R client/zanata-maven-plugin/demo-glossary/csv/pom.xml
    R client/zanata-maven-plugin/demo-glossary/csv/translate1.csv
    R client/zanata-maven-plugin/demo-glossary/csv/zanata.xml
    R client/zanata-maven-plugin/demo-glossary/delete/pom.xml
    R client/zanata-maven-plugin/demo-glossary/delete/zanata.xml
    R client/zanata-maven-plugin/demo-glossary/fuel/fuel_hi.po
    R client/zanata-maven-plugin/demo-glossary/fuel/pom.xml
    R client/zanata-maven-plugin/demo-glossary/fuel/zanata.xml
    R client/zanata-maven-plugin/demo-props/pom.xml
    R client/zanata-maven-plugin/demo-props/src/org/zanata/test.properties
    R client/zanata-maven-plugin/demo-props/src/org/zanata/test_ja_JP.properties
    R client/zanata-maven-plugin/demo-props/zanata.xml
    R client/zanata-maven-plugin/demo-publican/pom.xml
    R client/zanata-maven-plugin/demo-publican/pot/subdir/RPM.pot
    R client/zanata-maven-plugin/demo-publican/zanata.xml
    R client/zanata-maven-plugin/demo-publican/zh-TW/subdir/RPM.po
    R client/zanata-maven-plugin/demo-xliff/pom.xml
    R client/zanata-maven-plugin/demo-xliff/src/dir1/StringResource_de.xml
    R client/zanata-maven-plugin/demo-xliff/src/dir1/StringResource_en_US.xml
    R client/zanata-maven-plugin/demo-xliff/src/dir2/StringResource_de.xml
    R client/zanata-maven-plugin/demo-xliff/src/dir2/StringResource_en_US.xml
    R client/zanata-maven-plugin/demo-xliff/zanata.xml
    R client/zanata-maven-plugin/demo-xml/pom.xml
    R client/zanata-maven-plugin/demo-xml/src/org/zanata/test.xml
    R client/zanata-maven-plugin/demo-xml/src/org/zanata/test_ja_JP.xml
    R client/zanata-maven-plugin/demo-xml/zanata.xml
    R client/zanata-maven-plugin/pom.xml
    R client/zanata-maven-plugin/sample-scripts/README-scripts.md
    R client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata.sh
    R client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata_draft_build
    R client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata_export_translations
    R client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata_import_all
    R client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata_import_source
    R client/zanata-maven-plugin/sample-scripts/pom.xml
    R client/zanata-maven-plugin/sample-scripts/zanata.xml
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableProjectMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryDeleteMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryPushMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListLocalMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListRemoteMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushPullMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutProjectMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutUserMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutVersionMojo.java
    R client/zanata-maven-plugin/src/test/java/org/zanata/maven/PushMojoTest.java
    R client/zanata-maven-plugin/src/test/java/org/zanata/maven/ZanataMojoTest.java
    R client/zanata-maven-plugin/src/test/resources/push-test/pom-config-pushType.xml
    R client/zanata-maven-plugin/src/test/resources/push-test/pom-config.xml
    R client/zanata-rest-client/.gitignore
    R client/zanata-rest-client/pom.xml
    R client/zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderDecorator.java
    R client/zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtility.java
    R client/zanata-rest-client/src/main/java/org/zanata/rest/client/ITranslationResourcesFactory.java
    R client/zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugInterceptor.java
    R client/zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
    R client/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
    R client/zanata-rest-client/src/test/java/org/zanata/rest/client/TestProxyFactory.java
    M pom.xml

  Log Message:
  -----------
  Extract client again


  Commit: a93210b396de6c84c31029283c7e14d04c792367
      https://github.com/zanata/zanata/commit/a93210b396de6c84c31029283c7e14d04c792367
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-02 (Wed, 02 May 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
    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/presenter/WorkspaceUsersPresenter.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
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserPanelSessionItem.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

  Log Message:
  -----------
  Live translator in editor implementation: work in progress


  Commit: 1b84f15139c549b6f4a715b91d0539ca42e35554
      https://github.com/zanata/zanata/commit/1b84f15139c549b6f4a715b91d0539ca42e35554
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    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/WorkspaceUsersPresenter.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/view/WorkspaceUsersView.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java

  Log Message:
  -----------
  Implement live translator selection in workspace user presenter: work in progress


  Commit: c0e96601b4ba9963078e758618917d3617511e9a
      https://github.com/zanata/zanata/commit/c0e96601b4ba9963078e758618917d3617511e9a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/PersonSessionDetails.java

  Log Message:
  -----------
  Fix participant count problem in workspace user view


  Commit: 2886d305b2d9b9b4ee327a5cb615719af24f8530
      https://github.com/zanata/zanata/commit/2886d305b2d9b9b4ee327a5cb615719af24f8530
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    R brew.repo
    R client/.gitignore
    R client/pom.xml
    R client/zanata-client-ant-po/.gitignore
    R client/zanata-client-ant-po/eclipse/DownloadPoTask --help.launch	
    R client/zanata-client-ant-po/eclipse/DownloadPoTask.launch
    R client/zanata-client-ant-po/eclipse/UploadPoTask --help.launch	
    R client/zanata-client-ant-po/eclipse/UploadPoTask localhost.launch	
    R client/zanata-client-ant-po/flies-ant-demo/build.xml
    R client/zanata-client-ant-po/flies-ant-demo/pom.xml
    R client/zanata-client-ant-po/flies-ant-demo/taskdefs.xml
    R client/zanata-client-ant-po/flies-ant-demo/test1/foo/foo.properties
    R client/zanata-client-ant-po/flies-ant-demo/test1/foo/foo_de.properties
    R client/zanata-client-ant-po/flies-ant-demo/test1/test.properties
    R client/zanata-client-ant-po/flies-ant-demo/test1/test_fr.properties
    R client/zanata-client-ant-po/pom.xml
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableProjectTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/CreateIterationTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/CreateProjectTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/DownloadPoTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/PutUserTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/UploadPoTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/Utility.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ZanataTask.java
    R client/zanata-client-ant-po/src/main/resources/log4j.xml
    R client/zanata-client-ant-po/src/main/resources/org/zanata/client/ant/po/antlib.xml
    R client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/AbstractBuildTest.java
    R client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/LocalTest.java
    R client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/RemoteTest.java
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/build.xml
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/downloadpo.xml
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/roundtrip.xml
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/sample/documents/documents.xml
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/taskdefs.xml
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/uploadpo.xml
    R client/zanata-client-ant-po/src/test/resources/test-input/en-US/Book_Info.xml
    R client/zanata-client-ant-po/src/test/resources/test-input/ja-JP/Book_Info.po
    R client/zanata-client-ant-po/src/test/resources/test-input/ja-JP/RPM.po
    R client/zanata-client-ant-po/src/test/resources/test-input/pot/RPM.pot
    R client/zanata-client-ant-po/src/test/resources/test-input/publican.cfg
    R client/zanata-client-ant-properties/.gitignore
    R client/zanata-client-ant-properties/README-TESTING.txt
    R client/zanata-client-ant-properties/pom.xml
    R client/zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/BasePropertiesSelector.java
    R client/zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/BaseTask.java
    R client/zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/Docs2PropsTask.java
    R client/zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/Props2DocsTask.java
    R client/zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/Utility.java
    R client/zanata-client-ant-properties/src/main/resources/org/zanata/client/ant/properties/antlib.xml
    R client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/AbstractBuildTest.java
    R client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/LocalTest.java
    R client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/RemoteTest.java
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/build.xml
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/roundtrip.xml
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/taskdefs.xml
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test1/foo/foo.properties
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test1/foo/foo_de.properties
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test1/test.properties
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test1/test_fr.properties
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test2/documents.xml
    R client/zanata-client-ant-properties/zanata-ant-demo/build.xml
    R client/zanata-client-ant-properties/zanata-ant-demo/pom.xml
    R client/zanata-client-ant-properties/zanata-ant-demo/taskdefs.xml
    R client/zanata-client-ant-properties/zanata-ant-demo/test1/foo/foo.properties
    R client/zanata-client-ant-properties/zanata-ant-demo/test1/foo/foo_de.properties
    R client/zanata-client-ant-properties/zanata-ant-demo/test1/test.properties
    R client/zanata-client-ant-properties/zanata-ant-demo/test1/test_fr.properties
    R client/zanata-client-commands/.gitignore
    R client/zanata-client-commands/pom.xml
    R client/zanata-client-commands/src/main/java/org/zanata/client/ZanataClient.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/AppAbortStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ArgsUtil.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/BasicOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/BasicOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ListLocalCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ListLocalOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/RuntimeExceptionStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/StringUtil.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/SystemExitStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ZanataCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/gettext/GettextUtils.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/gettext/PublicanUtil.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/AbstractGlossaryPushReader.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryCSVReader.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPoReader.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextDirStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XmlStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/AbstractPushStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushType.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/XliffStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/XmlStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/ConfigUtil.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/LocaleList.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/LocaleMapping.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/StringTrimAdapter.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/ZanataConfig.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/package-info.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/exceptions/ConfigException.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/ZanataClientTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPullCommandTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPushCommandTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/glossary/push/GlossaryCSVReaderTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/glossary/push/GlossaryPoReaderTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullPropertiesStrategyTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushPropertiesStrategyTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/XliffStrategyTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/config/ConfigUtilTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/config/ZanataConfigTest.java
    R client/zanata-client-commands/src/test/resources/glossary/fuel_hi.po
    R client/zanata-client-commands/src/test/resources/glossary/translate1.csv
    R client/zanata-client-commands/src/test/resources/glossary/translate2.csv
    R client/zanata-client-commands/src/test/resources/log4j.xml
    R client/zanata-client-commands/src/test/resources/test1/ja-JP/RPM.po
    R client/zanata-client-commands/src/test/resources/test1/pot/RPM.pot
    R client/zanata-client-commands/src/test/resources/test1/pot/sub/RPM.pot
    R client/zanata-client-commands/src/test/resources/test2/zanata.xml
    R client/zanata-client-commands/src/test/resources/testdir/placeholder.txt
    R client/zanata-client-commands/src/test/resources/xliffDir/dir1/StringResource_de.xml
    R client/zanata-client-commands/src/test/resources/xliffDir/dir1/StringResource_en_US.xml
    R client/zanata-client-commands/src/test/resources/xliffDir/dir1/dir2/StringResource_en_US.xml
    R client/zanata-client-commands/src/test/resources/xliffDir/dir1/dir2/StringResource_fr.xml
    R client/zanata-client-commands/src/test/resources/xliffDir/dir2/StringResource_en_US.xml
    R client/zanata-client-commands/src/test/resources/xliffDir/dir2/StringResource_fr.xml
    R client/zanata-client-commands/src/test/resources/zanata.ini
    R client/zanata-client-commands/src/test/resources/zanata.xml
    R client/zanata-maven-plugin/.gitignore
    R client/zanata-maven-plugin/README.txt
    R client/zanata-maven-plugin/demo-glossary/compendium/fr.po
    R client/zanata-maven-plugin/demo-glossary/compendium/pom.xml
    R client/zanata-maven-plugin/demo-glossary/compendium/zanata.xml
    R client/zanata-maven-plugin/demo-glossary/csv/pom.xml
    R client/zanata-maven-plugin/demo-glossary/csv/translate1.csv
    R client/zanata-maven-plugin/demo-glossary/csv/zanata.xml
    R client/zanata-maven-plugin/demo-glossary/delete/pom.xml
    R client/zanata-maven-plugin/demo-glossary/delete/zanata.xml
    R client/zanata-maven-plugin/demo-glossary/fuel/fuel_hi.po
    R client/zanata-maven-plugin/demo-glossary/fuel/pom.xml
    R client/zanata-maven-plugin/demo-glossary/fuel/zanata.xml
    R client/zanata-maven-plugin/demo-props/pom.xml
    R client/zanata-maven-plugin/demo-props/src/org/zanata/test.properties
    R client/zanata-maven-plugin/demo-props/src/org/zanata/test_ja_JP.properties
    R client/zanata-maven-plugin/demo-props/zanata.xml
    R client/zanata-maven-plugin/demo-publican/pom.xml
    R client/zanata-maven-plugin/demo-publican/pot/subdir/RPM.pot
    R client/zanata-maven-plugin/demo-publican/zanata.xml
    R client/zanata-maven-plugin/demo-publican/zh-TW/subdir/RPM.po
    R client/zanata-maven-plugin/demo-xliff/pom.xml
    R client/zanata-maven-plugin/demo-xliff/src/dir1/StringResource_de.xml
    R client/zanata-maven-plugin/demo-xliff/src/dir1/StringResource_en_US.xml
    R client/zanata-maven-plugin/demo-xliff/src/dir2/StringResource_de.xml
    R client/zanata-maven-plugin/demo-xliff/src/dir2/StringResource_en_US.xml
    R client/zanata-maven-plugin/demo-xliff/zanata.xml
    R client/zanata-maven-plugin/demo-xml/pom.xml
    R client/zanata-maven-plugin/demo-xml/src/org/zanata/test.xml
    R client/zanata-maven-plugin/demo-xml/src/org/zanata/test_ja_JP.xml
    R client/zanata-maven-plugin/demo-xml/zanata.xml
    R client/zanata-maven-plugin/pom.xml
    R client/zanata-maven-plugin/sample-scripts/README-scripts.md
    R client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata.sh
    R client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata_draft_build
    R client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata_export_translations
    R client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata_import_all
    R client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata_import_source
    R client/zanata-maven-plugin/sample-scripts/pom.xml
    R client/zanata-maven-plugin/sample-scripts/zanata.xml
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableProjectMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryDeleteMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryPushMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListLocalMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListRemoteMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushPullMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutProjectMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutUserMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutVersionMojo.java
    R client/zanata-maven-plugin/src/test/java/org/zanata/maven/PushMojoTest.java
    R client/zanata-maven-plugin/src/test/java/org/zanata/maven/ZanataMojoTest.java
    R client/zanata-maven-plugin/src/test/resources/push-test/pom-config-pushType.xml
    R client/zanata-maven-plugin/src/test/resources/push-test/pom-config.xml
    R client/zanata-rest-client/.gitignore
    R client/zanata-rest-client/pom.xml
    R client/zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderDecorator.java
    R client/zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtility.java
    R client/zanata-rest-client/src/main/java/org/zanata/rest/client/ITranslationResourcesFactory.java
    R client/zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugInterceptor.java
    R client/zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
    R client/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
    R client/zanata-rest-client/src/test/java/org/zanata/rest/client/TestProxyFactory.java
    M pom.xml

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


  Commit: 56ce3cfea621dd92e5755983da3e070b0e6deffe
      https://github.com/zanata/zanata/commit/56ce3cfea621dd92e5755983da3e070b0e6deffe
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  Eliminate snapshot dependency on zanata-api-compat


  Commit: 02c11ede8c1013147c639eb83d677720b1df09f6
      https://github.com/zanata/zanata/commit/02c11ede8c1013147c639eb83d677720b1df09f6
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    R brew.repo
    R client/.gitignore
    R client/pom.xml
    R client/zanata-client-ant-po/.gitignore
    R client/zanata-client-ant-po/eclipse/DownloadPoTask --help.launch	
    R client/zanata-client-ant-po/eclipse/DownloadPoTask.launch
    R client/zanata-client-ant-po/eclipse/UploadPoTask --help.launch	
    R client/zanata-client-ant-po/eclipse/UploadPoTask localhost.launch	
    R client/zanata-client-ant-po/flies-ant-demo/build.xml
    R client/zanata-client-ant-po/flies-ant-demo/pom.xml
    R client/zanata-client-ant-po/flies-ant-demo/taskdefs.xml
    R client/zanata-client-ant-po/flies-ant-demo/test1/foo/foo.properties
    R client/zanata-client-ant-po/flies-ant-demo/test1/foo/foo_de.properties
    R client/zanata-client-ant-po/flies-ant-demo/test1/test.properties
    R client/zanata-client-ant-po/flies-ant-demo/test1/test_fr.properties
    R client/zanata-client-ant-po/pom.xml
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableProjectTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/CreateIterationTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/CreateProjectTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/DownloadPoTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/PutUserTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/UploadPoTask.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/Utility.java
    R client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ZanataTask.java
    R client/zanata-client-ant-po/src/main/resources/log4j.xml
    R client/zanata-client-ant-po/src/main/resources/org/zanata/client/ant/po/antlib.xml
    R client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/AbstractBuildTest.java
    R client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/LocalTest.java
    R client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/RemoteTest.java
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/build.xml
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/downloadpo.xml
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/roundtrip.xml
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/sample/documents/documents.xml
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/taskdefs.xml
    R client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/uploadpo.xml
    R client/zanata-client-ant-po/src/test/resources/test-input/en-US/Book_Info.xml
    R client/zanata-client-ant-po/src/test/resources/test-input/ja-JP/Book_Info.po
    R client/zanata-client-ant-po/src/test/resources/test-input/ja-JP/RPM.po
    R client/zanata-client-ant-po/src/test/resources/test-input/pot/RPM.pot
    R client/zanata-client-ant-po/src/test/resources/test-input/publican.cfg
    R client/zanata-client-ant-properties/.gitignore
    R client/zanata-client-ant-properties/README-TESTING.txt
    R client/zanata-client-ant-properties/pom.xml
    R client/zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/BasePropertiesSelector.java
    R client/zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/BaseTask.java
    R client/zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/Docs2PropsTask.java
    R client/zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/Props2DocsTask.java
    R client/zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/Utility.java
    R client/zanata-client-ant-properties/src/main/resources/org/zanata/client/ant/properties/antlib.xml
    R client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/AbstractBuildTest.java
    R client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/LocalTest.java
    R client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/RemoteTest.java
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/build.xml
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/roundtrip.xml
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/taskdefs.xml
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test1/foo/foo.properties
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test1/foo/foo_de.properties
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test1/test.properties
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test1/test_fr.properties
    R client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test2/documents.xml
    R client/zanata-client-ant-properties/zanata-ant-demo/build.xml
    R client/zanata-client-ant-properties/zanata-ant-demo/pom.xml
    R client/zanata-client-ant-properties/zanata-ant-demo/taskdefs.xml
    R client/zanata-client-ant-properties/zanata-ant-demo/test1/foo/foo.properties
    R client/zanata-client-ant-properties/zanata-ant-demo/test1/foo/foo_de.properties
    R client/zanata-client-ant-properties/zanata-ant-demo/test1/test.properties
    R client/zanata-client-ant-properties/zanata-ant-demo/test1/test_fr.properties
    R client/zanata-client-commands/.gitignore
    R client/zanata-client-commands/pom.xml
    R client/zanata-client-commands/src/main/java/org/zanata/client/ZanataClient.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/AppAbortStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ArgsUtil.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/BasicOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/BasicOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ListLocalCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ListLocalOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionOptionsImpl.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/RuntimeExceptionStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/StringUtil.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/SystemExitStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/ZanataCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/gettext/GettextUtils.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/gettext/PublicanUtil.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/AbstractGlossaryPushReader.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryCSVReader.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPoReader.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextDirStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XmlStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/AbstractPushStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushType.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/XliffStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/XmlStrategy.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/ConfigUtil.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/LocaleList.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/LocaleMapping.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/StringTrimAdapter.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/ZanataConfig.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/config/package-info.java
    R client/zanata-client-commands/src/main/java/org/zanata/client/exceptions/ConfigException.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/ZanataClientTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPullCommandTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPushCommandTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/glossary/push/GlossaryCSVReaderTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/glossary/push/GlossaryPoReaderTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullPropertiesStrategyTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushPropertiesStrategyTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/XliffStrategyTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/config/ConfigUtilTest.java
    R client/zanata-client-commands/src/test/java/org/zanata/client/config/ZanataConfigTest.java
    R client/zanata-client-commands/src/test/resources/glossary/fuel_hi.po
    R client/zanata-client-commands/src/test/resources/glossary/translate1.csv
    R client/zanata-client-commands/src/test/resources/glossary/translate2.csv
    R client/zanata-client-commands/src/test/resources/log4j.xml
    R client/zanata-client-commands/src/test/resources/test1/ja-JP/RPM.po
    R client/zanata-client-commands/src/test/resources/test1/pot/RPM.pot
    R client/zanata-client-commands/src/test/resources/test1/pot/sub/RPM.pot
    R client/zanata-client-commands/src/test/resources/test2/zanata.xml
    R client/zanata-client-commands/src/test/resources/testdir/placeholder.txt
    R client/zanata-client-commands/src/test/resources/xliffDir/dir1/StringResource_de.xml
    R client/zanata-client-commands/src/test/resources/xliffDir/dir1/StringResource_en_US.xml
    R client/zanata-client-commands/src/test/resources/xliffDir/dir1/dir2/StringResource_en_US.xml
    R client/zanata-client-commands/src/test/resources/xliffDir/dir1/dir2/StringResource_fr.xml
    R client/zanata-client-commands/src/test/resources/xliffDir/dir2/StringResource_en_US.xml
    R client/zanata-client-commands/src/test/resources/xliffDir/dir2/StringResource_fr.xml
    R client/zanata-client-commands/src/test/resources/zanata.ini
    R client/zanata-client-commands/src/test/resources/zanata.xml
    R client/zanata-maven-plugin/.gitignore
    R client/zanata-maven-plugin/README.txt
    R client/zanata-maven-plugin/demo-glossary/compendium/fr.po
    R client/zanata-maven-plugin/demo-glossary/compendium/pom.xml
    R client/zanata-maven-plugin/demo-glossary/compendium/zanata.xml
    R client/zanata-maven-plugin/demo-glossary/csv/pom.xml
    R client/zanata-maven-plugin/demo-glossary/csv/translate1.csv
    R client/zanata-maven-plugin/demo-glossary/csv/zanata.xml
    R client/zanata-maven-plugin/demo-glossary/delete/pom.xml
    R client/zanata-maven-plugin/demo-glossary/delete/zanata.xml
    R client/zanata-maven-plugin/demo-glossary/fuel/fuel_hi.po
    R client/zanata-maven-plugin/demo-glossary/fuel/pom.xml
    R client/zanata-maven-plugin/demo-glossary/fuel/zanata.xml
    R client/zanata-maven-plugin/demo-props/pom.xml
    R client/zanata-maven-plugin/demo-props/src/org/zanata/test.properties
    R client/zanata-maven-plugin/demo-props/src/org/zanata/test_ja_JP.properties
    R client/zanata-maven-plugin/demo-props/zanata.xml
    R client/zanata-maven-plugin/demo-publican/pom.xml
    R client/zanata-maven-plugin/demo-publican/pot/subdir/RPM.pot
    R client/zanata-maven-plugin/demo-publican/zanata.xml
    R client/zanata-maven-plugin/demo-publican/zh-TW/subdir/RPM.po
    R client/zanata-maven-plugin/demo-xliff/pom.xml
    R client/zanata-maven-plugin/demo-xliff/src/dir1/StringResource_de.xml
    R client/zanata-maven-plugin/demo-xliff/src/dir1/StringResource_en_US.xml
    R client/zanata-maven-plugin/demo-xliff/src/dir2/StringResource_de.xml
    R client/zanata-maven-plugin/demo-xliff/src/dir2/StringResource_en_US.xml
    R client/zanata-maven-plugin/demo-xliff/zanata.xml
    R client/zanata-maven-plugin/demo-xml/pom.xml
    R client/zanata-maven-plugin/demo-xml/src/org/zanata/test.xml
    R client/zanata-maven-plugin/demo-xml/src/org/zanata/test_ja_JP.xml
    R client/zanata-maven-plugin/demo-xml/zanata.xml
    R client/zanata-maven-plugin/pom.xml
    R client/zanata-maven-plugin/sample-scripts/README-scripts.md
    R client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata.sh
    R client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata_draft_build
    R client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata_export_translations
    R client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata_import_all
    R client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata_import_source
    R client/zanata-maven-plugin/sample-scripts/pom.xml
    R client/zanata-maven-plugin/sample-scripts/zanata.xml
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableProjectMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryDeleteMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryPushMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListLocalMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListRemoteMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushPullMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutProjectMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutUserMojo.java
    R client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutVersionMojo.java
    R client/zanata-maven-plugin/src/test/java/org/zanata/maven/PushMojoTest.java
    R client/zanata-maven-plugin/src/test/java/org/zanata/maven/ZanataMojoTest.java
    R client/zanata-maven-plugin/src/test/resources/push-test/pom-config-pushType.xml
    R client/zanata-maven-plugin/src/test/resources/push-test/pom-config.xml
    R client/zanata-rest-client/.gitignore
    R client/zanata-rest-client/pom.xml
    R client/zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderDecorator.java
    R client/zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtility.java
    R client/zanata-rest-client/src/main/java/org/zanata/rest/client/ITranslationResourcesFactory.java
    R client/zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugInterceptor.java
    R client/zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
    R client/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
    R client/zanata-rest-client/src/test/java/org/zanata/rest/client/TestProxyFactory.java
    M pom.xml
    M server/zanata-war/pom.xml
    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
    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/presenter/WorkspaceUsersPresenter.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
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspace.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TranslatorStatusUpdateHandler.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/PersonSessionDetails.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserPanelSessionItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslatorListResult.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslatorListCommand.java

  Log Message:
  -----------
  Merge branch 'master' into search-replace

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
		just some moved import declarations, not a real conflict


Compare: https://github.com/zanata/zanata/compare/8a0006d...02c11ed


More information about the zanata-commits mailing list