diff --git a/plugins/actions/evaluatetablecontent/src/main/resources/org/apache/hop/workflow/actions/evaluatetablecontent/messages/messages_zh_CN.properties b/plugins/actions/evaluatetablecontent/src/main/resources/org/apache/hop/workflow/actions/evaluatetablecontent/messages/messages_zh_CN.properties
index 9ae15d623cd..adf4e8241c1 100644
--- a/plugins/actions/evaluatetablecontent/src/main/resources/org/apache/hop/workflow/actions/evaluatetablecontent/messages/messages_zh_CN.properties
+++ b/plugins/actions/evaluatetablecontent/src/main/resources/org/apache/hop/workflow/actions/evaluatetablecontent/messages/messages_zh_CN.properties
@@ -68,4 +68,4 @@ ActionEvalTableContent.TableName.Tooltip=\u9700\u8981\u5BFC\u5165\u7684\u8868\u6
 ActionEvalTableContent.Title=\u9A8C\u8BC1\u8868\u884C\u6570
 ActionEvalTableContent.UnableLoadXML=\u65E0\u6CD5\u4ECE XML \u8282\u70B9\u52A0\u8F7D "\u9A8C\u8BC1\u8868\u884C\u6570" \u7C7B\u578B\u7684 Action
 ActionEvalTableContent.UseVariableSubst.Label=\u4F7F\u7528\u53D8\u91CF\u66FF\u6362 
-ActionEvalTableContent.UseVariableSubst.Tooltip=\u5C06 SQL \u811A\u672C\u4E2D\u7684\u73AF\u5883\u53D8\u91CF\u66FF\u6362\u4E3A\u5176\u5B9E\u9645\u503C.\n\u73AF\u5883\u53D8\u91CF\u7684\u683C\u5F0F\u53D6\u51B3\u4E8E\u64CD\u4F5C\u7CFB\u7EDF(\u5747\u4E0D\u5E26\u5F15\u53F7)\uFF1A\n * \u5728 Windows \u4E0A, \u4F7F\u7528 "\#\#" \u62EC\u8D77\u6765\n * \u5728 Unix \u4E0A, \u4F7F\u7528 "${}" \u62EC\u8D77\u6765
+ActionEvalTableContent.UseVariableSubst.Tooltip=\u5C06 SQL \u811A\u672C\u4E2D\u7684\u73AF\u5883\u53D8\u91CF\u66FF\u6362\u4E3A\u5176\u5B9E\u9645\u503C.\n\u73AF\u5883\u53D8\u91CF\u7684\u683C\u5F0F\u53D6\u51B3\u4E8E\u64CD\u4F5C\u7CFB\u7EDF(\u5747\u4E0D\u5E26\u5F15\u53F7)\uFF1A\n * \u5728 Windows \u4E0A, \u4F7F\u7528 "\#\#" \u62EC\u8D77\u6765\n * \u5728 Unix \u4E0A, \u4F7F\u7528 '${}' \u62EC\u8D77\u6765
diff --git a/plugins/actions/waitforsql/src/main/resources/org/apache/hop/workflow/actions/waitforsql/messages/messages_es_AR.properties b/plugins/actions/waitforsql/src/main/resources/org/apache/hop/workflow/actions/waitforsql/messages/messages_es_AR.properties
index 160b8d4c0e7..4e3ba898690 100644
--- a/plugins/actions/waitforsql/src/main/resources/org/apache/hop/workflow/actions/waitforsql/messages/messages_es_AR.properties
+++ b/plugins/actions/waitforsql/src/main/resources/org/apache/hop/workflow/actions/waitforsql/messages/messages_es_AR.properties
@@ -71,4 +71,4 @@ ActionWaitForSQL.Tablename.Tooltip=Nombre de la tabla destino
 ActionWaitForSQL.Title=Esperar por SQL
 ActionWaitForSQL.UnableLoadXML=Imposible cargar la entrada de trabajo del tipo 'Esperar por SQL' del nodo XML
 ActionWaitForSQL.UseVariableSubst.Label=\u00BFRealizar sustituci\u00F3n de variables?
