[midPoint-git] [Evolveum/midpoint] b11f54: en_US -> en for English autodetection

[Petr Gašparík]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: b11f545b255955691e0b526462fb5e2c191529ba
      https://github.com/Evolveum/midpoint/commit/b11f545b255955691e0b526462fb5e2c191529ba
  Author: Petr Gašparík <petr.gasparik at ami.cz>
  Date:   2016-07-21 (Thu, 21 Jul 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    A gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    A infra/schema/src/main/resources/localization/schema_en.properties
    R infra/schema/src/main/resources/localization/schema_en_US.properties

  Log Message:
  -----------
  en_US -> en for English autodetection


  Commit: 68999b521a4238c074ff14b8dd37ce263268f91c
      https://github.com/Evolveum/midpoint/commit/68999b521a4238c074ff14b8dd37ce263268f91c
  Author: Petr Gašparík <petr.gasparik at ami.cz>
  Date:   2016-07-21 (Thu, 21 Jul 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    A gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    R gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    A infra/schema/src/main/resources/localization/schema_en.properties
    R infra/schema/src/main/resources/localization/schema_en_US.properties

  Log Message:
  -----------
  Merge branch 'transifex'


Compare: https://github.com/Evolveum/midpoint/compare/2a431e327b61...68999b521a42