[midPoint-git] [Evolveum/midpoint] aae241: Localization files are split into two language fil...

[Petr Gašparík]

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

  Changed paths:
    M .tx/config
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    A infra/schema/src/main/resources/localization/schema_cs.properties
    A infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    A infra/schema/src/main/resources/localization/schema_es.properties
    A infra/schema/src/main/resources/localization/schema_es_AR.properties
    A infra/schema/src/main/resources/localization/schema_et.properties
    A infra/schema/src/main/resources/localization/schema_hi.properties
    A infra/schema/src/main/resources/localization/schema_hu.properties
    A infra/schema/src/main/resources/localization/schema_pt_BR.properties
    A infra/schema/src/main/resources/localization/schema_ru.properties
    A infra/schema/src/main/resources/localization/schema_sk.properties
    A infra/schema/src/main/resources/localization/schema_tr.properties

  Log Message:
  -----------
  Localization files are split into two language files.
Translations arealso split since this commit.


  Commit: 0da9c90447704c6ac398784f6abe37f957670ab9
      https://github.com/Evolveum/midpoint/commit/0da9c90447704c6ac398784f6abe37f957670ab9
  Author: Petr Gašparík <petr.gasparik at ami.cz>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M .tx/config
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    A infra/schema/src/main/resources/localization/schema_cs.properties
    A infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    A infra/schema/src/main/resources/localization/schema_es.properties
    A infra/schema/src/main/resources/localization/schema_es_AR.properties
    A infra/schema/src/main/resources/localization/schema_et.properties
    A infra/schema/src/main/resources/localization/schema_hi.properties
    A infra/schema/src/main/resources/localization/schema_hu.properties
    A infra/schema/src/main/resources/localization/schema_pt_BR.properties
    A infra/schema/src/main/resources/localization/schema_ru.properties
    A infra/schema/src/main/resources/localization/schema_sk.properties
    A infra/schema/src/main/resources/localization/schema_tr.properties

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

# Conflicts:
#	gui/admin-gui/src/main/resources/localization/Midpoint_en.properties


Compare: https://github.com/Evolveum/midpoint/compare/67abe49b76fe...0da9c9044770