[zanata/zanata-server] 080660: Update docs printscreen and messages

[GitHub]

  Branch: refs/heads/rhbz1133989
  Home:   https://github.com/zanata/zanata-server
  Commit: 08066023037783c4a04f47e0847ee53301735248
      https://github.com/zanata/zanata-server/commit/08066023037783c4a04f47e0847ee53301735248
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M docs/images/version-merge-trans-cancel.png
    A docs/images/version-merge-trans-dialog.png
    R docs/images/version-merge-trans-windows.png
    M docs/user-guide/merge-translations.md
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Update docs printscreen and messages