-ActionWaitForSQL.UseVariableSubst.Tooltip=Reemplaza las variables en el script SQL con su valor real.\nEl formato de la variable dependel del sistema operativo\:\nEn windows\: "\#VARIABLE". En Unix\: "${VARIABLE}".\nEn ambos casos sin las comillas.
+ActionWaitForSQL.UseVariableSubst.Tooltip=Reemplaza las variables en el script SQL con su valor real.\nEl formato de la variable dependel del sistema operativo\:\nEn windows\: "\#VARIABLE". En Unix\: '${VARIABLE}'.\nEn ambos casos sin las comillas.
diff --git a/plugins/actions/waitforsql/src/main/resources/org/apache/hop/workflow/actions/waitforsql/messages/messages_zh_CN.properties b/plugins/actions/waitforsql/src/main/resources/org/apache/hop/workflow/actions/waitforsql/messages/messages_zh_CN.properties
index 1a7ae3b69cc..ac79c1d512a 100644
--- a/plugins/actions/waitforsql/src/main/resources/org/apache/hop/workflow/actions/waitforsql/messages/messages_zh_CN.properties
+++ b/plugins/actions/waitforsql/src/main/resources/org/apache/hop/workflow/actions/waitforsql/messages/messages_zh_CN.properties
@@ -74,4 +74,4 @@ ActionWaitForSQL.Tablename.Tooltip=\u8981\u5BFC\u5165\u7684\u8868\u6216\u8005\u8
 ActionWaitForSQL.Title=\u7B49\u5F85SQL
 ActionWaitForSQL.UnableLoadXML=\u65E0\u6CD5\u4ECE XML \u8282\u70B9\u52A0\u8F7D "\u7B49\u5F85 SQL" \u7C7B\u578B\u7684 Action
 ActionWaitForSQL.UseVariableSubst.Label=\u4F7F\u7528\u53D8\u91CF\u66FF\u6362
-ActionWaitForSQL.UseVariableSubst.Tooltip=\u4F7F\u7528\u73AF\u5883\u53D8\u91CF\u66FF\u6362SQL\u811A\u672C\u4E2D\u7684\u503C. \u73AF\u5883\u53D8\u91CF\u7684\u683C\u5F0F\u53D6\u51B3\u4E8E\u64CD\u4F5C\u7CFB\u7EDF, windows\u7CFB\u7EDF\u4E2D\u73AF\u5883\u53D8\u91CF\u7528\u4E24\u4E2A\#\u62EC\u8D77\u6765 (\#\#), linux\r\n\u7CFB\u7EDF\u7684\u73AF\u5883\u53D8\u91CF\u683C\u5F0F\u662F${}
+ActionWaitForSQL.UseVariableSubst.Tooltip=\u4F7F\u7528\u73AF\u5883\u53D8\u91CF\u66FF\u6362SQL\u811A\u672C\u4E2D\u7684\u503C. \u73AF\u5883\u53D8\u91CF\u7684\u683C\u5F0F\u53D6\u51B3\u4E8E\u64CD\u4F5C\u7CFB\u7EDF, windows\u7CFB\u7EDF\u4E2D\u73AF\u5883\u53D8\u91CF\u7528\u4E24\u4E2A\#\u62EC\u8D77\u6765 (\#\#), linux\r\n\u7CFB\u7EDF\u7684\u73AF\u5883\u53D8\u91CF\u683C\u5F0F\u662F$'{}'
diff --git a/plugins/transforms/ldap/src/main/resources/org/apache/hop/pipeline/transforms/ldapinput/messages/messages_ja_JP.properties b/plugins/transforms/ldap/src/main/resources/org/apache/hop/pipeline/transforms/ldapinput/messages/messages_ja_JP.properties
index 13839b87205..9cc0e5ead8d 100644
--- a/plugins/transforms/ldap/src/main/resources/org/apache/hop/pipeline/transforms/ldapinput/messages/messages_ja_JP.properties
+++ b/plugins/transforms/ldap/src/main/resources/org/apache/hop/pipeline/transforms/ldapinput/messages/messages_ja_JP.properties
@@ -28,7 +28,7 @@ LdapConnection.Error.Search=Error while performing search!
 LdapConnection.Error.Update=Error updating entry with dn 
 LdapConnection.Error.Upsert=Error upserting for entry with DN 
 LdapConnection.Exception.GettingAttributes=Error getting attributes!
-LdapConnection.Update.Attribute=Will update attribute [{0}] with value [{}]...
+LdapConnection.Update.Attribute=Will update attribute [{0}] with value [{1}]...
 LdapInput.ClassUsed.Message=The class used to connect is [{0}]
 LdapInput.Description=LDAP Input\nLDAP\u30DB\u30B9\u30C8\u304B\u3089\u30C7\u30FC\u30BF\u3092\u8AAD\u307F\u8FBC\u307F\u307E\u3059\u3002
 LdapInput.Error.DynamicFilterFieldMissing=Dynamic filter string fieldname is missing!
@@ -51,91 +51,91 @@ LdapInput.Log.ReadRow=Row
 LdapInput.Log.SortingKeys=Sorted attributes : [{0}]
 LdapInput.Name=LDAP\u5165\u529B
 LdapInput.SearchBaseFound=Search Base found [{0}]
