[midPoint-git] [Evolveum/midpoint] bdae62: Fixed other instances of role "approver".

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: bdae62994316cdbd3822207d3e2539f6f5b62380
      https://github.com/Evolveum/midpoint/commit/bdae62994316cdbd3822207d3e2539f6f5b62380
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/041-role-approver.xml
    M model/workflow-impl/src/test/resources/policy/041-role-approver.xml

  Log Message:
  -----------
  Fixed other instances of role "approver".

(cherry picked from commit 9253cc8)


  Commit: 97359965ed2fee399dcbf48fe8bdd7f1fce9a483
      https://github.com/Evolveum/midpoint/commit/97359965ed2fee399dcbf48fe8bdd7f1fce9a483
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M config/initial-objects/041-role-approver.xml
    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_pl.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 remote-tracking branch 'origin/master'


Compare: https://github.com/Evolveum/midpoint/compare/fc5c90901d67...97359965ed2f