[midPoint-git] [Evolveum/midpoint] 73c5e7: new translations, thanks transifex users to AivoK, ...

[petr.gasparik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 73c5e756cc631b707f55b1ab332c5745cfb98a13
      https://github.com/Evolveum/midpoint/commit/73c5e756cc631b707f55b1ab332c5745cfb98a13
  Author: petr.gasparik <petr.gasparik at ami.cz>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et_EE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi_IN.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu_HU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru_RU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties

  Log Message:
  -----------
  new translations, thanks transifex users to AivoK, securny, petr.gasparik


  Commit: a707d5c8b3543ec7fde949369486c587fc518322
      https://github.com/Evolveum/midpoint/commit/a707d5c8b3543ec7fde949369486c587fc518322
  Author: petr.gasparik <petr.gasparik at ami.cz>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi_IN.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu_HU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru_RU.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties

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

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


Compare: https://github.com/Evolveum/midpoint/compare/25f9672f59f9...a707d5c8b354