-LdapInputDialog.Button.PreviewRows=\u3000\u30d7\u30ec\u30d3\u30e5\u30fc(&V)
-LdapInputDialog.Connected.NOK=LDAP\u30b5\u30fc\u30d0\u30fc\u306b\u63a5\u7d9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\n \u4f8b\u5916: \n[{0}]
-LdapInputDialog.Connected.OK=LDAP\u30b5\u30fc\u30d0\u30fc\u306b\u63a5\u7d9a\u3055\u308c\u307e\u3057\u305f\u3002
-LdapInputDialog.Connected.Title.Error=\u30a8\u30e9\u30fc
+LdapInputDialog.Button.PreviewRows=\u3000\u30D7\u30EC\u30D3\u30E5\u30FC(&V)
+LdapInputDialog.Connected.NOK=LDAP\u30B5\u30FC\u30D0\u30FC\u306B\u63A5\u7D9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\n \u4F8B\u5916: \n[{0}]
+LdapInputDialog.Connected.OK=LDAP\u30B5\u30FC\u30D0\u30FC\u306B\u63A5\u7D9A\u3055\u308C\u307E\u3057\u305F\u3002
+LdapInputDialog.Connected.Title.Error=\u30A8\u30E9\u30FC
 LdapInputDialog.Connected.Title.Ok=OK
-LdapInputDialog.Content.Tab=\u5168\u822c
-LdapInputDialog.DialogTitle=LDAP\u5165\u529b
-LdapInputDialog.dynamicBase.Label=\u52d5\u7684\u691c\u7d22\u30d9\u30fc\u30b9
-LdapInputDialog.dynamicBase.Tooltip=\u52d5\u7684\u691c\u7d22\u30d9\u30fc\u30b9
-LdapInputDialog.dynamicFilter.Label=\u52d5\u7684\u30d5\u30a3\u30eb\u30bf\u2015\u6587\u5b57\u5217
-LdapInputDialog.dynamicFilter.Tooltip=\u52d5\u7684\u30d5\u30a3\u30eb\u30bf\u30fc\u6587\u5b57\u5217
-LdapInputDialog.ErrorGettingColums.DialogMessage=\u5c5e\u6027\u53d6\u5f97\u30a8\u30e9\u30fc
-LdapInputDialog.ErrorGettingColums.DialogTitle=\u5c5e\u6027\u53d6\u5f97\u30a8\u30e9\u30fc
-LdapInputDialog.ErrorParsingData.DialogMessage=\u5165\u529b\u30c7\u30fc\u30bf\u3092\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
-LdapInputDialog.ErrorParsingData.DialogTitle=\u30a8\u30e9\u30fc
-LdapInputDialog.ErrorPreviewingData.DialogMessage=\u30d7\u30ec\u30d3\u30e5\u30fc\u3092\u5b9f\u884c\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
-LdapInputDialog.ErrorPreviewingData.DialogTitle=\u30a8\u30e9\u30fc
-LdapInputDialog.FailedToGetFields.DialogMessage=\u524d\u306e\u30b9\u30c6\u30c3\u30d7\u304b\u3089\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u30fb
-LdapInputDialog.FailedToGetFields.DialogTitle=\u30a8\u30e9\u30fc\u30d5\u30a3\u30fc\u30eb\u30c9
-LdapInputDialog.Fields.Tab=\u30d5\u30a3\u30fc\u30eb\u30c9
-LdapInputDialog.FieldsTable.Attribute.Column=\u5217\u540d
-LdapInputDialog.FieldsTable.Attribute.Column.Tooltip=\u30c6\u30fc\u30d6\u30eb\u306e\u5217\u540d\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-LdapInputDialog.FieldsTable.Currency.Column=\u901a\u8ca8\u8a18\u53f7
-LdapInputDialog.FieldsTable.Decimal.Column=\u6841\u533a\u5207\u308a\u6587\u5b57
-LdapInputDialog.FieldsTable.FetchAttributeAs.Column=\u30d5\u30a7\u30c3\u30c1\u30bf\u30a4\u30d7
-LdapInputDialog.FieldsTable.Format.Column=\u66f8\u5f0f
-LdapInputDialog.FieldsTable.Group.Column=\u6570\u5024\u56f2\u307f\u6587\u5b57
-LdapInputDialog.FieldsTable.IsSortedKey.Column=\u30ad\u30fc\u4e26\u3073\u66ff\u3048
+LdapInputDialog.Content.Tab=\u5168\u822C
+LdapInputDialog.DialogTitle=LDAP\u5165\u529B
+LdapInputDialog.dynamicBase.Label=\u52D5\u7684\u691C\u7D22\u30D9\u30FC\u30B9
+LdapInputDialog.dynamicBase.Tooltip=\u52D5\u7684\u691C\u7D22\u30D9\u30FC\u30B9
+LdapInputDialog.dynamicFilter.Label=\u52D5\u7684\u30D5\u30A3\u30EB\u30BF\u2015\u6587\u5B57\u5217
+LdapInputDialog.dynamicFilter.Tooltip=\u52D5\u7684\u30D5\u30A3\u30EB\u30BF\u30FC\u6587\u5B57\u5217
+LdapInputDialog.ErrorGettingColums.DialogMessage=\u5C5E\u6027\u53D6\u5F97\u30A8\u30E9\u30FC
+LdapInputDialog.ErrorGettingColums.DialogTitle=\u5C5E\u6027\u53D6\u5F97\u30A8\u30E9\u30FC
+LdapInputDialog.ErrorParsingData.DialogMessage=\u5165\u529B\u30C7\u30FC\u30BF\u3092\u53D6\u5F97\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+LdapInputDialog.ErrorParsingData.DialogTitle=\u30A8\u30E9\u30FC
+LdapInputDialog.ErrorPreviewingData.DialogMessage=\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u5B9F\u884C\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+LdapInputDialog.ErrorPreviewingData.DialogTitle=\u30A8\u30E9\u30FC
+LdapInputDialog.FailedToGetFields.DialogMessage=\u524D\u306E\u30B9\u30C6\u30C3\u30D7\u304B\u3089\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u30FB
+LdapInputDialog.FailedToGetFields.DialogTitle=\u30A8\u30E9\u30FC\u30D5\u30A3\u30FC\u30EB\u30C9
+LdapInputDialog.Fields.Tab=\u30D5\u30A3\u30FC\u30EB\u30C9
+LdapInputDialog.FieldsTable.Attribute.Column=\u5217\u540D
+LdapInputDialog.FieldsTable.Attribute.Column.Tooltip=\u30C6\u30FC\u30D6\u30EB\u306E\u5217\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+LdapInputDialog.FieldsTable.Currency.Column=\u901A\u8CA8\u8A18\u53F7
+LdapInputDialog.FieldsTable.Decimal.Column=\u6841\u533A\u5207\u308A\u6587\u5B57
+LdapInputDialog.FieldsTable.FetchAttributeAs.Column=\u30D5\u30A7\u30C3\u30C1\u30BF\u30A4\u30D7
+LdapInputDialog.FieldsTable.Format.Column=\u66F8\u5F0F
+LdapInputDialog.FieldsTable.Group.Column=\u6570\u5024\u56F2\u307F\u6587\u5B57
+LdapInputDialog.FieldsTable.IsSortedKey.Column=\u30AD\u30FC\u4E26\u3073\u66FF\u3048
 LdapInputDialog.FieldsTable.Length.Column=\u9577\u3055
