[zanata/zanata] 49986f: change wording according to feedback

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata
  Commit: 49986fd0d62b0a2cce580e5d0d91db98f0ed324b
      https://github.com/zanata/zanata/commit/49986fd0d62b0a2cce580e5d0d91db98f0ed324b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  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/view/EditorOptionsView.ui.xml

  Log Message:
  -----------
  change wording according to feedback


  Commit: 8ee674ba7f99eafd595d7b02fe44b9501ca0b87e
      https://github.com/zanata/zanata/commit/8ee674ba7f99eafd595d7b02fe44b9501ca0b87e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/PersonEmailValidationKeyDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java

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


  Commit: 5a651f86ec8442bad939814a7386ea16f5fcce22
      https://github.com/zanata/zanata/commit/5a651f86ec8442bad939814a7386ea16f5fcce22
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  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/view/EditorOptionsView.ui.xml

  Log Message:
  -----------
  change wording according to feedback


  Commit: d5b1a88cd105f8bd1700a7bd6c659fe50c308aaf
      https://github.com/zanata/zanata/commit/d5b1a88cd105f8bd1700a7bd6c659fe50c308aaf
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

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

  Log Message:
  -----------
  change default editor option


  Commit: ee92789f19659bdc02c3959d5c609d3de73ab662
      https://github.com/zanata/zanata/commit/ee92789f19659bdc02c3959d5c609d3de73ab662
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

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

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


Compare: https://github.com/zanata/zanata/compare/69ec5c8a5cdb...ee92789f1965