diff --git a/WebContent/WEB-INF/jsp/dataSourceList.jsp b/WebContent/WEB-INF/jsp/dataSourceList.jsp
index f1d2b77ee9..1b2988d1b8 100644
--- a/WebContent/WEB-INF/jsp/dataSourceList.jsp
+++ b/WebContent/WEB-INF/jsp/dataSourceList.jsp
@@ -62,8 +62,12 @@
             setDataPointStatusImg(enabled, imgNode);
     }
     
-    function deleteDataSource(dataSourceId) {
-        if (confirm("<spring:message code="dsList.dsDeleteConfirm"/>")) {
+    function deleteDataSource(el, dataSourceId) {
+      var name = el.getAttribute("data-name") || "";
+      var xid  = el.getAttribute("data-xid")  || "";
+      var template = "<spring:message code='dsList.dsDeleteConfirmNamed'/>";
+      var msg = template.replace("{0}", name).replace("{1}", xid);
+        if (confirm(msg)) {
             startImageFader("deleteDataSourceImg"+ dataSourceId);
             DataSourceListDwr.deleteDataSource(dataSourceId, function(dataSourceId) {
                 stopImageFader("deleteDataSourceImg"+ dataSourceId);
@@ -152,8 +156,12 @@
                       <a href="data_source_edit.shtm?dsid=${listParent.parent.id}"><tag:img png="icon_ds_edit"
                               title="common.edit"/></a>
                       <tag:img png="arrow_out" title="dsList.show" onclick="togglePanelVisibility2(this, 'points${listParent.parent.id}', '${hideText}', '${showText}');"/>
-                      <tag:img png="icon_ds_delete" title="common.delete" id="deleteDataSourceImg${listParent.parent.id}" 
-                              onclick="deleteDataSource(${listParent.parent.id})"/>
+                      <tag:img png="icon_ds_delete"
+                               title="common.delete"
+                               id="deleteDataSourceImg${listParent.parent.id}"
+                               dataName="${listParent.parent.name}"
+                               dataXid="${listParent.parent.xid}"
+                               onclick="deleteDataSource(this, ${listParent.parent.id})"/>
                       <tag:img png="icon_ds_add" title="common.copy" id="copyDataSourceImg${listParent.parent.id}" 
                               onclick="copyDataSource(${listParent.parent.id})"/>
                     </td>
diff --git a/WebContent/WEB-INF/tags/img.tag b/WebContent/WEB-INF/tags/img.tag
index 6626b28e65..c5fedca320 100644
--- a/WebContent/WEB-INF/tags/img.tag
+++ b/WebContent/WEB-INF/tags/img.tag
@@ -25,6 +25,8 @@
 --%><%@attribute name="onmouseover"%><%--
 --%><%@attribute name="onmouseout"%><%--
 --%><%@attribute name="style"%><%--
+--%><%@attribute name="dataName" rtexprvalue="true"%><%--
+--%><%@attribute name="dataXid"  rtexprvalue="true"%><%--
 --%><img class="ptr" <c:if test="${!empty id}"> id="${id}"</c:if><%--
 --%><c:if test="${!empty src}"> src="${src}"</c:if><%--
 --%><c:if test="${!empty png && empty src}"> src="images/${png}.png"</c:if><%--
@@ -33,4 +35,6 @@
 --%><c:if test="${!empty onmouseover}"> onmouseover="${onmouseover}"</c:if><%--
 --%><c:if test="${!empty onmouseout}"> onmouseout="${onmouseout}"</c:if><%--
 --%><c:if test="${!empty style}"> style="${style}"</c:if><%--
+--%><c:if test="${!empty dataName}"> data-name="<c:out value='${dataName}'/>"</c:if><%--
+--%><c:if test="${!empty dataXid}">  data-xid="<c:out value='${dataXid}'/>"</c:if><%--
 --%> border="0"/>
\ No newline at end of file
diff --git a/webapp-resources/messages_de.properties b/webapp-resources/messages_de.properties
index 7308c8fecb..e1a4bd84c1 100644
--- a/webapp-resources/messages_de.properties
+++ b/webapp-resources/messages_de.properties
@@ -3454,4 +3454,5 @@ systemSettings.amChart.limitFactor=Limit factor
 systemSettings.amChartsSaved=AmCharts settings have been saved
 systemSettings.scadaConfTitle=Scada-LTS environment settings
 systemSettings.scadaConfCheck=Check configuration
-validate.unsupportedDataType=Data type {0} is not supported
\ No newline at end of file
+validate.unsupportedDataType=Data type {0} is not supported
+dsList.dsDeleteConfirmNamed=Sind Sie sicher, dass Sie die Datenquelle {0} (XID: {1}) löschen möchten?
diff --git a/webapp-resources/messages_en.properties b/webapp-resources/messages_en.properties
index 9873d02b88..8b933247bf 100644
--- a/webapp-resources/messages_en.properties
+++ b/webapp-resources/messages_en.properties
@@ -3457,4 +3457,5 @@ systemSettings.amChart.limitFactor=Limit factor
 systemSettings.amChartsSaved=AmCharts settings have been saved
 systemSettings.scadaConfTitle=Scada-LTS environment settings
 systemSettings.scadaConfCheck=Check configuration
-validate.unsupportedDataType=Data type {0} is not supported
\ No newline at end of file
+validate.unsupportedDataType=Data type {0} is not supported
+dsList.dsDeleteConfirmNamed=Are you sure you wish to delete data source {0} (XID: {1})?
\ No newline at end of file
diff --git a/webapp-resources/messages_es.properties b/webapp-resources/messages_es.properties
index a717417cef..8cc0ba1c55 100644
--- a/webapp-resources/messages_es.properties
+++ b/webapp-resources/messages_es.properties
@@ -3497,4 +3497,5 @@ systemSettings.amChart.limitFactor=Limit factor
 systemSettings.amChartsSaved=AmCharts settings have been saved
 systemSettings.scadaConfTitle=Scada-LTS environment settings
 systemSettings.scadaConfCheck=Check configuration
-validate.unsupportedDataType=Data type {0} is not supported
\ No newline at end of file
+validate.unsupportedDataType=Data type {0} is not supported
+dsList.dsDeleteConfirmNamed=¿Está seguro de que desea eliminar la fuente de datos {0} (XID: {1})?
diff --git a/webapp-resources/messages_fi.properties b/webapp-resources/messages_fi.properties
index 7cc97de4d9..50d26ac269 100644
--- a/webapp-resources/messages_fi.properties
+++ b/webapp-resources/messages_fi.properties
@@ -3582,4 +3582,5 @@ systemSettings.amChart.limitFactor=Limit factor
 systemSettings.amChartsSaved=AmCharts settings have been saved
 systemSettings.scadaConfTitle=Scada-LTS environment settings
 systemSettings.scadaConfCheck=Check configuration
-validate.unsupportedDataType=Data type {0} is not supported
\ No newline at end of file
+validate.unsupportedDataType=Data type {0} is not supported
+dsList.dsDeleteConfirmNamed=Haluatko varmasti poistaa tietolähteen {0} (XID: {1})?
diff --git a/webapp-resources/messages_fr.properties b/webapp-resources/messages_fr.properties
index c0b4ad6aeb..f18958022c 100644
--- a/webapp-resources/messages_fr.properties
+++ b/webapp-resources/messages_fr.properties
@@ -3451,4 +3451,5 @@ systemSettings.amChart.limitFactor=Limit factor
 systemSettings.amChartsSaved=AmCharts settings have been saved
 systemSettings.scadaConfTitle=Scada-LTS environment settings
 systemSettings.scadaConfCheck=Check configuration
-validate.unsupportedDataType=Data type {0} is not supported
\ No newline at end of file
+validate.unsupportedDataType=Data type {0} is not supported
+dsList.dsDeleteConfirmNamed=Êtes-vous sûr de vouloir supprimer la source de données {0} (XID : {1}) ?
diff --git a/webapp-resources/messages_lu.properties b/webapp-resources/messages_lu.properties
index e412f7af02..bdecfdb357 100644
--- a/webapp-resources/messages_lu.properties
+++ b/webapp-resources/messages_lu.properties
@@ -3470,4 +3470,5 @@ systemSettings.amChart.limitFactor=Limit factor
 systemSettings.amChartsSaved=AmCharts settings have been saved
 systemSettings.scadaConfTitle=Scada-LTS environment settings
 systemSettings.scadaConfCheck=Check configuration
-validate.unsupportedDataType=Data type {0} is not supported
\ No newline at end of file
+validate.unsupportedDataType=Data type {0} is not supported
+dsList.dsDeleteConfirmNamed=Sidd Dir sécher datt Dir déi Datequell {0} (XID: {1}) läschen wëllt?
\ No newline at end of file
diff --git a/webapp-resources/messages_nl.properties b/webapp-resources/messages_nl.properties
index 75ee3a784c..0370bb08d3 100644
--- a/webapp-resources/messages_nl.properties
+++ b/webapp-resources/messages_nl.properties
@@ -3572,4 +3572,5 @@ systemSettings.amChart.limitFactor=Limit factor
 systemSettings.amChartsSaved=AmCharts settings have been saved
 systemSettings.scadaConfTitle=Scada-LTS environment settings
 systemSettings.scadaConfCheck=Check configuration
-validate.unsupportedDataType=Data type {0} is not supported
\ No newline at end of file
+validate.unsupportedDataType=Data type {0} is not supported
+dsList.dsDeleteConfirmNamed=Weet u zeker dat u de gegevensbron {0} (XID: {1}) wilt verwijderen?
diff --git a/webapp-resources/messages_pl.properties b/webapp-resources/messages_pl.properties
index 2514b6694a..492007f50d 100644
--- a/webapp-resources/messages_pl.properties
+++ b/webapp-resources/messages_pl.properties
@@ -3594,4 +3594,5 @@ systemSettings.amChart.limitFactor=Limit factor
 systemSettings.amChartsSaved=AmCharts settings have been saved
 systemSettings.scadaConfTitle=Scada-LTS environment settings
 systemSettings.scadaConfCheck=Check configuration
-validate.unsupportedDataType=Data type {0} is not supported
\ No newline at end of file
+validate.unsupportedDataType=Data type {0} is not supported
+dsList.dsDeleteConfirmNamed=Czy na pewno chcesz usun?? ?ród?o danych {0} (XID: {1})?
diff --git a/webapp-resources/messages_pt.properties b/webapp-resources/messages_pt.properties
index f38cef2737..8b95f26d45 100644
--- a/webapp-resources/messages_pt.properties
+++ b/webapp-resources/messages_pt.properties
@@ -3610,3 +3610,4 @@ systemSettings.amChartsSaved=AmCharts settings have been saved
 systemSettings.scadaConfTitle=Scada-LTS environment settings
 systemSettings.scadaConfCheck=Check configuration
 validate.unsupportedDataType=Data type {0} is not supported
+dsList.dsDeleteConfirmNamed=Tem certeza de que deseja excluir a fonte de dados {0} (XID: {1})?
diff --git a/webapp-resources/messages_ru.properties b/webapp-resources/messages_ru.properties
index fd33cfed88..2ae63b772b 100644
--- a/webapp-resources/messages_ru.properties
+++ b/webapp-resources/messages_ru.properties
@@ -3605,4 +3605,5 @@ systemSettings.amChart.limitFactor=Limit factor
 systemSettings.amChartsSaved=AmCharts settings have been saved
 systemSettings.scadaConfTitle=Scada-LTS environment settings
 systemSettings.scadaConfCheck=Check configuration
-validate.unsupportedDataType=Data type {0} is not supported
\ No newline at end of file
+validate.unsupportedDataType=Data type {0} is not supported
+dsList.dsDeleteConfirmNamed=Are you sure you wish to delete data source {0} (XID: {1})?
\ No newline at end of file
diff --git a/webapp-resources/messages_zh.properties b/webapp-resources/messages_zh.properties
index 9d20631c6d..64103bd265 100644
--- a/webapp-resources/messages_zh.properties
+++ b/webapp-resources/messages_zh.properties
@@ -3557,4 +3557,5 @@ systemSettings.amChart.limitFactor=Limit factor
 systemSettings.amChartsSaved=AmCharts settings have been saved
 systemSettings.scadaConfTitle=Scada-LTS environment settings
 systemSettings.scadaConfCheck=Check configuration
-validate.unsupportedDataType=Data type {0} is not supported
\ No newline at end of file
+validate.unsupportedDataType=Data type {0} is not supported
+dsList.dsDeleteConfirmNamed=Are you sure you wish to delete data source {0} (XID: {1})?
\ No newline at end of file