-LdapInputDialog.FieldsTable.Name.Column=\u30d5\u30a3\u30fc\u30eb\u30c9\u540d
-LdapInputDialog.FieldsTable.Name.Column.Tooltip=\u7d50\u679c\u30b9\u30c8\u30ea\u30fc\u30e0\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u540d\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-LdapInputDialog.FieldsTable.Precision.Column=\u7cbe\u5ea6
-LdapInputDialog.FieldsTable.Repeat.Column=\u30c7\u30fc\u30bf\u3092\u4ee3\u66ff\u3059\u308b
-LdapInputDialog.FieldsTable.TrimType.Column=\u7a7a\u767d\u9664\u53bb
-LdapInputDialog.FieldsTable.Type.Column=\u30c7\u30fc\u30bf\u30bf\u30a4\u30d7
-LdapInputDialog.filterField.Label=\u30d5\u30a3\u30eb\u30bf\u30fc\u6587\u5b57\u5217\u30d5\u30a3\u30fc\u30eb\u30c9\u540d
-LdapInputDialog.FilterString.Label=\u30d5\u30a3\u30eb\u30bf\u6587\u5b57
-LdapInputDialog.FilterString.Tooltip=\u30d5\u30a3\u30eb\u30bf\u3059\u308b\u6587\u5b57\u5217\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-LdapInputDialog.General.Tab=\u63a5\u7d9a
-LdapInputDialog.GetFields.Button=\u3000\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u53d6\u5f97(&G)
-LdapInputDialog.Group.AdditionalGroup.Label=\u30ec\u30b3\u30fc\u30c9\u756a\u53f7\u8a2d\u5b9a
-LdapInputDialog.Group.AuthenticationGroup.Label=\u8a8d\u8a3c
-LdapInputDialog.Group.CertificateGroup.Label=\u8a3c\u660e\u66f8
-LdapInputDialog.Group.HostGroup.Label=\u30db\u30b9\u30c8
-LdapInputDialog.Group.SearchGroup.Label=\u691c\u7d22\u8a2d\u5b9a
-LdapInputDialog.Host.Label=\u30db\u30b9\u30c8\u540d
-LdapInputDialog.Host.Tooltip=\u30db\u30b9\u30c8\u540d\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-LdapInputDialog.InclRownum.Label=\u30ec\u30b3\u30fc\u30c9\u756a\u53f7\u3092\u51fa\u529b\u306b\u542b\u3080
-LdapInputDialog.InclRownum.Tooltip=\u30ec\u30b3\u30fc\u30c9\u756a\u53f7\u3092\u51fa\u529b\u306b\u542b\u3080\u5834\u5408\u306f\u30c1\u30a7\u30c3\u30af\u30dc\u30c3\u30af\u30b9\u3092\u6709\u52b9\u306b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-LdapInputDialog.InclRownumField.Label=\u30d5\u30a3\u30fc\u30eb\u30c9\u540d
-LdapInputDialog.Limit.Label=\u30ea\u30df\u30c3\u30c8\u30b5\u30a4\u30ba
-LdapInputDialog.Log.GettingFieldsInfo=\u30d5\u30a3\u30fc\u30eb\u30c9\u60c5\u5831\u3092\u53d6\u5f97\u4e2d...
-LdapInputDialog.MultiValuedSeparator.Label=\u30d5\u30a3\u30fc\u30eb\u30c9\u533a\u5207\u308a\u6587\u5b57
-LdapInputDialog.MultiValuedSeparator.Tooltip=\u30ec\u30b3\u30fc\u30c9\u304b\u3089\u8907\u6570\u306e\u5024\u306b\u533a\u5207\u308b\u5834\u5408\u306f\u533a\u5207\u308a\u6587\u5b57\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-LdapInputDialog.NumberRows.DialogMessage=\u30d7\u30ec\u30d3\u30e5\u30fc\u306e\u30ec\u30b3\u30fc\u30c9\u6570\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-LdapInputDialog.NumberRows.DialogTitle=\u30d7\u30ec\u30d3\u30e5\u30fc
-LdapInputDialog.PageSize.Label=\u30da\u30fc\u30b8\u30b5\u30a4\u30ba
-LdapInputDialog.Password.Label=\u30d1\u30b9\u30ef\u30fc\u30c9
-LdapInputDialog.Password.Tooltip=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-LdapInputDialog.Port.Label=\u30dd\u30fc\u30c8\u756a\u53f7
-LdapInputDialog.Port.Tooltip=\u30dd\u30fc\u30c8\u756a\u53f7\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-LdapInputDialog.Protocol.Label=\u30d7\u30ed\u30c8\u30b3\u30eb
-LdapInputDialog.Search.Tab=\u691c\u7d22
-LdapInputDialog.SearchBase.Label=\u691c\u7d22\u30d9\u30fc\u30b9
-LdapInputDialog.SearchBase.Tooltip=\u691c\u7d22\u30d9\u30fc\u30b9\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-LdapInputDialog.SearchScope.Label=\u691c\u7d22\u30b9\u30b3\u30fc\u30d7
-LdapInputDialog.setPaging.Label=\u30da\u30fc\u30b8\u8a2d\u5b9a
-LdapInputDialog.setPaging.Tooltip=\u30da\u30fc\u30b8\u30f3\u30b0\u30b5\u30a4\u30ba\u8a2d\u5b9a\u3092\u884c\u3044\u7d50\u679c\u884c\u3092\u30b5\u30fc\u30d0\u30fc\u304b\u3089\u8fd4\u5374(>1000)\n\u4f8b\uff1a\u30c7\u30fc\u30bf\u6570\u30921000\u306b\u8a2d\u5b9a
-LdapInputDialog.setTrustStore.Label=\u8a3c\u660e\u66f8\u3092\u4f7f\u7528\u3059\u308b
-LdapInputDialog.setTrustStore.Tooltip=\u8a3c\u660e\u66f8\u3092\u4f7f\u7528\u3059\u308b
-LdapInputDialog.TestConnection.Label=\u30c6\u30b9\u30c8\u63a5\u7d9a
-LdapInputDialog.TestConnection.Tooltip=\u30ea\u30e2\u30fc\u30c8\u30b5\u30fc\u30d0\u3078\u30c6\u30b9\u30c8\u63a5\u7d9a\u3057\u307e\u3059\u3002
-LdapInputDialog.TimeLimit.Label=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8
-LdapInputDialog.TimeLimit.Tooltip=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u6642\u9593\u3092\u79d2\u5358\u4f4d\u3067\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-LdapInputDialog.TrustAll.Label=\u5168\u3066\u306e\u8a3c\u660e\u66f8\u3092\u4fe1\u7528\u3059\u308b
-LdapInputDialog.TrustAll.Tooltip=\u3059\u3079\u3066\u306e\u8a3c\u660e\u66f8\u3092\u4fe1\u7528\u3059\u308b
-LdapInputDialog.TrustStorePassword.Label=\u30c8\u30e9\u30b9\u30c8\u30b9\u30c8\u30a2\u306e\u30d1\u30b9\u30ef\u30fc\u30c9
-LdapInputDialog.TrustStorePassword.Tooltip=\u30c8\u30e9\u30b9\u30c8\u30b9\u30c8\u30a2\u306e\u30d1\u30b9\u30ef\u30fc\u30c9
-LdapInputDialog.TrustStorePath.Label=\u30c8\u30e9\u30b9\u30c8\u30b9\u30c8\u30a2\u306e\u30d1\u30b9
-LdapInputDialog.TrustStorePath.Tooltip=\u30c8\u30e9\u30b9\u30c8\u30b9\u30c8\u30a2\u306e\u30d1\u30b9
-LdapInputDialog.Username.Label=\u30e6\u30fc\u30b6\u540d
-LdapInputDialog.Username.Tooltip=\u30e6\u30fc\u30b6\u540d\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-LdapInputDialog.usingAuthentication.Label=\u8a8d\u8a3c\u3092\u4f7f\u7528\u3059\u308b
-LdapInputDialog.usingAuthentication.Tooltip=\u8a8d\u8a3c\u3092\u4f7f\u7528\u3059\u308b\u5834\u5408\u306f\u30c1\u30a7\u30c3\u30af\u30dc\u30c3\u30af\u30b9\u3092\u6709\u52b9\u306b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-LdapInputDialog.wsearchBaseField.Label=\u691c\u7d22\u30d9\u30fc\u30b9\u30d5\u30a3\u30fc\u30eb\u30c9\u540d
+LdapInputDialog.FieldsTable.Name.Column=\u30D5\u30A3\u30FC\u30EB\u30C9\u540D
+LdapInputDialog.FieldsTable.Name.Column.Tooltip=\u7D50\u679C\u30B9\u30C8\u30EA\u30FC\u30E0\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+LdapInputDialog.FieldsTable.Precision.Column=\u7CBE\u5EA6
+LdapInputDialog.FieldsTable.Repeat.Column=\u30C7\u30FC\u30BF\u3092\u4EE3\u66FF\u3059\u308B
+LdapInputDialog.FieldsTable.TrimType.Column=\u7A7A\u767D\u9664\u53BB
+LdapInputDialog.FieldsTable.Type.Column=\u30C7\u30FC\u30BF\u30BF\u30A4\u30D7
+LdapInputDialog.filterField.Label=\u30D5\u30A3\u30EB\u30BF\u30FC\u6587\u5B57\u5217\u30D5\u30A3\u30FC\u30EB\u30C9\u540D
+LdapInputDialog.FilterString.Label=\u30D5\u30A3\u30EB\u30BF\u6587\u5B57
+LdapInputDialog.FilterString.Tooltip=\u30D5\u30A3\u30EB\u30BF\u3059\u308B\u6587\u5B57\u5217\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+LdapInputDialog.General.Tab=\u63A5\u7D9A
+LdapInputDialog.GetFields.Button=\u3000\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u53D6\u5F97(&G)
+LdapInputDialog.Group.AdditionalGroup.Label=\u30EC\u30B3\u30FC\u30C9\u756A\u53F7\u8A2D\u5B9A
+LdapInputDialog.Group.AuthenticationGroup.Label=\u8A8D\u8A3C
+LdapInputDialog.Group.CertificateGroup.Label=\u8A3C\u660E\u66F8
+LdapInputDialog.Group.HostGroup.Label=\u30DB\u30B9\u30C8
+LdapInputDialog.Group.SearchGroup.Label=\u691C\u7D22\u8A2D\u5B9A
+LdapInputDialog.Host.Label=\u30DB\u30B9\u30C8\u540D
+LdapInputDialog.Host.Tooltip=\u30DB\u30B9\u30C8\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+LdapInputDialog.InclRownum.Label=\u30EC\u30B3\u30FC\u30C9\u756A\u53F7\u3092\u51FA\u529B\u306B\u542B\u3080
+LdapInputDialog.InclRownum.Tooltip=\u30EC\u30B3\u30FC\u30C9\u756A\u53F7\u3092\u51FA\u529B\u306B\u542B\u3080\u5834\u5408\u306F\u30C1\u30A7\u30C3\u30AF\u30DC\u30C3\u30AF\u30B9\u3092\u6709\u52B9\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+LdapInputDialog.InclRownumField.Label=\u30D5\u30A3\u30FC\u30EB\u30C9\u540D
+LdapInputDialog.Limit.Label=\u30EA\u30DF\u30C3\u30C8\u30B5\u30A4\u30BA
+LdapInputDialog.Log.GettingFieldsInfo=\u30D5\u30A3\u30FC\u30EB\u30C9\u60C5\u5831\u3092\u53D6\u5F97\u4E2D...
+LdapInputDialog.MultiValuedSeparator.Label=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A\u6587\u5B57
+LdapInputDialog.MultiValuedSeparator.Tooltip=\u30EC\u30B3\u30FC\u30C9\u304B\u3089\u8907\u6570\u306E\u5024\u306B\u533A\u5207\u308B\u5834\u5408\u306F\u533A\u5207\u308A\u6587\u5B57\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+LdapInputDialog.NumberRows.DialogMessage=\u30D7\u30EC\u30D3\u30E5\u30FC\u306E\u30EC\u30B3\u30FC\u30C9\u6570\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+LdapInputDialog.NumberRows.DialogTitle=\u30D7\u30EC\u30D3\u30E5\u30FC
+LdapInputDialog.PageSize.Label=\u30DA\u30FC\u30B8\u30B5\u30A4\u30BA
+LdapInputDialog.Password.Label=\u30D1\u30B9\u30EF\u30FC\u30C9
+LdapInputDialog.Password.Tooltip=\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+LdapInputDialog.Port.Label=\u30DD\u30FC\u30C8\u756A\u53F7
+LdapInputDialog.Port.Tooltip=\u30DD\u30FC\u30C8\u756A\u53F7\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+LdapInputDialog.Protocol.Label=\u30D7\u30ED\u30C8\u30B3\u30EB
+LdapInputDialog.Search.Tab=\u691C\u7D22
+LdapInputDialog.SearchBase.Label=\u691C\u7D22\u30D9\u30FC\u30B9
+LdapInputDialog.SearchBase.Tooltip=\u691C\u7D22\u30D9\u30FC\u30B9\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+LdapInputDialog.SearchScope.Label=\u691C\u7D22\u30B9\u30B3\u30FC\u30D7
+LdapInputDialog.setPaging.Label=\u30DA\u30FC\u30B8\u8A2D\u5B9A
+LdapInputDialog.setPaging.Tooltip=\u30DA\u30FC\u30B8\u30F3\u30B0\u30B5\u30A4\u30BA\u8A2D\u5B9A\u3092\u884C\u3044\u7D50\u679C\u884C\u3092\u30B5\u30FC\u30D0\u30FC\u304B\u3089\u8FD4\u5374(>1000)\n\u4F8B\uFF1A\u30C7\u30FC\u30BF\u6570\u30921000\u306B\u8A2D\u5B9A
+LdapInputDialog.setTrustStore.Label=\u8A3C\u660E\u66F8\u3092\u4F7F\u7528\u3059\u308B
+LdapInputDialog.setTrustStore.Tooltip=\u8A3C\u660E\u66F8\u3092\u4F7F\u7528\u3059\u308B
+LdapInputDialog.TestConnection.Label=\u30C6\u30B9\u30C8\u63A5\u7D9A
+LdapInputDialog.TestConnection.Tooltip=\u30EA\u30E2\u30FC\u30C8\u30B5\u30FC\u30D0\u3078\u30C6\u30B9\u30C8\u63A5\u7D9A\u3057\u307E\u3059\u3002
+LdapInputDialog.TimeLimit.Label=\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8
+LdapInputDialog.TimeLimit.Tooltip=\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u6642\u9593\u3092\u79D2\u5358\u4F4D\u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+LdapInputDialog.TrustAll.Label=\u5168\u3066\u306E\u8A3C\u660E\u66F8\u3092\u4FE1\u7528\u3059\u308B
+LdapInputDialog.TrustAll.Tooltip=\u3059\u3079\u3066\u306E\u8A3C\u660E\u66F8\u3092\u4FE1\u7528\u3059\u308B
+LdapInputDialog.TrustStorePassword.Label=\u30C8\u30E9\u30B9\u30C8\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9
+LdapInputDialog.TrustStorePassword.Tooltip=\u30C8\u30E9\u30B9\u30C8\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9
+LdapInputDialog.TrustStorePath.Label=\u30C8\u30E9\u30B9\u30C8\u30B9\u30C8\u30A2\u306E\u30D1\u30B9
+LdapInputDialog.TrustStorePath.Tooltip=\u30C8\u30E9\u30B9\u30C8\u30B9\u30C8\u30A2\u306E\u30D1\u30B9
+LdapInputDialog.Username.Label=\u30E6\u30FC\u30B6\u540D
+LdapInputDialog.Username.Tooltip=\u30E6\u30FC\u30B6\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+LdapInputDialog.usingAuthentication.Label=\u8A8D\u8A3C\u3092\u4F7F\u7528\u3059\u308B
+LdapInputDialog.usingAuthentication.Tooltip=\u8A8D\u8A3C\u3092\u4F7F\u7528\u3059\u308B\u5834\u5408\u306F\u30C1\u30A7\u30C3\u30AF\u30DC\u30C3\u30AF\u30B9\u3092\u6709\u52B9\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+LdapInputDialog.wsearchBaseField.Label=\u691C\u7D22\u30D9\u30FC\u30B9\u30D5\u30A3\u30FC\u30EB\u30C9\u540D
 LdapInputField.FetchAttributeAs.Binary=Binary
 LdapInputField.FetchAttributeAs.String=String
 LdapInputField.TrimType.Both=both
