[zanata/zanata-server] 962ce6: Frech updated translations from translate.zanata.o...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 962ce62b748df35297905a1cd1d0eee825a7b183
      https://github.com/zanata/zanata-server/commit/962ce62b748df35297905a1cd1d0eee825a7b183
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_eo.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_ru.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties

  Log Message:
  -----------
  Frech updated translations from translate.zanata.org


  Commit: 34bc4e6bb0d8d138bad21f8d9e0cd5bfdf03d04b
      https://github.com/zanata/zanata-server/commit/34bc4e6bb0d8d138bad21f8d9e0cd5bfdf03d04b
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.6.0


  Commit: 0e2193d26bd84f061af1f99549a27c6eac8efbf0
      https://github.com/zanata/zanata-server/commit/0e2193d26bd84f061af1f99549a27c6eac8efbf0
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration


  Commit: dddea7d131297e6c3168cee8d527dc2c006b6eab
      https://github.com/zanata/zanata-server/commit/dddea7d131297e6c3168cee8d527dc2c006b6eab
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/OpenOfficeAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/PlainTextAdapter.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/ChangePositionalResIdToContentHash.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/db/db.changelog.xml

  Log Message:
  -----------
  rhbz1194543 - change resId for plaintext and libreoffice to be content hash.

Closes #734

Squashed commit of the following:

commit 823f613f8829d0110623f248bfe99c3a626c75e9
Author: David Mason <drdmason at gmail.com>
Date:   Mon Mar 16 13:57:17 2015 +1000

    Improve logging during id migration from positional to hash-based.

commit e4ad8892ff54f7a2b5b6f26af32dce29db7285e4
Author: David Mason <drdmason at gmail.com>
Date:   Thu Mar 12 13:57:29 2015 +1000

    Use try-with-resources for prepared statements when migrating resId from positional to content hash

commit 03d48b6bdd438881e23776f2f70e20d50eb50682
Author: David Mason <drdmason at gmail.com>
Date:   Thu Mar 12 13:33:13 2015 +1000

    Add warning note to some text unit id sources

commit fe76f4fb8cf95ddb7d6eaaad4f76185dc7505a9e
Author: David Mason <drdmason at gmail.com>
Date:   Tue Mar 10 13:23:47 2015 +1000

    Change resId for plaintext and libreoffice to use content hash.

    This includes migration of resId in all existing documents of
    the above types to be the content hash.

    Conflicts:
    	zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml

    The conflicting file did not yet exist on this branch (this is a back-ported change)
    so it was added with only the basic xml structure and the relevant change.

    An element was also added in the main db.changelog file to import the conflicting
    file.


  Commit: a1a8a605c96c870550858063cecc3038ee43cd68
      https://github.com/zanata/zanata-server/commit/a1a8a605c96c870550858063cecc3038ee43cd68
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-20 (Fri, 20 Mar 2015)

  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/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_eo.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_ru.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties

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

Conflicts:
	functional-test/pom.xml
	pom.xml
	zanata-model/pom.xml
	zanata-test-war/pom.xml
	zanata-war/pom.xml
	zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml

The pom conflicts were just the release version conflicting with the
development version. Kept the development version (3.7.0-SNAPSHOT) in
all cases.

The conflict in db.changelog-3.7.xml was caused by the file being created
in both release and master branches. In the release branch it had a single
changeset that was already in the master branch, so the master copy was
kept in its entirety. There was an XML comment on the changeset in release,
this was kept and put above the identical changeset in master.


Compare: https://github.com/zanata/zanata-server/compare/75a212749e4d...a1a8a605c96c