[midPoint-git] [Evolveum/midpoint] ebf1b0: Update of translations

[petr.gasparik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: ebf1b0b04758aeb5405831aa665574fe135da8ba
      https://github.com/Evolveum/midpoint/commit/ebf1b0b04758aeb5405831aa665574fe135da8ba
  Author: petr.gasparik <petr.gasparik at ami.cz>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

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

  Log Message:
  -----------
  Update of translations


  Commit: 974019d4b5e91485b5e538777e09a409bf6eba0d
      https://github.com/Evolveum/midpoint/commit/974019d4b5e91485b5e538777e09a409bf6eba0d
  Author: petr.gasparik <petr.gasparik at ami.cz>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M .gitignore
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
    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

  Log Message:
  -----------
  Update of translations


  Commit: 6cae27441d1690c9e8e9f3e0da8a42181b628ecf
      https://github.com/Evolveum/midpoint/commit/6cae27441d1690c9e8e9f3e0da8a42181b628ecf
  Author: petr.gasparik <petr.gasparik at ami.cz>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

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


  Commit: 671e423596ce47f3d3510ddf2c7bedd968f7c458
      https://github.com/Evolveum/midpoint/commit/671e423596ce47f3d3510ddf2c7bedd968f7c458
  Author: petr.gasparik <petr.gasparik at ami.cz>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M .gitignore
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
    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

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

# Conflicts:
#	gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
#	gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
#	gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
#	gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
#	gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
#	gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
#	gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
#	gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
#	gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
#	gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
#	gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
#	gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
#	gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties


Compare: https://github.com/Evolveum/midpoint/compare/ee44ccf0f6ce...671e423596ce