diff --git a/plugins/transforms/mongodb/src/main/resources/org/apache/hop/mongo/messages/messages_de_DE.properties b/plugins/transforms/mongodb/src/main/resources/org/apache/hop/mongo/messages/messages_de_DE.properties
index ebd5468083f..1f0e6d37d8e 100644
--- a/plugins/transforms/mongodb/src/main/resources/org/apache/hop/mongo/messages/messages_de_DE.properties
+++ b/plugins/transforms/mongodb/src/main/resources/org/apache/hop/mongo/messages/messages_de_DE.properties
@@ -17,7 +17,7 @@
 #
 #
 
-MongoPropToOption.ErrorMessage.ReadPreferenceNotFound=Die angegebene READ_PREFERENCE ist ung\u00FCltig: '{0}'. Sollte einr von: {} sein.
+MongoPropToOption.ErrorMessage.ReadPreferenceNotFound=Die angegebene READ_PREFERENCE ist ung\u00FCltig: '{0}'. Sollte einr von: {1} sein.
 MongoPropToOption.ErrorMessage.UnableToParseTagSets=Die angegebene Tag-Set Eigenschaft kann nicht geparsed werden: {0}
 MongoPropToOption.Message.ConfiguringWithDefaultWriteConcern=Konfiguriere Verbindung mit Standard write concern - w = 1, wTimeout:0, journaled = false
 MongoPropToOption.Message.ConfiguringWithWriteConcern=Konfiguriere Verbindung mit write concern - {0}
