[zanata/zanata] 434318: Fix handling of fuzzy entries when saving Properti...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 434318ca1126636e121a27f696f6dd599b95bd67
      https://github.com/zanata/zanata/commit/434318ca1126636e121a27f696f6dd599b95bd67
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
  M client/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java

  Log Message:
  -----------
  Fix handling of fuzzy entries when saving Properties files


  Commit: eb867e9c21c5409bcc4f5a9f490c0bbb908ba765
      https://github.com/zanata/zanata/commit/eb867e9c21c5409bcc4f5a9f490c0bbb908ba765
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java

  Log Message:
  -----------
  Fix problem with back-ported fix.


  Commit: 97d94192fb68b216d3c0cc9b8ef0093a87acbe63
      https://github.com/zanata/zanata/commit/97d94192fb68b216d3c0cc9b8ef0093a87acbe63
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M CHANGELOG.md

  Log Message:
  -----------
  Update changelog


  Commit: 409b08bb2fa92af7bbebef8689b1b3f3d7d471d1
      https://github.com/zanata/zanata/commit/409b08bb2fa92af7bbebef8689b1b3f3d7d471d1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Log Message:
  -----------
  Merge commit '52431a6806'


  Commit: 90db1fab4a4a5b4bd1b8aef52863e99bfbd78467
      https://github.com/zanata/zanata/commit/90db1fab4a4a5b4bd1b8aef52863e99bfbd78467
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M CHANGELOG.md

  Log Message:
  -----------
  Merge from 1.4

Conflicts:
	CHANGELOG.md
	client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
	client/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java


Compare: https://github.com/zanata/zanata/compare/ce62f90...90db1fa