diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 6b7e99bc9..634f945c2 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -5445,7 +5445,7 @@ class SurveyAdminAjax {
                 $return['output'] .= '<h2>'.$lang['srv_warning'].'</h2>';
 
 				$return['output'] .= '<p>'.$lang['spremenljivka_delete_data'].'</p>';
-                $return['output'] .= '<p>'.$lang['srv_brisispremenljivkoconfirm'].'</p><br />';
+                $return['output'] .= '<p>'.$lang['srv_brisispremenljivkoconfirm_data'].'</p><br />';
                 
                 $return['output'] .= '<span class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="brisi_spremenljivko(\''.$spremenljivka.'\', \'\', \'1\'); return false;"><span>'.$lang['srv_brisispremenljivko'].'</span></a></span>';
                 $return['output'] .= '<span class="buttonwrapper floatRight spaceRight"><a class="ovalbutton ovalbutton_gray" href="#" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;"><span>'.$lang['srv_analiza_arhiviraj_cancle'].'</span></a></span>';
diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php
index b78318c3a..0c7179c9a 100644
--- a/admin/survey/classes/class.Vprasanje.php
+++ b/admin/survey/classes/class.Vprasanje.php
@@ -6682,7 +6682,7 @@ class Vprasanje {
                 $return['output'] .= '<div class="popup_close"><a href="#" onClick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">✕</a></div>';
 
 				$return['output'] .= '<p>'.$lang['spremenljivka_delete_data_vre'].'</p>';
-                $return['output'] .= '<p>'.$lang['srv_brisivrednostconfirm'].'</p><br />';
+                $return['output'] .= '<p>'.$lang['srv_brisivrednostconfirm_data'].'</p><br />';
                 
                 //ce se spremeni onclick, se prosim spremeni v datoteki vprasanjeInline.js v funkciji inline_vrednost_delete v else if (data.error == 2)
                 $return['output'] .= '<span class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inline_vrednost_delete(\''.$spremenljivka.'\', \''.$vrednost.'\', \'1\'); $(\'#dropped_alert\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;"><span>'.$lang['srv_brisivrednost'].'</span></a></span>';
diff --git a/lang/1.php b/lang/1.php
index 2a21b4a75..9a80412df 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -1873,7 +1873,9 @@ $lang = array (
 	"srv_anketadeletelibrary_4"		=>	"Ali ste prepri&#269;ani, da &#382;elite odstraniti anketo iz sistemske knji&#382;nice?",
 	"srv_brisigrupoconfirm"			=>	"Ali ste prepri&#269;ani, da &#382;elite izbrisati stran?",
 	"srv_brisispremenljivkoconfirm"	=>	"Ali ste prepričani, da želite izbrisati vprašanje?",
+	"srv_brisispremenljivkoconfirm_data"	=>	"Ali ste prepričani, da želite izbrisati vprašanje in s tem tudi podatke?",
 	"srv_brisivrednostconfirm"		=>	"Ali ste prepričani, da želite izbrisati odgovor?",
+	"srv_brisivrednostconfirm_data"		=>	"Ali ste prepričani, da želite izbrisati odgovor in s tem tudi podatke?",
 	"srv_brisiifconfirm"			=>	"Ali ste prepričani, da želite odstraniti pogoj?",
     "srv_brisiifconfirm_all"	    =>	"Ali ste prepričani, da želite odstraniti pogoj in vsa vprašanja znotraj pogoja?",
 	"srv_brisiblockconfirm"			=>	"Ali ste prepričani, da želite odstraniti blok?",
@@ -3839,9 +3841,9 @@ $lang = array (
 	"srv_truncate"						=>	"Iz &#269;asov uporabljenih za ra&#269;unanje povpre&#269;ja je odstranjenih %s najdalj&#353;ih in najkraj&#353;ih &#269;asov vsake strani.",			
 	"srv_truncate_off"					=>	"Upo&#353;tevaj vse &#269;ase",			
 	"spremenljivka_delete_in_if"		=>	"Spremenljivke ne morete zbrisati, ker se pojavi v vsaj enem od pogojev",			
-	"spremenljivka_delete_data"			=>	"Vaša anketa vsebuje odgovore respondentov. Z brisanjem vprašanja boste izbrisali tudi morebitne odgovore na to vprašanje. <br>Vprašanje lahko tudi označite, da ni vidno za respondente.",			
-	"spremenljivka_delete_data_vre"		=>	"Vaša anketa vsebuje odgovore respondentov. Z brisanjem odgovorov vprašanja boste izbrisali tudi morebitne odgovore na to vprašanje.",			
-	"if_delete_data"			=>	"Vaša anketa vsebuje odgovore respondentov. Z brisanjem pogoja in vseh vprašanj znotraj pogoja boste izbrisali tudi morebitne odgovore na ta vprašanja.",				
+	"spremenljivka_delete_data"			=>	"Vaša anketa vsebuje odgovore respondentov. Z brisanjem vprašanja boste izbrisali tudi morebitne odgovore na to vprašanje.<br><br>Če ne želite zgubiti podatkov, predlagamo, da vprašanja ne izbrišete, temveč vprašanje označite, da ni vidno za respondente. To storite v zavihku \"Napredno\" pri urejanju vprašanja.",			
+	"spremenljivka_delete_data_vre"		=>	"Vaša anketa vsebuje odgovore respondentov. Z brisanjem odgovorov vprašanja boste izbrisali tudi morebitne odgovore na to vprašanje.<br><br>Če ne želite zgubiti podatkov, predlagamo, da odgovora ne izbrišete, temveč ga skrijete za respondente. Postopek je opisan <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/skrivanje-odgovorov-ze-aktivni-anketi\" target=\"_blank\">tukaj</a>.",			
+	"if_delete_data"			=>	"Vaša anketa vsebuje odgovore respondentov. Z brisanjem pogoja in vseh vprašanj znotraj pogoja boste izbrisali tudi morebitne odgovore na ta vprašanja.<br><br>Če ne želite zgubiti podatkov, predlagamo, da pogoja z vprašanji ne izbrišete, temveč v nastavitvah pogoja označite, da vsebine pogoja ne prikaže.",				
 	"oid_auth_rejected"			=>	"Avtentikacija je bila zavrnjena",
 	"google_auth_rejected"			=>	"Avtentikacija preko ponudnika google je bila zavrnjena.",
 	"oid_maybe_you_rejected"		=>	"Morda ste ponesre&#269;i zavrnili avtentikacijo preko googlea.",
diff --git a/lang/2.php b/lang/2.php
index 86ce62756..0336f44de 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -1861,8 +1861,10 @@ $lang = array (
 	"srv_anketadeletelibrary_4"		=>	"Are you sure you want to remove the survey from the system library?",
 	"srv_brisigrupoconfirm"			=>	"Are you sure you want to delete the page?",
 	"srv_brisispremenljivkoconfirm"	=>	"Are you sure you want to delete the question?",
-	"srv_brisivrednostconfirm"		=>	"Are you sure you want to delete the answer?",
-	"srv_brisiifconfirm"			=>	"Are you sure you want to delete this condition?",
+    "srv_brisispremenljivkoconfirm_data"	=>	"Are you sure you want to delete the question and responses for this question?",
+    "srv_brisivrednostconfirm"		=>	"Are you sure you want to delete the answer?",
+    "srv_brisivrednostconfirm_data"		=>	"Are you sure you want to delete the answer and responses for this answer?",
+    "srv_brisiifconfirm"			=>	"Are you sure you want to delete this condition?",
     "srv_brisiifconfirm_all"		=>	"Are you sure you want to delete this condition and all questions inside this condition?",
 	"srv_brisiblockconfirm"			=>	"Are you sure you want to delete this block?",
     "srv_brisiblockconfirm_all"		=>	"Are you sure you want to delete this block and all questions inside this block?",
@@ -3823,7 +3825,7 @@ $lang = array (
 	"srv_truncate_off"					=>	"Calculate with all times",
 	"spremenljivka_delete_in_if"		=>	"Question cannot be deleted, because it appears in at least on of the conditions",
 	"spremenljivka_delete_data"			=>	"This survey already has some data collected. With deleting this question, you will also be deleting question data.",
-	"spremenljivka_delete_data_vre"		=>	"This survey already has some data collected. With deleting this question, you will also be deleting question data.",
+	"spremenljivka_delete_data_vre"		=>	"This survey already has some data collected. With deleting this answer, you will also be deleting question data.",
 	"if_delete_data"			=>	"This survey already has some data collected. With deleting this condition and all questions inside condition, you will also be deleting question data.",					
 	"oid_auth_rejected"					=>	"Authentication has been rejected",
 	"google_auth_rejected"				=>	"Google rejected authentication.",