diff --git a/ui/src/main/resources/org/apache/hop/ui/pipeline/config/messages/messages_zh_CN.properties b/ui/src/main/resources/org/apache/hop/ui/pipeline/config/messages/messages_zh_CN.properties
index 52261a6d4a2..a3da34ba697 100644
--- a/ui/src/main/resources/org/apache/hop/ui/pipeline/config/messages/messages_zh_CN.properties
+++ b/ui/src/main/resources/org/apache/hop/ui/pipeline/config/messages/messages_zh_CN.properties
@@ -31,7 +31,7 @@ PipelineRunConfigurationDialog.label.ExecutionInfoLocation=\u6267\u884C\u4FE1\u6
 PipelineRunConfigurationDialog.label.name=\u540D\u79F0
 PipelineRunConfigurationDialog.MainTab.TabTitle=\u4E3B\u8981
 PipelineRunConfigurationDialog.NamedResourceSourceFolder.Label=\u547D\u540D\u8D44\u6E90\u5F15\u7528\u6E90\u6587\u4EF6\u5939
-PipelineRunConfigurationDialog.NamedResourceSourceFolder.ToolTip=\u8FD9\u662F\u6B63\u5728\u4F7F\u7528\u7684\u547D\u540D\u8D44\u6E90\u7684\u53C2\u8003\u6E90\u6587\u4EF6\u5939\u4F8B\u5982(\u201C${PROJECT_HOME}\u201D)
+PipelineRunConfigurationDialog.NamedResourceSourceFolder.ToolTip=\u8FD9\u662F\u6B63\u5728\u4F7F\u7528\u7684\u547D\u540D\u8D44\u6E90\u7684\u53C2\u8003\u6E90\u6587\u4EF6\u5939\u4F8B\u5982('${PROJECT_HOME}')
 PipelineRunConfigurationDialog.NamedResourceTargetFolder.Label=\u547D\u540D\u8D44\u6E90\u5F15\u7528\u76EE\u6807\u6587\u4EF6\u5939
 PipelineRunConfigurationDialog.NamedResourceTargetFolder.ToolTip=\u8FD9\u662F\u60A8\u671F\u671B\u6E90\u6587\u4EF6\u5939\u6620\u5C04\u5230\u8FDC\u7A0B\u670D\u52A1\u5668\u4E0A\u7684\u4F4D\u7F6E.
 PipelineRunConfigurationDialog.RowSetSize.Label=\u884C\u5927\u5C0F