[midPoint-git] [Evolveum/midpoint] cc523a: some translation fixes

[KaterynaHonchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: cc523ac768fada2aec435fd8610566d5e329505a
      https://github.com/Evolveum/midpoint/commit/cc523ac768fada2aec435fd8610566d5e329505a
  Author: kate <honchar at evolveum.com>
  Date:   2019-03-20 (Wed, 20 Mar 2019)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  some translation fixes


  Commit: 49289ecaba1129df90b0c4eb66fc3aa1725c93ca
      https://github.com/Evolveum/midpoint/commit/49289ecaba1129df90b0c4eb66fc3aa1725c93ca
  Author: kate <honchar at evolveum.com>
  Date:   2019-03-20 (Wed, 20 Mar 2019)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
    A infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringLangType.java
    M infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringType.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanUnmarshaller.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismMarshaller.java
    M infra/prism-impl/src/main/resources/xml/ns/public/types-3.xsd
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingXml.java
    M infra/prism-impl/src/test/resources/common/json/user-jack-adhoc.json
    M infra/prism-impl/src/test/resources/common/json/user-jack-modified.json
    M infra/prism-impl/src/test/resources/common/json/user-jack-no-ns.json
    M infra/prism-impl/src/test/resources/common/json/user-jack.json
    M infra/prism-impl/src/test/resources/common/xml/user-jack-adhoc.xml
    M infra/prism-impl/src/test/resources/common/xml/user-jack-modified.xml
    M infra/prism-impl/src/test/resources/common/xml/user-jack-no-ns.xml
    M infra/prism-impl/src/test/resources/common/xml/user-jack.xml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack-adhoc.yaml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack-modified.yaml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack-no-ns.yaml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack.yaml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


Compare: https://github.com/Evolveum/midpoint/compare/a323bbca2dce...49289ecaba11