From a621e43abc09f4656c3d262778f2b021209a39d5 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Wed, 16 Feb 2022 10:06:33 +0100
Subject: [PATCH] Redesign - analize povprecje - manjsi popravki

---
 admin/survey/classes/surveyAnalysis/class.SurveyMeans.php | 7 +++++--
 lang/1.php                                                | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php b/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php
index daa7ca444..d56dde992 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php
@@ -1356,11 +1356,14 @@ class SurveyMeans{
 							if (strip_tags($grid['naslov']) != $lang['srv_new_text']) {
 								$labela .= '<br/>'.strip_tags($grid['naslov']);
 							}
+                            
 							$labela .= '&nbsp;('.strip_tags($grid['variable']).')' ;
-						} else {
-							if (strip_tags($variable['naslov']) != $lang['srv_new_text']) {
+						} 
+                        else {
+							if (strip_tags($variable['naslov']) != $lang['srv_new_text'] && strip_tags($variable['naslov']) != $lang['srv_new_vprasanje']) {
 								$labela .= '<br/>'.strip_tags($variable['naslov']);
 							}
+
 							if ($show_variables_values == true) {
 								$labela .= '&nbsp;('.strip_tags($variable['variable']).')';
 							}
diff --git a/lang/1.php b/lang/1.php
index d5eff8b4b..f5b3222ca 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -5423,8 +5423,8 @@ $lang = array (
 	"srv_means_najprej_prvo" 					=>	"Najprej izberite prvo vpra&#353;anje",
 	"srv_means_izberi_drugo" 					=>	"Izberite drugo vpra&#353;anje",
 	"srv_means_label" 							=>	"Povprečje",
-	"srv_means_label1" 							=>	"Neodvisna spremenljivka (kategorije):",
-	"srv_means_label2" 							=>	"Odvisna spremenljivka (numerična):",
+	"srv_means_label1" 							=>	"Neodvisna spremenljivka:",
+	"srv_means_label2" 							=>	"Odvisna spremenljivka:",
 	"srv_means_label3" 							=>	"Skupaj",
 	"srv_means_label4" 							=>	"Št. enot",
 	"srv_means_setting_1"						=>	"Odvisne spremenljivke prikazuj v ločenih tabelah",