Merge branch 'master' of github.com:Evolveum/midpoint

gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml

@@ -28,6 +28,10 @@
 		<key>de_DE</key>
 		<label>Deutsch</label>
 	</row>
+	<row>
+		<key>et_EE</key>
+		<label>Eesti</label>
+	</row>
 	<row>
 		<key>en_US</key>
 		<label>English (US)</label>
@@ -36,6 +40,10 @@
 		<key>es_ES</key>
 		<label>Español</label>
 	</row>
+	<row>
+		<key>hu_HU</key>
+		<label>Magyar</label>
+	</row>
 	<row>
 		<key>sk_SK</key>
 		<label>Slovenčina</label>

gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml

@@ -40,6 +40,10 @@
 		<key>es_ES</key>
 		<label>Español</label>
 	</row>
+	<row>
+		<key>hu_HU</key>
+		<label>Magyar</label>
+	</row>
 	<row>
 		<key>sk_SK</key>
 		<label>Slovenčina</label>

gui/admin-gui/src/main/resources/localization/Midpoint.properties

@@ -2528,7 +2528,7 @@ SchemaHandlingStep.limitations.tooltip.maxOccurs=Maximum number of occurrences o
 SchemaHandlingStep.limitations.tooltip.minOccurs=Minimum number of occurrences of the attribute. A value of zero means optional attribute, value of one means mandatory attribute. A value which is specified here overrides the value taken from resource schema.
 SchemaHandlingStep.limitations.tooltip.other=TODO\: REMOVE THIS TOOLTIP
 SchemaHandlingStep.limitations.tooltip.propertyAccess=The type of access which is allowed or denied.
-SchemaHandlingStep.mapping.tooltip.authoritative=Authoritative mappings both add are remove specified value. Non-authoritative mappings only add the value. E.g. if a role with an authoritative mapping is removed the value that the mapping implied is also removed. If a role with non-authoritative mapping is removed then the value remains.
+SchemaHandlingStep.mapping.tooltip.authoritative=Authoritative mappings both add and remove specified value. Non-authoritative mappings only add the value. E.g. if a role with an authoritative mapping is removed the value that the mapping implied is also removed. If a role with non-authoritative mapping is removed then the value remains.
 SchemaHandlingStep.mapping.tooltip.channel=Limits application of this mapping only to specific channel. E.g. to changes coming from live sync, reconciliation or GUI. If the channel is listed then the mapping will be applied. If it is not then it will not be applied. If no channel is specified then no limitations apply and the mapping will be applied for all channels.
 SchemaHandlingStep.mapping.tooltip.conditionLanguage=Programming language in which is the condition script written.
 SchemaHandlingStep.mapping.tooltip.condition=The XML representation of mapping condition. This is the actual expression code that will be interpreted. Mapping sources are provided as input variables for the condition. If the condition returns true then the mapping will be applied. If it returns false then the mapping is ignored. Note that mappings that were true and that become false may result in removal of a value that was the result of the mapping while it was still true.
@@ -3049,7 +3049,7 @@ operation.com.evolveum.midpoint.wf.impl.WfHook.invoke=Invoke (Workflow)
 operation.com.evolveum.midpoint.model.impl.lens.ChangeExecutor.execute=Execute (Model)
 operation.com.evolveum.midpoint.model.impl.lens.ChangeExecutor.execute.focus.UserType=Execute - user (Model)
 operation.com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta=Execute delta (Model)
-operation.com.evolveum.midpoint.task.api.Task.listSubtasksDeeply=List subtasts deeply (Task)
+operation.com.evolveum.midpoint.task.api.Task.listSubtasksDeeply=List subtasks deeply (Task)
 operation.com.evolveum.midpoint.task.api.Task.listSubtasksRaw=List subtasks raw (Task)
 operation.com.evolveum.midpoint.web.page.self.PageSelfCredentials.savePassword=Password is successfully changed
 operation.com.evolveum.midpoint.web.page.self.PageRequestRole.save=Changes were successfully saved