From cb83387a1ce0773bf742a2ed9b706a85c17c0892 Mon Sep 17 00:00:00 2001
From: "DESKTOP-B5Q2TUL\\Win10" <nejc.kouko@gmail.com>
Date: Fri, 27 May 2022 10:03:52 +0200
Subject: [PATCH 01/17] ai popravki blalblab

---
 frontend/simple/classes/DisplayController.php | 215 +++++++++++++-----
 1 file changed, 164 insertions(+), 51 deletions(-)

diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index 4dea55684..c19935772 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -73,7 +73,7 @@ class DisplayController{
         echo '    <meta name = "viewport" content = "user-scalable=no, initial-scale=1.0, maximum-scale=1.0, width=device-width">';
 
         echo '    <meta name="keywords" content="web survey software, internet survey, online survey, web questionaires">';
-        echo '    <meta name="keywords" content="spletne ankete, spletna anketa, spletno anketiranje, internetne ankete, slovenščina, slovenski jezik, software, softver, programska oprema, orodje za spletne ankete, internetno anketiranje, online vprašalniki, ankete po internetu, internet, internetne ankete, anketa" lang="si">';
+        echo '    <meta name="keywords" content="spletne , spletna anketa, spletno anketiranje, internetne ankete, slovenščina, slovenski jezik, software, softver, programska oprema, orodje za spletne ankete, internetno anketiranje, online vprašalniki, ankete po internetu, internet, internetne ankete, anketa" lang="si">';
         echo '    <meta name="description" content="1KA je orodje za spletne ankete, hkrati pa je tudi on-line platforma (gostitelj), na kateri se lahko spletna anketa brezplačno izdela.">';
         echo '    <meta name="abstract" content="1KA je orodje za spletne ankete">';
         echo '    <meta name="author" content="CDI, FDV">';
@@ -94,6 +94,9 @@ class DisplayController{
 
         echo '    <!-- CSS -->';
         echo '    <link type="text/css" href="'.$site_url.'frontend/simple/css/style.css" rel="stylesheet" />';
+        if(isAAI()){
+            echo '    <link type="text/css" href="'.$site_url.'frontend/simple/css/aai.css" rel="stylesheet" />';
+        }
         echo '    <link type="text/css" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css" rel="stylesheet" /">';
             
         echo '    <!-- JAVASCRIPT -->';
@@ -119,7 +122,7 @@ class DisplayController{
         echo '<div class="logo ">';
 
         echo '  <a href="'.$site_url.$this->root.'index.php">';
-        echo '      <img src="'.$site_url.'/public/img/logo/1ka_logo_namestitev.svg">';
+        echo '      <img src="'.$site_url.'/public/img/logo/1ka_'.($this->lang_id != 1 ? 'eng' : 'slo').'.svg">';
         if(isAAI()){
             echo '      <img src="'.$site_url.'/public/img/logo/arnes_logo.png" style="margin-left:30px;">';
         }
@@ -128,8 +131,57 @@ class DisplayController{
         echo '</div>';
         
 
+        echo '<div class="mobile">';
+            echo ' <div id="nav-icon3">';
+                echo ' <span></span> ';
+                echo ' <span></span> ';
+                echo ' <span></span> ';
+                echo ' <span></span> ';
+
+                // echo '<div id="links">' ;
+                //     echo '<a href="#news">News</a>';
+                //     echo ' <a href="#contact">Contact</a>';
+                //     echo ' <a href="#about">About</a> ';
+                // echo '</div>';
+            echo ' </div>';
+
+            echo '<div id="links" class="links">' ;
+                // GDPR zahtevek je prisoten samo na virtualkah in na lastno zahtevo
+                echo '<span class="menu_item '.($this->stran == 'gdpr' ? 'active' : '').'">';
+                    echo '  <a href="index.php?a=gdpr">'.$lang['srv_gdpr_drupal_tab'].'</a>';
+                echo '</span>';
+
+
+                // Preklop jezika
+                echo '<span class="menu_item lang_switch">';
+                $params = '?' . (isset($_GET['a']) ? 'a='.$_GET['a'].'&' : '') . (isset($_GET['b']) ? 'b='.$_GET['b'].'&' : '');
+                if($this->lang_id == 1){
+                    echo '	<a href="'.$site_url.$this->root.'index.php'.$params.'lang_id=1">';
+                    echo '		<div class="flag eng">'.$lang['lang_flag'].' </div> ';
+                    
+                    echo '	</a>';
+                }
+                else{
+                    echo '	<a href="'.$site_url.$this->root.'index.php'.$params.'lang_id=2">';
+                    echo '		<div class="flag eng">'.$lang['lang_flag'].' </div> ';
+                    
+                    echo '	</a>';
+                }
+                echo '</span>';
+
+                // AAI PRIJAVA 
+                echo '<span class="menu_item ">';
+                    echo    '<a id="header-btn"  href="https://idp.uni-lj.si/simplesaml/module.php/core/loginuserpassorg.php?AuthState=_37d7b155b8685940ef2887cd2c204e1cd9f46213e8%3Ahttps%3A%2F%2Fidp.uni-lj.si%2Fsimplesaml%2Fsaml2%2Fidp%2FSSOService.php%3Fspentityid%3Dhttps%253A%252F%252F1ka.arnes.si%252Fsp%252F202005292157%26RelayState%3Dcookie%253A1650096713_0820%26cookieTime%3D1650096713c>">'.$lang['AAI_prijava'].' </a> ';
+                echo '</span>';
+
+
+            echo '</div>';
+        echo '</div>';
+
+        echo '<script type="text/javascript" src="frontend/simple/script/nav-mobile.js"></script> ';
+
         // Navigacija
-        echo '<nav>';
+        echo '<nav class=nav-desktop>';
 
         // Hidden polje z lang_id-jem
         echo '	<input type="hidden" name="lang_id" value="'.$this->lang_id.'" />';
@@ -144,17 +196,28 @@ class DisplayController{
         $params = '?' . (isset($_GET['a']) ? 'a='.$_GET['a'].'&' : '') . (isset($_GET['b']) ? 'b='.$_GET['b'].'&' : '');
 		if($this->lang_id == 1){
 			echo '	<a href="'.$site_url.$this->root.'index.php'.$params.'lang_id=2">';
-			echo '		<div class="flag eng"></div> <span>English</span>';
+			echo '		<div class= "flag" >'.$lang['lang_flag'].' </div> ';
+            
 			echo '	</a>';
 		}
 		else{
 			echo '	<a href="'.$site_url.$this->root.'index.php'.$params.'lang_id=1">';
-			echo '		<div class="flag slo"></div> <span>Slovenščina</span>';
+			echo '		<div class = "flag" > <img src="public/img/flags/english_flag.svg" alt="english flag"> <span>SLO</span>  </div> ';
 			echo '</a>';
 		}
         echo '</span>';
-		
+
+        // AAI PRIJAVA 
+        echo '<span class="menu_item ">';
+        echo    '<a id="header-btn"  href="https://idp.uni-lj.si/simplesaml/module.php/core/loginuserpassorg.php?AuthState=_37d7b155b8685940ef2887cd2c204e1cd9f46213e8%3Ahttps%3A%2F%2Fidp.uni-lj.si%2Fsimplesaml%2Fsaml2%2Fidp%2FSSOService.php%3Fspentityid%3Dhttps%253A%252F%252F1ka.arnes.si%252Fsp%252F202005292157%26RelayState%3Dcookie%253A1650096713_0820%26cookieTime%3D1650096713c>">'.$lang['AAI_prijava'].' </a> ';
+		echo '</span>';
+
+
         echo '</nav>';
+
+        
+        
+
 	}
 	
 	// Izris vsebine
@@ -232,48 +295,63 @@ class DisplayController{
     // Izris footerja
     public function displayFooter(){
         global $lang;
-
+        global $site_url;
 
         // Stolpec 1
-        echo '<div class="col">';
+        echo '<div class="col col1">';
         echo '  <h2>'.$lang['simple_footer_about'].'</h2>';
-        echo '  <span>'.$lang['simple_footer_about_1ka'].'</span>';
-        if(isAAI())
-            echo '  <span>'.$lang['simple_footer_about_faq'].'</span>';
-        echo '  <span>'.$lang['simple_footer_about_general'].'</span>';
-        echo '  <span>'.$lang['simple_footer_about_privacy'].'</span>';
-        echo '  <span>'.$lang['simple_footer_about_cookies'].'</span>';
-        echo '  <span>'.$lang['simple_footer_about_antispam'].'</span>';
-        echo '  <div class="follow">'.$lang['simple_footer_about_follow'].': ';
-        echo '      <a href="https://twitter.com/enklikanketa" target="_blank"><span class="icon twitter"></span></a>';
-        echo '      <a href="https://www.facebook.com/1KA-123545614388521/" target="_blank"><span class="icon fb"></span></a>';
-        echo '  </div>';
+        echo '<div class="col1-flex">';
+            echo '  <span>'.$lang['simple_footer_about_1ka'].'</span>';
+            if(isAAI())
+                echo '  <span>'.$lang['simple_footer_about_faq'].'</span>';
+            echo '  <span>'.$lang['simple_footer_about_general'].'</span>';
+            echo '  <span>'.$lang['simple_footer_about_privacy'].'</span>';
+            echo '  <span>'.$lang['simple_footer_about_cookies'].'</span>';
+            echo '  <span>'.$lang['simple_footer_about_antispam'].'</span>';
+            // echo '  <div class="follow">'.$lang['simple_footer_about_follow'].': ';
+            // echo '      <a href="https://twitter.com/enklikanketa" target="_blank"><span class="icon twitter"></span></a>';
+            // echo '      <a href="https://www.facebook.com/1KA-123545614388521/" target="_blank"><span class="icon fb"></span></a>';
+            // echo '  </div>';
+        echo '</div>';
         echo '</div>';
         
         
         // Stolpec 2
-        echo '<div class="col">';
+        echo '<div class="col col2">';
         echo '  <h2>'.$lang['simple_footer_company'].'</h2>';
-        if(isAAI()) {
-            echo '  <span><a href="https://www.arnes.si/">Arnes</a></span>';
-        }
-        else {
-            echo '  <h2>'.$lang['simple_footer_company'].'</h2>';
-            echo '  <span class="semi-bold">'.AppSettings::getInstance()->getSetting('app_settings-owner').'</span>';
-            echo '  <span><a href="mailto:'.AppSettings::getInstance()->getSetting('app_settings-admin_email').'">'.AppSettings::getInstance()->getSetting('app_settings-admin_email').'</a></span>';
-            echo '  <span><a href="'.AppSettings::getInstance()->getSetting('app_settings-owner_website').'" target="_blank">'.AppSettings::getInstance()->getSetting('app_settings-owner_website').'</a></span>';
-        }
+
+        echo ' <a href="https://1ka.arnes.si/"> Arnes </a>';
+
+        echo '  <span class="semi-bold">'.AppSettings::getInstance()->getSetting('app_settings-owner').'</span>';
+        echo '  <span><a href="mailto:'.AppSettings::getInstance()->getSetting('app_settings-admin_email').'">'.AppSettings::getInstance()->getSetting('app_settings-admin_email').'</a></span>';
+        echo '  <span><a href="'.AppSettings::getInstance()->getSetting('app_settings-owner_website').'" target="_blank">'.AppSettings::getInstance()->getSetting('app_settings-owner_website').'</a></span>';
+
+        
         echo '</div>';
 
 
-        // Stolpec 3 - logotipi
-        echo '<div class="col">';
+        // stolpec 3 - spremljajte nas
+        echo '<div class="col col3">';
+        echo '  <h2>'.$lang['simple_footer_about_follow'].'</h2>';
+            echo ' <div class= "social_logo_flex">';
+                echo ' <a href="https://www.facebook.com/1KAenklikanketa/"> <img src="public/img/social/fb_orange.svg" alt="Facebook logo"> </a>';
+                echo ' <a href="https://twitter.com/enklikanketa"> <img src="public/img/social/twitter_orange.svg" alt="Twitter logo"> </a>';
+            echo ' </div>';
+        echo '</div>';
+        // Stolpec 4 - logotipi
+        echo '<div class="col col4">';
+        echo '  <h2>'.$lang['simple_footer_namestitev'].'</h2>';
 
         // Logotipa FDV in CDI - samo pri virtualkah
         if(isVirtual() || isAAI()){
             echo '<div class="logo_holder">';
+            
+            echo ' <img src="public/img/logo/ministrstvo.svg" alt="ministrstvo za izobraževanje znanost in šport">';
+            echo '  <img class="arnes-logo" src="'.$site_url.'/public/img/logo/arnes_logo.png">';
             echo '  <img src="'.$site_url.'/public/img/logo/fdv.png">';
-            echo '  <img src="'.$site_url.'/public/img/logo/cdi_'.($this->lang_id != 1 ? 'eng' : 'slo').'.png">';
+            
+            
+            
             echo '</div>';
         }
 
@@ -352,33 +430,67 @@ class DisplayController{
     // Izris okna na prvi strani - AAI
     private function displayFrontPageFormAAI(){
         global $lang;
-		global $site_url;
+		
 
+        // HERO
+        echo '<div class= "hero-container"> ';
 
-        // WHITE BOX FOR LOGIN / REGISTRATION
-        echo '<div class="landing_page_window">';      
-
-        // APP TITLE - aai
-        echo '<div class="app_title" style="text-transform: initial;">'.AppSettings::getInstance()->getSetting('app_settings-app_name').'</div>';
-
-        // AAI logo
-        //echo '<div class="arnes_logo"><img src="'.$site_url.'/public/img/logo/arnes_logo.png"></div>';
-
-        // AAI text
-        echo '	<div class="tabs">';
-        echo '	    <div class="tab full_width">'.$lang['app_aai_installation_text'].'</div>';
-        echo '	</div>';
-                    
-        // AAI login/register
-		echo '  <a href="'.$site_url.'/aai"><input type="button" name="aai-login" title="'.$lang['aaiPopupTitle'].'" value="'.$lang['aaiPopupTitle'].'"></a>';
+            echo '<div class="text">';
+                echo '<h1>'.$lang["hero_heading"].'</h1>';
+                echo '<p>'.$lang["hero_text"].'</p>';
+                
+                echo '<a href="https://idp.uni-lj.si/simplesaml/module.php/core/loginuserpassorg.php?AuthState=_3500459a6006c401ca27bd4fb483cc9a05e8e2c5f9%3Ahttps%3A%2F%2Fidp.uni-lj.si%2Fsimplesaml%2Fsaml2%2Fidp%2FSSOService.php%3Fspentityid%3Dhttps%253A%252F%252F1ka.arnes.si%252Fsp%252F202005292157%26RelayState%3Dcookie%253A1650096713_0820%26cookieTime%3D1650880771"> '.$lang["AAI_prijava"].' <img src="public/img/icons/chevron.svg"></a>';
+                
         
+            echo '</div>';
+
+            echo '<img src="public/img/icons/hero.svg" alt="hero image">';
+                
         echo '</div>';
 
+        // POMEMBNE POVEZAVE
+        echo '<h2 class="title">'.$lang["povezave_pomembne_povezave"].'</h2>';
+
+        echo '<div class="povezave">';
+
+            echo '<div class= "col"> ';
+                echo '<img src="public/img/icons/icon_kako_deluje.svg" alt="kako deluje">';
+                echo '<h2>'.$lang["povezave__kako_deluje_h2"].'</h2>';
+                echo '<p> '.$lang["povezave__kako_deluje_text"].' </p>';
+                echo '<a id="povezave-btn"href="https://www.1ka.si/d/sl/pomoc"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron.svg" alt="hero image"> </a>';
+            echo '</div>';
+
+            echo '<div class= "col"> ';
+                echo '<img src="public/img/icons/icon_o_1ka.svg" alt="o 1ka">';
+                echo '<h2>'.$lang["povezave_o_1ka_h2"].'</h2>';
+                echo '<p> '.$lang["povezave_o_1ka_text"].' </p>';
+                echo ' <a id="povezave-btn" href="https://www.1ka.si/d/sl/o-1ka/splosen-opis"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron.svg" alt="hero image"> </a>';
+            echo '</div>';
+
+            echo '<div class= "col"> ';
+                echo '<img src="public/img/icons/icon_1ka_podpora.svg" alt="1ka podpora">';
+                echo '<h2>'.$lang["povezave_1ka_podpora_h2"].'</h2>';
+                echo '<p> '.$lang["povezave_1ka_podpora_text"].' </p>';
+                echo ' <a id="povezave-btn" href="https://www.1ka.si/d/sl/pomoc"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron.svg" alt="hero image"> </a>';
+            echo '</div>';
+
+            echo '<div class= "col"> ';
+                echo '<img src="public/img/icons/icon_arnes_podpora.svg" alt="arnes podpora">';
+                echo '<h2>'.$lang["povezave_arnes_podpora_h2"].'</h2>';
+                echo '<p> '.$lang["povezave_arnes_podpora_text"].' </p>';
+                echo ' <a id="povezave-btn" href="https://www.arnes.si/zavod-arnes/kontakti/"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron.svg" alt="hero image"> </a>';
+            echo '</div>';
+
+        echo '</div>';
+
+
 
         // APP SUBTITLE
         /*echo '<div class="app_subtitle">';
         echo $lang['app_aai_installation'];
         echo '</div>';*/
+
+        
     }
 
     // Izris okna za login na prvi strani
@@ -477,7 +589,7 @@ class DisplayController{
         echo '  <span class="subtitle">'.$lang['cms_register_user_text'].'</span>';
 
 		// Email
-		echo '  <label for="email" '.(isset($error['email']) ? 'class="red"' : '').'>'.$lang['email'].':</label>';
+		echo '  <label for="email" '.(isset($error['email']) ? 'class="red"' : '').''.$lang['email'].':</label>'; 
 		echo '  <input class="regfield '.(isset($error['email']) ? 'red' : '').'" id="email" name="email" value="'.$email.'" placeholder="'.$lang['email'].'" type="text">';
 		
 		// Ime
@@ -538,6 +650,7 @@ class DisplayController{
 		echo '  <input name="submit" value="'.$lang['next1'].'" class="regfield" type="submit">';
 		
 		echo '</form>';
+        echo 'hello there';
     }
 	
 	
@@ -763,7 +876,7 @@ class DisplayController{
 		echo '			<p><span class="label edit"><label for="pass">'.$lang['password'].':</label></span>';
 		echo '			<a href="'.$url_edit.'">'.($geslo == '' ? $lang['no1'] : $lang['yes']).'</a></p>';
 		
-		echo '			<br /><input name="submit" value="'.$lang['next1'].'" class="regfield" type="submit"><br />';
+		echo '			<br /><input name="submit" value="'.$lang['next1'].'" class="regfield"  type="submit"><br />';
 		
 		echo '		</form>';
 		

From 3fde81cfa96e08a2d26ebd1c23a6725c3757a429 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Fri, 27 May 2022 11:17:13 +0200
Subject: [PATCH 02/17] Dodan nov jezik - Nepali

---
 lang/45.php     | 66 +++++++++++++++++++++++++++++++++++++++++++++++++
 lang/jeziki.php |  2 ++
 2 files changed, 68 insertions(+)
 create mode 100644 lang/45.php

diff --git a/lang/45.php b/lang/45.php
new file mode 100644
index 000000000..333ef1d25
--- /dev/null
+++ b/lang/45.php
@@ -0,0 +1,66 @@
+<?php
+// _/ _/ _/  za primerjavo z 1.php uporabi: /utils/checkLanguageKeys.php _/ _/ _/
+// Language file
+
+$lang_add = array (
+	"id"			=>		"45",							// ID te jezikovne datoteke (ID.php)
+	"lang_short"	=>		"ne",							// si - slovenian, en - english
+	"language"		=> 	"Nepali",
+    
+    
+	// Translation texts
+    "srv_survey_non_active" => "सर्वेक्षण बन्द",
+    "srv_survey_non_active_notStarted" => "सर्वेक्षण सक्रिय छैन। मतदान सुरु:",
+    "srv_survey_non_active_expired" => "Survey is not active. Poll has expired:",
+    "srv_survey_non_active_voteLimit" => "सर्वेक्षण सक्रिय छैन। मतदानको म्याद सकिएको छ:",
+    "srv_previewalert" =>  "तपाईं हाल सर्वेक्षणको पूर्वावलोकन हेर्दै हुनुहुन्छ। तपाईंका जवाफहरू बचत हुने छैनन्!",
+    "srv_recognized" => "सर्वेक्षणको रूपमा जवाफ दिनुहोस्",
+    "srv_ranking_avaliable_categories" => "अवस्थित कोटीहरू",
+    "srv_ranking_ranked_categories" => "श्रेणी वर्गहरू",
+    "srv_add_field" =>  "नयाँ फिल्ड थप्नुहोस्",
+    "vote_sex_selection" => " लिङ्ग चयन गर्नुहोस्",
+    "vote_sex_man" =>  "पुरुष",
+    "vote_gender_female" => "महिला",
+    "srv_remind_sum_hard" => "तपाईंले अधिकतम योगफल नाघेको छ!",
+    "srv_remind_sum_soft" => "तपाईंले अधिकतम योगफल नाघेको छ। के तपाइँ जारी राख्न चाहनुहुन्छ?",
+    "srv_remind_num_hard" => "तपाईंले अनुमति दिएको मान नाघ्नुभयो!",
+    "srv_remind_num_soft" => "तपाईंले अनुमति दिएको मान नाघ्नुभयो। के तपाइँ जारी राख्न चाहनुहुन्छ?",
+    "srv_remind_hard" => "कृपया सबै आवश्यक प्रश्नहरूको जवाफ दिनुहोस्।",
+    "srv_remind_soft" => "तपाईंले सबै आवश्यक प्रश्नहरूको जवाफ दिनुभएन। के तपाइँ जारी राख्न चाहनुहुन्छ?",
+    "srv_confirm" => "पुष्टि गर्नुहोस्",
+    "srv_lastpage" => "अन्तिम पाना",
+    "srv_nextpage" => "अर्को पाना",
+    "srv_nextpage_uvod" => "अर्को पाना",
+    "srv_prevpage" => "अघिल्लो पृष्ठ",
+    "results" => "परिणामहरू",
+    "vote_count" => "गणना गणना",
+    "vote_time" => "बाट भोट गर्न सकिनेछ",
+    "vote_time_end" => "को",
+    "hour_all" => "सबै",
+    "female_female_voting" => "महिला",
+    "srv_intro" => "कृपया क्लिक गरेर यो सर्वेक्षण पूरा गर्न एक क्षण लिनुहोस् \"अर्को पाना\"",
+    "srv_basecode" => "आफ्नो पासवर्ड प्रविष्ट गर्नुहोस्",
+    "srv_end" => "तपाईंले सर्वेक्षण पूरा गर्नुभयो। धन्यवाद।",
+    "srv_back_edit" => "सम्पादन मा फर्कनुहोस्",
+    "srv_nextins" => "अर्को प्रविष्टि",
+    "srv_insend" => "समाप्त गर्नुहोस्",
+    "srv_back_edit" => "सम्पादन मा फर्कनुहोस्",
+    "srv_alert_msg" => "सर्वेक्षण पूरा गरे",
+    "srv_alert_subject" => "सर्वेक्षण सम्पन्न भएको छ",
+    "srv_remind_captcha_hard" => "तपाईंले प्रविष्ट गर्नुभएको नम्बर छविमा जस्तै छैन!",
+    "srv_remind_captcha_soft" => "तपाईंले प्रविष्ट गर्नुभएको नम्बर छविमा जस्तै छैन! के तपाइँ जारी राख्न चाहनुहुन्छ?",
+    "srv_alert_number_exists" => "चेतावनी: नम्बर पहिले नै अवस्थित छ!",
+    "srv_alert_number_toobig" => "चेतावनी: संख्या धेरै ठूलो!",
+    "srv_forma_send" => "पठाउनुहोस्",
+    "srv_end" => "अन्त्य",
+    "srv_dropdown_select" => "चयन गर्नुहोस्",
+);
+
+include(dirname(__FILE__).'/2.php');
+
+// povozimo angleski jezik s prevodi
+foreach ($lang_add AS $key => $val) {
+	$lang[$key] = $val;
+}
+
+?>
\ No newline at end of file
diff --git a/lang/jeziki.php b/lang/jeziki.php
index 1838e23d1..6b278f2bf 100644
--- a/lang/jeziki.php
+++ b/lang/jeziki.php
@@ -47,6 +47,7 @@ $lang_all_global = array(
             42 => 'Hindi',
             43 => 'Hebrew',
             44 => 'New Norwegian',
+            45 => 'Nepali',
         ),
     'kratko-ime' =>
         array(
@@ -94,5 +95,6 @@ $lang_all_global = array(
             42 => 'hi',
             43 => 'he',
             44 => 'nn',
+            45 => 'ne',
         ),
 );
\ No newline at end of file

From 15473f33daa7d8cbe439f24109f3a206623c6acb Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Fri, 27 May 2022 11:17:54 +0200
Subject: [PATCH 03/17] Redesign - popravki - napredni statusi (boxi), ikone za
 komentarje

---
 admin/survey/SurveyAdmin.php                  |   18 +-
 admin/survey/SurveyAdminSettings.php          |    2 +-
 public/css/admin_new.css                      | 2943 +++++++++--------
 .../sass/admin_new/basic/icons/standard.scss  |   15 +-
 .../components/header/navigation.scss         |   42 +-
 .../pages/survey_status/status_advanced.scss  |   45 +
 .../pages/survey_status/survey_status.scss    |    3 +-
 .../pages/survey_testiranje/komentarji.scss   |    7 +-
 8 files changed, 1552 insertions(+), 1523 deletions(-)
 create mode 100644 resources/sass/admin_new/pages/survey_status/status_advanced.scss

diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 013dfeb12..4383aff66 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -1425,15 +1425,15 @@ class SurveyAdmin
                     
                     if($userAccess->checkUserAccess('komentarji')){
                         if ($sas->testiranje_komentarji_komentarji_na_vprasanje() > 0)
-                            echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments_num" title="' . $lang['srv_view_comment'] . '"><strong class="fa-stack-1x">' . $sas->testiranje_komentarji_komentarji_na_vprasanje() . '</strong></span></div></a>';
+                            echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
                         else
-                            echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments_empty" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
+                            echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
                     }
                     else{
                         if ($sas->testiranje_komentarji_komentarji_na_vprasanje() > 0)
-                            echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='. $row['id'].'&a=urejanje" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments_num icon-orange fa-stack-1x user_access_locked" title="' . $lang['srv_view_comment'] . '"><strong class="fa-stack-1x">' . $sas->testiranje_komentarji_komentarji_na_vprasanje() . '</strong></span></div></a>';
+                            echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='. $row['id'].'&a=urejanje" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments icon-orange fa-stack-1x user_access_locked" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
                         else
-                            echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=urejanje" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments_empty user_access_locked" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
+                            echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=urejanje" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments user_access_locked" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
                     }
 
                     echo '</div>';
@@ -1887,7 +1887,7 @@ class SurveyAdmin
             # Gumb za novo stran napredni statusi
             echo '<li class="' . ($_GET['a'] == A_STATUS_ADVANCED ? ' active' : '') . '">';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_STATUS_ADVANCED . '" title="' . $lang['srv_status_advanced'] . '">';
-            echo $lang['srv_status_advanced'] . ' >></a>';
+            echo $lang['srv_status_advanced'] . '<span class="faicon arrow2_r"></span></a>';
             echo '</li>';
 
             echo '</ul>';
@@ -4318,12 +4318,12 @@ class SurveyAdmin
             
                 if($userAccess->checkUserAccess('komentarji')){
                     echo '<a href="#" onclick="return false;" class="surveycomment srv_ico" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0">';
-                    echo '  <div class="fa-stack"><span class="faicon comments" title="' . $lang['srv_survey_general_comment'] . '"></div></span>';
+                    echo '  <div class="fa-stack"><span class="faicon comments_empty" title="' . $lang['srv_survey_general_comment'] . '"></div></span>';
                     echo '</a>';
                 }
                 else{
                     echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='. $row['id'].'&a=urejanje" class="surveycomment srv_ico" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0">';
-                    echo '  <div class="fa-stack"><span class="faicon comments user_access_locked" title="' . $lang['srv_survey_general_comment'] . '"></div></span>';
+                    echo '  <div class="fa-stack"><span class="faicon comments_empty user_access_locked" title="' . $lang['srv_survey_general_comment'] . '"></div></span>';
                     echo '</a>';
                 }                
             } 
@@ -4344,7 +4344,7 @@ class SurveyAdmin
                 if($userAccess->checkUserAccess('komentarji')){
                     echo '<a href="#" onclick="return false;" class="surveycomment srv_ico" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0">';
                     
-                    echo '<div class="fa-stack"><span class="faicon comments_num" title="' . $lang['srv_survey_general_comment'] . '"><strong class="fa-stack-1x">' . $comment_count_text . '</strong></span></div>';
+                    echo '<div class="fa-stack"><span class="faicon comments_empty" title="' . $lang['srv_survey_general_comment'] . '"></span></div>';
 
                     // ali prikazemo okno odprto - je dodan tak admin komentar
                     $sqlf1 = sisplet_query("SELECT id FROM post p WHERE p.tid='$row[thread]' AND p.ocena='5'");
@@ -4359,7 +4359,7 @@ class SurveyAdmin
                 }
                 else{
                     echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='. $row['id'].'&a=urejanje" class="surveycomment srv_ico" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0">';
-                    echo '  <div class="fa-stack"><span class="faicon comments_num user_access_locked" title="' . $lang['srv_survey_general_comment'] . '"><strong class="fa-stack-1x">' . $comment_count_text . '</strong></span></div>';
+                    echo '  <div class="fa-stack"><span class="faicon comments_empty user_access_locked" title="' . $lang['srv_survey_general_comment'] . '"></span></div>';
                     echo '</a>';
                 }
             }
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 3f556fbc4..b174f72ae 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -1169,7 +1169,7 @@ class SurveyAdminSettings {
 				$d = new Dostop();
 
 				echo '<div class="button" title="'.$lang['srv_view_comment'].'" onClick="window.location.href=\'index.php?anketa='.$this->anketa.'&a=komentarji\';">';
-				echo '<span class="faicon comments_num blue"></span>';
+				echo '<span class="faicon comments blue"></span>';
 				echo $lang['srv_admin_s_comments_view'];
 				echo '</div>';
 
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index f6c9b0b16..dae94a016 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -214,4767 +214,4767 @@
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
 readers do not read off random characters that represent icons */
 .fa-500px:before {
-  content: "\f26e";
+  content: "";
 }
 
 .fa-accessible-icon:before {
-  content: "\f368";
+  content: "";
 }
 
 .fa-accusoft:before {
-  content: "\f369";
+  content: "";
 }
 
 .fa-ad:before {
-  content: "\f641";
+  content: "";
 }
 
 .fa-address-book:before {
-  content: "\f2b9";
+  content: "";
 }
 
 .fa-address-card:before {
-  content: "\f2bb";
+  content: "";
 }
 
 .fa-adjust:before {
-  content: "\f042";
+  content: "";
 }
 
 .fa-adn:before {
-  content: "\f170";
+  content: "";
 }
 
 .fa-adversal:before {
-  content: "\f36a";
+  content: "";
 }
 
 .fa-affiliatetheme:before {
-  content: "\f36b";
+  content: "";
 }
 
 .fa-air-freshener:before {
-  content: "\f5d0";
+  content: "";
 }
 
 .fa-algolia:before {
-  content: "\f36c";
+  content: "";
 }
 
 .fa-align-center:before {
-  content: "\f037";
+  content: "";
 }
 
 .fa-align-justify:before {
-  content: "\f039";
+  content: "";
 }
 
 .fa-align-left:before {
-  content: "\f036";
+  content: "";
 }
 
 .fa-align-right:before {
-  content: "\f038";
+  content: "";
 }
 
 .fa-alipay:before {
-  content: "\f642";
+  content: "";
 }
 
 .fa-allergies:before {
-  content: "\f461";
+  content: "";
 }
 
 .fa-amazon:before {
-  content: "\f270";
+  content: "";
 }
 
 .fa-amazon-pay:before {
-  content: "\f42c";
+  content: "";
 }
 
 .fa-ambulance:before {
-  content: "\f0f9";
+  content: "";
 }
 
 .fa-american-sign-language-interpreting:before {
-  content: "\f2a3";
+  content: "";
 }
 
 .fa-amilia:before {
-  content: "\f36d";
+  content: "";
 }
 
 .fa-anchor:before {
-  content: "\f13d";
+  content: "";
 }
 
 .fa-android:before {
-  content: "\f17b";
+  content: "";
 }
 
 .fa-angellist:before {
-  content: "\f209";
+  content: "";
 }
 
 .fa-angle-double-down:before {
-  content: "\f103";
+  content: "";
 }
 
 .fa-angle-double-left:before {
-  content: "\f100";
+  content: "";
 }
 
 .fa-angle-double-right:before {
-  content: "\f101";
+  content: "";
 }
 
 .fa-angle-double-up:before {
-  content: "\f102";
+  content: "";
 }
 
 .fa-angle-down:before {
-  content: "\f107";
+  content: "";
 }
 
 .fa-angle-left:before {
-  content: "\f104";
+  content: "";
 }
 
 .fa-angle-right:before {
-  content: "\f105";
+  content: "";
 }
 
 .fa-angle-up:before {
-  content: "\f106";
+  content: "";
 }
 
 .fa-angry:before {
-  content: "\f556";
+  content: "";
 }
 
 .fa-angrycreative:before {
-  content: "\f36e";
+  content: "";
 }
 
 .fa-angular:before {
-  content: "\f420";
+  content: "";
 }
 
 .fa-ankh:before {
-  content: "\f644";
+  content: "";
 }
 
 .fa-app-store:before {
-  content: "\f36f";
+  content: "";
 }
 
 .fa-app-store-ios:before {
-  content: "\f370";
+  content: "";
 }
 
 .fa-apper:before {
-  content: "\f371";
+  content: "";
 }
 
 .fa-apple:before {
-  content: "\f179";
+  content: "";
 }
 
 .fa-apple-alt:before {
-  content: "\f5d1";
+  content: "";
 }
 
 .fa-apple-pay:before {
-  content: "\f415";
+  content: "";
 }
 
 .fa-archive:before {
-  content: "\f187";
+  content: "";
 }
 
 .fa-archway:before {
-  content: "\f557";
+  content: "";
 }
 
 .fa-arrow-alt-circle-down:before {
-  content: "\f358";
+  content: "";
 }
 
 .fa-arrow-alt-circle-left:before {
-  content: "\f359";
+  content: "";
 }
 
 .fa-arrow-alt-circle-right:before {
-  content: "\f35a";
+  content: "";
 }
 
 .fa-arrow-alt-circle-up:before {
-  content: "\f35b";
+  content: "";
 }
 
 .fa-arrow-circle-down:before {
-  content: "\f0ab";
+  content: "";
 }
 
 .fa-arrow-circle-left:before {
-  content: "\f0a8";
+  content: "";
 }
 
 .fa-arrow-circle-right:before {
-  content: "\f0a9";
+  content: "";
 }
 
 .fa-arrow-circle-up:before {
-  content: "\f0aa";
+  content: "";
 }
 
 .fa-arrow-down:before {
-  content: "\f063";
+  content: "";
 }
 
 .fa-arrow-left:before {
-  content: "\f060";
+  content: "";
 }
 
 .fa-arrow-right:before {
-  content: "\f061";
+  content: "";
 }
 
 .fa-arrow-up:before {
-  content: "\f062";
+  content: "";
 }
 
 .fa-arrows-alt:before {
-  content: "\f0b2";
+  content: "";
 }
 
 .fa-arrows-alt-h:before {
-  content: "\f337";
+  content: "";
 }
 
 .fa-arrows-alt-v:before {
-  content: "\f338";
+  content: "";
 }
 
 .fa-assistive-listening-systems:before {
-  content: "\f2a2";
+  content: "";
 }
 
 .fa-asterisk:before {
-  content: "\f069";
+  content: "";
 }
 
 .fa-asymmetrik:before {
-  content: "\f372";
+  content: "";
 }
 
 .fa-at:before {
-  content: "\f1fa";
+  content: "";
 }
 
 .fa-atlas:before {
-  content: "\f558";
+  content: "";
 }
 
 .fa-atom:before {
-  content: "\f5d2";
+  content: "";
 }
 
 .fa-audible:before {
-  content: "\f373";
+  content: "";
 }
 
 .fa-audio-description:before {
-  content: "\f29e";
+  content: "";
 }
 
 .fa-autoprefixer:before {
-  content: "\f41c";
+  content: "";
 }
 
 .fa-avianex:before {
-  content: "\f374";
+  content: "";
 }
 
 .fa-aviato:before {
-  content: "\f421";
+  content: "";
 }
 
 .fa-award:before {
-  content: "\f559";
+  content: "";
 }
 
 .fa-aws:before {
-  content: "\f375";
+  content: "";
 }
 
 .fa-backspace:before {
-  content: "\f55a";
+  content: "";
 }
 
 .fa-backward:before {
-  content: "\f04a";
+  content: "";
 }
 
 .fa-balance-scale:before {
-  content: "\f24e";
+  content: "";
 }
 
 .fa-ban:before {
-  content: "\f05e";
+  content: "";
 }
 
 .fa-band-aid:before {
-  content: "\f462";
+  content: "";
 }
 
 .fa-bandcamp:before {
-  content: "\f2d5";
+  content: "";
 }
 
 .fa-barcode:before {
-  content: "\f02a";
+  content: "";
 }
 
 .fa-bars:before {
-  content: "\f0c9";
+  content: "";
 }
 
 .fa-baseball-ball:before {
-  content: "\f433";
+  content: "";
 }
 
 .fa-basketball-ball:before {
-  content: "\f434";
+  content: "";
 }
 
 .fa-bath:before {
-  content: "\f2cd";
+  content: "";
 }
 
 .fa-battery-empty:before {
-  content: "\f244";
+  content: "";
 }
 
 .fa-battery-full:before {
-  content: "\f240";
+  content: "";
 }
 
 .fa-battery-half:before {
-  content: "\f242";
+  content: "";
 }
 
 .fa-battery-quarter:before {
-  content: "\f243";
+  content: "";
 }
 
 .fa-battery-three-quarters:before {
-  content: "\f241";
+  content: "";
 }
 
 .fa-bed:before {
-  content: "\f236";
+  content: "";
 }
 
 .fa-beer:before {
-  content: "\f0fc";
+  content: "";
 }
 
 .fa-behance:before {
-  content: "\f1b4";
+  content: "";
 }
 
 .fa-behance-square:before {
-  content: "\f1b5";
+  content: "";
 }
 
 .fa-bell:before {
-  content: "\f0f3";
+  content: "";
 }
 
 .fa-bell-slash:before {
-  content: "\f1f6";
+  content: "";
 }
 
 .fa-bezier-curve:before {
-  content: "\f55b";
+  content: "";
 }
 
 .fa-bible:before {
-  content: "\f647";
+  content: "";
 }
 
 .fa-bicycle:before {
-  content: "\f206";
+  content: "";
 }
 
 .fa-bimobject:before {
-  content: "\f378";
+  content: "";
 }
 
 .fa-binoculars:before {
-  content: "\f1e5";
+  content: "";
 }
 
 .fa-birthday-cake:before {
-  content: "\f1fd";
+  content: "";
 }
 
 .fa-bitbucket:before {
-  content: "\f171";
+  content: "";
 }
 
 .fa-bitcoin:before {
-  content: "\f379";
+  content: "";
 }
 
 .fa-bity:before {
-  content: "\f37a";
+  content: "";
 }
 
 .fa-black-tie:before {
-  content: "\f27e";
+  content: "";
 }
 
 .fa-blackberry:before {
-  content: "\f37b";
+  content: "";
 }
 
 .fa-blender:before {
-  content: "\f517";
+  content: "";
 }
 
 .fa-blind:before {
-  content: "\f29d";
+  content: "";
 }
 
 .fa-blogger:before {
-  content: "\f37c";
+  content: "";
 }
 
 .fa-blogger-b:before {
-  content: "\f37d";
+  content: "";
 }
 
 .fa-bluetooth:before {
-  content: "\f293";
+  content: "";
 }
 
 .fa-bluetooth-b:before {
-  content: "\f294";
+  content: "";
 }
 
 .fa-bold:before {
-  content: "\f032";
+  content: "";
 }
 
 .fa-bolt:before {
-  content: "\f0e7";
+  content: "";
 }
 
 .fa-bomb:before {
-  content: "\f1e2";
+  content: "";
 }
 
 .fa-bone:before {
-  content: "\f5d7";
+  content: "";
 }
 
 .fa-bong:before {
-  content: "\f55c";
+  content: "";
 }
 
 .fa-book:before {
-  content: "\f02d";
+  content: "";
 }
 
 .fa-book-open:before {
-  content: "\f518";
+  content: "";
 }
 
 .fa-book-reader:before {
-  content: "\f5da";
+  content: "";
 }
 
 .fa-bookmark:before {
-  content: "\f02e";
+  content: "";
 }
 
 .fa-bowling-ball:before {
-  content: "\f436";
+  content: "";
 }
 
 .fa-box:before {
-  content: "\f466";
+  content: "";
 }
 
 .fa-box-open:before {
-  content: "\f49e";
+  content: "";
 }
 
 .fa-boxes:before {
-  content: "\f468";
+  content: "";
 }
 
 .fa-braille:before {
-  content: "\f2a1";
+  content: "";
 }
 
 .fa-brain:before {
-  content: "\f5dc";
+  content: "";
 }
 
 .fa-briefcase:before {
-  content: "\f0b1";
+  content: "";
 }
 
 .fa-briefcase-medical:before {
-  content: "\f469";
+  content: "";
 }
 
 .fa-broadcast-tower:before {
-  content: "\f519";
+  content: "";
 }
 
 .fa-broom:before {
-  content: "\f51a";
+  content: "";
 }
 
 .fa-brush:before {
-  content: "\f55d";
+  content: "";
 }
 
 .fa-btc:before {
-  content: "\f15a";
+  content: "";
 }
 
 .fa-bug:before {
-  content: "\f188";
+  content: "";
 }
 
 .fa-building:before {
-  content: "\f1ad";
+  content: "";
 }
 
 .fa-bullhorn:before {
-  content: "\f0a1";
+  content: "";
 }
 
 .fa-bullseye:before {
-  content: "\f140";
+  content: "";
 }
 
 .fa-burn:before {
-  content: "\f46a";
+  content: "";
 }
 
 .fa-buromobelexperte:before {
-  content: "\f37f";
+  content: "";
 }
 
 .fa-bus:before {
-  content: "\f207";
+  content: "";
 }
 
 .fa-bus-alt:before {
-  content: "\f55e";
+  content: "";
 }
 
 .fa-business-time:before {
-  content: "\f64a";
+  content: "";
 }
 
 .fa-buysellads:before {
-  content: "\f20d";
+  content: "";
 }
 
 .fa-calculator:before {
-  content: "\f1ec";
+  content: "";
 }
 
 .fa-calendar:before {
-  content: "\f133";
+  content: "";
 }
 
 .fa-calendar-alt:before {
-  content: "\f073";
+  content: "";
 }
 
 .fa-calendar-check:before {
-  content: "\f274";
+  content: "";
 }
 
 .fa-calendar-minus:before {
-  content: "\f272";
+  content: "";
 }
 
 .fa-calendar-plus:before {
-  content: "\f271";
+  content: "";
 }
 
 .fa-calendar-times:before {
-  content: "\f273";
+  content: "";
 }
 
 .fa-camera:before {
-  content: "\f030";
+  content: "";
 }
 
 .fa-camera-retro:before {
-  content: "\f083";
+  content: "";
 }
 
 .fa-cannabis:before {
-  content: "\f55f";
+  content: "";
 }
 
 .fa-capsules:before {
-  content: "\f46b";
+  content: "";
 }
 
 .fa-car:before {
-  content: "\f1b9";
+  content: "";
 }
 
 .fa-car-alt:before {
-  content: "\f5de";
+  content: "";
 }
 
 .fa-car-battery:before {
-  content: "\f5df";
+  content: "";
 }
 
 .fa-car-crash:before {
-  content: "\f5e1";
+  content: "";
 }
 
 .fa-car-side:before {
-  content: "\f5e4";
+  content: "";
 }
 
 .fa-caret-down:before {
-  content: "\f0d7";
+  content: "";
 }
 
 .fa-caret-left:before {
-  content: "\f0d9";
+  content: "";
 }
 
 .fa-caret-right:before {
-  content: "\f0da";
+  content: "";
 }
 
 .fa-caret-square-down:before {
-  content: "\f150";
+  content: "";
 }
 
 .fa-caret-square-left:before {
-  content: "\f191";
+  content: "";
 }
 
 .fa-caret-square-right:before {
-  content: "\f152";
+  content: "";
 }
 
 .fa-caret-square-up:before {
-  content: "\f151";
+  content: "";
 }
 
 .fa-caret-up:before {
-  content: "\f0d8";
+  content: "";
 }
 
 .fa-cart-arrow-down:before {
-  content: "\f218";
+  content: "";
 }
 
 .fa-cart-plus:before {
-  content: "\f217";
+  content: "";
 }
 
 .fa-cc-amazon-pay:before {
-  content: "\f42d";
+  content: "";
 }
 
 .fa-cc-amex:before {
-  content: "\f1f3";
+  content: "";
 }
 
 .fa-cc-apple-pay:before {
-  content: "\f416";
+  content: "";
 }
 
 .fa-cc-diners-club:before {
-  content: "\f24c";
+  content: "";
 }
 
 .fa-cc-discover:before {
-  content: "\f1f2";
+  content: "";
 }
 
 .fa-cc-jcb:before {
-  content: "\f24b";
+  content: "";
 }
 
 .fa-cc-mastercard:before {
-  content: "\f1f1";
+  content: "";
 }
 
 .fa-cc-paypal:before {
-  content: "\f1f4";
+  content: "";
 }
 
 .fa-cc-stripe:before {
-  content: "\f1f5";
+  content: "";
 }
 
 .fa-cc-visa:before {
-  content: "\f1f0";
+  content: "";
 }
 
 .fa-centercode:before {
-  content: "\f380";
+  content: "";
 }
 
 .fa-certificate:before {
-  content: "\f0a3";
+  content: "";
 }
 
 .fa-chalkboard:before {
-  content: "\f51b";
+  content: "";
 }
 
 .fa-chalkboard-teacher:before {
-  content: "\f51c";
+  content: "";
 }
 
 .fa-charging-station:before {
-  content: "\f5e7";
+  content: "";
 }
 
 .fa-chart-area:before {
-  content: "\f1fe";
+  content: "";
 }
 
 .fa-chart-bar:before {
-  content: "\f080";
+  content: "";
 }
 
 .fa-chart-line:before {
-  content: "\f201";
+  content: "";
 }
 
 .fa-chart-pie:before {
-  content: "\f200";
+  content: "";
 }
 
 .fa-check:before {
-  content: "\f00c";
+  content: "";
 }
 
 .fa-check-circle:before {
-  content: "\f058";
+  content: "";
 }
 
 .fa-check-double:before {
-  content: "\f560";
+  content: "";
 }
 
 .fa-check-square:before {
-  content: "\f14a";
+  content: "";
 }
 
 .fa-chess:before {
-  content: "\f439";
+  content: "";
 }
 
 .fa-chess-bishop:before {
-  content: "\f43a";
+  content: "";
 }
 
 .fa-chess-board:before {
-  content: "\f43c";
+  content: "";
 }
 
 .fa-chess-king:before {
-  content: "\f43f";
+  content: "";
 }
 
 .fa-chess-knight:before {
-  content: "\f441";
+  content: "";
 }
 
 .fa-chess-pawn:before {
-  content: "\f443";
+  content: "";
 }
 
 .fa-chess-queen:before {
-  content: "\f445";
+  content: "";
 }
 
 .fa-chess-rook:before {
-  content: "\f447";
+  content: "";
 }
 
 .fa-chevron-circle-down:before {
-  content: "\f13a";
+  content: "";
 }
 
 .fa-chevron-circle-left:before {
-  content: "\f137";
+  content: "";
 }
 
 .fa-chevron-circle-right:before {
-  content: "\f138";
+  content: "";
 }
 
 .fa-chevron-circle-up:before {
-  content: "\f139";
+  content: "";
 }
 
 .fa-chevron-down:before {
-  content: "\f078";
+  content: "";
 }
 
 .fa-chevron-left:before {
-  content: "\f053";
+  content: "";
 }
 
 .fa-chevron-right:before {
-  content: "\f054";
+  content: "";
 }
 
 .fa-chevron-up:before {
-  content: "\f077";
+  content: "";
 }
 
 .fa-child:before {
-  content: "\f1ae";
+  content: "";
 }
 
 .fa-chrome:before {
-  content: "\f268";
+  content: "";
 }
 
 .fa-church:before {
-  content: "\f51d";
+  content: "";
 }
 
 .fa-circle:before {
-  content: "\f111";
+  content: "";
 }
 
 .fa-circle-notch:before {
-  content: "\f1ce";
+  content: "";
 }
 
 .fa-city:before {
-  content: "\f64f";
+  content: "";
 }
 
 .fa-clipboard:before {
-  content: "\f328";
+  content: "";
 }
 
 .fa-clipboard-check:before {
-  content: "\f46c";
+  content: "";
 }
 
 .fa-clipboard-list:before {
-  content: "\f46d";
+  content: "";
 }
 
 .fa-clock:before {
-  content: "\f017";
+  content: "";
 }
 
 .fa-clone:before {
-  content: "\f24d";
+  content: "";
 }
 
 .fa-closed-captioning:before {
-  content: "\f20a";
+  content: "";
 }
 
 .fa-cloud:before {
-  content: "\f0c2";
+  content: "";
 }
 
 .fa-cloud-download-alt:before {
-  content: "\f381";
+  content: "";
 }
 
 .fa-cloud-upload-alt:before {
-  content: "\f382";
+  content: "";
 }
 
 .fa-cloudscale:before {
-  content: "\f383";
+  content: "";
 }
 
 .fa-cloudsmith:before {
-  content: "\f384";
+  content: "";
 }
 
 .fa-cloudversify:before {
-  content: "\f385";
+  content: "";
 }
 
 .fa-cocktail:before {
-  content: "\f561";
+  content: "";
 }
 
 .fa-code:before {
-  content: "\f121";
+  content: "";
 }
 
 .fa-code-branch:before {
-  content: "\f126";
+  content: "";
 }
 
 .fa-codepen:before {
-  content: "\f1cb";
+  content: "";
 }
 
 .fa-codiepie:before {
-  content: "\f284";
+  content: "";
 }
 
 .fa-coffee:before {
-  content: "\f0f4";
+  content: "";
 }
 
 .fa-cog:before {
-  content: "\f013";
+  content: "";
 }
 
 .fa-cogs:before {
-  content: "\f085";
+  content: "";
 }
 
 .fa-coins:before {
-  content: "\f51e";
+  content: "";
 }
 
 .fa-columns:before {
-  content: "\f0db";
+  content: "";
 }
 
 .fa-comment:before {
-  content: "\f075";
+  content: "";
 }
 
 .fa-comment-alt:before {
-  content: "\f27a";
+  content: "";
 }
 
 .fa-comment-dollar:before {
-  content: "\f651";
+  content: "";
 }
 
 .fa-comment-dots:before {
-  content: "\f4ad";
+  content: "";
 }
 
 .fa-comment-slash:before {
-  content: "\f4b3";
+  content: "";
 }
 
 .fa-comments:before {
-  content: "\f086";
+  content: "";
 }
 
 .fa-comments-dollar:before {
-  content: "\f653";
+  content: "";
 }
 
 .fa-compact-disc:before {
-  content: "\f51f";
+  content: "";
 }
 
 .fa-compass:before {
-  content: "\f14e";
+  content: "";
 }
 
 .fa-compress:before {
-  content: "\f066";
+  content: "";
 }
 
 .fa-concierge-bell:before {
-  content: "\f562";
+  content: "";
 }
 
 .fa-connectdevelop:before {
-  content: "\f20e";
+  content: "";
 }
 
 .fa-contao:before {
-  content: "\f26d";
+  content: "";
 }
 
 .fa-cookie:before {
-  content: "\f563";
+  content: "";
 }
 
 .fa-cookie-bite:before {
-  content: "\f564";
+  content: "";
 }
 
 .fa-copy:before {
-  content: "\f0c5";
+  content: "";
 }
 
 .fa-copyright:before {
-  content: "\f1f9";
+  content: "";
 }
 
 .fa-couch:before {
-  content: "\f4b8";
+  content: "";
 }
 
 .fa-cpanel:before {
-  content: "\f388";
+  content: "";
 }
 
 .fa-creative-commons:before {
-  content: "\f25e";
+  content: "";
 }
 
 .fa-creative-commons-by:before {
-  content: "\f4e7";
+  content: "";
 }
 
 .fa-creative-commons-nc:before {
-  content: "\f4e8";
+  content: "";
 }
 
 .fa-creative-commons-nc-eu:before {
-  content: "\f4e9";
+  content: "";
 }
 
 .fa-creative-commons-nc-jp:before {
-  content: "\f4ea";
+  content: "";
 }
 
 .fa-creative-commons-nd:before {
-  content: "\f4eb";
+  content: "";
 }
 
 .fa-creative-commons-pd:before {
-  content: "\f4ec";
+  content: "";
 }
 
 .fa-creative-commons-pd-alt:before {
-  content: "\f4ed";
+  content: "";
 }
 
 .fa-creative-commons-remix:before {
-  content: "\f4ee";
+  content: "";
 }
 
 .fa-creative-commons-sa:before {
-  content: "\f4ef";
+  content: "";
 }
 
 .fa-creative-commons-sampling:before {
-  content: "\f4f0";
+  content: "";
 }
 
 .fa-creative-commons-sampling-plus:before {
-  content: "\f4f1";
+  content: "";
 }
 
 .fa-creative-commons-share:before {
-  content: "\f4f2";
+  content: "";
 }
 
 .fa-credit-card:before {
-  content: "\f09d";
+  content: "";
 }
 
 .fa-crop:before {
-  content: "\f125";
+  content: "";
 }
 
 .fa-crop-alt:before {
-  content: "\f565";
+  content: "";
 }
 
 .fa-cross:before {
-  content: "\f654";
+  content: "";
 }
 
 .fa-crosshairs:before {
-  content: "\f05b";
+  content: "";
 }
 
 .fa-crow:before {
-  content: "\f520";
+  content: "";
 }
 
 .fa-crown:before {
-  content: "\f521";
+  content: "";
 }
 
 .fa-css3:before {
-  content: "\f13c";
+  content: "";
 }
 
 .fa-css3-alt:before {
-  content: "\f38b";
+  content: "";
 }
 
 .fa-cube:before {
-  content: "\f1b2";
+  content: "";
 }
 
 .fa-cubes:before {
-  content: "\f1b3";
+  content: "";
 }
 
 .fa-cut:before {
-  content: "\f0c4";
+  content: "";
 }
 
 .fa-cuttlefish:before {
-  content: "\f38c";
+  content: "";
 }
 
 .fa-d-and-d:before {
-  content: "\f38d";
+  content: "";
 }
 
 .fa-dashcube:before {
-  content: "\f210";
+  content: "";
 }
 
 .fa-database:before {
-  content: "\f1c0";
+  content: "";
 }
 
 .fa-deaf:before {
-  content: "\f2a4";
+  content: "";
 }
 
 .fa-delicious:before {
-  content: "\f1a5";
+  content: "";
 }
 
 .fa-deploydog:before {
-  content: "\f38e";
+  content: "";
 }
 
 .fa-deskpro:before {
-  content: "\f38f";
+  content: "";
 }
 
 .fa-desktop:before {
-  content: "\f108";
+  content: "";
 }
 
 .fa-deviantart:before {
-  content: "\f1bd";
+  content: "";
 }
 
 .fa-dharmachakra:before {
-  content: "\f655";
+  content: "";
 }
 
 .fa-diagnoses:before {
-  content: "\f470";
+  content: "";
 }
 
 .fa-dice:before {
-  content: "\f522";
+  content: "";
 }
 
 .fa-dice-five:before {
-  content: "\f523";
+  content: "";
 }
 
 .fa-dice-four:before {
-  content: "\f524";
+  content: "";
 }
 
 .fa-dice-one:before {
-  content: "\f525";
+  content: "";
 }
 
 .fa-dice-six:before {
-  content: "\f526";
+  content: "";
 }
 
 .fa-dice-three:before {
-  content: "\f527";
+  content: "";
 }
 
 .fa-dice-two:before {
-  content: "\f528";
+  content: "";
 }
 
 .fa-digg:before {
-  content: "\f1a6";
+  content: "";
 }
 
 .fa-digital-ocean:before {
-  content: "\f391";
+  content: "";
 }
 
 .fa-digital-tachograph:before {
-  content: "\f566";
+  content: "";
 }
 
 .fa-directions:before {
-  content: "\f5eb";
+  content: "";
 }
 
 .fa-discord:before {
-  content: "\f392";
+  content: "";
 }
 
 .fa-discourse:before {
-  content: "\f393";
+  content: "";
 }
 
 .fa-divide:before {
-  content: "\f529";
+  content: "";
 }
 
 .fa-dizzy:before {
-  content: "\f567";
+  content: "";
 }
 
 .fa-dna:before {
-  content: "\f471";
+  content: "";
 }
 
 .fa-dochub:before {
-  content: "\f394";
+  content: "";
 }
 
 .fa-docker:before {
-  content: "\f395";
+  content: "";
 }
 
 .fa-dollar-sign:before {
-  content: "\f155";
+  content: "";
 }
 
 .fa-dolly:before {
-  content: "\f472";
+  content: "";
 }
 
 .fa-dolly-flatbed:before {
-  content: "\f474";
+  content: "";
 }
 
 .fa-donate:before {
-  content: "\f4b9";
+  content: "";
 }
 
 .fa-door-closed:before {
-  content: "\f52a";
+  content: "";
 }
 
 .fa-door-open:before {
-  content: "\f52b";
+  content: "";
 }
 
 .fa-dot-circle:before {
-  content: "\f192";
+  content: "";
 }
 
 .fa-dove:before {
-  content: "\f4ba";
+  content: "";
 }
 
 .fa-download:before {
-  content: "\f019";
+  content: "";
 }
 
 .fa-draft2digital:before {
-  content: "\f396";
+  content: "";
 }
 
 .fa-drafting-compass:before {
-  content: "\f568";
+  content: "";
 }
 
 .fa-draw-polygon:before {
-  content: "\f5ee";
+  content: "";
 }
 
 .fa-dribbble:before {
-  content: "\f17d";
+  content: "";
 }
 
 .fa-dribbble-square:before {
-  content: "\f397";
+  content: "";
 }
 
 .fa-dropbox:before {
-  content: "\f16b";
+  content: "";
 }
 
 .fa-drum:before {
-  content: "\f569";
+  content: "";
 }
 
 .fa-drum-steelpan:before {
-  content: "\f56a";
+  content: "";
 }
 
 .fa-drupal:before {
-  content: "\f1a9";
+  content: "";
 }
 
 .fa-dumbbell:before {
-  content: "\f44b";
+  content: "";
 }
 
 .fa-dyalog:before {
-  content: "\f399";
+  content: "";
 }
 
 .fa-earlybirds:before {
-  content: "\f39a";
+  content: "";
 }
 
 .fa-ebay:before {
-  content: "\f4f4";
+  content: "";
 }
 
 .fa-edge:before {
-  content: "\f282";
+  content: "";
 }
 
 .fa-edit:before {
-  content: "\f044";
+  content: "";
 }
 
 .fa-eject:before {
-  content: "\f052";
+  content: "";
 }
 
 .fa-elementor:before {
-  content: "\f430";
+  content: "";
 }
 
 .fa-ellipsis-h:before {
-  content: "\f141";
+  content: "";
 }
 
 .fa-ellipsis-v:before {
-  content: "\f142";
+  content: "";
 }
 
 .fa-ello:before {
-  content: "\f5f1";
+  content: "";
 }
 
 .fa-ember:before {
-  content: "\f423";
+  content: "";
 }
 
 .fa-empire:before {
-  content: "\f1d1";
+  content: "";
 }
 
 .fa-envelope:before {
-  content: "\f0e0";
+  content: "";
 }
 
 .fa-envelope-open:before {
-  content: "\f2b6";
+  content: "";
 }
 
 .fa-envelope-open-text:before {
-  content: "\f658";
+  content: "";
 }
 
 .fa-envelope-square:before {
-  content: "\f199";
+  content: "";
 }
 
 .fa-envira:before {
-  content: "\f299";
+  content: "";
 }
 
 .fa-equals:before {
-  content: "\f52c";
+  content: "";
 }
 
 .fa-eraser:before {
-  content: "\f12d";
+  content: "";
 }
 
 .fa-erlang:before {
-  content: "\f39d";
+  content: "";
 }
 
 .fa-ethereum:before {
-  content: "\f42e";
+  content: "";
 }
 
 .fa-etsy:before {
-  content: "\f2d7";
+  content: "";
 }
 
 .fa-euro-sign:before {
-  content: "\f153";
+  content: "";
 }
 
 .fa-exchange-alt:before {
-  content: "\f362";
+  content: "";
 }
 
 .fa-exclamation:before {
-  content: "\f12a";
+  content: "";
 }
 
 .fa-exclamation-circle:before {
-  content: "\f06a";
+  content: "";
 }
 
 .fa-exclamation-triangle:before {
-  content: "\f071";
+  content: "";
 }
 
 .fa-expand:before {
-  content: "\f065";
+  content: "";
 }
 
 .fa-expand-arrows-alt:before {
-  content: "\f31e";
+  content: "";
 }
 
 .fa-expeditedssl:before {
-  content: "\f23e";
+  content: "";
 }
 
 .fa-external-link-alt:before {
-  content: "\f35d";
+  content: "";
 }
 
 .fa-external-link-square-alt:before {
-  content: "\f360";
+  content: "";
 }
 
 .fa-eye:before {
-  content: "\f06e";
+  content: "";
 }
 
 .fa-eye-dropper:before {
-  content: "\f1fb";
+  content: "";
 }
 
 .fa-eye-slash:before {
-  content: "\f070";
+  content: "";
 }
 
 .fa-facebook:before {
-  content: "\f09a";
+  content: "";
 }
 
 .fa-facebook-f:before {
-  content: "\f39e";
+  content: "";
 }
 
 .fa-facebook-messenger:before {
-  content: "\f39f";
+  content: "";
 }
 
 .fa-facebook-square:before {
-  content: "\f082";
+  content: "";
 }
 
 .fa-fast-backward:before {
-  content: "\f049";
+  content: "";
 }
 
 .fa-fast-forward:before {
-  content: "\f050";
+  content: "";
 }
 
 .fa-fax:before {
-  content: "\f1ac";
+  content: "";
 }
 
 .fa-feather:before {
-  content: "\f52d";
+  content: "";
 }
 
 .fa-feather-alt:before {
-  content: "\f56b";
+  content: "";
 }
 
 .fa-female:before {
-  content: "\f182";
+  content: "";
 }
 
 .fa-fighter-jet:before {
-  content: "\f0fb";
+  content: "";
 }
 
 .fa-file:before {
-  content: "\f15b";
+  content: "";
 }
 
 .fa-file-alt:before {
-  content: "\f15c";
+  content: "";
 }
 
 .fa-file-archive:before {
-  content: "\f1c6";
+  content: "";
 }
 
 .fa-file-audio:before {
-  content: "\f1c7";
+  content: "";
 }
 
 .fa-file-code:before {
-  content: "\f1c9";
+  content: "";
 }
 
 .fa-file-contract:before {
-  content: "\f56c";
+  content: "";
 }
 
 .fa-file-download:before {
-  content: "\f56d";
+  content: "";
 }
 
 .fa-file-excel:before {
-  content: "\f1c3";
+  content: "";
 }
 
 .fa-file-export:before {
-  content: "\f56e";
+  content: "";
 }
 
 .fa-file-image:before {
-  content: "\f1c5";
+  content: "";
 }
 
 .fa-file-import:before {
-  content: "\f56f";
+  content: "";
 }
 
 .fa-file-invoice:before {
-  content: "\f570";
+  content: "";
 }
 
 .fa-file-invoice-dollar:before {
-  content: "\f571";
+  content: "";
 }
 
 .fa-file-medical:before {
-  content: "\f477";
+  content: "";
 }
 
 .fa-file-medical-alt:before {
-  content: "\f478";
+  content: "";
 }
 
 .fa-file-pdf:before {
-  content: "\f1c1";
+  content: "";
 }
 
 .fa-file-powerpoint:before {
-  content: "\f1c4";
+  content: "";
 }
 
 .fa-file-prescription:before {
-  content: "\f572";
+  content: "";
 }
 
 .fa-file-signature:before {
-  content: "\f573";
+  content: "";
 }
 
 .fa-file-upload:before {
-  content: "\f574";
+  content: "";
 }
 
 .fa-file-video:before {
-  content: "\f1c8";
+  content: "";
 }
 
 .fa-file-word:before {
-  content: "\f1c2";
+  content: "";
 }
 
 .fa-fill:before {
-  content: "\f575";
+  content: "";
 }
 
 .fa-fill-drip:before {
-  content: "\f576";
+  content: "";
 }
 
 .fa-film:before {
-  content: "\f008";
+  content: "";
 }
 
 .fa-filter:before {
-  content: "\f0b0";
+  content: "";
 }
 
 .fa-fingerprint:before {
-  content: "\f577";
+  content: "";
 }
 
 .fa-fire:before {
-  content: "\f06d";
+  content: "";
 }
 
 .fa-fire-extinguisher:before {
-  content: "\f134";
+  content: "";
 }
 
 .fa-firefox:before {
-  content: "\f269";
+  content: "";
 }
 
 .fa-first-aid:before {
-  content: "\f479";
+  content: "";
 }
 
 .fa-first-order:before {
-  content: "\f2b0";
+  content: "";
 }
 
 .fa-first-order-alt:before {
-  content: "\f50a";
+  content: "";
 }
 
 .fa-firstdraft:before {
-  content: "\f3a1";
+  content: "";
 }
 
 .fa-fish:before {
-  content: "\f578";
+  content: "";
 }
 
 .fa-flag:before {
-  content: "\f024";
+  content: "";
 }
 
 .fa-flag-checkered:before {
-  content: "\f11e";
+  content: "";
 }
 
 .fa-flask:before {
-  content: "\f0c3";
+  content: "";
 }
 
 .fa-flickr:before {
-  content: "\f16e";
+  content: "";
 }
 
 .fa-flipboard:before {
-  content: "\f44d";
+  content: "";
 }
 
 .fa-flushed:before {
-  content: "\f579";
+  content: "";
 }
 
 .fa-fly:before {
-  content: "\f417";
+  content: "";
 }
 
 .fa-folder:before {
-  content: "\f07b";
+  content: "";
 }
 
 .fa-folder-minus:before {
-  content: "\f65d";
+  content: "";
 }
 
 .fa-folder-open:before {
-  content: "\f07c";
+  content: "";
 }
 
 .fa-folder-plus:before {
-  content: "\f65e";
+  content: "";
 }
 
 .fa-font:before {
-  content: "\f031";
+  content: "";
 }
 
 .fa-font-awesome:before {
-  content: "\f2b4";
+  content: "";
 }
 
 .fa-font-awesome-alt:before {
-  content: "\f35c";
+  content: "";
 }
 
 .fa-font-awesome-flag:before {
-  content: "\f425";
+  content: "";
 }
 
 .fa-font-awesome-logo-full:before {
-  content: "\f4e6";
+  content: "";
 }
 
 .fa-fonticons:before {
-  content: "\f280";
+  content: "";
 }
 
 .fa-fonticons-fi:before {
-  content: "\f3a2";
+  content: "";
 }
 
 .fa-football-ball:before {
-  content: "\f44e";
+  content: "";
 }
 
 .fa-fort-awesome:before {
-  content: "\f286";
+  content: "";
 }
 
 .fa-fort-awesome-alt:before {
-  content: "\f3a3";
+  content: "";
 }
 
 .fa-forumbee:before {
-  content: "\f211";
+  content: "";
 }
 
 .fa-forward:before {
-  content: "\f04e";
+  content: "";
 }
 
 .fa-foursquare:before {
-  content: "\f180";
+  content: "";
 }
 
 .fa-free-code-camp:before {
-  content: "\f2c5";
+  content: "";
 }
 
 .fa-freebsd:before {
-  content: "\f3a4";
+  content: "";
 }
 
 .fa-frog:before {
-  content: "\f52e";
+  content: "";
 }
 
 .fa-frown:before {
-  content: "\f119";
+  content: "";
 }
 
 .fa-frown-open:before {
-  content: "\f57a";
+  content: "";
 }
 
 .fa-fulcrum:before {
-  content: "\f50b";
+  content: "";
 }
 
 .fa-funnel-dollar:before {
-  content: "\f662";
+  content: "";
 }
 
 .fa-futbol:before {
-  content: "\f1e3";
+  content: "";
 }
 
 .fa-galactic-republic:before {
-  content: "\f50c";
+  content: "";
 }
 
 .fa-galactic-senate:before {
-  content: "\f50d";
+  content: "";
 }
 
 .fa-gamepad:before {
-  content: "\f11b";
+  content: "";
 }
 
 .fa-gas-pump:before {
-  content: "\f52f";
+  content: "";
 }
 
 .fa-gavel:before {
-  content: "\f0e3";
+  content: "";
 }
 
 .fa-gem:before {
-  content: "\f3a5";
+  content: "";
 }
 
 .fa-genderless:before {
-  content: "\f22d";
+  content: "";
 }
 
 .fa-get-pocket:before {
-  content: "\f265";
+  content: "";
 }
 
 .fa-gg:before {
-  content: "\f260";
+  content: "";
 }
 
 .fa-gg-circle:before {
-  content: "\f261";
+  content: "";
 }
 
 .fa-gift:before {
-  content: "\f06b";
+  content: "";
 }
 
 .fa-git:before {
-  content: "\f1d3";
+  content: "";
 }
 
 .fa-git-square:before {
-  content: "\f1d2";
+  content: "";
 }
 
 .fa-github:before {
-  content: "\f09b";
+  content: "";
 }
 
 .fa-github-alt:before {
-  content: "\f113";
+  content: "";
 }
 
 .fa-github-square:before {
-  content: "\f092";
+  content: "";
 }
 
 .fa-gitkraken:before {
-  content: "\f3a6";
+  content: "";
 }
 
 .fa-gitlab:before {
-  content: "\f296";
+  content: "";
 }
 
 .fa-gitter:before {
-  content: "\f426";
+  content: "";
 }
 
 .fa-glass-martini:before {
-  content: "\f000";
+  content: "";
 }
 
 .fa-glass-martini-alt:before {
-  content: "\f57b";
+  content: "";
 }
 
 .fa-glasses:before {
-  content: "\f530";
+  content: "";
 }
 
 .fa-glide:before {
-  content: "\f2a5";
+  content: "";
 }
 
 .fa-glide-g:before {
-  content: "\f2a6";
+  content: "";
 }
 
 .fa-globe:before {
-  content: "\f0ac";
+  content: "";
 }
 
 .fa-globe-africa:before {
-  content: "\f57c";
+  content: "";
 }
 
 .fa-globe-americas:before {
-  content: "\f57d";
+  content: "";
 }
 
 .fa-globe-asia:before {
-  content: "\f57e";
+  content: "";
 }
 
 .fa-gofore:before {
-  content: "\f3a7";
+  content: "";
 }
 
 .fa-golf-ball:before {
-  content: "\f450";
+  content: "";
 }
 
 .fa-goodreads:before {
-  content: "\f3a8";
+  content: "";
 }
 
 .fa-goodreads-g:before {
-  content: "\f3a9";
+  content: "";
 }
 
 .fa-google:before {
-  content: "\f1a0";
+  content: "";
 }
 
 .fa-google-drive:before {
-  content: "\f3aa";
+  content: "";
 }
 
 .fa-google-play:before {
-  content: "\f3ab";
+  content: "";
 }
 
 .fa-google-plus:before {
-  content: "\f2b3";
+  content: "";
 }
 
 .fa-google-plus-g:before {
-  content: "\f0d5";
+  content: "";
 }
 
 .fa-google-plus-square:before {
-  content: "\f0d4";
+  content: "";
 }
 
 .fa-google-wallet:before {
-  content: "\f1ee";
+  content: "";
 }
 
 .fa-gopuram:before {
-  content: "\f664";
+  content: "";
 }
 
 .fa-graduation-cap:before {
-  content: "\f19d";
+  content: "";
 }
 
 .fa-gratipay:before {
-  content: "\f184";
+  content: "";
 }
 
 .fa-grav:before {
-  content: "\f2d6";
+  content: "";
 }
 
 .fa-greater-than:before {
-  content: "\f531";
+  content: "";
 }
 
 .fa-greater-than-equal:before {
-  content: "\f532";
+  content: "";
 }
 
 .fa-grimace:before {
-  content: "\f57f";
+  content: "";
 }
 
 .fa-grin:before {
-  content: "\f580";
+  content: "";
 }
 
 .fa-grin-alt:before {
-  content: "\f581";
+  content: "";
 }
 
 .fa-grin-beam:before {
-  content: "\f582";
+  content: "";
 }
 
 .fa-grin-beam-sweat:before {
-  content: "\f583";
+  content: "";
 }
 
 .fa-grin-hearts:before {
-  content: "\f584";
+  content: "";
 }
 
 .fa-grin-squint:before {
-  content: "\f585";
+  content: "";
 }
 
 .fa-grin-squint-tears:before {
-  content: "\f586";
+  content: "";
 }
 
 .fa-grin-stars:before {
-  content: "\f587";
+  content: "";
 }
 
 .fa-grin-tears:before {
-  content: "\f588";
+  content: "";
 }
 
 .fa-grin-tongue:before {
-  content: "\f589";
+  content: "";
 }
 
 .fa-grin-tongue-squint:before {
-  content: "\f58a";
+  content: "";
 }
 
 .fa-grin-tongue-wink:before {
-  content: "\f58b";
+  content: "";
 }
 
 .fa-grin-wink:before {
-  content: "\f58c";
+  content: "";
 }
 
 .fa-grip-horizontal:before {
-  content: "\f58d";
+  content: "";
 }
 
 .fa-grip-vertical:before {
-  content: "\f58e";
+  content: "";
 }
 
 .fa-gripfire:before {
-  content: "\f3ac";
+  content: "";
 }
 
 .fa-grunt:before {
-  content: "\f3ad";
+  content: "";
 }
 
 .fa-gulp:before {
-  content: "\f3ae";
+  content: "";
 }
 
 .fa-h-square:before {
-  content: "\f0fd";
+  content: "";
 }
 
 .fa-hacker-news:before {
-  content: "\f1d4";
+  content: "";
 }
 
 .fa-hacker-news-square:before {
-  content: "\f3af";
+  content: "";
 }
 
 .fa-hackerrank:before {
-  content: "\f5f7";
+  content: "";
 }
 
 .fa-hamsa:before {
-  content: "\f665";
+  content: "";
 }
 
 .fa-hand-holding:before {
-  content: "\f4bd";
+  content: "";
 }
 
 .fa-hand-holding-heart:before {
-  content: "\f4be";
+  content: "";
 }
 
 .fa-hand-holding-usd:before {
-  content: "\f4c0";
+  content: "";
 }
 
 .fa-hand-lizard:before {
-  content: "\f258";
+  content: "";
 }
 
 .fa-hand-paper:before {
-  content: "\f256";
+  content: "";
 }
 
 .fa-hand-peace:before {
-  content: "\f25b";
+  content: "";
 }
 
 .fa-hand-point-down:before {
-  content: "\f0a7";
+  content: "";
 }
 
 .fa-hand-point-left:before {
-  content: "\f0a5";
+  content: "";
 }
 
 .fa-hand-point-right:before {
-  content: "\f0a4";
+  content: "";
 }
 
 .fa-hand-point-up:before {
-  content: "\f0a6";
+  content: "";
 }
 
 .fa-hand-pointer:before {
-  content: "\f25a";
+  content: "";
 }
 
 .fa-hand-rock:before {
-  content: "\f255";
+  content: "";
 }
 
 .fa-hand-scissors:before {
-  content: "\f257";
+  content: "";
 }
 
 .fa-hand-spock:before {
-  content: "\f259";
+  content: "";
 }
 
 .fa-hands:before {
-  content: "\f4c2";
+  content: "";
 }
 
 .fa-hands-helping:before {
-  content: "\f4c4";
+  content: "";
 }
 
 .fa-handshake:before {
-  content: "\f2b5";
+  content: "";
 }
 
 .fa-hashtag:before {
-  content: "\f292";
+  content: "";
 }
 
 .fa-haykal:before {
-  content: "\f666";
+  content: "";
 }
 
 .fa-hdd:before {
-  content: "\f0a0";
+  content: "";
 }
 
 .fa-heading:before {
-  content: "\f1dc";
+  content: "";
 }
 
 .fa-headphones:before {
-  content: "\f025";
+  content: "";
 }
 
 .fa-headphones-alt:before {
-  content: "\f58f";
+  content: "";
 }
 
 .fa-headset:before {
-  content: "\f590";
+  content: "";
 }
 
 .fa-heart:before {
-  content: "\f004";
+  content: "";
 }
 
 .fa-heartbeat:before {
-  content: "\f21e";
+  content: "";
 }
 
 .fa-helicopter:before {
-  content: "\f533";
+  content: "";
 }
 
 .fa-highlighter:before {
-  content: "\f591";
+  content: "";
 }
 
 .fa-hips:before {
-  content: "\f452";
+  content: "";
 }
 
 .fa-hire-a-helper:before {
-  content: "\f3b0";
+  content: "";
 }
 
 .fa-history:before {
-  content: "\f1da";
+  content: "";
 }
 
 .fa-hockey-puck:before {
-  content: "\f453";
+  content: "";
 }
 
 .fa-home:before {
-  content: "\f015";
+  content: "";
 }
 
 .fa-hooli:before {
-  content: "\f427";
+  content: "";
 }
 
 .fa-hornbill:before {
-  content: "\f592";
+  content: "";
 }
 
 .fa-hospital:before {
-  content: "\f0f8";
+  content: "";
 }
 
 .fa-hospital-alt:before {
-  content: "\f47d";
+  content: "";
 }
 
 .fa-hospital-symbol:before {
-  content: "\f47e";
+  content: "";
 }
 
 .fa-hot-tub:before {
-  content: "\f593";
+  content: "";
 }
 
 .fa-hotel:before {
-  content: "\f594";
+  content: "";
 }
 
 .fa-hotjar:before {
-  content: "\f3b1";
+  content: "";
 }
 
 .fa-hourglass:before {
-  content: "\f254";
+  content: "";
 }
 
 .fa-hourglass-end:before {
-  content: "\f253";
+  content: "";
 }
 
 .fa-hourglass-half:before {
-  content: "\f252";
+  content: "";
 }
 
 .fa-hourglass-start:before {
-  content: "\f251";
+  content: "";
 }
 
 .fa-houzz:before {
-  content: "\f27c";
+  content: "";
 }
 
 .fa-html5:before {
-  content: "\f13b";
+  content: "";
 }
 
 .fa-hubspot:before {
-  content: "\f3b2";
+  content: "";
 }
 
 .fa-i-cursor:before {
-  content: "\f246";
+  content: "";
 }
 
 .fa-id-badge:before {
-  content: "\f2c1";
+  content: "";
 }
 
 .fa-id-card:before {
-  content: "\f2c2";
+  content: "";
 }
 
 .fa-id-card-alt:before {
-  content: "\f47f";
+  content: "";
 }
 
 .fa-image:before {
-  content: "\f03e";
+  content: "";
 }
 
 .fa-images:before {
-  content: "\f302";
+  content: "";
 }
 
 .fa-imdb:before {
-  content: "\f2d8";
+  content: "";
 }
 
 .fa-inbox:before {
-  content: "\f01c";
+  content: "";
 }
 
 .fa-indent:before {
-  content: "\f03c";
+  content: "";
 }
 
 .fa-industry:before {
-  content: "\f275";
+  content: "";
 }
 
 .fa-infinity:before {
-  content: "\f534";
+  content: "";
 }
 
 .fa-info:before {
-  content: "\f129";
+  content: "";
 }
 
 .fa-info-circle:before {
-  content: "\f05a";
+  content: "";
 }
 
 .fa-instagram:before {
-  content: "\f16d";
+  content: "";
 }
 
 .fa-internet-explorer:before {
-  content: "\f26b";
+  content: "";
 }
 
 .fa-ioxhost:before {
-  content: "\f208";
+  content: "";
 }
 
 .fa-italic:before {
-  content: "\f033";
+  content: "";
 }
 
 .fa-itunes:before {
-  content: "\f3b4";
+  content: "";
 }
 
 .fa-itunes-note:before {
-  content: "\f3b5";
+  content: "";
 }
 
 .fa-java:before {
-  content: "\f4e4";
+  content: "";
 }
 
 .fa-jedi:before {
-  content: "\f669";
+  content: "";
 }
 
 .fa-jedi-order:before {
-  content: "\f50e";
+  content: "";
 }
 
 .fa-jenkins:before {
-  content: "\f3b6";
+  content: "";
 }
 
 .fa-joget:before {
-  content: "\f3b7";
+  content: "";
 }
 
 .fa-joint:before {
-  content: "\f595";
+  content: "";
 }
 
 .fa-joomla:before {
-  content: "\f1aa";
+  content: "";
 }
 
 .fa-journal-whills:before {
-  content: "\f66a";
+  content: "";
 }
 
 .fa-js:before {
-  content: "\f3b8";
+  content: "";
 }
 
 .fa-js-square:before {
-  content: "\f3b9";
+  content: "";
 }
 
 .fa-jsfiddle:before {
-  content: "\f1cc";
+  content: "";
 }
 
 .fa-kaaba:before {
-  content: "\f66b";
+  content: "";
 }
 
 .fa-kaggle:before {
-  content: "\f5fa";
+  content: "";
 }
 
 .fa-key:before {
-  content: "\f084";
+  content: "";
 }
 
 .fa-keybase:before {
-  content: "\f4f5";
+  content: "";
 }
 
 .fa-keyboard:before {
-  content: "\f11c";
+  content: "";
 }
 
 .fa-keycdn:before {
-  content: "\f3ba";
+  content: "";
 }
 
 .fa-khanda:before {
-  content: "\f66d";
+  content: "";
 }
 
 .fa-kickstarter:before {
-  content: "\f3bb";
+  content: "";
 }
 
 .fa-kickstarter-k:before {
-  content: "\f3bc";
+  content: "";
 }
 
 .fa-kiss:before {
-  content: "\f596";
+  content: "";
 }
 
 .fa-kiss-beam:before {
-  content: "\f597";
+  content: "";
 }
 
 .fa-kiss-wink-heart:before {
-  content: "\f598";
+  content: "";
 }
 
 .fa-kiwi-bird:before {
-  content: "\f535";
+  content: "";
 }
 
 .fa-korvue:before {
-  content: "\f42f";
+  content: "";
 }
 
 .fa-landmark:before {
-  content: "\f66f";
+  content: "";
 }
 
 .fa-language:before {
-  content: "\f1ab";
+  content: "";
 }
 
 .fa-laptop:before {
-  content: "\f109";
+  content: "";
 }
 
 .fa-laptop-code:before {
-  content: "\f5fc";
+  content: "";
 }
 
 .fa-laravel:before {
-  content: "\f3bd";
+  content: "";
 }
 
 .fa-lastfm:before {
-  content: "\f202";
+  content: "";
 }
 
 .fa-lastfm-square:before {
-  content: "\f203";
+  content: "";
 }
 
 .fa-laugh:before {
-  content: "\f599";
+  content: "";
 }
 
 .fa-laugh-beam:before {
-  content: "\f59a";
+  content: "";
 }
 
 .fa-laugh-squint:before {
-  content: "\f59b";
+  content: "";
 }
 
 .fa-laugh-wink:before {
-  content: "\f59c";
+  content: "";
 }
 
 .fa-layer-group:before {
-  content: "\f5fd";
+  content: "";
 }
 
 .fa-leaf:before {
-  content: "\f06c";
+  content: "";
 }
 
 .fa-leanpub:before {
-  content: "\f212";
+  content: "";
 }
 
 .fa-lemon:before {
-  content: "\f094";
+  content: "";
 }
 
 .fa-less:before {
-  content: "\f41d";
+  content: "";
 }
 
 .fa-less-than:before {
-  content: "\f536";
+  content: "";
 }
 
 .fa-less-than-equal:before {
-  content: "\f537";
+  content: "";
 }
 
 .fa-level-down-alt:before {
-  content: "\f3be";
+  content: "";
 }
 
 .fa-level-up-alt:before {
-  content: "\f3bf";
+  content: "";
 }
 
 .fa-life-ring:before {
-  content: "\f1cd";
+  content: "";
 }
 
 .fa-lightbulb:before {
-  content: "\f0eb";
+  content: "";
 }
 
 .fa-line:before {
-  content: "\f3c0";
+  content: "";
 }
 
 .fa-link:before {
-  content: "\f0c1";
+  content: "";
 }
 
 .fa-linkedin:before {
-  content: "\f08c";
+  content: "";
 }
 
 .fa-linkedin-in:before {
-  content: "\f0e1";
+  content: "";
 }
 
 .fa-linode:before {
-  content: "\f2b8";
+  content: "";
 }
 
 .fa-linux:before {
-  content: "\f17c";
+  content: "";
 }
 
 .fa-lira-sign:before {
-  content: "\f195";
+  content: "";
 }
 
 .fa-list:before {
-  content: "\f03a";
+  content: "";
 }
 
 .fa-list-alt:before {
-  content: "\f022";
+  content: "";
 }
 
 .fa-list-ol:before {
-  content: "\f0cb";
+  content: "";
 }
 
 .fa-list-ul:before {
-  content: "\f0ca";
+  content: "";
 }
 
 .fa-location-arrow:before {
-  content: "\f124";
+  content: "";
 }
 
 .fa-lock:before {
-  content: "\f023";
+  content: "";
 }
 
 .fa-lock-open:before {
-  content: "\f3c1";
+  content: "";
 }
 
 .fa-long-arrow-alt-down:before {
-  content: "\f309";
+  content: "";
 }
 
 .fa-long-arrow-alt-left:before {
-  content: "\f30a";
+  content: "";
 }
 
 .fa-long-arrow-alt-right:before {
-  content: "\f30b";
+  content: "";
 }
 
 .fa-long-arrow-alt-up:before {
-  content: "\f30c";
+  content: "";
 }
 
 .fa-low-vision:before {
-  content: "\f2a8";
+  content: "";
 }
 
 .fa-luggage-cart:before {
-  content: "\f59d";
+  content: "";
 }
 
 .fa-lyft:before {
-  content: "\f3c3";
+  content: "";
 }
 
 .fa-magento:before {
-  content: "\f3c4";
+  content: "";
 }
 
 .fa-magic:before {
-  content: "\f0d0";
+  content: "";
 }
 
 .fa-magnet:before {
-  content: "\f076";
+  content: "";
 }
 
 .fa-mail-bulk:before {
-  content: "\f674";
+  content: "";
 }
 
 .fa-mailchimp:before {
-  content: "\f59e";
+  content: "";
 }
 
 .fa-male:before {
-  content: "\f183";
+  content: "";
 }
 
 .fa-mandalorian:before {
-  content: "\f50f";
+  content: "";
 }
 
 .fa-map:before {
-  content: "\f279";
+  content: "";
 }
 
 .fa-map-marked:before {
-  content: "\f59f";
+  content: "";
 }
 
 .fa-map-marked-alt:before {
-  content: "\f5a0";
+  content: "";
 }
 
 .fa-map-marker:before {
-  content: "\f041";
+  content: "";
 }
 
 .fa-map-marker-alt:before {
-  content: "\f3c5";
+  content: "";
 }
 
 .fa-map-pin:before {
-  content: "\f276";
+  content: "";
 }
 
 .fa-map-signs:before {
-  content: "\f277";
+  content: "";
 }
 
 .fa-markdown:before {
-  content: "\f60f";
+  content: "";
 }
 
 .fa-marker:before {
-  content: "\f5a1";
+  content: "";
 }
 
 .fa-mars:before {
-  content: "\f222";
+  content: "";
 }
 
 .fa-mars-double:before {
-  content: "\f227";
+  content: "";
 }
 
 .fa-mars-stroke:before {
-  content: "\f229";
+  content: "";
 }
 
 .fa-mars-stroke-h:before {
-  content: "\f22b";
+  content: "";
 }
 
 .fa-mars-stroke-v:before {
-  content: "\f22a";
+  content: "";
 }
 
 .fa-mastodon:before {
-  content: "\f4f6";
+  content: "";
 }
 
 .fa-maxcdn:before {
-  content: "\f136";
+  content: "";
 }
 
 .fa-medal:before {
-  content: "\f5a2";
+  content: "";
 }
 
 .fa-medapps:before {
-  content: "\f3c6";
+  content: "";
 }
 
 .fa-medium:before {
-  content: "\f23a";
+  content: "";
 }
 
 .fa-medium-m:before {
-  content: "\f3c7";
+  content: "";
 }
 
 .fa-medkit:before {
-  content: "\f0fa";
+  content: "";
 }
 
 .fa-medrt:before {
-  content: "\f3c8";
+  content: "";
 }
 
 .fa-meetup:before {
-  content: "\f2e0";
+  content: "";
 }
 
 .fa-megaport:before {
-  content: "\f5a3";
+  content: "";
 }
 
 .fa-meh:before {
-  content: "\f11a";
+  content: "";
 }
 
 .fa-meh-blank:before {
-  content: "\f5a4";
+  content: "";
 }
 
 .fa-meh-rolling-eyes:before {
-  content: "\f5a5";
+  content: "";
 }
 
 .fa-memory:before {
-  content: "\f538";
+  content: "";
 }
 
 .fa-menorah:before {
-  content: "\f676";
+  content: "";
 }
 
 .fa-mercury:before {
-  content: "\f223";
+  content: "";
 }
 
 .fa-microchip:before {
-  content: "\f2db";
+  content: "";
 }
 
 .fa-microphone:before {
-  content: "\f130";
+  content: "";
 }
 
 .fa-microphone-alt:before {
-  content: "\f3c9";
+  content: "";
 }
 
 .fa-microphone-alt-slash:before {
-  content: "\f539";
+  content: "";
 }
 
 .fa-microphone-slash:before {
-  content: "\f131";
+  content: "";
 }
 
 .fa-microscope:before {
-  content: "\f610";
+  content: "";
 }
 
 .fa-microsoft:before {
-  content: "\f3ca";
+  content: "";
 }
 
 .fa-minus:before {
-  content: "\f068";
+  content: "";
 }
 
 .fa-minus-circle:before {
-  content: "\f056";
+  content: "";
 }
 
 .fa-minus-square:before {
-  content: "\f146";
+  content: "";
 }
 
 .fa-mix:before {
-  content: "\f3cb";
+  content: "";
 }
 
 .fa-mixcloud:before {
-  content: "\f289";
+  content: "";
 }
 
 .fa-mizuni:before {
-  content: "\f3cc";
+  content: "";
 }
 
 .fa-mobile:before {
-  content: "\f10b";
+  content: "";
 }
 
 .fa-mobile-alt:before {
-  content: "\f3cd";
+  content: "";
 }
 
 .fa-modx:before {
-  content: "\f285";
+  content: "";
 }
 
 .fa-monero:before {
-  content: "\f3d0";
+  content: "";
 }
 
 .fa-money-bill:before {
-  content: "\f0d6";
+  content: "";
 }
 
 .fa-money-bill-alt:before {
-  content: "\f3d1";
+  content: "";
 }
 
 .fa-money-bill-wave:before {
-  content: "\f53a";
+  content: "";
 }
 
 .fa-money-bill-wave-alt:before {
-  content: "\f53b";
+  content: "";
 }
 
 .fa-money-check:before {
-  content: "\f53c";
+  content: "";
 }
 
 .fa-money-check-alt:before {
-  content: "\f53d";
+  content: "";
 }
 
 .fa-monument:before {
-  content: "\f5a6";
+  content: "";
 }
 
 .fa-moon:before {
-  content: "\f186";
+  content: "";
 }
 
 .fa-mortar-pestle:before {
-  content: "\f5a7";
+  content: "";
 }
 
 .fa-mosque:before {
-  content: "\f678";
+  content: "";
 }
 
 .fa-motorcycle:before {
-  content: "\f21c";
+  content: "";
 }
 
 .fa-mouse-pointer:before {
-  content: "\f245";
+  content: "";
 }
 
 .fa-music:before {
-  content: "\f001";
+  content: "";
 }
 
 .fa-napster:before {
-  content: "\f3d2";
+  content: "";
 }
 
 .fa-neos:before {
-  content: "\f612";
+  content: "";
 }
 
 .fa-neuter:before {
-  content: "\f22c";
+  content: "";
 }
 
 .fa-newspaper:before {
-  content: "\f1ea";
+  content: "";
 }
 
 .fa-nimblr:before {
-  content: "\f5a8";
+  content: "";
 }
 
 .fa-nintendo-switch:before {
-  content: "\f418";
+  content: "";
 }
 
 .fa-node:before {
-  content: "\f419";
+  content: "";
 }
 
 .fa-node-js:before {
-  content: "\f3d3";
+  content: "";
 }
 
 .fa-not-equal:before {
-  content: "\f53e";
+  content: "";
 }
 
 .fa-notes-medical:before {
-  content: "\f481";
+  content: "";
 }
 
 .fa-npm:before {
-  content: "\f3d4";
+  content: "";
 }
 
 .fa-ns8:before {
-  content: "\f3d5";
+  content: "";
 }
 
 .fa-nutritionix:before {
-  content: "\f3d6";
+  content: "";
 }
 
 .fa-object-group:before {
-  content: "\f247";
+  content: "";
 }
 
 .fa-object-ungroup:before {
-  content: "\f248";
+  content: "";
 }
 
 .fa-odnoklassniki:before {
-  content: "\f263";
+  content: "";
 }
 
 .fa-odnoklassniki-square:before {
-  content: "\f264";
+  content: "";
 }
 
 .fa-oil-can:before {
-  content: "\f613";
+  content: "";
 }
 
 .fa-old-republic:before {
-  content: "\f510";
+  content: "";
 }
 
 .fa-om:before {
-  content: "\f679";
+  content: "";
 }
 
 .fa-opencart:before {
-  content: "\f23d";
+  content: "";
 }
 
 .fa-openid:before {
-  content: "\f19b";
+  content: "";
 }
 
 .fa-opera:before {
-  content: "\f26a";
+  content: "";
 }
 
 .fa-optin-monster:before {
-  content: "\f23c";
+  content: "";
 }
 
 .fa-osi:before {
-  content: "\f41a";
+  content: "";
 }
 
 .fa-outdent:before {
-  content: "\f03b";
+  content: "";
 }
 
 .fa-page4:before {
-  content: "\f3d7";
+  content: "";
 }
 
 .fa-pagelines:before {
-  content: "\f18c";
+  content: "";
 }
 
 .fa-paint-brush:before {
-  content: "\f1fc";
+  content: "";
 }
 
 .fa-paint-roller:before {
-  content: "\f5aa";
+  content: "";
 }
 
 .fa-palette:before {
-  content: "\f53f";
+  content: "";
 }
 
 .fa-palfed:before {
-  content: "\f3d8";
+  content: "";
 }
 
 .fa-pallet:before {
-  content: "\f482";
+  content: "";
 }
 
 .fa-paper-plane:before {
-  content: "\f1d8";
+  content: "";
 }
 
 .fa-paperclip:before {
-  content: "\f0c6";
+  content: "";
 }
 
 .fa-parachute-box:before {
-  content: "\f4cd";
+  content: "";
 }
 
 .fa-paragraph:before {
-  content: "\f1dd";
+  content: "";
 }
 
 .fa-parking:before {
-  content: "\f540";
+  content: "";
 }
 
 .fa-passport:before {
-  content: "\f5ab";
+  content: "";
 }
 
 .fa-pastafarianism:before {
-  content: "\f67b";
+  content: "";
 }
 
 .fa-paste:before {
-  content: "\f0ea";
+  content: "";
 }
 
 .fa-patreon:before {
-  content: "\f3d9";
+  content: "";
 }
 
 .fa-pause:before {
-  content: "\f04c";
+  content: "";
 }
 
 .fa-pause-circle:before {
-  content: "\f28b";
+  content: "";
 }
 
 .fa-paw:before {
-  content: "\f1b0";
+  content: "";
 }
 
 .fa-paypal:before {
-  content: "\f1ed";
+  content: "";
 }
 
 .fa-peace:before {
-  content: "\f67c";
+  content: "";
 }
 
 .fa-pen:before {
-  content: "\f304";
+  content: "";
 }
 
 .fa-pen-alt:before {
-  content: "\f305";
+  content: "";
 }
 
 .fa-pen-fancy:before {
-  content: "\f5ac";
+  content: "";
 }
 
 .fa-pen-nib:before {
-  content: "\f5ad";
+  content: "";
 }
 
 .fa-pen-square:before {
-  content: "\f14b";
+  content: "";
 }
 
 .fa-pencil-alt:before {
-  content: "\f303";
+  content: "";
 }
 
 .fa-pencil-ruler:before {
-  content: "\f5ae";
+  content: "";
 }
 
 .fa-people-carry:before {
-  content: "\f4ce";
+  content: "";
 }
 
 .fa-percent:before {
-  content: "\f295";
+  content: "";
 }
 
 .fa-percentage:before {
-  content: "\f541";
+  content: "";
 }
 
 .fa-periscope:before {
-  content: "\f3da";
+  content: "";
 }
 
 .fa-phabricator:before {
-  content: "\f3db";
+  content: "";
 }
 
 .fa-phoenix-framework:before {
-  content: "\f3dc";
+  content: "";
 }
 
 .fa-phoenix-squadron:before {
-  content: "\f511";
+  content: "";
 }
 
 .fa-phone:before {
-  content: "\f095";
+  content: "";
 }
 
 .fa-phone-slash:before {
-  content: "\f3dd";
+  content: "";
 }
 
 .fa-phone-square:before {
-  content: "\f098";
+  content: "";
 }
 
 .fa-phone-volume:before {
-  content: "\f2a0";
+  content: "";
 }
 
 .fa-php:before {
-  content: "\f457";
+  content: "";
 }
 
 .fa-pied-piper:before {
-  content: "\f2ae";
+  content: "";
 }
 
 .fa-pied-piper-alt:before {
-  content: "\f1a8";
+  content: "";
 }
 
 .fa-pied-piper-hat:before {
-  content: "\f4e5";
+  content: "";
 }
 
 .fa-pied-piper-pp:before {
-  content: "\f1a7";
+  content: "";
 }
 
 .fa-piggy-bank:before {
-  content: "\f4d3";
+  content: "";
 }
 
 .fa-pills:before {
-  content: "\f484";
+  content: "";
 }
 
 .fa-pinterest:before {
-  content: "\f0d2";
+  content: "";
 }
 
 .fa-pinterest-p:before {
-  content: "\f231";
+  content: "";
 }
 
 .fa-pinterest-square:before {
-  content: "\f0d3";
+  content: "";
 }
 
 .fa-place-of-worship:before {
-  content: "\f67f";
+  content: "";
 }
 
 .fa-plane:before {
-  content: "\f072";
+  content: "";
 }
 
 .fa-plane-arrival:before {
-  content: "\f5af";
+  content: "";
 }
 
 .fa-plane-departure:before {
-  content: "\f5b0";
+  content: "";
 }
 
 .fa-play:before {
-  content: "\f04b";
+  content: "";
 }
 
 .fa-play-circle:before {
-  content: "\f144";
+  content: "";
 }
 
 .fa-playstation:before {
-  content: "\f3df";
+  content: "";
 }
 
 .fa-plug:before {
-  content: "\f1e6";
+  content: "";
 }
 
 .fa-plus:before {
-  content: "\f067";
+  content: "";
 }
 
 .fa-plus-circle:before {
-  content: "\f055";
+  content: "";
 }
 
 .fa-plus-square:before {
-  content: "\f0fe";
+  content: "";
 }
 
 .fa-podcast:before {
-  content: "\f2ce";
+  content: "";
 }
 
 .fa-poll:before {
-  content: "\f681";
+  content: "";
 }
 
 .fa-poll-h:before {
-  content: "\f682";
+  content: "";
 }
 
 .fa-poo:before {
-  content: "\f2fe";
+  content: "";
 }
 
 .fa-poop:before {
-  content: "\f619";
+  content: "";
 }
 
 .fa-portrait:before {
-  content: "\f3e0";
+  content: "";
 }
 
 .fa-pound-sign:before {
-  content: "\f154";
+  content: "";
 }
 
 .fa-power-off:before {
-  content: "\f011";
+  content: "";
 }
 
 .fa-pray:before {
-  content: "\f683";
+  content: "";
 }
 
 .fa-praying-hands:before {
-  content: "\f684";
+  content: "";
 }
 
 .fa-prescription:before {
-  content: "\f5b1";
+  content: "";
 }
 
 .fa-prescription-bottle:before {
-  content: "\f485";
+  content: "";
 }
 
 .fa-prescription-bottle-alt:before {
-  content: "\f486";
+  content: "";
 }
 
 .fa-print:before {
-  content: "\f02f";
+  content: "";
 }
 
 .fa-procedures:before {
-  content: "\f487";
+  content: "";
 }
 
 .fa-product-hunt:before {
-  content: "\f288";
+  content: "";
 }
 
 .fa-project-diagram:before {
-  content: "\f542";
+  content: "";
 }
 
 .fa-pushed:before {
-  content: "\f3e1";
+  content: "";
 }
 
 .fa-puzzle-piece:before {
-  content: "\f12e";
+  content: "";
 }
 
 .fa-python:before {
-  content: "\f3e2";
+  content: "";
 }
 
 .fa-qq:before {
-  content: "\f1d6";
+  content: "";
 }
 
 .fa-qrcode:before {
-  content: "\f029";
+  content: "";
 }
 
 .fa-question:before {
-  content: "\f128";
+  content: "";
 }
 
 .fa-question-circle:before {
-  content: "\f059";
+  content: "";
 }
 
 .fa-quidditch:before {
-  content: "\f458";
+  content: "";
 }
 
 .fa-quinscape:before {
-  content: "\f459";
+  content: "";
 }
 
 .fa-quora:before {
-  content: "\f2c4";
+  content: "";
 }
 
 .fa-quote-left:before {
-  content: "\f10d";
+  content: "";
 }
 
 .fa-quote-right:before {
-  content: "\f10e";
+  content: "";
 }
 
 .fa-quran:before {
-  content: "\f687";
+  content: "";
 }
 
 .fa-r-project:before {
-  content: "\f4f7";
+  content: "";
 }
 
 .fa-random:before {
-  content: "\f074";
+  content: "";
 }
 
 .fa-ravelry:before {
-  content: "\f2d9";
+  content: "";
 }
 
 .fa-react:before {
-  content: "\f41b";
+  content: "";
 }
 
 .fa-readme:before {
-  content: "\f4d5";
+  content: "";
 }
 
 .fa-rebel:before {
-  content: "\f1d0";
+  content: "";
 }
 
 .fa-receipt:before {
-  content: "\f543";
+  content: "";
 }
 
 .fa-recycle:before {
-  content: "\f1b8";
+  content: "";
 }
 
 .fa-red-river:before {
-  content: "\f3e3";
+  content: "";
 }
 
 .fa-reddit:before {
-  content: "\f1a1";
+  content: "";
 }
 
 .fa-reddit-alien:before {
-  content: "\f281";
+  content: "";
 }
 
 .fa-reddit-square:before {
-  content: "\f1a2";
+  content: "";
 }
 
 .fa-redo:before {
-  content: "\f01e";
+  content: "";
 }
 
 .fa-redo-alt:before {
-  content: "\f2f9";
+  content: "";
 }
 
 .fa-registered:before {
-  content: "\f25d";
+  content: "";
 }
 
 .fa-rendact:before {
-  content: "\f3e4";
+  content: "";
 }
 
 .fa-renren:before {
-  content: "\f18b";
+  content: "";
 }
 
 .fa-reply:before {
-  content: "\f3e5";
+  content: "";
 }
 
 .fa-reply-all:before {
-  content: "\f122";
+  content: "";
 }
 
 .fa-replyd:before {
-  content: "\f3e6";
+  content: "";
 }
 
 .fa-researchgate:before {
-  content: "\f4f8";
+  content: "";
 }
 
 .fa-resolving:before {
-  content: "\f3e7";
+  content: "";
 }
 
 .fa-retweet:before {
-  content: "\f079";
+  content: "";
 }
 
 .fa-rev:before {
-  content: "\f5b2";
+  content: "";
 }
 
 .fa-ribbon:before {
-  content: "\f4d6";
+  content: "";
 }
 
 .fa-road:before {
-  content: "\f018";
+  content: "";
 }
 
 .fa-robot:before {
-  content: "\f544";
+  content: "";
 }
 
 .fa-rocket:before {
-  content: "\f135";
+  content: "";
 }
 
 .fa-rocketchat:before {
-  content: "\f3e8";
+  content: "";
 }
 
 .fa-rockrms:before {
-  content: "\f3e9";
+  content: "";
 }
 
 .fa-route:before {
-  content: "\f4d7";
+  content: "";
 }
 
 .fa-rss:before {
-  content: "\f09e";
+  content: "";
 }
 
 .fa-rss-square:before {
-  content: "\f143";
+  content: "";
 }
 
 .fa-ruble-sign:before {
-  content: "\f158";
+  content: "";
 }
 
 .fa-ruler:before {
-  content: "\f545";
+  content: "";
 }
 
 .fa-ruler-combined:before {
-  content: "\f546";
+  content: "";
 }
 
 .fa-ruler-horizontal:before {
-  content: "\f547";
+  content: "";
 }
 
 .fa-ruler-vertical:before {
-  content: "\f548";
+  content: "";
 }
 
 .fa-rupee-sign:before {
-  content: "\f156";
+  content: "";
 }
 
 .fa-sad-cry:before {
-  content: "\f5b3";
+  content: "";
 }
 
 .fa-sad-tear:before {
-  content: "\f5b4";
+  content: "";
 }
 
 .fa-safari:before {
-  content: "\f267";
+  content: "";
 }
 
 .fa-sass:before {
-  content: "\f41e";
+  content: "";
 }
 
 .fa-save:before {
-  content: "\f0c7";
+  content: "";
 }
 
 .fa-schlix:before {
-  content: "\f3ea";
+  content: "";
 }
 
 .fa-school:before {
-  content: "\f549";
+  content: "";
 }
 
 .fa-screwdriver:before {
-  content: "\f54a";
+  content: "";
 }
 
 .fa-scribd:before {
-  content: "\f28a";
+  content: "";
 }
 
 .fa-search:before {
-  content: "\f002";
+  content: "";
 }
 
 .fa-search-dollar:before {
-  content: "\f688";
+  content: "";
 }
 
 .fa-search-location:before {
-  content: "\f689";
+  content: "";
 }
 
 .fa-search-minus:before {
-  content: "\f010";
+  content: "";
 }
 
 .fa-search-plus:before {
-  content: "\f00e";
+  content: "";
 }
 
 .fa-searchengin:before {
-  content: "\f3eb";
+  content: "";
 }
 
 .fa-seedling:before {
-  content: "\f4d8";
+  content: "";
 }
 
 .fa-sellcast:before {
-  content: "\f2da";
+  content: "";
 }
 
 .fa-sellsy:before {
-  content: "\f213";
+  content: "";
 }
 
 .fa-server:before {
-  content: "\f233";
+  content: "";
 }
 
 .fa-servicestack:before {
-  content: "\f3ec";
+  content: "";
 }
 
 .fa-shapes:before {
-  content: "\f61f";
+  content: "";
 }
 
 .fa-share:before {
-  content: "\f064";
+  content: "";
 }
 
 .fa-share-alt:before {
-  content: "\f1e0";
+  content: "";
 }
 
 .fa-share-alt-square:before {
-  content: "\f1e1";
+  content: "";
 }
 
 .fa-share-square:before {
-  content: "\f14d";
+  content: "";
 }
 
 .fa-shekel-sign:before {
-  content: "\f20b";
+  content: "";
 }
 
 .fa-shield-alt:before {
-  content: "\f3ed";
+  content: "";
 }
 
 .fa-ship:before {
-  content: "\f21a";
+  content: "";
 }
 
 .fa-shipping-fast:before {
-  content: "\f48b";
+  content: "";
 }
 
 .fa-shirtsinbulk:before {
-  content: "\f214";
+  content: "";
 }
 
 .fa-shoe-prints:before {
-  content: "\f54b";
+  content: "";
 }
 
 .fa-shopping-bag:before {
-  content: "\f290";
+  content: "";
 }
 
 .fa-shopping-basket:before {
-  content: "\f291";
+  content: "";
 }
 
 .fa-shopping-cart:before {
-  content: "\f07a";
+  content: "";
 }
 
 .fa-shopware:before {
-  content: "\f5b5";
+  content: "";
 }
 
 .fa-shower:before {
-  content: "\f2cc";
+  content: "";
 }
 
 .fa-shuttle-van:before {
-  content: "\f5b6";
+  content: "";
 }
 
 .fa-sign:before {
-  content: "\f4d9";
+  content: "";
 }
 
 .fa-sign-in-alt:before {
-  content: "\f2f6";
+  content: "";
 }
 
 .fa-sign-language:before {
-  content: "\f2a7";
+  content: "";
 }
 
 .fa-sign-out-alt:before {
-  content: "\f2f5";
+  content: "";
 }
 
 .fa-signal:before {
-  content: "\f012";
+  content: "";
 }
 
 .fa-signature:before {
-  content: "\f5b7";
+  content: "";
 }
 
 .fa-simplybuilt:before {
-  content: "\f215";
+  content: "";
 }
 
 .fa-sistrix:before {
-  content: "\f3ee";
+  content: "";
 }
 
 .fa-sitemap:before {
-  content: "\f0e8";
+  content: "";
 }
 
 .fa-sith:before {
-  content: "\f512";
+  content: "";
 }
 
 .fa-skull:before {
-  content: "\f54c";
+  content: "";
 }
 
 .fa-skyatlas:before {
-  content: "\f216";
+  content: "";
 }
 
 .fa-skype:before {
-  content: "\f17e";
+  content: "";
 }
 
 .fa-slack:before {
-  content: "\f198";
+  content: "";
 }
 
 .fa-slack-hash:before {
-  content: "\f3ef";
+  content: "";
 }
 
 .fa-sliders-h:before {
-  content: "\f1de";
+  content: "";
 }
 
 .fa-slideshare:before {
-  content: "\f1e7";
+  content: "";
 }
 
 .fa-smile:before {
-  content: "\f118";
+  content: "";
 }
 
 .fa-smile-beam:before {
-  content: "\f5b8";
+  content: "";
 }
 
 .fa-smile-wink:before {
-  content: "\f4da";
+  content: "";
 }
 
 .fa-smoking:before {
-  content: "\f48d";
+  content: "";
 }
 
 .fa-smoking-ban:before {
-  content: "\f54d";
+  content: "";
 }
 
 .fa-snapchat:before {
-  content: "\f2ab";
+  content: "";
 }
 
 .fa-snapchat-ghost:before {
-  content: "\f2ac";
+  content: "";
 }
 
 .fa-snapchat-square:before {
-  content: "\f2ad";
+  content: "";
 }
 
 .fa-snowflake:before {
-  content: "\f2dc";
+  content: "";
 }
 
 .fa-socks:before {
-  content: "\f696";
+  content: "";
 }
 
 .fa-solar-panel:before {
-  content: "\f5ba";
+  content: "";
 }
 
 .fa-sort:before {
-  content: "\f0dc";
+  content: "";
 }
 
 .fa-sort-alpha-down:before {
-  content: "\f15d";
+  content: "";
 }
 
 .fa-sort-alpha-up:before {
-  content: "\f15e";
+  content: "";
 }
 
 .fa-sort-amount-down:before {
-  content: "\f160";
+  content: "";
 }
 
 .fa-sort-amount-up:before {
-  content: "\f161";
+  content: "";
 }
 
 .fa-sort-down:before {
-  content: "\f0dd";
+  content: "";
 }
 
 .fa-sort-numeric-down:before {
-  content: "\f162";
+  content: "";
 }
 
 .fa-sort-numeric-up:before {
-  content: "\f163";
+  content: "";
 }
 
 .fa-sort-up:before {
-  content: "\f0de";
+  content: "";
 }
 
 .fa-soundcloud:before {
-  content: "\f1be";
+  content: "";
 }
 
 .fa-spa:before {
-  content: "\f5bb";
+  content: "";
 }
 
 .fa-space-shuttle:before {
-  content: "\f197";
+  content: "";
 }
 
 .fa-speakap:before {
-  content: "\f3f3";
+  content: "";
 }
 
 .fa-spinner:before {
-  content: "\f110";
+  content: "";
 }
 
 .fa-splotch:before {
-  content: "\f5bc";
+  content: "";
 }
 
 .fa-spotify:before {
-  content: "\f1bc";
+  content: "";
 }
 
 .fa-spray-can:before {
-  content: "\f5bd";
+  content: "";
 }
 
 .fa-square:before {
-  content: "\f0c8";
+  content: "";
 }
 
 .fa-square-full:before {
-  content: "\f45c";
+  content: "";
 }
 
 .fa-square-root-alt:before {
-  content: "\f698";
+  content: "";
 }
 
 .fa-squarespace:before {
-  content: "\f5be";
+  content: "";
 }
 
 .fa-stack-exchange:before {
-  content: "\f18d";
+  content: "";
 }
 
 .fa-stack-overflow:before {
-  content: "\f16c";
+  content: "";
 }
 
 .fa-stamp:before {
-  content: "\f5bf";
+  content: "";
 }
 
 .fa-star:before {
-  content: "\f005";
+  content: "";
 }
 
 .fa-star-and-crescent:before {
-  content: "\f699";
+  content: "";
 }
 
 .fa-star-half:before {
-  content: "\f089";
+  content: "";
 }
 
 .fa-star-half-alt:before {
-  content: "\f5c0";
+  content: "";
 }
 
 .fa-star-of-david:before {
-  content: "\f69a";
+  content: "";
 }
 
 .fa-star-of-life:before {
-  content: "\f621";
+  content: "";
 }
 
 .fa-staylinked:before {
-  content: "\f3f5";
+  content: "";
 }
 
 .fa-steam:before {
-  content: "\f1b6";
+  content: "";
 }
 
 .fa-steam-square:before {
-  content: "\f1b7";
+  content: "";
 }
 
 .fa-steam-symbol:before {
-  content: "\f3f6";
+  content: "";
 }
 
 .fa-step-backward:before {
-  content: "\f048";
+  content: "";
 }
 
 .fa-step-forward:before {
-  content: "\f051";
+  content: "";
 }
 
 .fa-stethoscope:before {
-  content: "\f0f1";
+  content: "";
 }
 
 .fa-sticker-mule:before {
-  content: "\f3f7";
+  content: "";
 }
 
 .fa-sticky-note:before {
-  content: "\f249";
+  content: "";
 }
 
 .fa-stop:before {
-  content: "\f04d";
+  content: "";
 }
 
 .fa-stop-circle:before {
-  content: "\f28d";
+  content: "";
 }
 
 .fa-stopwatch:before {
-  content: "\f2f2";
+  content: "";
 }
 
 .fa-store:before {
-  content: "\f54e";
+  content: "";
 }
 
 .fa-store-alt:before {
-  content: "\f54f";
+  content: "";
 }
 
 .fa-strava:before {
-  content: "\f428";
+  content: "";
 }
 
 .fa-stream:before {
-  content: "\f550";
+  content: "";
 }
 
 .fa-street-view:before {
-  content: "\f21d";
+  content: "";
 }
 
 .fa-strikethrough:before {
-  content: "\f0cc";
+  content: "";
 }
 
 .fa-stripe:before {
-  content: "\f429";
+  content: "";
 }
 
 .fa-stripe-s:before {
-  content: "\f42a";
+  content: "";
 }
 
 .fa-stroopwafel:before {
-  content: "\f551";
+  content: "";
 }
 
 .fa-studiovinari:before {
-  content: "\f3f8";
+  content: "";
 }
 
 .fa-stumbleupon:before {
-  content: "\f1a4";
+  content: "";
 }
 
 .fa-stumbleupon-circle:before {
-  content: "\f1a3";
+  content: "";
 }
 
 .fa-subscript:before {
-  content: "\f12c";
+  content: "";
 }
 
 .fa-subway:before {
-  content: "\f239";
+  content: "";
 }
 
 .fa-suitcase:before {
-  content: "\f0f2";
+  content: "";
 }
 
 .fa-suitcase-rolling:before {
-  content: "\f5c1";
+  content: "";
 }
 
 .fa-sun:before {
-  content: "\f185";
+  content: "";
 }
 
 .fa-superpowers:before {
-  content: "\f2dd";
+  content: "";
 }
 
 .fa-superscript:before {
-  content: "\f12b";
+  content: "";
 }
 
 .fa-supple:before {
-  content: "\f3f9";
+  content: "";
 }
 
 .fa-surprise:before {
-  content: "\f5c2";
+  content: "";
 }
 
 .fa-swatchbook:before {
-  content: "\f5c3";
+  content: "";
 }
 
 .fa-swimmer:before {
-  content: "\f5c4";
+  content: "";
 }
 
 .fa-swimming-pool:before {
-  content: "\f5c5";
+  content: "";
 }
 
 .fa-synagogue:before {
-  content: "\f69b";
+  content: "";
 }
 
 .fa-sync:before {
-  content: "\f021";
+  content: "";
 }
 
 .fa-sync-alt:before {
-  content: "\f2f1";
+  content: "";
 }
 
 .fa-syringe:before {
-  content: "\f48e";
+  content: "";
 }
 
 .fa-table:before {
-  content: "\f0ce";
+  content: "";
 }
 
 .fa-table-tennis:before {
-  content: "\f45d";
+  content: "";
 }
 
 .fa-tablet:before {
-  content: "\f10a";
+  content: "";
 }
 
 .fa-tablet-alt:before {
-  content: "\f3fa";
+  content: "";
 }
 
 .fa-tablets:before {
-  content: "\f490";
+  content: "";
 }
 
 .fa-tachometer-alt:before {
-  content: "\f3fd";
+  content: "";
 }
 
 .fa-tag:before {
-  content: "\f02b";
+  content: "";
 }
 
 .fa-tags:before {
-  content: "\f02c";
+  content: "";
 }
 
 .fa-tape:before {
-  content: "\f4db";
+  content: "";
 }
 
 .fa-tasks:before {
-  content: "\f0ae";
+  content: "";
 }
 
 .fa-taxi:before {
-  content: "\f1ba";
+  content: "";
 }
 
 .fa-teamspeak:before {
-  content: "\f4f9";
+  content: "";
 }
 
 .fa-teeth:before {
-  content: "\f62e";
+  content: "";
 }
 
 .fa-teeth-open:before {
-  content: "\f62f";
+  content: "";
 }
 
 .fa-telegram:before {
-  content: "\f2c6";
+  content: "";
 }
 
 .fa-telegram-plane:before {
-  content: "\f3fe";
+  content: "";
 }
 
 .fa-tencent-weibo:before {
-  content: "\f1d5";
+  content: "";
 }
 
 .fa-terminal:before {
-  content: "\f120";
+  content: "";
 }
 
 .fa-text-height:before {
-  content: "\f034";
+  content: "";
 }
 
 .fa-text-width:before {
-  content: "\f035";
+  content: "";
 }
 
 .fa-th:before {
-  content: "\f00a";
+  content: "";
 }
 
 .fa-th-large:before {
-  content: "\f009";
+  content: "";
 }
 
 .fa-th-list:before {
-  content: "\f00b";
+  content: "";
 }
 
 .fa-the-red-yeti:before {
-  content: "\f69d";
+  content: "";
 }
 
 .fa-theater-masks:before {
-  content: "\f630";
+  content: "";
 }
 
 .fa-themeco:before {
-  content: "\f5c6";
+  content: "";
 }
 
 .fa-themeisle:before {
-  content: "\f2b2";
+  content: "";
 }
 
 .fa-thermometer:before {
-  content: "\f491";
+  content: "";
 }
 
 .fa-thermometer-empty:before {
-  content: "\f2cb";
+  content: "";
 }
 
 .fa-thermometer-full:before {
-  content: "\f2c7";
+  content: "";
 }
 
 .fa-thermometer-half:before {
-  content: "\f2c9";
+  content: "";
 }
 
 .fa-thermometer-quarter:before {
-  content: "\f2ca";
+  content: "";
 }
 
 .fa-thermometer-three-quarters:before {
-  content: "\f2c8";
+  content: "";
 }
 
 .fa-thumbs-down:before {
-  content: "\f165";
+  content: "";
 }
 
 .fa-thumbs-up:before {
-  content: "\f164";
+  content: "";
 }
 
 .fa-thumbtack:before {
-  content: "\f08d";
+  content: "";
 }
 
 .fa-ticket-alt:before {
-  content: "\f3ff";
+  content: "";
 }
 
 .fa-times:before {
-  content: "\f00d";
+  content: "";
 }
 
 .fa-times-circle:before {
-  content: "\f057";
+  content: "";
 }
 
 .fa-tint:before {
-  content: "\f043";
+  content: "";
 }
 
 .fa-tint-slash:before {
-  content: "\f5c7";
+  content: "";
 }
 
 .fa-tired:before {
-  content: "\f5c8";
+  content: "";
 }
 
 .fa-toggle-off:before {
-  content: "\f204";
+  content: "";
 }
 
 .fa-toggle-on:before {
-  content: "\f205";
+  content: "";
 }
 
 .fa-toolbox:before {
-  content: "\f552";
+  content: "";
 }
 
 .fa-tooth:before {
-  content: "\f5c9";
+  content: "";
 }
 
 .fa-torah:before {
-  content: "\f6a0";
+  content: "";
 }
 
 .fa-torii-gate:before {
-  content: "\f6a1";
+  content: "";
 }
 
 .fa-trade-federation:before {
-  content: "\f513";
+  content: "";
 }
 
 .fa-trademark:before {
-  content: "\f25c";
+  content: "";
 }
 
 .fa-traffic-light:before {
-  content: "\f637";
+  content: "";
 }
 
 .fa-train:before {
-  content: "\f238";
+  content: "";
 }
 
 .fa-transgender:before {
-  content: "\f224";
+  content: "";
 }
 
 .fa-transgender-alt:before {
-  content: "\f225";
+  content: "";
 }
 
 .fa-trash:before {
-  content: "\f1f8";
+  content: "";
 }
 
 .fa-trash-alt:before {
-  content: "\f2ed";
+  content: "";
 }
 
 .fa-tree:before {
-  content: "\f1bb";
+  content: "";
 }
 
 .fa-trello:before {
-  content: "\f181";
+  content: "";
 }
 
 .fa-tripadvisor:before {
-  content: "\f262";
+  content: "";
 }
 
 .fa-trophy:before {
-  content: "\f091";
+  content: "";
 }
 
 .fa-truck:before {
-  content: "\f0d1";
+  content: "";
 }
 
 .fa-truck-loading:before {
-  content: "\f4de";
+  content: "";
 }
 
 .fa-truck-monster:before {
-  content: "\f63b";
+  content: "";
 }
 
 .fa-truck-moving:before {
-  content: "\f4df";
+  content: "";
 }
 
 .fa-truck-pickup:before {
-  content: "\f63c";
+  content: "";
 }
 
 .fa-tshirt:before {
-  content: "\f553";
+  content: "";
 }
 
 .fa-tty:before {
-  content: "\f1e4";
+  content: "";
 }
 
 .fa-tumblr:before {
-  content: "\f173";
+  content: "";
 }
 
 .fa-tumblr-square:before {
-  content: "\f174";
+  content: "";
 }
 
 .fa-tv:before {
-  content: "\f26c";
+  content: "";
 }
 
 .fa-twitch:before {
-  content: "\f1e8";
+  content: "";
 }
 
 .fa-twitter:before {
-  content: "\f099";
+  content: "";
 }
 
 .fa-twitter-square:before {
-  content: "\f081";
+  content: "";
 }
 
 .fa-typo3:before {
-  content: "\f42b";
+  content: "";
 }
 
 .fa-uber:before {
-  content: "\f402";
+  content: "";
 }
 
 .fa-uikit:before {
-  content: "\f403";
+  content: "";
 }
 
 .fa-umbrella:before {
-  content: "\f0e9";
+  content: "";
 }
 
 .fa-umbrella-beach:before {
-  content: "\f5ca";
+  content: "";
 }
 
 .fa-underline:before {
-  content: "\f0cd";
+  content: "";
 }
 
 .fa-undo:before {
-  content: "\f0e2";
+  content: "";
 }
 
 .fa-undo-alt:before {
-  content: "\f2ea";
+  content: "";
 }
 
 .fa-uniregistry:before {
-  content: "\f404";
+  content: "";
 }
 
 .fa-universal-access:before {
-  content: "\f29a";
+  content: "";
 }
 
 .fa-university:before {
-  content: "\f19c";
+  content: "";
 }
 
 .fa-unlink:before {
-  content: "\f127";
+  content: "";
 }
 
 .fa-unlock:before {
-  content: "\f09c";
+  content: "";
 }
 
 .fa-unlock-alt:before {
-  content: "\f13e";
+  content: "";
 }
 
 .fa-untappd:before {
-  content: "\f405";
+  content: "";
 }
 
 .fa-upload:before {
-  content: "\f093";
+  content: "";
 }
 
 .fa-usb:before {
-  content: "\f287";
+  content: "";
 }
 
 .fa-user:before {
-  content: "\f007";
+  content: "";
 }
 
 .fa-user-alt:before {
-  content: "\f406";
+  content: "";
 }
 
 .fa-user-alt-slash:before {
-  content: "\f4fa";
+  content: "";
 }
 
 .fa-user-astronaut:before {
-  content: "\f4fb";
+  content: "";
 }
 
 .fa-user-check:before {
-  content: "\f4fc";
+  content: "";
 }
 
 .fa-user-circle:before {
-  content: "\f2bd";
+  content: "";
 }
 
 .fa-user-clock:before {
-  content: "\f4fd";
+  content: "";
 }
 
 .fa-user-cog:before {
-  content: "\f4fe";
+  content: "";
 }
 
 .fa-user-edit:before {
-  content: "\f4ff";
+  content: "";
 }
 
 .fa-user-friends:before {
-  content: "\f500";
+  content: "";
 }
 
 .fa-user-graduate:before {
-  content: "\f501";
+  content: "";
 }
 
 .fa-user-lock:before {
-  content: "\f502";
+  content: "";
 }
 
 .fa-user-md:before {
-  content: "\f0f0";
+  content: "";
 }
 
 .fa-user-minus:before {
-  content: "\f503";
+  content: "";
 }
 
 .fa-user-ninja:before {
-  content: "\f504";
+  content: "";
 }
 
 .fa-user-plus:before {
-  content: "\f234";
+  content: "";
 }
 
 .fa-user-secret:before {
-  content: "\f21b";
+  content: "";
 }
 
 .fa-user-shield:before {
-  content: "\f505";
+  content: "";
 }
 
 .fa-user-slash:before {
-  content: "\f506";
+  content: "";
 }
 
 .fa-user-tag:before {
-  content: "\f507";
+  content: "";
 }
 
 .fa-user-tie:before {
-  content: "\f508";
+  content: "";
 }
 
 .fa-user-times:before {
-  content: "\f235";
+  content: "";
 }
 
 .fa-users:before {
-  content: "\f0c0";
+  content: "";
 }
 
 .fa-users-cog:before {
-  content: "\f509";
+  content: "";
 }
 
 .fa-ussunnah:before {
-  content: "\f407";
+  content: "";
 }
 
 .fa-utensil-spoon:before {
-  content: "\f2e5";
+  content: "";
 }
 
 .fa-utensils:before {
-  content: "\f2e7";
+  content: "";
 }
 
 .fa-vaadin:before {
-  content: "\f408";
+  content: "";
 }
 
 .fa-vector-square:before {
-  content: "\f5cb";
+  content: "";
 }
 
 .fa-venus:before {
-  content: "\f221";
+  content: "";
 }
 
 .fa-venus-double:before {
-  content: "\f226";
+  content: "";
 }
 
 .fa-venus-mars:before {
-  content: "\f228";
+  content: "";
 }
 
 .fa-viacoin:before {
-  content: "\f237";
+  content: "";
 }
 
 .fa-viadeo:before {
-  content: "\f2a9";
+  content: "";
 }
 
 .fa-viadeo-square:before {
-  content: "\f2aa";
+  content: "";
 }
 
 .fa-vial:before {
-  content: "\f492";
+  content: "";
 }
 
 .fa-vials:before {
-  content: "\f493";
+  content: "";
 }
 
 .fa-viber:before {
-  content: "\f409";
+  content: "";
 }
 
 .fa-video:before {
-  content: "\f03d";
+  content: "";
 }
 
 .fa-video-slash:before {
-  content: "\f4e2";
+  content: "";
 }
 
 .fa-vihara:before {
-  content: "\f6a7";
+  content: "";
 }
 
 .fa-vimeo:before {
-  content: "\f40a";
+  content: "";
 }
 
 .fa-vimeo-square:before {
-  content: "\f194";
+  content: "";
 }
 
 .fa-vimeo-v:before {
-  content: "\f27d";
+  content: "";
 }
 
 .fa-vine:before {
-  content: "\f1ca";
+  content: "";
 }
 
 .fa-vk:before {
-  content: "\f189";
+  content: "";
 }
 
 .fa-vnv:before {
-  content: "\f40b";
+  content: "";
 }
 
 .fa-volleyball-ball:before {
-  content: "\f45f";
+  content: "";
 }
 
 .fa-volume-down:before {
-  content: "\f027";
+  content: "";
 }
 
 .fa-volume-off:before {
-  content: "\f026";
+  content: "";
 }
 
 .fa-volume-up:before {
-  content: "\f028";
+  content: "";
 }
 
 .fa-vuejs:before {
-  content: "\f41f";
+  content: "";
 }
 
 .fa-walking:before {
-  content: "\f554";
+  content: "";
 }
 
 .fa-wallet:before {
-  content: "\f555";
+  content: "";
 }
 
 .fa-warehouse:before {
-  content: "\f494";
+  content: "";
 }
 
 .fa-weebly:before {
-  content: "\f5cc";
+  content: "";
 }
 
 .fa-weibo:before {
-  content: "\f18a";
+  content: "";
 }
 
 .fa-weight:before {
-  content: "\f496";
+  content: "";
 }
 
 .fa-weight-hanging:before {
-  content: "\f5cd";
+  content: "";
 }
 
 .fa-weixin:before {
-  content: "\f1d7";
+  content: "";
 }
 
 .fa-whatsapp:before {
-  content: "\f232";
+  content: "";
 }
 
 .fa-whatsapp-square:before {
-  content: "\f40c";
+  content: "";
 }
 
 .fa-wheelchair:before {
-  content: "\f193";
+  content: "";
 }
 
 .fa-whmcs:before {
-  content: "\f40d";
+  content: "";
 }
 
 .fa-wifi:before {
-  content: "\f1eb";
+  content: "";
 }
 
 .fa-wikipedia-w:before {
-  content: "\f266";
+  content: "";
 }
 
 .fa-window-close:before {
-  content: "\f410";
+  content: "";
 }
 
 .fa-window-maximize:before {
-  content: "\f2d0";
+  content: "";
 }
 
 .fa-window-minimize:before {
-  content: "\f2d1";
+  content: "";
 }
 
 .fa-window-restore:before {
-  content: "\f2d2";
+  content: "";
 }
 
 .fa-windows:before {
-  content: "\f17a";
+  content: "";
 }
 
 .fa-wine-glass:before {
-  content: "\f4e3";
+  content: "";
 }
 
 .fa-wine-glass-alt:before {
-  content: "\f5ce";
+  content: "";
 }
 
 .fa-wix:before {
-  content: "\f5cf";
+  content: "";
 }
 
 .fa-wolf-pack-battalion:before {
-  content: "\f514";
+  content: "";
 }
 
 .fa-won-sign:before {
-  content: "\f159";
+  content: "";
 }
 
 .fa-wordpress:before {
-  content: "\f19a";
+  content: "";
 }
 
 .fa-wordpress-simple:before {
-  content: "\f411";
+  content: "";
 }
 
 .fa-wpbeginner:before {
-  content: "\f297";
+  content: "";
 }
 
 .fa-wpexplorer:before {
-  content: "\f2de";
+  content: "";
 }
 
 .fa-wpforms:before {
-  content: "\f298";
+  content: "";
 }
 
 .fa-wrench:before {
-  content: "\f0ad";
+  content: "";
 }
 
 .fa-x-ray:before {
-  content: "\f497";
+  content: "";
 }
 
 .fa-xbox:before {
-  content: "\f412";
+  content: "";
 }
 
 .fa-xing:before {
-  content: "\f168";
+  content: "";
 }
 
 .fa-xing-square:before {
-  content: "\f169";
+  content: "";
 }
 
 .fa-y-combinator:before {
-  content: "\f23b";
+  content: "";
 }
 
 .fa-yahoo:before {
-  content: "\f19e";
+  content: "";
 }
 
 .fa-yandex:before {
-  content: "\f413";
+  content: "";
 }
 
 .fa-yandex-international:before {
-  content: "\f414";
+  content: "";
 }
 
 .fa-yelp:before {
-  content: "\f1e9";
+  content: "";
 }
 
 .fa-yen-sign:before {
-  content: "\f157";
+  content: "";
 }
 
 .fa-yin-yang:before {
-  content: "\f6ad";
+  content: "";
 }
 
 .fa-yoast:before {
-  content: "\f2b1";
+  content: "";
 }
 
 .fa-youtube:before {
-  content: "\f167";
+  content: "";
 }
 
 .fa-youtube-square:before {
-  content: "\f431";
+  content: "";
 }
 
 .fa-zhihu:before {
-  content: "\f63f";
+  content: "";
 }
 
 .sr-only {
@@ -5341,22 +5341,22 @@ and open the template in the editor.
   color: #E5E5E5;
 }
 .enka-custom-radio.star::before {
-  content: "\f005";
+  content: "";
 }
 .enka-custom-radio.thumb::before {
-  content: "\f164";
+  content: "";
 }
 .enka-custom-radio.smiley::before {
-  content: "\f118";
+  content: "";
 }
 .enka-custom-radio.heart::before {
-  content: "\f004";
+  content: "";
 }
 .enka-custom-radio.flag::before {
-  content: "\f024";
+  content: "";
 }
 .enka-custom-radio.user::before {
-  content: "\f007";
+  content: "";
 }
 
 /* visual analog scale - radio buttons */
@@ -5367,25 +5367,25 @@ and open the template in the editor.
   color: #E5E5E5;
 }
 .enka-vizualna-skala.siv-61::before, .enka-vizualna-skala.siv-71::before {
-  content: "\f5b4";
+  content: "";
 }
 .enka-vizualna-skala.siv-41::before, .enka-vizualna-skala.siv-51::before, .enka-vizualna-skala.siv-62::before, .enka-vizualna-skala.siv-72::before {
-  content: "\f57a";
+  content: "";
 }
 .enka-vizualna-skala.siv-21::before, .enka-vizualna-skala.siv-31::before, .enka-vizualna-skala.siv-42::before, .enka-vizualna-skala.siv-52::before, .enka-vizualna-skala.siv-63::before, .enka-vizualna-skala.siv-73::before {
-  content: "\f119";
+  content: "";
 }
 .enka-vizualna-skala.siv-32::before, .enka-vizualna-skala.siv-53::before, .enka-vizualna-skala.siv-74::before {
-  content: "\f11a";
+  content: "";
 }
 .enka-vizualna-skala.siv-22::before, .enka-vizualna-skala.siv-33::before, .enka-vizualna-skala.siv-43::before, .enka-vizualna-skala.siv-54::before, .enka-vizualna-skala.siv-64::before, .enka-vizualna-skala.siv-75::before {
-  content: "\f118";
+  content: "";
 }
 .enka-vizualna-skala.siv-44::before, .enka-vizualna-skala.siv-55::before, .enka-vizualna-skala.siv-65::before, .enka-vizualna-skala.siv-76::before {
-  content: "\f580";
+  content: "";
 }
 .enka-vizualna-skala.siv-66::before, .enka-vizualna-skala.siv-77::before {
-  content: "\f59c";
+  content: "";
 }
 
 /*
@@ -5399,88 +5399,88 @@ and open the template in the editor.
 */
 /* icons */
 span.faicon.plus::before {
-  content: "\f067";
+  content: "";
 }
 
 span.faicon.minus::before {
-  content: "\f068";
+  content: "";
 }
 
 span.faicon.success::before,
 span.circle-check::before {
-  content: "\f058";
+  content: "";
 }
 
 span.faicon.close::before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f057";
+  content: "";
 }
 
 span.faicon.dropdown_blue::before {
   font-size: 16px;
-  content: "\f13a";
+  content: "";
 }
 
 span.faicon.dropup_blue::before {
   font-size: 16px;
-  content: "\f139";
+  content: "";
 }
 
 span.faicon.arrow_back::before {
   font-weight: 600;
   font-size: 16px;
-  content: "\f137";
+  content: "";
 }
 
 span.faicon.add::before {
   font-size: 18px;
-  content: "\f055";
+  content: "";
 }
 
 span.faicon.remove::before {
   font-size: 18px;
-  content: "\f056";
+  content: "";
 }
 
 span.faicon.delete::before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f2ed";
+  content: "";
 }
 
 span.faicon.anketa_delete::before {
   font-size: 24px;
   font-weight: 400;
-  content: "\f2ed";
+  content: "";
 }
 
 span.faicon.copy::before {
   font-size: 18px;
-  content: "\f0c5";
+  content: "";
   font-weight: 400;
 }
 
 span.faicon.anketa_copy::before {
   font-size: 24px;
-  content: "\f0c5";
+  content: "";
   font-weight: 400;
 }
 
 span.faicon.export::before {
   font-size: 24px;
-  content: "\f56e";
+  content: "";
 }
 
 span.faicon.file-import::before {
-  content: "\f56f";
+  content: "";
   transform: scaleX(-1);
 }
 
 span.faicon.import::before {
   font-size: 24px;
   font-weight: 400;
-  content: "\f1c2";
+  content: "";
 }
 
 /*span.faicon.import::after{
@@ -5490,137 +5490,137 @@ span.faicon.import::before {
 }*/
 span.faicon.library::before {
   font-size: 24px;
-  content: "\f518";
+  content: "";
 }
 
 span.faicon.folder::before {
   font-size: 16px;
   font-weight: 600;
-  content: "\f07b";
+  content: "";
 }
 
 span.faicon.folder_empty::before {
   font-size: 16px;
   font-weight: 400;
-  content: "\f07b";
+  content: "";
 }
 
 span.faicon.after.sort_down_arrow::after {
-  content: "\f0d7";
+  content: "";
   margin-left: 5px;
 }
 
 span.faicon.after.sort_up_arrow::after {
-  content: "\f0d8";
+  content: "";
   margin-left: 5px;
 }
 
 span.faicon.info::before {
   font-size: 28px;
-  content: "\f05a";
+  content: "";
   vertical-align: middle;
 }
 
 span.faicon.pagination_left::before {
   margin: 0 1px 0 1px;
-  content: "\f104";
+  content: "";
 }
 
 span.faicon.pagination_right::before {
   margin: 0 0 0 1px;
-  content: "\f105";
+  content: "";
 }
 
 span.faicon.edit::before,
 span.faicon.edit2::before {
-  content: "\f304";
+  content: "";
 }
 
 span.faicon.refresh::before {
   font-size: 18px;
-  content: "\f2f1";
+  content: "";
 }
 
 span.faicon.filter::before {
   font-size: 18px;
-  content: "\f0b0";
+  content: "";
 }
 
 span.faicon.grip::before {
-  content: "\f58e";
+  content: "";
 }
 
 span.faicon.star::before,
 span.faicon.star_off::before {
   font-size: 14px;
   font-weight: 400;
-  content: "\f005";
+  content: "";
 }
 
 span.faicon.star_on::before {
   font-size: 14px;
   font-weight: 700;
-  content: "\f005";
+  content: "";
 }
 
 span.faicon.search::before {
   font-size: 20px;
-  content: "\f002";
+  content: "";
 }
 
 span.faicon.clipboard_notes::before {
   font-size: 20px;
-  content: "\f46d";
+  content: "";
 }
 
 span.faicon.help2::before {
   font-size: 20px;
-  content: "\f059";
+  content: "";
 }
 
 span.faicon.user::before {
   font-size: 18px;
-  content: "\f007";
+  content: "";
 }
 
 span.faicon.logout::before {
   font-size: 20px;
-  content: "\f2f5";
+  content: "";
 }
 
 .faicon.monitor::before {
-  content: "\f108";
+  content: "";
 }
 
 .faicon.mobile::before {
-  content: "\f3cd";
+  content: "";
 }
 
 .faicon.tablet::before {
-  content: "\f3fa";
+  content: "";
 }
 
 span.faicon.users::before {
-  content: "\f500";
+  content: "";
 }
 
 span.faicon.lock_open::before {
-  content: "\f3c1";
+  content: "";
 }
 
 span.faicon.lock_close::before {
-  content: "\f023";
+  content: "";
 }
 
 span.faicon.bottom_saving::before {
   font-size: 24px;
   font-weight: 400;
-  content: "\f0c7";
+  content: "";
 }
 
 span.faicon.bottom_publish::before {
   font-size: 24px;
-  content: "\f093";
+  content: "";
 }
 
 span.faicon.bottom_preview {
@@ -5630,71 +5630,63 @@ span.faicon.bottom_preview {
 span.faicon.bottom_preview::before {
   font-size: 24px;
   font-weight: 400;
-  content: "\f15b";
+  content: "";
 }
 
 span.faicon.bottom_preview::after {
   font-size: 14px;
-  content: "\f002";
+  content: "";
   display: inline-block;
   margin-left: -70%;
 }
 
 span.faicon.bottom_test::before {
   font-size: 24px;
-  content: "\f492";
+  content: "";
 }
 
 span.faicon.language::before {
   font-size: 24px;
-  content: "\f0ac";
+  content: "";
 }
 
 span.faicon.mobile_off::before {
   font-size: 24px;
-  content: "\f3cd";
+  content: "";
 }
 
 span.faicon.mobile_off::after {
   font-size: 24px;
-  content: "\f715";
+  content: "";
   margin-left: -23px;
 }
 
 span.faicon.comments::before {
-  content: "\f27a";
+  content: "";
+  font-weight: 700;
 }
 
 span.faicon.comments_empty::before {
-  content: "\f27a";
-}
-
-span.faicon.comments_num::before {
-  content: "\f27a";
-}
-
-span.faicon.comments_num strong {
-  color: white;
-  font-family: Source Sans Pro, sans-serif;
-  margin-top: -2px;
+  content: "";
+  font-weight: 400;
 }
 
 span.faicon.data_link::before {
-  content: "\f0c1";
+  content: "";
 }
 
 span.faicon.data_link_small::before {
-  content: "\f0c1";
+  content: "";
 }
 
 span.faicon.print::before {
   font-size: 24px;
-  content: "\f02f";
+  content: "";
 }
 
 span.faicon.print_small::before {
   font-size: 16px;
-  content: "\f02f";
+  content: "";
 }
 
 span.faicon.preview {
@@ -5704,11 +5696,11 @@ span.faicon.preview {
 span.faicon.preview::before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f15b";
+  content: "";
 }
 
 span.faicon.preview::after {
-  content: "\f002";
+  content: "";
   display: inline-block;
   font-size: 11px;
   margin-left: -50%;
@@ -5716,87 +5708,87 @@ span.faicon.preview::after {
 
 span.faicon.palette::before {
   font-size: 18px;
-  content: "\f53f";
+  content: "";
 }
 
 span.faicon.inline_comment::before {
   font-size: 14px;
   font-weight: 400;
-  content: "\f075";
+  content: "";
 }
 
 span.faicon.inline_double_comment::before {
   font-size: 14px;
   font-weight: 400;
-  content: "\f086";
+  content: "";
 }
 
 span.faicon.comments_creport::before {
   font-size: 16px;
-  content: "\f086";
+  content: "";
 }
 
 span.faicon.compress::before {
   font-size: 15px;
-  content: "\f066";
+  content: "";
 }
 
 span.faicon.expand::before {
   font-size: 15px;
-  content: "\f065";
+  content: "";
 }
 
 span.faicon.hashtag::before {
   font-size: 15px;
-  content: "\f292";
+  content: "";
 }
 
 span.faicon.bug::before {
   font-size: 15px;
-  content: "\f188";
+  content: "";
 }
 
 span.faicon.paragraph::before {
   font-size: 15px;
-  content: "\f1dd";
+  content: "";
 }
 
 span.faicon.replace::before {
   font-size: 15px;
-  content: "\f362";
+  content: "";
 }
 
 span.faicon.plus_square::before {
   font-size: 15px;
   font-weight: 400;
-  content: "\f0fe";
+  content: "";
 }
 
 span.faicon.minus_square::before {
   font-size: 15px;
   font-weight: 400;
-  content: "\f146";
+  content: "";
 }
 
 span.faicon.delete_circle::before {
   font-size: 14px;
-  content: "\f056";
+  content: "";
 }
 
 span.faicon.quick_view::before {
   font-size: 15px;
   font-weight: 400;
-  content: "\f06e";
+  content: "";
 }
 
 span.faicon.edit_square::before {
   font-size: 15px;
-  content: "\f044";
+  content: "";
 }
 
 span.faicon.test::before {
   font-size: 15px;
-  content: "\f492";
+  content: "";
 }
 
 a.faicon.if_add {
@@ -5832,7 +5824,7 @@ span.faicon.if_add:hover:before {
 }
 
 span.faicon.text_file::before {
-  content: "\f15c";
+  content: "";
 }
 
 span.faicon.text_file_small {
@@ -5842,40 +5834,40 @@ span.faicon.text_file_small {
 span.faicon.text_file_small:before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f15c";
+  content: "";
 }
 
 span.faicon.warning::before {
   font-size: 16px;
-  content: "\f071";
+  content: "";
 }
 
 span.faicon.users_small::before {
   font-size: 16px;
-  content: "\f0c0";
+  content: "";
 }
 
 span.faicon.popup_0::before {
   font-size: 14px;
-  content: "\f065";
+  content: "";
   color: #1E88E5;
 }
 
 span.faicon.popup_1::before {
   font-size: 14px;
-  content: "\f065";
+  content: "";
   color: #0059ab;
 }
 
 span.faicon.flat_0::before {
   font-size: 14px;
-  content: "\f03c";
+  content: "";
   color: #0059ab;
 }
 
 span.faicon.flat_1::before {
   font-size: 14px;
-  content: "\f03c";
+  content: "";
   color: #1E88E5;
 }
 
@@ -5890,46 +5882,46 @@ span.basic-icon.spss::before {
 span.faicon.external_link::before {
   font-size: 14px;
   font-weight: 600;
-  content: "\f35d";
+  content: "";
 }
 
 span.faicon.cog_large::before {
   font-size: 34px;
   font-weight: 600;
-  content: "\f013";
+  content: "";
 }
 
 span.faicon.chart_large::before {
   font-size: 34px;
   font-weight: 600;
-  content: "\f201";
+  content: "";
 }
 
 span.faicon.reload_large::before {
   font-size: 34px;
   font-weight: 600;
-  content: "\f021";
+  content: "";
 }
 
 span.faicon.chart::before {
-  content: "\f080";
+  content: "";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.data::before {
-  content: "\f1c0";
+  content: "";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.publish::before {
-  content: "\f093";
+  content: "";
   font-size: 16px;
 }
 
 span.faicon.test::before {
-  content: "\f492";
+  content: "";
   font-size: 16px;
 }
 
@@ -5939,63 +5931,63 @@ button.ui-datepicker-trigger::before {
   font-family: "Font Awesome 5 Free";
   font-weight: 400;
   font-size: 16px;
-  content: "\f073";
+  content: "";
 }
 
 /* ARROWS */
 span.faicon.arrow_up::before {
   font-size: 14px;
-  content: "\f062";
+  content: "";
 }
 
 span.faicon.arrow2_r::before {
   font-size: 14px;
-  content: "\f054";
+  content: "";
 }
 
 span.faicon.arrow2_l::before {
   font-size: 14px;
-  content: "\f053";
+  content: "";
 }
 
 span.faicon.arrow2_d::before {
   font-size: 14px;
-  content: "\f078";
+  content: "";
 }
 
 span.faicon.arrow2_u::before {
   font-size: 14px;
-  content: "\f077";
+  content: "";
 }
 
 span.faicon.arrow_large2_r::before {
   font-size: 35px;
-  content: "\f054";
+  content: "";
 }
 
 span.faicon.arrow_large2_l::before {
   font-size: 35px;
-  content: "\f053";
+  content: "";
 }
 
 span.faicon.arrow_verylarge2_r::before {
   font-size: 40px;
-  content: "\f054";
+  content: "";
 }
 
 span.faicon.arrow_verylarge2_l::before {
   font-size: 40px;
-  content: "\f053";
+  content: "";
 }
 
 span.faicon.sort_descending::before {
   font-size: 14px;
-  content: "\f0d7";
+  content: "";
 }
 
 span.faicon.sort_ascending::before {
   font-size: 14px;
-  content: "\f0d8";
+  content: "";
 }
 
 /* Plus/minus sqare */
@@ -6007,127 +5999,127 @@ span.folder_plusminus {
 span.faicon.plus_orange::before {
   font-size: 12px;
   font-weight: 400;
-  content: "\f0fe";
+  content: "";
 }
 
 span.faicon.minus_orange::before {
   font-size: 12px;
   font-weight: 400;
-  content: "\f146";
+  content: "";
 }
 
 /* Spinner */
 span.faicon.spinner::before {
   font-size: 18px;
-  content: "\f1ce";
+  content: "";
 }
 
 /* Bars - mobile menu */
 span.faicon.bars::before {
   font-size: 26px;
-  content: "\f0c9";
+  content: "";
 }
 
 span.faicon.lock_open::before {
-  content: "\f3c1";
+  content: "";
 }
 
 span.faicon.lock_close::before {
-  content: "\f023";
+  content: "";
 }
 
 span.faicon.bell::before {
-  content: "\f0f3";
+  content: "";
 }
 
 span.faicon.bell_slash::before {
-  content: "\f1f6";
+  content: "";
 }
 
 span.faicon.trash::before {
-  content: "\f2ed";
+  content: "";
 }
 
 span.faicon.copy::before {
-  content: "\f0c5";
+  content: "";
 }
 
 span.faicon.circle::before {
-  content: "\f111";
+  content: "";
   vertical-align: middle;
 }
 
 span.faicon.plus::before {
-  content: "\f067";
+  content: "";
 }
 
 span.faicon.plus_circle::before {
-  content: "\f055";
+  content: "";
 }
 
 span.faicon.minus_circle::before {
-  content: "\f056";
+  content: "";
 }
 
 span.faicon.calendar_icon::before {
-  content: "\f073";
+  content: "";
 }
 
 span.faicon.clipboard::before {
-  content: "\f328";
+  content: "";
 }
 
 span.faicon.list-alt::before {
-  content: "\f022";
+  content: "";
 }
 
 span.faicon.vote-yes::before {
-  content: "\f772";
+  content: "";
 }
 
 span.faicon.file-preview::before {
-  content: "\f865";
+  content: "";
 }
 
 span.faicon.dots::before {
-  content: "\f141";
+  content: "";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.dots_ver:before {
-  content: "\f142";
+  content: "";
   font-size: 16px;
   font-weight: 600;
 }
 
 span.faicon.open_icon::before,
 a.faicon.open_icon::before {
-  content: "\f35d";
+  content: "";
 }
 
 span.faicon.table_icon::before {
-  content: "\f0ce";
+  content: "";
 }
 
 span.faicon.list::before {
-  content: "\f03a";
+  content: "";
 }
 
 span.faicon.link-chain::before {
-  content: "\f0c1";
+  content: "";
 }
 
 span.fa-brands.html5::before {
-  content: "\f13b";
+  content: "";
 }
 
 span.faicon.stopwatch20::before {
-  content: "\e06f";
+  content: "";
 }
 
 span.faicon.checkbox-empty::before {
-  content: "\f0c8";
+  content: "";
   font-weight: 400 !important;
 }
 
@@ -6136,7 +6128,7 @@ span.faicon.fa-1::before {
 }
 
 span.faicon.phone::before {
-  content: "\f095";
+  content: "";
 }
 
 /*
@@ -6273,23 +6265,23 @@ and open the template in the editor.
 */
 /* Toolbox na levi strani */
 span.faicon.wheel_32::before {
-  content: "\f013";
+  content: "";
 }
 
 span.faicon.radio_32::before {
-  content: "\f192";
+  content: "";
   font-weight: 400;
   font-size: 18px;
 }
 
 span.faicon.check_32::before {
-  content: "\f14a";
+  content: "";
   font-weight: 400;
   font-size: 18px;
 }
 
 span.faicon.matrix_32::before {
-  content: "\f192\f192\a\f192\f192";
+  content: "\a";
   white-space: pre;
   font-weight: 400;
   font-size: 12px;
@@ -6313,7 +6305,7 @@ span.faicon.nagovor::before {
 }
 
 span.faicon.plus_32::before {
-  content: "\f055";
+  content: "";
   font-size: 18px;
 }
 
@@ -6357,12 +6349,12 @@ span.faicon.edit-vprasanje {
 }
 span.faicon.edit-vprasanje:before {
   font-size: 18px;
-  content: "\f031";
+  content: "";
 }
 
 a.faicon.edit::before {
   font-size: 16px;
-  content: "\f304";
+  content: "";
 }
 
 a.faicon.addif::before {
@@ -6375,22 +6367,22 @@ a.faicon.addif::before {
 a.faicon.copy::before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f0c5";
+  content: "";
 }
 
 a.faicon.copycond::before {
   font-size: 18px;
-  content: "\f0c5";
+  content: "";
 }
 
 a.faicon.preview::before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f15b";
+  content: "";
 }
 
 a.faicon.preview::after {
-  content: "\f002";
+  content: "";
   display: inline-block;
   font-size: 11px;
   margin-left: -50%;
@@ -6398,25 +6390,25 @@ a.faicon.preview::after {
 
 a.faicon.arhiv::before {
   font-size: 18px;
-  content: "\f044";
+  content: "";
 }
 
 a.faicon.delete::before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f2ed";
+  content: "";
 }
 
 a.faicon.hide::before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f06e";
+  content: "";
 }
 
 a.faicon.unhide_icon::before {
   font-size: 18px;
   font-weight: 400;
-  content: "\f070";
+  content: "";
 }
 
 /* Urejanje vrednosti inline */
@@ -6430,12 +6422,12 @@ a.faicon.unhide_icon::before {
 
 .variabla span.inline.faicon.edit2::before {
   font-size: 14px;
-  content: "\f304";
+  content: "";
 }
 
 .variabla span.inline.faicon.odg_hidden::before {
   font-size: 14px;
-  content: "\f05e";
+  content: "";
 }
 
 .variabla span.inline.faicon.odg_hidden.show-hidden::before {
@@ -6463,23 +6455,23 @@ a.faicon.unhide_icon::before {
 .variabla span.inline.faicon.odg_if_follow::after {
   font-size: 14px;
   margin-left: 2px;
-  content: "\f0da";
+  content: "";
 }
 
 .variabla span.inline.faicon.correct::before {
   font-size: 14px;
   font-weight: 900;
-  content: "\f00c";
+  content: "";
 }
 
 .faicon.move_updown::before {
   font-size: 16px;
   color: #0059ab;
-  content: "\f338";
+  content: "";
 }
 
 .faicon.image_upload::before {
-  content: "\f03e";
+  content: "";
   font-weight: 400;
 }
 
@@ -6496,22 +6488,22 @@ and open the template in the editor.
 span.faicon.mapca.anketa::before {
   font-size: 16px;
   font-weight: 400;
-  content: "\f022";
+  content: "";
 }
 
 span.faicon.table::before {
   font-size: 16px;
-  content: "\f00b";
+  content: "";
 }
 
 span.faicon.other_vprasanja::before {
   font-size: 16px;
-  content: "\f0ca" !important;
+  content: "" !important;
 }
 
 span.faicon.osnovna_vprasanja::before {
   font-size: 16px;
-  content: "\f0ca";
+  content: "";
 }
 
 span.faicon.mapca.if::before {
@@ -6540,7 +6532,7 @@ and open the template in the editor.
 /* Izvozi */
 span.faicon.pdf::before {
   font-size: 16px;
-  content: "\f1c1";
+  content: "";
   color: #ed1c24;
 }
 
@@ -6562,7 +6554,7 @@ span.faicon.pdf.black::before {
 span.faicon.xls::before {
   font-size: 16px;
   font-weight: 400;
-  content: "\f1c3";
+  content: "";
   color: #008000;
 }
 
@@ -6584,7 +6576,7 @@ span.faicon.xls.black::before {
 span.faicon.rtf::before {
   font-size: 16px;
   font-weight: 400;
-  content: "\f1c2";
+  content: "";
   color: #0f3ea8;
 }
 
@@ -6606,7 +6598,7 @@ span.faicon.rtf.black::before {
 span.faicon.ppt::before {
   font-size: 16px;
   font-weight: 400;
-  content: "\f1c4";
+  content: "";
   color: #fa4913;
 }
 
@@ -6628,7 +6620,7 @@ span.faicon.ppt.black::before {
 span.faicon.xml::before {
   font-size: 16px;
   font-weight: 400;
-  content: "\f1c9";
+  content: "";
   color: #00a000;
 }
 
@@ -6648,17 +6640,17 @@ span.faicon.xml.black::before {
 }
 
 span.faicon.arhiv::before {
-  content: "\f187";
+  content: "";
 }
 
 span.faicon.arhiv_mail::before {
   font-size: 16px;
   font-weight: 400;
-  content: "\f14d";
+  content: "";
 }
 
 span.faicon.share-arrow::before {
-  content: "\f14d";
+  content: "";
 }
 
 /*
@@ -6708,7 +6700,7 @@ span.faicon.an_chart_bar::before {
   font-size: 14px;
   font-weight: 700;
   /*content: "\f080";*/
-  content: "\f200";
+  content: "";
 }
 
 /*
@@ -6722,35 +6714,35 @@ and open the template in the editor.
 */
 /* Invitation table */
 span.faicon.inv_sent_0::before {
-  content: "\f2b6";
+  content: "";
 }
 
 span.faicon.inv_sent_1::before {
-  content: "\f0e0";
+  content: "";
 }
 
 span.faicon.inv_responded_0::before {
   font-size: 14px;
   font-weight: 400;
-  content: "\f005";
+  content: "";
 }
 
 span.faicon.inv_responded_1::before {
   font-size: 14px;
   font-weight: 700;
-  content: "\f005";
+  content: "";
 }
 
 span.faicon.inv_unsubscribed_0::before {
   font-size: 14px;
   font-weight: 400;
-  content: "\f111";
+  content: "";
 }
 
 span.faicon.inv_unsubscribed_1::before {
   font-size: 14px;
   font-weight: 700;
-  content: "\f111";
+  content: "";
   color: #FF0000;
 }
 
@@ -6851,7 +6843,7 @@ a.read-more .faicon:before {
 .qtip .qtip-wrapper .qtip-contentWrapper .qtip-content h1::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f059";
+  content: "";
   font-size: 20px;
   color: #1E88E5;
   vertical-align: -1px;
@@ -6888,7 +6880,7 @@ a.read-more .faicon:before {
   padding-left: 8px;
   vertical-align: middle;
   font-family: "Font Awesome 5 Free";
-  content: "\f054";
+  content: "";
   font-size: 8px;
   color: #1E88E5;
   transition: 0.2s;
@@ -7211,7 +7203,7 @@ a.read-more .faicon:before {
 .divPopUp.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -7252,7 +7244,7 @@ a.read-more .faicon:before {
 .divPopUp_info.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -7744,7 +7736,7 @@ body.waitlong #loading {
 #check_pogoji.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -7925,7 +7917,7 @@ body.waitlong #loading {
 #dropped_alert.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -8115,7 +8107,7 @@ body.waitlong #loading {
 #popup_user_access.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -8928,31 +8920,11 @@ header #surveyNavigation #firstNavigation ol.quick_settings #quick_comments_link
 header #surveyNavigation #firstNavigation ol.quick_settings #quick_comments_link.newCss a:hover {
   color: #FFFFFF !important;
 }
-header #surveyNavigation #firstNavigation ol.quick_settings #quick_comments_link.newCss a span.comments_blue_off {
-  margin-top: 4px !important;
+header #surveyNavigation #firstNavigation ol.quick_settings #quick_comments_link.newCss .faicon {
+  line-height: 25px;
 }
-header #surveyNavigation #firstNavigation ol.quick_settings #quick_comments_link.newCss a span.comments_orange_off {
-  margin-top: 4px !important;
-}
-header #surveyNavigation #firstNavigation ol.quick_settings #quick_comments_link.newCss a span.comments_blue_on {
-  margin-top: -1px !important;
-}
-header #surveyNavigation #firstNavigation ol.quick_settings #quick_comments_link.newCss a span.comments_orange_on {
-  margin-top: -1px !important;
-}
-header #surveyNavigation #firstNavigation ol.quick_settings span.sprites.comments_blue_on {
-  color: #FFFFFF;
-  font-size: 11px;
-  font-weight: bold;
-  line-height: 12px;
-  text-align: center;
-}
-header #surveyNavigation #firstNavigation ol.quick_settings span.sprites.comments_orange_on {
-  color: #FFFFFF;
-  font-size: 11px;
-  font-weight: bold;
-  line-height: 12px;
-  text-align: center;
+header #surveyNavigation #firstNavigation ol.quick_settings #quick_comments_link.newCss .faicon:before {
+  font-size: 24px;
 }
 header #surveyNavigation #firstNavigation ol.navigation_modules li {
   margin-left: 16px;
@@ -9000,6 +8972,15 @@ header #secondNavigation ul.secondNavigationArchive li a {
   color: #808080;
   text-decoration: none;
 }
+header #secondNavigation ul.secondNavigation li a .faicon.arrow2_r,
+header #secondNavigation ul.secondNavigationArchive li a .faicon.arrow2_r {
+  margin-left: 8px;
+}
+header #secondNavigation ul.secondNavigation li a .faicon.arrow2_r:before,
+header #secondNavigation ul.secondNavigationArchive li a .faicon.arrow2_r:before {
+  font-size: 10px;
+  vertical-align: 1px;
+}
 header #secondNavigation ul.secondNavigation li.active, header #secondNavigation ul.secondNavigation li:hover,
 header #secondNavigation ul.secondNavigationArchive li.active,
 header #secondNavigation ul.secondNavigationArchive li:hover {
@@ -9136,7 +9117,7 @@ header #topSettingsHolder .left_options_holder #analizaSubNav #globalSetingsLink
   right: 8px;
   top: 5px;
   font-family: "Font Awesome 5 Free";
-  content: "\f078";
+  content: "";
   font-size: 10px;
   font-weight: 600;
 }
@@ -9767,17 +9748,17 @@ input[type=radio]:checked + label:before, input[type=checkbox]:checked + label:b
   color: #1E88E5;
 }
 input[type=checkbox] + label:before {
-  content: "\f0c8";
+  content: "";
 }
 input[type=checkbox]:checked + label:before {
-  content: "\f14a";
+  content: "";
   font-weight: bold;
 }
 input[type=radio] + label:before {
-  content: "\f111";
+  content: "";
 }
 input[type=radio]:checked + label:before {
-  content: "\f192";
+  content: "";
 }
 input[type=checkbox][disabled] + label:before {
   color: #C4C4C4;
@@ -10344,7 +10325,7 @@ div .table-horizontal-scroll-wrapper2 table {
 #survey_list .second_line .filters #folderSwitch#sortButton:after {
   position: absolute;
   font-family: "Font Awesome 5 Free";
-  content: "\f078";
+  content: "";
   right: 8px;
   top: 13px;
   font-weight: 600;
@@ -10690,13 +10671,13 @@ body.eng #survey_list .filters #folderSwitch {
   cursor: pointer;
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_arrow_icon::before {
-  content: "\f078";
+  content: "";
   font-size: 14px;
   color: #333333;
   margin-right: 8px;
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_icon::before {
-  content: "\f07b";
+  content: "";
   font-size: 16px;
   font-weight: 400;
   color: #1E88E5;
@@ -10706,7 +10687,7 @@ body.eng #survey_list .filters #folderSwitch {
   background-color: #F8F8F8;
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title.open .folder_arrow_icon::before {
-  content: "\f077";
+  content: "";
 }
 #survey_list .div_sl_new.folders .folder_holder .folder_title.open .folder_icon::before {
   font-weight: 600;
@@ -11791,13 +11772,13 @@ div.page_obvestila #unread_notifications .gdpr_popup_radio input {
   cursor: pointer;
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box .folder_arrow_icon::before {
-  content: "\f078";
+  content: "";
   font-size: 14px;
   color: #333333;
   margin-right: 8px;
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box .folder::before {
-  content: "\f07b";
+  content: "";
   font-size: 16px;
   font-weight: 400;
   color: #1E88E5;
@@ -11823,7 +11804,7 @@ div.page_obvestila #unread_notifications .gdpr_popup_radio input {
   }*/
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box.open .folder_arrow_icon::before {
-  content: "\f077";
+  content: "";
 }
 #anketa_knjiznica #libraryInner ul li .folder_box_holder .folder_box.open .folder::before {
   font-weight: 600;
@@ -12076,7 +12057,7 @@ and open the template in the editor.
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "\f111";
+  content: "";
   letter-spacing: 10px;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=radio] + span.enka-custom-radio:before {
@@ -12084,7 +12065,7 @@ and open the template in the editor.
   display: inline-block;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "\f192";
+  content: "";
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=checkbox] {
   display: none !important;
@@ -12097,11 +12078,11 @@ and open the template in the editor.
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=checkbox] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
   display: inline-block;
-  content: "\f0c8";
+  content: "";
   letter-spacing: 10px;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "\f14a";
+  content: "";
   letter-spacing: 8px;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting .custom_radio_picture.obarvan > label > span.enka-custom-radio:before {
@@ -12394,7 +12375,7 @@ and open the template in the editor.
 }
 #new_anketa_div .layout_right_item .layout_right_centering .anketa_from_text .from_text_sidebyside_holder #preview_field_holder #preview_field span.variable input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
-  content: "\f111";
+  content: "";
   display: inline-block;
   font-size: 14px;
   color: #C4C4C4;
@@ -12833,6 +12814,38 @@ div.drop_setting_transition {
   transition: all 0.5s ease-in-out;
 }
 
+.page_status_advanced .status_advanced {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  position: relative;
+  width: 100%;
+}
+.page_status_advanced .status_advanced a {
+  width: 25%;
+  min-width: 290px;
+  text-decoration: none;
+}
+.page_status_advanced .status_advanced .status_advanced_box {
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-sizing: border-box;
+  padding: 16px;
+  margin: 0 16px 16px 0;
+  font-size: 16px;
+  font-weight: 600;
+  text-transform: uppercase;
+  color: #333333;
+  background-color: #fff;
+  border: 1px solid #E5E5E5;
+  transition: 0.2s;
+}
+.page_status_advanced .status_advanced .status_advanced_box:hover {
+  background-color: #F8F8F8;
+}
+
 /*
     Branching ikone, radio, checkboxi...
 */
@@ -12860,20 +12873,20 @@ div.drop_setting_transition {
   font-weight: 400;
 }
 #branching input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "\f0c8";
+  content: "";
   letter-spacing: 10px;
 }
 #branching input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
-  content: "\f111";
+  content: "";
   letter-spacing: 8px;
 }
 #branching input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "\f14a";
+  content: "";
   color: #D3D3D3;
   letter-spacing: 8px;
 }
 #branching input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before {
-  content: "\f192";
+  content: "";
   color: #D3D3D3;
 }
 #branching span.faicon.delete_circle::before {
@@ -18719,7 +18732,7 @@ and open the template in the editor.
   transition: 0.2s;
 }
 .tab_content .content_left ul li.folder_item .faicon.arrow:before {
-  content: "\f078";
+  content: "";
 }
 .tab_content .content_left ul li.folder_item .faicon.folder:before,
 .tab_content .content_left ul li.folder_item .faicon.clipboard:before {
@@ -18736,7 +18749,7 @@ and open the template in the editor.
   color: #1E88E5;
 }
 .tab_content .content_left ul li.folder_item.open .faicon.arrow:before {
-  content: "\f077";
+  content: "";
 }
 .tab_content .content_left ul li.folder_item.no_arrow .faicon.arrow:before {
   display: none;
@@ -19227,7 +19240,7 @@ img.mapster_el {
   border-radius: 4px;
 }
 .jquery-selectbox .jquery-selectbox-moreButton::before {
-  content: "\f078";
+  content: "";
   padding-left: 2px;
   color: #333333;
   font-size: 10px;
@@ -19840,7 +19853,7 @@ div#theme-edit-wrap div#theme-editor #picker .button_holder button:last-child {
 div#theme-edit-wrap div#theme-editor #picker.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -20199,7 +20212,7 @@ span.faicon.st-besede-popup {
 #vrednost_edit.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -20395,7 +20408,7 @@ span.faicon.st-besede-popup {
 #calculation.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -20645,7 +20658,7 @@ and open the template in the editor.
 #preview_spremenljivka.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -21327,7 +21340,7 @@ and open the template in the editor.
 }
 #popup_import_from_text .anketa_from_text .import_holder #preview_field_holder #preview_field span.variable input[type=radio] + span.enka-checkbox-radio:before {
   font-family: "Font Awesome 5 Free";
-  content: "\f111";
+  content: "";
   display: inline-block;
   font-size: 14px;
   color: #E5E5E5;
@@ -21335,7 +21348,7 @@ and open the template in the editor.
   font-weight: 400;
 }
 #popup_import_from_text .anketa_from_text .import_holder #preview_field_holder #preview_field span.variable input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "\f192";
+  content: "";
   color: #E5E5E5;
 }
 
@@ -21598,7 +21611,7 @@ dl.arch_email dd {
 #inv_view_arch_recipients.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -22586,11 +22599,6 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment d
   margin: 0px 3px;
 }
 
-#quick_comments_link {
-  margin-bottom: 1px !important;
-  margin-left: 3px !important;
-  padding-bottom: 3px !important;
-}
 #quick_comments_link a span.link {
   display: inline-block;
   padding: 3px !important;
@@ -22600,10 +22608,7 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment d
 }
 
 #quick_comments_link.newCss {
-  height: 20px !important;
-  line-height: 20px !important;
   text-align: center;
-  margin-top: 8px !important;
 }
 #quick_comments_link.newCss img {
   vertical-align: middle;
@@ -24385,7 +24390,7 @@ div.subpage_coding .coding-refresh .button_holder button:last-child {
 div.subpage_coding .coding-refresh.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -24567,7 +24572,7 @@ div.subpage_coding #coding .button_holder button:last-child {
 div.subpage_coding #coding.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -24891,7 +24896,7 @@ div.subpage_coding .floatRecodeSpremenljivka .button_holder button:last-child {
 div.subpage_coding .floatRecodeSpremenljivka.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -25233,18 +25238,18 @@ ul#merge li {
   -webkit-text-stroke: 0.35px;
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=checkbox] + span.enka-checkbox-radio:before {
-  content: "\f0c8";
+  content: "";
   letter-spacing: 10px;
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=checkbox]:checked + span.enka-checkbox-radio:before {
-  content: "\f14a";
+  content: "";
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=radio] + span.enka-checkbox-radio:before {
-  content: "\f111";
+  content: "";
   letter-spacing: 10px;
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=radio]:checked + span.enka-checkbox-radio:before {
-  content: "\f192";
+  content: "";
 }
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=checkbox] + span.enka-checkbox-radio,
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=radio] + span.enka-checkbox-radio,
@@ -25733,7 +25738,7 @@ and open the template in the editor.
 #div_export_setting_show.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -28652,7 +28657,7 @@ ul.vrednost_sort input[type=text] {
 .subpage_analysis_creport #anketa_custom_report #newCReportProfile.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -28951,7 +28956,7 @@ and open the template in the editor.
 #dsp_inspect_cover.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -29478,7 +29483,7 @@ input#endDate {
 .mc_table_settings.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -29689,7 +29694,7 @@ input#endDate {
 #newMCTable.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -29876,7 +29881,7 @@ input#endDate {
 #renameMCTable.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -30063,7 +30068,7 @@ input#endDate {
 #deleteMCTable.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
-  content: "\f071";
+  content: "";
   font-size: 14px;
   color: #FFC700;
 }
@@ -30348,7 +30353,7 @@ button.buttons-columnVisibility.active {
 table.usersTable {
   margin-left: 14px;
   margin-right: 14px;
-  width: calc(100% - 28px);
+  width: calc(100% - 2*14px);
   white-space: nowrap;
   border-collapse: collapse !important;
 }
diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss
index b95faf8e7..185fb9c47 100644
--- a/resources/sass/admin_new/basic/icons/standard.scss
+++ b/resources/sass/admin_new/basic/icons/standard.scss
@@ -249,21 +249,14 @@ span.faicon.mobile_off::after{
 		margin-left: -23px;
 }
 span.faicon.comments::before{
-        content: "\f27a";
+    content: "\f27a";
+    font-weight: 700;
 }
 span.faicon.comments_empty::before{
     content: "\f27a";
+    font-weight: 400;
 }
-span.faicon.comments_num::before{
-        content: "\f27a";
-}
-span.faicon.comments_num {
-        strong {
-                color: white;
-                font-family: $font_family;
-                margin-top: -2px;
-        }
-}
+
 @mixin icon_link(){
         content: "\f0c1";
 }
diff --git a/resources/sass/admin_new/components/header/navigation.scss b/resources/sass/admin_new/components/header/navigation.scss
index 1bf123acf..fb725b852 100644
--- a/resources/sass/admin_new/components/header/navigation.scss
+++ b/resources/sass/admin_new/components/header/navigation.scss
@@ -117,35 +117,16 @@ header{
                             &:hover {
                                 color: $white !important;
                             }
-                            
-                            span.comments_blue_off {
-                                margin-top: 4px !important;
-                            }
-                            span.comments_orange_off {
-                                margin-top: 4px !important;
-                            }
-                            span.comments_blue_on {
-                                margin-top: -1px !important;
-                            }
-                            span.comments_orange_on {
-                                margin-top: -1px !important;
+                        }
+
+                        .faicon{
+                            line-height: 25px;
+
+                            &:before{
+                                font-size: 24px;
                             }
                         }
                     }
-                    span.sprites.comments_blue_on {
-                        color: $white;
-                        font-size: 11px;
-                        font-weight: bold;
-                        line-height: 12px;
-                        text-align: center;
-                    }
-                    span.sprites.comments_orange_on {
-                        color: $white;
-                        font-size: 11px;
-                        font-weight: bold;
-                        line-height: 12px;
-                        text-align: center;
-                    }
                 }
 
                 // Vklopljeni moduli na desni
@@ -210,6 +191,15 @@ header{
                     font-size: 15px;
                     color: $very-dark-gray2;
                     text-decoration: none;
+
+                    .faicon.arrow2_r{
+                        margin-left: 8px;
+
+                        &:before{
+                            font-size: 10px;
+                            vertical-align: 1px;
+                        }
+                    }
                 }
 
                 &.active,
diff --git a/resources/sass/admin_new/pages/survey_status/status_advanced.scss b/resources/sass/admin_new/pages/survey_status/status_advanced.scss
new file mode 100644
index 000000000..251e36eb1
--- /dev/null
+++ b/resources/sass/admin_new/pages/survey_status/status_advanced.scss
@@ -0,0 +1,45 @@
+.page_status_advanced {
+
+
+    .status_advanced{
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+
+        position: relative;
+        width: 100%;
+
+        a{
+            width: 25%;
+            min-width: 290px;
+            text-decoration: none;
+        }
+
+        .status_advanced_box{
+            cursor: pointer;
+
+            display: flex;
+            align-items: center;
+            justify-content: center;
+
+            box-sizing: border-box;
+            padding: 16px;
+            margin: 0 16px 16px 0;
+
+            font-size: 16px;
+            font-weight: 600;
+            text-transform: uppercase;
+            color: $black;
+
+            background-color: #fff;
+            border: 1px solid $gray;
+            
+            transition: .2s;
+
+            &:hover{
+                background-color: $light-gray;
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/survey_status/survey_status.scss b/resources/sass/admin_new/pages/survey_status/survey_status.scss
index be5913e22..e310f3a6a 100644
--- a/resources/sass/admin_new/pages/survey_status/survey_status.scss
+++ b/resources/sass/admin_new/pages/survey_status/survey_status.scss
@@ -1,2 +1,3 @@
 @import "summary";
-@import "nonresponse";
\ No newline at end of file
+@import "nonresponse";
+@import "status_advanced";
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
index 42e496e6c..138ebd605 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
@@ -295,9 +295,6 @@ div.page_komentarji_anketa {
 	margin: 0px 3px;
 }
 #quick_comments_link {
-	margin-bottom: 1px !important;
-	margin-left: 3px !important;
-	padding-bottom: 3px !important;
 	a {
 		span.link {
 			display: inline-block;
@@ -309,10 +306,8 @@ div.page_komentarji_anketa {
 	}
 }
 #quick_comments_link.newCss {
-	height: 20px !important;
-	line-height: 20px !important;
 	text-align: center;
-	margin-top: 8px !important;
+
 	img {
 		vertical-align: middle;
 	}

From 146bc5b1de1332f5f260e79dd5eac176fd6c0a75 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Fri, 27 May 2022 12:02:31 +0200
Subject: [PATCH 04/17] Redesign - popravki napak - drag dodajanja vprasanja,
 komentarji

---
 admin/survey/SurveyAdminSettings.php          | 20 +++++++++----
 admin/survey/script/branching.js              | 12 ++------
 lang/1.php                                    |  6 ++--
 lang/2.php                                    |  6 ++--
 public/css/admin_new.css                      | 29 ++++++++++++++-----
 .../admin_new/pages/survey_edit/toolbox.scss  |  4 +--
 .../pages/survey_testiranje/komentarji.scss   | 26 ++++++++++++++++-
 7 files changed, 75 insertions(+), 28 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index b174f72ae..fae47ac97 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -1131,7 +1131,17 @@ class SurveyAdminSettings {
 				$preview_disable_test_insert = SurveySetting::getInstance()->getSurveyMiscSetting('preview_disable_test_insert');				
 				
 				if ( isset($_GET['show']) && $_GET['show']=='on_alert' ) {
-					echo '<div class="comments_on_alert google_yellow">'.$lang['srv_comments_on_alert'].' <a href="ajax.php?anketa='.$this->anketa.'&a=comments_onoff&do=off">'.$lang['srv_off'].'.</a> '.$lang['srv_comments_on_alert2'].' <a href="https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/komentarji/?from1ka=1" target="_blank">'.$lang['srv_anl_more'].'</a></div>';
+					echo '<div class="comments_on_alert google_yellow">';
+                    
+                    echo '  <div class="title"><span class="faicon success"></span>'.$lang['srv_comments_on_alert'].'</div>';
+
+                    echo '  <div class="text">';
+                    echo        $lang['srv_comments_on_alert1'].' <a href="ajax.php?anketa='.$this->anketa.'&a=comments_onoff&do=off">'.$lang['srv_here'].'</a>. ';
+                    echo        $lang['srv_comments_on_alert2'];
+                    echo '      <a href="https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/komentarji/?from1ka=1" target="_blank">'.$lang['srv_more_info'].'</a>.';
+                    echo '  </div>';
+
+                    echo '</div>';
 				}
 				
 				$css_width = '';
@@ -10577,10 +10587,10 @@ class SurveyAdminSettings {
 		
 		if ($admin_type == '0' || $admin_type == '1') {
 			echo '<div class="setting_holder">';
-			echo '<input type="checkbox" onclick="changeSurveyLock(this)" '.($lockSurvey == 1 ? ' checked="checekd"' : '').'>';
-			echo '<label>';
-			echo $lang['srv_survey_lock_note'];
-			echo '</label>';
+			echo '  <input type="checkbox" id="change_survey_lock" onclick="changeSurveyLock(this)" '.($lockSurvey == 1 ? ' checked="checekd"' : '').'>';
+			echo '  <label for="change_survey_lock">';
+			echo        $lang['srv_survey_lock_note'];
+			echo '  </label>';
 			echo '</div>';
         }
         
diff --git a/admin/survey/script/branching.js b/admin/survey/script/branching.js
index b91aa375e..8a686ad33 100644
--- a/admin/survey/script/branching.js
+++ b/admin/survey/script/branching.js
@@ -636,7 +636,7 @@ function branching_struktura() {
 
     // nastavimo droppable
     $('li.drop', $('#branching')).droppable({
-        accept: '.spr, .if, .block, .endif, .endblock, .new_spr, .new_adv, .new_if, .new_block, .new_loop, .new_pb, .loop, .endloop',
+        accept: '.spr, .if, .block, .endif, .endblock, .new_spr, .new_if, .new_block, .new_loop, .new_pb, .loop, .endloop',
         hoverClass: 'branchinghover',
         tolerance: 'pointer',
         drop: function (e, ui) {
@@ -658,9 +658,6 @@ function branching_struktura() {
                     spremenljivka_new(spr, _if, endif, copy, tip, podtip, drop);
                 }
 
-            } else if ($(ui.draggable).hasClass('new_adv')) {		// nova advanced spremenljivka (odpre se popup za izbiro)
-                toolbox_add_advanced();
-
             } else if ($(ui.draggable).hasClass('new_if')) {		// nov if iz toolbox
                 var spr = $(this).attr('spr');
                 var _if = $(this).attr('if');
@@ -718,7 +715,7 @@ var is_new_spr_dragable = false; // gledamo ali vlečemo new_spr da skrbimo za s
 // inicializira toolbox na levi strani
 function init_toolbox() {
 
-    $('.new_spr:not(.user_access_locked), .new_adv:not(.user_access_locked), .new_if:not(.user_access_locked), .new_block:not(.user_access_locked), .new_loop:not(.user_access_locked), .new_pb', '#toolbox_basic').draggable({
+    $('.new_spr:not(.user_access_locked), .new_if:not(.user_access_locked), .new_block:not(.user_access_locked), .new_loop:not(.user_access_locked), .new_pb', '#toolbox_basic').draggable({
         start: function (e, ui) {
             is_new_spr_dragable = true;
             $('#toolbox_add_advanced').addClass('dragging');
@@ -739,7 +736,7 @@ function init_toolbox() {
     }).bind('click', function (event) {
 
         var ta = $(event.target);
-        ta = $(ta).closest('.new_spr, .new_adv, .new_if, .new_block, .new_loop');
+        ta = $(ta).closest('.new_spr, .new_if, .new_block, .new_loop');
         
         if (ta.hasClass('new_spr')) {				// nova spremenljivka (iz toolboxa)
             
@@ -758,9 +755,6 @@ function init_toolbox() {
             }
 
         } 
-        else if (ta.hasClass('new_adv')) {		// nova spremenljivka advanced (prikaze se popup z vsemi tipi vprasanj)
-            toolbox_add_advanced();
-        } 
         else if (ta.hasClass('new_if')) {			// nov if iz toolbox
             $('html, body').animate({scrollTop: $('body').height() + $('#branching').height()});		// scrollamo na dno zaslona
             if_new(0, 0, 1, 0);
diff --git a/lang/1.php b/lang/1.php
index c5b9d1a23..838549b37 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -3001,6 +3001,7 @@ $lang = array (
 	"srv_orientacija_horizontalna_3"  =>	"Vodoravno",
 	"srv_orientacija_expand"          =>	"Z razpiranjem",
 	"srv_dynamic_multigrid"  		=>	"Postopno reševanje",
+	"srv_more_info"					=>	"Več informacij",
 	"srv_more"						=>	"ve&#269",
 	"srv_less"						=>	"manj",
 	"user_tracker"					=>	"Nadzor uporabnika",
@@ -3697,7 +3698,7 @@ $lang = array (
 	"srv_language_admin"			=>	"Jezik za urednike",
 	"srv_language_admin_0"			=>	"Jezik",
 	"srv_language_admin_1"			=>	"Osnovni jezik",
-	"srv_language_admin_survey"		=>	"jezik administrativnega vmesnika",
+	"srv_language_admin_survey"		=>	"Jezik administrativnega vmesnika",
 	"srv_language_admin_surveyA"		=>	"Trenutni ",
 	"srv_language_admin_surveyB"		=>	" je Slovenščina.",
 	"srv_language_std_bes1"		=>	"Standardne besede lahko urejate v ",
@@ -6658,7 +6659,8 @@ $lang = array (
 	'srv_data_column_naslov_map'				=>	'Naslov',
 	'srv_data_column_vrednost_map'				=>	'Vrednost',
 	'srv_data_column_koordinate_map'			=>	'Koordinate',
-	'srv_comments_on_alert'						=>	'Komentarji so sedaj vklopljeni.',
+	'srv_comments_on_alert'						=>	'Komentarji so sedaj vklopljeni',
+	'srv_comments_on_alert1'					=>	'Če vklop komentarjev ni bil storjen namerno, lahko komentarje izklopite',
 	'srv_comments_on_alert2'					=>	'Dodatne nastavitve lahko uredite spodaj.',
 	'srv_off'									=>	'Izklopi',
 	'srv_para_neodgovori'						=>	'Neodgovor spremenljivke',
diff --git a/lang/2.php b/lang/2.php
index 9e051420a..225447495 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -2973,6 +2973,7 @@ $lang = array (
     "srv_orientacija_expand"          =>	"Expanding",
 	"srv_dynamic_multigrid"  			=>	"Step by step mode",
     "srv_analiza_filter_all"            =>  "All entries",
+    "srv_more_info"					=>	"More information",
 	"srv_more"							=>	"more",
 	"srv_less"							=>	"less",
 	"user_tracker"			=> "Tracker",
@@ -3665,7 +3666,7 @@ $lang = array (
 	"srv_language_admin"			=>	"Language for editors",
 	"srv_language_admin_0"			=>	"Language",
 	"srv_language_admin_1"			=>	"Basic language for ",
-	"srv_language_admin_survey"		=>	"language for survey editors",
+	"srv_language_admin_survey"		=>	"Language for survey editors",
 	"srv_language_admin_surveyA"		=>	"The current ",
 	"srv_language_admin_surveyB"		=>	" is English.",
 	"srv_language_std_bes1"		=>	"Standard words can be edited in the ",
@@ -6541,7 +6542,8 @@ $lang = array (
 	'srv_data_column_naslov_map'				=>	'Address',
 	'srv_data_column_vrednost_map'				=>	'Value',
 	'srv_data_column_koordinate_map'			=>	'Coordinates',
-	'srv_comments_on_alert'						=>	'Comments are now enabled.',
+	'srv_comments_on_alert'						=>	'Comments are now enabled',
+    'srv_comments_on_alert1'					=>	'If the enabling of comments was not done intentionally, you can turn off the comments',
 	'srv_comments_on_alert2'					=>	'You can edit extra settings below.',
 	'srv_off'									=>	'Turn off',
 	'srv_para_neodgovori'						=>	'Item nonresponse',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index dae94a016..c0eb1e71a 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -13348,17 +13348,17 @@ div.drop_setting_transition {
 .toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option {
   padding: 8px 16px 8px 16px;
 }
-.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a,
-.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover {
+.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:not(.help),
+.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover:not(.help) {
   color: #333333;
   text-decoration: none;
 }
-.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a .faicon,
-.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover .faicon {
+.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:not(.help) .faicon,
+.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover:not(.help) .faicon {
   margin-right: 8px;
 }
-.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a .faicon:before,
-.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover .faicon:before {
+.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:not(.help) .faicon:before,
+.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover:not(.help) .faicon:before {
   font-size: 14px;
   color: #1E88E5;
 }
@@ -22615,7 +22615,22 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment d
 }
 
 .comments_on_alert {
-  margin-bottom: 10px;
+  margin-bottom: 32px;
+  padding: 16px 32px;
+  border: 1px solid #E5E5E5;
+  box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+}
+.comments_on_alert .title {
+  font-weight: 600;
+  font-size: 16px;
+  text-transform: uppercase;
+  padding-bottom: 8px;
+  margin-bottom: 8px;
+  border-bottom: 1px #E5E5E5 solid;
+}
+.comments_on_alert .title .faicon {
+  margin-right: 8px;
+  color: #1E88E5;
 }
 .comments_on_alert a {
   font-weight: 500;
diff --git a/resources/sass/admin_new/pages/survey_edit/toolbox.scss b/resources/sass/admin_new/pages/survey_edit/toolbox.scss
index a6dc74046..757b85e22 100644
--- a/resources/sass/admin_new/pages/survey_edit/toolbox.scss
+++ b/resources/sass/admin_new/pages/survey_edit/toolbox.scss
@@ -333,8 +333,8 @@
             .segment_option{
                 padding: 8px 16px 8px 16px;
 
-                a,
-                a:hover{
+                a:not(.help),
+                a:hover:not(.help){
                     color: $black;
                     text-decoration: none;
 
diff --git a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
index 138ebd605..90f077eb3 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
@@ -313,7 +313,31 @@ div.page_komentarji_anketa {
 	}
 }
 .comments_on_alert {
-	margin-bottom: 10px;
+	margin-bottom: 32px;
+    padding: 16px 32px;
+
+    border: 1px solid $gray;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+
+    .title{
+        font-weight: 600;
+        font-size: 16px;
+        text-transform: uppercase;
+
+        padding-bottom: 8px;
+        margin-bottom: 8px;
+
+        border-bottom: 1px $gray solid;
+
+        .faicon{
+            margin-right: 8px;
+            color: $blue;
+        }
+    }
+
+    .text{
+
+    }
 
     a{
         //color: white;

From 8403c4a85b058df5c21a78da14c73354aab666f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Fri, 27 May 2022 14:19:05 +0200
Subject: [PATCH 05/17] Arnes landing page in GDPR  redesign popravki (header,
 mobile nav,body, footer ) displaycontroller.php je v prejsnjem testnem
 commitu "ai popravki blalbalb"

---
 frontend/simple/css/aai.css             |  567 ++++++++++
 frontend/simple/script/nav-mobile.js    |   10 +
 lang/1.php                              | 1262 +++++++++--------------
 public/img/flags/english_flag.svg       |   13 +
 public/img/icons/chevron.svg            |    3 +
 public/img/icons/hero.svg               |   92 ++
 public/img/icons/icon_1ka_podpora.svg   |   17 +
 public/img/icons/icon_arnes_podpora.svg |   12 +
 public/img/icons/icon_kako_deluje.svg   |    5 +
 public/img/icons/icon_o_1ka.svg         |    5 +
 public/img/logo/ministrstvo.svg         |   69 ++
 public/img/social/fb_orange.svg         |   11 +
 public/img/social/twitter_orange.svg    |   11 +
 13 files changed, 1285 insertions(+), 792 deletions(-)
 create mode 100644 frontend/simple/css/aai.css
 create mode 100644 frontend/simple/script/nav-mobile.js
 create mode 100644 public/img/flags/english_flag.svg
 create mode 100644 public/img/icons/chevron.svg
 create mode 100644 public/img/icons/hero.svg
 create mode 100644 public/img/icons/icon_1ka_podpora.svg
 create mode 100644 public/img/icons/icon_arnes_podpora.svg
 create mode 100644 public/img/icons/icon_kako_deluje.svg
 create mode 100644 public/img/icons/icon_o_1ka.svg
 create mode 100644 public/img/logo/ministrstvo.svg
 create mode 100644 public/img/social/fb_orange.svg
 create mode 100644 public/img/social/twitter_orange.svg

diff --git a/frontend/simple/css/aai.css b/frontend/simple/css/aai.css
new file mode 100644
index 000000000..4f5989cd0
--- /dev/null
+++ b/frontend/simple/css/aai.css
@@ -0,0 +1,567 @@
+@import url('https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap');
+
+* {
+    font-family: "Source Sans Pro","sans-serif";
+}
+
+/* nav */
+.mobile{
+    display: none;
+}
+
+
+ h1 {
+    font-weight: 300;
+    font-size: 50px;
+    line-height: 62px;
+}
+
+h2 {
+    font-size: 40px;
+    font-weight: bold;
+}
+
+
+header {
+    padding-top: 10px;
+    padding-bottom: 5px;
+
+}
+
+header a {
+    font-weight: 400;
+}
+
+
+header nav span.menu_item a:hover {
+    color: #F07D3E;
+}
+
+header nav span.menu_item.active {
+    border-bottom: 3px #F07D3E solid;
+  }
+
+
+#header-btn {
+    color: rgb(255, 255, 255);
+    background-color: #F07D3E;
+
+    width: 150x;
+    padding: 8px 16px;
+
+    text-transform: none;
+}
+
+#header-btn:hover {
+    color: #F07D3E;
+    background-color: white;
+
+    border: 1px solid #F07D3E;
+}
+
+
+.hero-container {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    height: auto;
+
+    margin-top: 30px;
+    margin-bottom: 100px;
+    
+}
+
+.hero-container img {
+        
+    max-width: 60%;
+    height: auto;
+}
+
+
+.hero-container .text {
+    text-align: left;
+    max-width: 350px;
+    margin-right: 10px;
+
+    font-size: 18px;
+
+    
+}
+
+.hero-container a {
+    display: flex;
+    justify-content: space-between;
+
+    background-color: #F07D3E;
+    color: white;
+
+    padding: 8px 16px;
+    width: 200px;
+
+}
+.hero-container a:hover {
+    background-color: white;
+    color: #F07D3E;
+    border: 1px solid #F07D3E;
+}
+
+
+.hero-container img {
+    max-height: 476px;
+    max-width: auto;
+}
+
+.povezave {
+
+    display: flex;
+    justify-content: space-between;
+}
+
+.title {
+    text-align: center;
+    font-weight: 400;
+
+    margin-bottom: 70px;
+    
+}
+
+.povezave h2 {
+    font-size: 18px;
+    font-weight: 700;
+
+    
+}
+
+.povezave .col{
+    text-align: center;
+    margin-left: 10px;
+
+}
+
+.povezave .col p {
+    height: 110px;
+    max-width: 300px;
+
+    
+}
+
+#povezave-btn {
+    display: flex;
+    justify-content: space-between;
+
+   background-color: #F07D3E;
+   color: white;
+
+   padding: 8px 16px;
+   max-width: 150px;
+   margin: auto;
+} 
+
+#povezave-btn:hover {
+    color: #F07D3E;
+    background-color: white;
+
+    border: 1px solid #F07D3E;
+}
+
+
+
+
+footer h2 {
+    text-transform: uppercase;
+    font-weight: 700;
+    font-size: 18px;
+   
+}
+
+footer .col a {
+    color: black;
+}
+
+.social_logo_flex img {
+    margin-right: 10px;
+    
+}
+
+.social_logo_flex img:hover {
+    opacity: 0.8;
+}
+
+footer .footer_content .col span {
+    font-weight: 400;
+}
+
+footer .footer_content .col1 .col1-flex {
+    display: flex;
+    flex-direction: column;
+}
+
+
+
+/* GDPR ZAHTEVEK -------------------------------------- */
+
+ .register_holder{
+    max-width: 810px;
+    margin: 100px auto 0px auto;
+}
+
+.register_holder h1 {
+    
+    font-weight: 300;
+}
+
+
+body.gdpr div.label  {
+    display: block;
+
+    font-weight: 600;
+
+    width: 200px;
+}
+
+body .gdpr form p:first-of-type{
+    font-weight: 600;
+}
+
+
+input[type=submit]:hover,
+button:hover,
+input[type=button]:hover,
+.button:hover {
+  border:  1px solid #F07D3E;
+  color: #F07D3E;
+  background-color: white;
+
+}
+    
+/* -------------------------------------- */
+
+@media screen and (max-width: 834px) {
+
+    header {
+        margin: none;
+    } 
+
+    /* header - arnes logo fix */
+    header .logo {
+        width: auto;
+        /* background-color: red; */
+    }
+    header .logo img:last-child{
+        max-width: 100px;
+        height: 40px;
+    }
+
+
+    .hero-container {
+        display: flex;
+        flex-direction: column-reverse;  
+        
+        
+        margin-top: 50px;
+        margin-bottom: 50px;
+
+        height: auto;
+    }
+
+    .hero-container img {
+        
+        max-width: 70%;
+        height: auto;
+    }
+
+    .hero-container .text {
+        margin: auto;
+        text-align: center;
+
+    }
+
+    .hero-container .text a {
+        margin: auto;
+    }
+    
+    .povezave{
+        display: grid;
+        grid-template-columns: 1fr 1fr;
+
+        row-gap: 30px;
+    }
+
+    .povezave .col  {
+        margin: auto;
+        
+    }
+
+    .povezave .col p {
+        max-width: 300px;
+
+        height: 80px;
+
+    }
+
+    footer .footer_content {
+        display: grid;
+        grid-template-columns: 1fr 1fr 1fr ;
+        grid-template-rows: 1fr 2fr;
+
+    }
+
+    footer .footer_content .col{
+        /* border: 1px solid red; */
+
+        width: auto;
+       
+    }
+
+    footer .footer_content .col .logo_holder{
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;  
+    }
+    footer .footer_content .col .logo_holder img{
+        max-width: 33%;
+        height: auto;
+    }
+
+    footer .footer_content .col1  {
+        grid-row: 1/3;
+    }
+
+    footer .footer_content .col4  {
+        grid-column: 2/4;
+    }
+
+    footer .footer_content .col1 .col1-flex {
+        display: flex;
+        flex-direction: column;
+    }
+
+}
+
+
+
+@media screen and (max-width: 700px) {
+
+
+    body #main .main_content h1 {
+        font-size: 50px;
+    }
+
+
+    .hero-container .text {
+        max-width: 95%;
+        
+    }
+
+    .hero-container .text a {
+        width: 95%;
+        color: white;  
+    }
+    .hero-container .text a:hover {
+        width: 95%;
+        border:  1px solid #F07D3E;
+        color: #F07D3E;
+        background-color: white;
+    }
+
+
+
+    .povezave {
+        display: flex;
+        flex-direction: column;
+        
+        align-items: center;
+    }
+
+    .povezave .col {
+        margin-bottom: 50px ;
+
+    }
+
+
+
+
+
+
+    /* --------------HAMBURGER---------------------------------- */
+
+
+    .nav-desktop {
+        display: none;
+        
+    }
+
+    .mobile {
+        display: block;
+    }
+
+    #nav-icon3 {
+
+        width: 40px;
+        height: 20px;
+        position: relative;
+
+
+        top: 15px;
+        
+        -webkit-transform: rotate(0deg);
+        -moz-transform: rotate(0deg);
+        -o-transform: rotate(0deg);
+        transform: rotate(0deg);
+        -webkit-transition: .5s ease-in-out;
+        -moz-transition: .5s ease-in-out;
+        -o-transition: .5s ease-in-out;
+        transition: .5s ease-in-out;
+        cursor: pointer;
+    }
+
+    #nav-icon3 span {
+        display: block;
+        position: absolute;
+        height: 5px;
+        width: 100%;
+        background: #d3531a;
+        border-radius: 9px;
+        opacity: 1;
+        left: 0;
+        -webkit-transform: rotate(0deg);
+        -moz-transform: rotate(0deg);
+        -o-transform: rotate(0deg);
+        transform: rotate(0deg);
+        -webkit-transition: .25s ease-in-out;
+        -moz-transition: .25s ease-in-out;
+        -o-transition: .25s ease-in-out;
+        transition: .25s ease-in-out;
+    }
+      
+
+    #nav-icon3 span:nth-child(1) {
+        top: 0px;
+    }
+      
+    #nav-icon3 span:nth-child(2),#nav-icon3 span:nth-child(3) {
+        top: 9px;
+    }
+      
+    #nav-icon3 span:nth-child(4) {
+        top: 18px;
+    }
+      
+    #nav-icon3.open span:nth-child(1) {
+        top: 9px;
+        width: 0%;
+        left: 50%;
+    }
+      
+    #nav-icon3.open span:nth-child(2) {
+        -webkit-transform: rotate(45deg);
+        -moz-transform: rotate(45deg);
+        -o-transform: rotate(45deg);
+        transform: rotate(45deg);
+    }
+      
+    #nav-icon3.open span:nth-child(3) {
+        -webkit-transform: rotate(-45deg);
+        -moz-transform: rotate(-45deg);
+        -o-transform: rotate(-45deg);
+        transform: rotate(-45deg);
+    }
+      
+    #nav-icon3.open span:nth-child(4) {
+        top: 9px;
+        width: 0%;
+        left: 50%;
+    }
+
+    #links {
+        display: none;
+
+        
+        
+    }
+
+    /*  */
+    .aai a  {
+        color: #333333;
+    }
+      
+    #links.open {
+        position: absolute;
+        top: 100px;
+        left: 0px;
+
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+
+        
+        
+
+        width: 100%;
+        height: 700px;
+        background-color: rgb(255, 255, 255);
+
+    }
+
+    #links .menu_item {
+        font-size: 30px;
+        margin-top: 30px;
+    }
+
+    #links .menu_item a {
+        font-size: 16px;
+    }
+
+    /* ------------------------------------------------- */
+
+
+    footer .footer_content {
+        /* background-color: rgb(184, 184, 184); */
+
+        
+
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+
+        
+    }
+
+    footer .footer_content .col {
+        /* border: 1px solid red; */
+        width: auto;
+        max-height: 180px;
+
+        text-align: left;
+        
+    }
+
+    footer .footer_content .col1 .col1-flex{
+        display: flex;
+        flex-direction: column;
+        flex-wrap: wrap;
+
+        max-height: 130px;
+    }
+
+
+
+
+    footer .footer_content .col1{
+
+        width: 100%;  
+    }
+
+
+    footer .footer_content .col2,
+    footer .footer_content .col3  {
+
+        width: 50%;  
+    }
+
+
+    
+
+}
+
diff --git a/frontend/simple/script/nav-mobile.js b/frontend/simple/script/nav-mobile.js
new file mode 100644
index 000000000..ad019c465
--- /dev/null
+++ b/frontend/simple/script/nav-mobile.js
@@ -0,0 +1,10 @@
+$(document).ready(function(){
+	$('#nav-icon3').click(function(){
+		$(this).toggleClass('open');
+
+        $('#links').toggleClass('open');
+
+
+        
+	});
+});
\ No newline at end of file
diff --git a/lang/1.php b/lang/1.php
index 838549b37..ca477a02f 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -98,7 +98,6 @@ $lang = array (
 	"logout_text" 			=>		"&#269;e on-line novic ne elite prejemati ve&#269;, se lahko odjavite tu.<br>Ko boste odjavljeni,
 						Vam ne bomo po&#353;iljali <b>nobene</b> pote. &#269;e imate shranjen pikotek, bo odstranjen.",
 	"email" 			=>		"E-mail",
-	"altemail" 			=>		"Alternativni e-mail",
 	"password" 			=>		"Geslo",
 	"google_2fa" 			=>	"Dvo nivojsko preverjanje pristnosti",
 	"google_2fa_user_code" =>	"Vpišite 6 mestno kodo",
@@ -117,8 +116,6 @@ $lang = array (
 	"app_aai_installation_text" =>		"<b>Z orodjem 1KA lahko na enostaven način izdelate spletni vprašalnik, izvedete spletno anketo, urejate in analizirate podatke, s kar najmanjšim številom klikov.</b><br /><br />Za uporabo orodja 1KA se lahko registrirate oziroma prijavite z vašim Arnes AAI-računom.<br /><br />Kliknite na spodnji gumb in sledite navodilom za prijavo v AAI.",
     "sent" 			        =>		"Poslano",
     "not_sent" 			    =>		"Ni poslano",
-    "unsubscribed"          =>		"Odjavljen",
-    "not_unsubscribed"      =>		"Ni odjavljen",
     "check_and" 			=>		"Preverite in",
     "submit" 			    =>		"potrdite spremembe",
 	"dontwant"			    =>	"Ne elim ve&#269; prejemati on-line novic",
@@ -225,7 +222,7 @@ $lang = array (
 	"show"				=>		"Prikazan povsod",
 	"only_show_index"		=>		"Samo na prvi strani",
 	"not_show"			=>		"Ni prikazan",
-	"ask_delete_link" 		=>		"Ali ste prepri&#269;ani, da želite izbrisati podstran",
+	"ask_delete_link" 		=>		"Ali ste prepri&#269;ani, da zelite izbrisati podstran",
 	"ask2_delete_link"		=>	"Unicili boste tudi vse podnavigacije! Ce hocete uniciti zgolj to navigacijo, ne pa tudi tistih pod njo, jo najprej spremenite v nizji nivo. Res zelite uniciti tudi vse podnavigacije in njihove vsebine?",
 	"ask_delete_news"		=>	"Ali ste prepri&#269;ani, da zelite izbrisati novico?",
 	"archive_restored"		=>		"Arhiv nalozen.",
@@ -340,7 +337,6 @@ $lang = array (
 	"add_category"			=>		"Dodajanje kategorije",
 	"add_category1"			=>		"Dodaj kategorijo",
 	"sent_by"			=>		"Vpisal",
-	"sent_by2"			=>		"Poslal",
 	"edit_by"			=>		"Popravil",
 	"send_mail"			=>		"Poslati maile",
 	"no_one"			=>		"Nikomur",
@@ -353,10 +349,8 @@ $lang = array (
 	"or_current"			=>		"<font color=\"red\"><br><b>ALI</b></font> obstoje&#269;e",
 	"edit4"				=>	"Spremeni",
 	"edit1337"				=>	"Shrani spremembe",
-	"edit1338"				=>	"Prekliči",
-	"edit1339"				=>	"Nadaljuj",
     "reset_translation"				    =>	"Ponastavi prevod",
-	"delete_account"				    =>	"Izbriši 1KA račun",
+	"delete_account"				    =>	"Izbriši račun 1KA",
 	"delete_account_conformation"       => "Ste prepričani, da želite trajno izbrisati vaš račun? Po potrditvi se ne boste več mogli prijaviti s tem računom!",
 	"change_account_pass_conformation"  => "Po spremembi gesla vas bo odjavilo iz aplikacije! Za aktiviranje spremembe gesla se ponovno prijavite z novim geslom.",
 	"pass_text1"			            =>	"Z geslom boste tretji osebi prepre&#269;ili spreminjanje vaih nastavitev on-line novic in profila.",
@@ -623,7 +617,6 @@ $lang = array (
 	"threads"			=>	"Tem",
 	"new_thread"			=>	"Nova tema",
 	"reply"				=>	"Odgovori",
-	"for"				=>	"Za",
 	"guest"				=>	"Gost",
 	"askdelforum"			=>	"Ali ste prepri&#269;ani, da zelite izbrisati forum? Izbrisali boste tudi vse teme v tem forumu!",
 	"newforum"			=>	"Nov forum",
@@ -683,7 +676,6 @@ $lang = array (
   "login_alternative_emails_success"	=>	"Na izbran elektronski naslov (#email#) je bilo poslano elektronsko sporočilo s povezavo za potrditev.",
 	"login_email_subscription"	=>	"Privzeti email",
 	"login_password"		=>	"Geslo",
-	"password_confirm"		=>	"Potrditev gesla",
 	"login_again"			=>	"Ponovno",
 	"login_alert"			=>	"Obve&#353;&#269;anje",
 	"login_frequency"		=>	"Pogostost",
@@ -770,11 +762,9 @@ $lang = array (
 	"date_dec"				=>	"Dec",
 	"s_search"				=>	"I&#353;&#269;i",
 	"s_search2"				=>	"Išči",
-	"s_search_Library"		=>	"Išči po knjižnici",
-	"s_search_Library_public"	=>	"Išči po javni knjižnici",
-	"s_search_Library_my"	    =>	"Išči po moji knjižnici",
-	"s_search_metaadmin"	=>	"Išči samo po avtorju",
 	"s_search_mySurvey"		=>	"Išči po mojih anketah",
+	"s_search_Library"		=>	"Išči po knjižnici",
+	"s_search_metaadmin"	=>	"Išči samo po avtorju",
 	"s_search_mySurvey_title"	=>	"Rezultati iskanja po mojih anketah",
 	"s_search_mySurvey_nothing"	=>	"Za poizvedbo ni bilo mogoče najti nobene ankete",
 	"s_search_mySurvey_back"	=>	"Nazaj na Moje ankete",
@@ -790,11 +780,11 @@ $lang = array (
 	"s_any"					=>	"Katerakoli beseda",
 	"s_thru"				=>	"I&#353;&#269;i po",
 	"s_lookinto"			=>	"Preglej",
-	"s_title"				=>	"Naslov",
+	"s_title"				=>	"Naslovu",
 	"s_content"				=>	"Vsebini",
-	"s_author"				=>	"Avtor",
+	"s_author"				=>	"Avtorju",
 	"s_word"				=>	"Ključnih besedah",
-	"s_text"				=>	"Besedilo",
+	"s_text"				=>	"Besedilu",
 	"s_webcontent"			=>	"Vsebino strani",
 	"s_articles"			=>	"&#269;lanke, novice, obvestila",
 	"s_database"			=>	"Baze",
@@ -1055,8 +1045,6 @@ $lang = array (
 	"send_email2admins"		=>	"Po&#353;lji e-mail administratorjem",
 	"sendmailnotice"		=>	"Pozor: vnesite va&#353; pravi e-mail naslov, da vam bo naslovnik lahko odgovoril!",
 	"subject"			=>	"Zadeva",
-	"message"		=>	"Sporočilo",
-	"message_content"			=>	"Vsebina sporočila",
 	"email_show"			=>	"Prika&#382;i e-mail",
 //	"email_send"			=>	"Mo&#382;no poslati e-mail",
 	"email_send"			=>	"Omogo&#269;i po&#154;iljanje, a skrij naslov",
@@ -1154,7 +1142,6 @@ $lang = array (
 	"group_members"			=>	"&#268;lanov",
 	"group_new"			=>	"Nova skupina",
 	"group_name"			=>	"Ime skupine",
-	"group_URL"				=>	"URL Povezava",
 	"admin_edit_groups"		=>	"Urejanje skupin za",
 	"admin_edit_groups_no"		=>	"Ni skupin. Dodajte jih.",
 	"mass_select_group"		=>	"Izberite skupino(e) uporabnikov",
@@ -1264,10 +1251,10 @@ $lang = array (
 	"deactive_column"		=>	"Deaktiviraj rubriko",
 	"breakedPage_title" 		=>	"Naslov prelomljene strani",
 	"access2"			=>	"To sporo&#269;ilo vidi <strong>avtor</strong> in",
-	"forum_admin"			=>	"Administratorji",
-	"forum_manager"			=>	"Managerji",
-	"forum_clan"			=>	"Člani",
-	"forum_registered"		=>	"Registrirani uporabniki",
+	"forum_admin"			=>	"administratorji",
+	"forum_manager"			=>	"managerji",
+	"forum_clan"			=>	"&#269;lani",
+	"forum_registered"		=>	"registrirani uporabniki",
 	"ForumAvatar"			=>	"Avatar v forumu",
 	"avatar_notin3"			=>	 	"ne v 3-kolonskem prikazu",
 	"upload_ur_avatar"		=>	"Nalo&#382;i svojega",
@@ -1574,46 +1561,23 @@ $lang = array (
 	"export_all_excel"		=>	"Izvozi vsa polja v Excel",
 	"export_s_excel"		=>	"Izvozi v Excel",
 	"srv_lnk_excel"			=>	"CSV",
-	"srv_lnk_excel_xls"		=>	"EXCEL XLS",
+	"srv_lnk_excel_xls"		=>	"Excel (xls)",
 	"srv_lnk_spss"			=>	"SPSS SYNTAX",
 	"srv_lnk_sav"   		=>	"SPSS SAV",
 	"srv_lnk_PDF/RTF"		=>	"Zaporedni izpis vseh respodentov",
 	"srv_lnk_txt"			=>	"Tekstovna datoteka",					
 	"srv_lnk_data_view"		=>	"Pregled",					
-	"srv_lnk_data_edit"		=>	"Urejanje",
-	"srv_izvoz_step1"		=>	"1. korak:",
-	"srv_izvoz_step2"		=>	"2. korak:",
-	"srv_izvoz_step3"		=>	"3. korak:",
-	"srv_izvoz_step4"		=>	"4. korak:",
-	"srv_izvoz_step5"		=>	"5. korak:",
-	"srv_izvoz_Excel_xls_note1"		=>	"Podatke v Excel izvozite s klikom na spodnji ukaz:",
-	"srv_izvoz_Excel_xls_file"		=>	"Izvoz v Excel",
-	"srv_izvoz_Excel_xls_prirocnik"		=>	"<a href='https://www.1ka.si/d/sl/pomoc/prirocniki/izvoz-excel'>Za več informacij smo pripravili tudi priročnik za izvoz v Excel.</a>",
-	"srv_izvoz_Excel_note_a"			=>	"Podatke v CSV (angl. <span class=\"italic\">comma separated values</span>) izvozite s klikom na spodnji ukaz:",
-	"srv_izvoz_Excel_file"			=>	"Izvoz v CSV",
-	"srv_izvoz_Excel_note_b"			=>	"V Excel verzije 2003 ali starejše je možen izvoz največ 256-ih stolpcev (spremenljivk). Morebitni nadaljnji stolpci se ne bodo izvozili. Ta omejitev je odpravljena v verziji 2007.",
-	"srv_izvoz_Excel_note_2"		=>	"<span class=\"red\">Opozorilo!</span> Pri izvozu v Excel (Microsoft Excel verzija 2007 in novejše) se odprti odgovori ne izpišejo v celoti. Rešitev takšne težave in vseh ostalih težav z Excelom si lahko ogledate v pomoči <a href=\" https://www.1ka.si/db/19/430/Pogosta%20vprasanja/Tezave_pri_izvozu_v_Excel/\" target=\"_blank\">Težave pri izvozu v Excel</a>.",
+	"srv_lnk_data_edit"		=>	"Urejanje",	
+	"srv_izvoz_Excel_xls_note"		=>	"<p>Podatke v Excel (xls) izvozite s klikom na ukaz <a href=\"#\" onclick=\"doExcelXlsExport(); return false;\" ><span class=\"bold\">\"Izvoz v Excel\"</span></a>.</p><p>V Excel verzije 2003 ali starej&#353;e je mo&#382;en izvoz najve&#269; 256-ih stolpcev (spremenljivk). Morebitni nadaljnji stolpci se ne bodo izvozili. Ta omejitev je odpravljena v verziji 2007.</p>",
+	"srv_izvoz_Excel_xls_note_2"	=>	"<p>Opozorilo! Pri izvozu v Excel (Microsoft Excel verzija 2007 in novejše) se odprti odgovori ne izpišejo v celoti. Rešitev takšne težave in vseh težav z Excelom si lahko pogledate v pomoči <a href=\"https://www.1ka.si/db/19/430/Pogosta%20vprasanja/Tezave_pri_izvozu_v_Excel/\" target=\"_blank\"><span class=\"bold\">Težave pri izvozu v Excel</span></a>.</p>",	
+	"srv_izvoz_Excel_note"			=>	"<p>Podatke v CSV (comma separated values) izvozite s klikom na ukaz <a href=\"#\" onclick=\"doExcelExport(); return false;\" ><span class=\"bold\">\"Izvoz v CSV\"</span></a>.</p><p>V Excel verzije 2003 ali starej&#353;e je mo&#382;en izvoz najve&#269; 256-ih stolpcev (spremenljivk). Morebitni nadaljnji stolpci se ne bodo izvozili. Ta omejitev je odpravljena v verziji 2007.</p>",
+	"srv_izvoz_Excel_note_2"		=>	"<p>Opozorilo! Pri izvozu v Excel (Microsoft Excel verzija 2007 in novejše) se odprti odgovori ne izpišejo v celoti. Rešitev takšne težave in vseh težav z Excelom si lahko pogledate v pomoči <a href=\" https://www.1ka.si/db/19/430/Pogosta%20vprasanja/Tezave_pri_izvozu_v_Excel/\" target=\"_blank\"><span class=\"bold\">Težave pri izvozu v Excel</span></a>.</p>",
 	"srv_izvoz_Excel_settings"		=>	"Nastavitve",
-	"srv_izvoz_SPSS_note"			=>	"Podatke vaše ankete izvozite v SPSS/PASW v petih kratkih korakih:",		
-	"srv_izvoz_step1_SPSS"			=>	"Naprej s klikom spodaj shranimo datoteko s podatki (format .txt) v izbrano mapo:",
-	"srv_izvoz_step1_SPSS_file"			=>	"Datoteka s podatki TXT",
-	"srv_izvoz_step2a_SPSS"		=>	"Nato v isto mapo shranimo še datoteko s sintakso (format .sps):",
-	"srv_izvoz_step2b_SPSS"		=>	"Nato z dvojnim klikom na datoteko odpremo sintakso v programu SPSS/PASW.",
-	"srv_izvoz_step2_SPSS_file"		=>	"Datoteka s sintakso SPS",
-	"srv_izvoz_step3a_SPSS"		=>	"V datoteki s sintakso poiščemo /FILE vrstico (primer: »/FILE =\C:\anketa_podatki.txt\"«).",
-	"srv_izvoz_step3b_SPSS"		=>	"Za povezavo sintakse in podatkov namesto »C:« vpišemo natančno lokacijo naše datoteke s podatki (primer: Če smo podatke shranili v mapo 'Prenosi', ki se nahaja v mapi 'My Documents', vpišemo naslednje:<br>DATA LIST FILE=\"C:\My Documents\Prenosi\anketa_podatki.txt\").",
-	"srv_izvoz_step3c_SPSS"		=>	"Natančno lokacijo datoteke s podatki lahko poiščemo na naslednji način: Uporabimo desni klik na datoteko s podatki in v meniju izberemo Lastnosti (Properties) - Mesto (Location) in to lokacijo vpišemo namesto »C:«.",
-	"srv_izvoz_step4_SPSS"			=>	"Datoteko s sintakso nato poženemo z ukazom RUN ALL (najdemo ga v spustnem meniju RUN) in tako kreiramo novo datoteko - bazo podatkov (.sav), ki jo lahko shranimo.",
-	"srv_izvoz_step5_SPSS"			=>	"Po izvozu v SPSS/PASW lahko določimo tudi manjkajoče vrednosti. Postavimo se v zavihek Variable View in v stolpcu Missing označimo 'Range plus one optional discrete missing value; Low: -99; High: -1;' v 1KA so namreč manjkajoče vse negativne vrednosti s sledečimi pomeni:<br>(-1) Ni odgovoril<br>(-2) Preskok (if)<br>(-3) Prekinjeno<br>(-4) Naknadno vprašanje<br>(-97) Neustrezno<br>(-98) Zavrnil<br>(-99) Ne vem.",
-	"srv_izvoz_txt_note"			=>	"Podatke lahko izvozite v tekstovno ASCII datoteko s klikom na spodnji ukaz:",	
-	"srv_izvoz_txt_file"			=>	"Izvoz v tekstovno datoteko",	
-	"srv_izvoz_SPSS_complex_note"	=>	"Pri izvozu zelo kompleksne ankete z zankami vam v primeru kakršnih koli težav priporočamo najprej izvoz v Excel, in nato uvoz v SPSS.",		
-	"srv_izvoz_SPSS_faq"			=>	"V primeru kakršnihkoli zapletov (npr. pri kompleksnih anketah z zankami, stare verzije SPSS) priporočamo izvoz v Excel, in nato uvoz v SPSS. To priporočamo še posebej pri kombiniranih tabelah. Več o izvozih v SPSS si lahko preberete v priročniku <a href='https://www.1ka.si/d/sl/pomoc/prirocniki/izvoz-spss' target=\"_blank\">Izvoz v SPSS</a>. V primeru težav kontaktirajte <a href=\"https://www.1ka.si/a/72864?Q1=5729900\" target=\"_blank\">Pomoč uporabnikom</a>.",		
-	"srv_izvoz_SAV_note1"			=>	"Podatke izvozite v SPSS SAV s klikom na spodnji ukaz:",
-	"srv_izvoz_SAV_file"			=>	"Izvoz v SPSS SAV",
-	"srv_izvoz_SAV_note2a"			=>	"<span class=\"red\">Opozorilo!</span> Izvoz ne omogoča izvoza label vrednosti odgovorov. Funkcionalnost je še v razvoju, zato so možne težave pri izvozu. Priporočamo uporabo ",
-	"srv_izvoz_SAV_note2b"			=>	"izvoza SPSS SYNTAX",
-	"srv_izvoz_SAV_note2c"			=>	", ki generira dve ločeni datoteki - datoteko s sintakso (.SPS) in datoteko s podatki (.TXT).",
+	"srv_izvoz_SPSS_note"			=>	"<p>Podatke va&#353;e ankete izvozite v SPSS/PASW v petih kratkih korakih:</p><p><dl class=\"dl_spss\"><dt>1. korak:</dt><dd>Naprej s klikom spodaj shranimo datoteko v izbrano mapo:</dd><dd><span class=\"bold\"><a href=\"#\" onclick=\"doSpssExport('yes'); return false;\" target=\"_blank\">Datoteka s podatki (.txt)</a></span></dd><br/><dt>2. korak:</dt><dd>Nato v isto mapo shranimo &#353;e datoteko s sintakso:</dd><dd><span class=\"bold\"><a href=\"#\" onclick=\"doSpssExport('no'); return false;\" target=\"_blank\">Datoteka s sintakso (.sps)</a></span></dd><dd>Z dvojnim klikom na datoteko sedaj odpremo sintakso v programu SPSS/PASW.</dd><br/><dt>3. korak:</dt><dd>V odprti datoteki s sintakso poi&#353;&#269;emo DATA LIST vrstico <i>(»primer: DATA LIST FILE=\"C:\anketa_podatki.txt\"«)</i>.</dd><dd>Da bi povezali sintakso in podatke, namesto »C:« vpi&#353;emo lokacijo na&#353;e datoteke s podatki <i>(zgled: &#269;e smo podatke shranili npr. v mapo Prenosi znotraj My Documents: DATA LIST FILE=\"C:\My Documents\Prenosi\anketa_podatki.txt\")</i>.</dd><dd>&nbsp;</dd><dd><i>Natan&#269;no lokacijo datoteke s podatki lahko poi&#353;&#269;emo na naslednji na&#269;in: uporabimo desni klik na datoteko s podatki in v meniju izberemo Lastnosti (Properties)- Mesto (Location) in to lokacijo vpi&#353;emo namesto »C:«.</i></dd><br/><dt>4. korak:</dt><dd>Datoteko s sintakso nato po&#382;enemo z ukazom RUN ALL (najdemo ga v spustnem meniju RUN) in tako kreiramo novo datoteko – bazo podatkov (.sav), ki jo lahko shranimo.</dd><br/><dt>5. korak:</dt><dd>Po izvozu v SPSS/PASW lahko dolo&#269;imo tudi manjkajo&#269;e vrednosti. Postavimo se v zavihek <i>Variable View</i> in v stolpcu Missing ozna&#269;imo <i>Range plus one optional discrete missing value; Low: -99; High: -1;</i> v 1KA so namre&#269; manjkajo&#269;e vse negativne vrednosti s slede&#269;imi pomeni:</dd><dd>&nbsp;&nbsp;<i>(-1) Ni odgovoril</i></dd><dd>&nbsp;&nbsp;<i>(-2) Preskok (if)</i></dd><dd>&nbsp;&nbsp;<i>(-3) Prekinjeno</i></dd><dd>&nbsp;&nbsp;<i>(-4) Naknadno vpra&#353;anje</i></dd><dd>&nbsp;&nbsp;<i>(-97) Neustrezno</i></dd><dd>&nbsp;&nbsp;<i>(-98) Zavrnil</i></dd><dd>&nbsp;&nbsp;<i>(-99) Ne vem.</i></dd></dl></p>",		
+	"srv_izvoz_txt_note"			=>	"<p>Podatke lahko izvozite tudi v <a href=\"#\" onclick=\"doTxtExport(); return false;\" target=\"_blank\"><span class=\"bold\">tekstovno</span></a> ASCII datoteko</p>",	
+	"srv_izvoz_SPSS_complex_note"	=>	"<p>Pri izvozu zelo kompleksne ankete z zankami vam v primeru kakršnih koli težav priporočamo najprej izvoz v Excel, in nato uvoz v SPSS.</p>",		
+	"srv_izvoz_SPSS_faq"			=>	"<p>V primeru kakršnihkoli zapletov (npr. pri kompleksnih anketah z zankami, stare verzije SPSS) priporočamo izvoz v Excel, in nato uvoz v SPSS. Posebej priporočamo pri kombiniranih tabelah. Več o izvozih v SPSS si lahko preberete v <span class=\"bold\"><a href='https://www.1ka.si/d/sl/pomoc/prirocniki/izvoz-spss' target=\"_blank\">FAQ</a></span>. V primeru težav kontaktirajte <a href=\"https://www.1ka.si/a/72864?Q1=5729900\" target=\"_blank\"><span class=\"bold\">Pomoč uporabnikom</span></a>.</p>",		
+	"srv_izvoz_SAV_note"			=>	"<p>Podatke v SPSS (SAV) izvozite s klikom na ukaz <a href=\"#\" onclick=\"doSAVExport(); return false;\" ><span class=\"bold\">\"Izvoz v SPSS (SAV)\"</span></a>.</p><p>Pozor: Izvoz ne omogoča izvoza label vrednosti odgovorov. </p><p class=\"semibold\">Funkcionalnost je še v razvoju, zato so možne težave pri izvozu.<br />Priporočamo uporabo (starega) izvoza v SPSS, ki generira dve lo&#269;eni datoteki - datoteko s sintakso (.SPS) in datoteko s podatki (.TXT).</p>",
 	"s_sortby_A"			=>	"Sortiraj po ",
 	"s_sortby_B"			=>	"&#269;asu",
 	"s_sortby_C"			=>	" / ",
@@ -1840,9 +1804,9 @@ $lang = array (
 	"srv_note"				=>	"Opomba",
 	"srv_note2"				=>	"Opomba na vprašanje",
 	"srv_novaanketa"		=>	"Nova anketa: ",
-	"srv_new_survey_success"		=>	"V anketi ni še nobenega vprašanja. Vprašanja lahko dodate tudi iz levega menija.",
-	"srv_new_survey_success_button_create"		=>	"Dodaj vprašanje",
-	"srv_new_survey_success_button_template"	=>	"Dodaj vprašanje iz knjižnice",
+	"srv_new_survey_success1"		=>	"Anketo lahko za&#269;nete s predlogo iz <a href=\"#\" onclick=\"show_library(2); return false;\">knji&#382;nice</a> ali z vpra&#353;anji iz spodnjega menija.",
+	"srv_new_survey_success2"		=>	"Vprašanja dodate iz levega menija.",
+	"srv_new_survey_success3"		=>	"Uporabite lahko predloge <a href=\"index.php?a=knjiznica\">anket</a> ali <a href=\"%s\" onclick=\"change_mode('toolbox', '3'); return false;\"> vprašanj</a>.",
 	"srv_new_question_icon" =>	"S klikom dodajte na konec ali umestite s \"povleci in spusti\"",
 	"srv_new_question"      =>	"Kliknite na izbrano vprašanje ali uporabite \"povleci in spusti\"",
 	"srv_new_question_text" =>	"Z miško izberite želeni tip vprašanja",
@@ -1900,24 +1864,14 @@ $lang = array (
 	"srv_anketa_active"				=>	"Anketa je aktivna. V aktivno anketo se odgovori na vpra&#353;anja shranjujejo.",
 	"srv_anketa_delete"				=>	"Izbri&#353;i anketo.",
 	"srv_anketa_noactive2"			=>	"Anketa ni aktivna",
-	"srv_anketa_noactive2_text"     =>	"Anketa še ni aktivna. Zbirate lahko samo testne podatke. Če želite za anketo zbirati realne podatke, jo lahko aktivirate v zavihku 'Objava' ali s klikom na stikalo 'OFF'.",
 	"srv_anketa_active2"			=>	"Anketa je aktivna",
-	"srv_anketa_active2_text"       =>	"Anketa je aktivna. Zbirate lahko realne podatke. V zavihku 'Objava' izberite način posredovanja ankete respondentom.",
 	"srv_anketa_is_active"			=>	"AKTIVNA",
 	"srv_anketa_is_not_active"		=>	"NEAKTIVNA",
 	"srv_anketa_is_finished"		=>	"ZAKLJUČENA",
 	"srv_anketa_href"				=>	"HTML koda povezave",
-	"srv_anketa_href_text"			=>	"Delite povezavo do ankete na vaši spletni strani.",
-	"srv_anketa_href_count"			=>	"HTML koda s števcem ogledov",
-	"srv_anketa_href_count_text"	=>	"Delite povezavo do ankete na vaši spletni strani in beležite število ogledov povezave na anketo. ",
-	"srv_anketa_href_friends"		=>	"QR koda",
-	"srv_anketa_href_friends_text"	=>	"Delite povezavo do ankete s QR kodo.",
-	"srv_anketa_href_ijs"			=>	"iFrame - JavaScript verzija",
-	"srv_anketa_href_ijs_text"		=>	"Vdelajte anketo na vašo spletno stran, da lahko respondenti anketo rešujejo na vaši strani.",
-	"srv_anketa_href_ijs_text2"		=>	"Tu lahko skopirate kodo vaše ankete (Javascript verzija) in jo vdelate v vašo spletno stran.",
-	"srv_anketa_href_inojs"			=>	"iFrame - brez JavaScripta",
-	"srv_anketa_href_inojs_text"	=>	"Vdelajte anketo na vašo spletno stran, da lahko respondenti anketo rešujejo na vaši strani.",
-	"srv_anketa_href_inojs_text2"	=>	"Tu lahko skopirate kodo vaše ankete (verzija brez Javascript-a) in jo vdelate v vašo spletno stran.",
+	"srv_anketa_href_text"			=>	"Običajna HTML koda za povezavo",
+	"srv_anketa_href_count"			=>	"HTML koda povezave s &#353;tevcem ogledov",
+	"srv_anketa_href_count_text"	=>	"HTML koda skupaj s števcem, ki šteje število ogledov <u>povezave</u> na anketo",
 	"srv_anketa_noactive_email"		=>	"Ozna&#269;i anketo kot 'Email vabila''.",
 	"srv_anketa_setActive_email"	=>	"aktiviraj 'Email vabila'",
 	"srv_anketa_active_email"		=>	"Anketa je ozna&#269;ena kot 'Email vabila'.",
@@ -2089,18 +2043,19 @@ $lang = array (
     "srv_alert_foto_remove"	        =>	"Odstrani sliko",
 	"srv_dostop"			=>	"Anketo lahko ureja avtor in vsi",
 	"srv_izpolnjujejo"		=>	"Anketo lahko izpolnjujejo",	
+	"srv_dostop_users"		=>	"Uporabniki, ki lahko urejajo anketo",
 	"srv_dostop_userspassive"	=>	"Pasivni uporabniki, ki lahko pregledujejo anketo",
 	"srv_passive_multilang"		=>	"Jeziki, ki jih lahko ureja",
 	"srv_passive_multilang_1"	=>	"Pasivni uporabniki, ki prevajajo",
 	"srv_dostop_addusers"			=>	"Dodajanje uporabnikov za urejanje ankete",
-	"srv_dostop_adduserstxt_admin"	=>	"Dostop za urejanje ankete lahko dodelite tudi ostalim uporabnikom, ki so že ali pa še ne registrirani na ",
+	"srv_dostop_adduserstxt_admin"	=>	"Dostop za urejanje ankete lahko dodelite tudi ostalim uporabnikom, ki so že ali pa še ne, registrirani na ",
 	"srv_dostop_adduserstxt"		=>	"Dostop za urejanje ankete lahko dodelite samo uporabnikom, ki so že registrirani na ",
 	"srv_dostop_adduserstxt_aai_more"	=>	"<a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/dodajanje-uredniskega-dostopa-na-1kaarnessi\" target=\"_blank\">Več >></a>",
     "srv_dostop_adduserstxt_email"	=>	"V vsako vrstico vpi&#353;ite le en email naslov. Poleg emaila lahko dodate tudi ime in priimek, vse spremenljivke lo&#269;ite z vejico (janez.novak@example.com,Janez,Novak):",
-    "srv_dostop_adduserstxt_note"	=>	"V avtomatsko obvestilo o dostopu dodaj svoje sporočilo (neobvezno).",
+    "srv_dostop_adduserstxt_note"	=>	"Sporočilo za uporabnike, ki jim dodeljujete dostop (opcijsko). Sporočilo lahko poljubno spremenite.",
     "srv_dostop_adduserstxt_note_text"	=>	"Pozdravljeni,\r\n\r\ndodelil/a sem vam dostop do ankete, ki jo trenutno urejam.\r\n\r\nLep pozdrav",
-	"srv_dostop_adduserstxt_end"	=>	"Uporabniki bodo o dostopu avtomatsko obveščeni na e-mail.",
-    "srv_dostop_addusers_button"	=>	"Dodaj dostope",
+	"srv_dostop_adduserstxt_end"	=>	"Uporabniki bodo o novem dostopu avtomatsko obve&#353;&#269;eni na e-mail.",
+    "srv_dostop_addusers_button"	=>	"Dodaj dostope in pošlji obvestila",
     "srv_dostop_addusers_error1"	=>	"Vnešeni email naslov ni veljaven!",
     "srv_dostop_addusers_error2"	=>	"Uporabnik s tem e-poštnim naslovom še ni registriran!",
     "srv_dostop_addusers_error3"	=>	"Prišlo je do napake pri pošiljanju obvestila!",
@@ -2155,10 +2110,8 @@ $lang = array (
 	"srv_alert_active_1"	=>	"Spremembi aktivnosti",
 	"srv_alert_delete_1"	=>	"Izbrisu ankete",
 	"srv_alert_completed_2"	=>	"Obveščanje o izpolnjeni anketi",
-	"srv_alert_completed_prejemniki"	=>	"Obvestilo o izpolnjeni anketi prejmejo naslednji prejemniki:",
 	"srv_alert_expired_2"	=>	"Obveščanje o izteku ankete",
 	"srv_alert_active_2"	=>	"Obveščanje o spremembi aktivnosti",
-	"srv_alert_active_prejemniki"	=>	"Obvestilo o spremembi aktivnosti prejmejo naslednji prejemniki:",
 	"srv_alert_delete_2"	=>	"Obveščanje o izbrisu ankete",
 	"srv_alert_setting"		=>	"Nastavitve",
 	"srv_alert_turnOn_text"	=>	"Zaradi množičnega izpolnjevanja anket je lahko količina poslanih e-mailov preko 1KA sistema zelo velika. Da bi se izognili temu, da so e-poštna obveščanja o izpolnjenih anketah uvrščena v spam oziroma vsiljeno pošto, je uporaba storitve plačljiva in se obračuna po veljavnem <a href=\"https://www.1ka.si/d/sl/storitve/cenik-metodoloskih-storitev?from1ka=1\" target=\"_blank\"><span class=\"bold\">1KA ceniku</span></a>. Za uporabo storitve je potrebno najprej izpolniti <a href=\"https://www.1ka.si/objava\" target=\"_blank\"><span class=\"bold\">obrazec</span></a>.",
@@ -2191,14 +2144,11 @@ $lang = array (
     "srv_podif_edit"        =>	 "Uredi pogoj za prikaz kategorije",
     "srv_block_new"         =>	 "Dodaj blok",
     "srv_if_rem"            =>	 "Odstrani pogoj",
-    "srv_if_rem_only"       =>	 "Odstrani pogoj (obdrži vsebino)",
-    "srv_if_rem_all"        =>	 "Odstrani pogoj in celotno vsebino",
+    "srv_if_rem_all"        =>	 "Izbri&#353;i pogoj in celotno vsebino",
     "srv_block_rem"			=>	 "Odstrani blok",
-    "srv_block_rem_only"    =>	 "Odstrani blok (obdrži vsebino)",
-    "srv_block_rem_all"		=>	 "Odstrani blok in celotno vsebino",
     "srv_loop_rem"			=>	 "Odstrani zanko",
-    "srv_loop_rem_only"     =>	 "Odstrani zanko (obdrži vsebino)",
-    "srv_loop_rem_all"		=>	 "Odstrani zanko in celotno vsebino",
+    "srv_block_rem_all"		=>	 "Izbri&#353;i blok in celotno vsebino",
+    "srv_loop_rem_all"		=>	 "Izbri&#353;i zanko in celotno vsebino",
     "srv_if_edit"           =>	 "Uredi pogoj",
     "srv_block_edit"		=>	 "Uredi blok",
     "srv_loop_edit"			=>	 "Uredi zanko",
@@ -2243,7 +2193,7 @@ $lang = array (
     "srv_notext"            =>	 "Brez tekstovnih",
     "srv_anketa"            =>	 "Anketa",
     "srv_vnos"            	=>	 "Vnos",
-    "srv_vnos_navodila"    	=>	 "Opcija 'Vnos' se uporablja za vnašanje večih vprašalnikov v bazo (npr. 1000), kar opravi nekaj vnašalcev (npr. 10). Vsak od vnašalcev mora biti registriran kot Sisplet uporabnik, kar anketa prepozna ter ime vnašalca shrani poleg vnesenega vprašalnika.",
+    "srv_vnos_navodila"    	=>	 "Opcija 'Vnos' se uporablja za vna&#353;anje ve&#269;ih vpra&#353;alnikov v bazo (npr. 1000), kar opravi nekaj vna&#353;alcev (npr. 10). Vsak od vna&#353;alcev mora biti registriran kot Sisplet uporabnik, kar anketa prepozna ter ime vna&#353;alca shrani poleg vnesenega vpra&#353;alnika.",
     "srv_test"            	=>	 "Test",
     "srv_forma"             =>	 "Forma",
 	"srv_forma_naslov"		=>	 "Nabor vpra&#154;anj",
@@ -2263,8 +2213,8 @@ $lang = array (
     "srv_moduli"        	=>	 "Napredni moduli",
     "srv_moduli_setings"    =>	 "Nastavitve",
     "srv_uporabnost"        =>	 "Evalvacija strani",
-    "srv_uporabnost_link"   =>	 "Povezava spletnega mesta za ocenjevanje (zaslon se razdeli):",
-    "srv_uporabnost_warning" =>	 "<span class='red'>Opozorilo!</span> Vključite lahko samo spletno stran, ki ima dovoljeno vključevanje iz drugih domen (angl. <span class='italic'>cross-origin farming</span>). Nekatere spletne strani takega vključevanja ne dovolijo, prav tako pa lahko pride do težav, če spletna stran nima dodatnega varnostnega protokola. V teh primerih v anketi spletne strani ne bo prikazalo, zato pred aktivacijo ankete dobro pretestirajte, ali ima spletna stran za ocenjevanje dovoljeno vključevanje iz drugih domen.",
+    "srv_uporabnost_link"   =>	 "URL strani, ki jo evaluirate (ekran se bo razpolovil)",
+    "srv_uporabnost_warning" =>	 "Vključite lahko samo spletno stran, ki ima dovoljeno vključevanje iz drugih domen (angl. cross-origin framing). Nekatere spletne strani takega vključevanja (npr. google.si ipd.) takega vključevanja ne dovolijo, prav tako lahko pride do težav, če spletna stran nima dodatnega varnostnega protokola (v primeru, da gre za spletno stran http). V teh primerih v anketi spletne strani ne bo prikazalo, zato pred aktivacijo ankete dobro pretestirajte, ali imate vključene spletne strani, ki to dovolijo.",
     "srv_uporabnost_razdeli"=>	 "Stran razdeli",
     "srv_vodoravno"			=>	 "vodoravno",
     "srv_navpicno"			=>	 "navpi&#269;no",
@@ -2284,22 +2234,20 @@ $lang = array (
 	"srv_alert_title"		=>	"Obve&#353;&#269;anje o vsaki izpolnjeni anketi:",
 	"srv_alert_expired_title"	=>	"Obve&#353;&#269;anje pred iztekom ankete:",
 	"srv_alert_expired_time_title"	=>	"Datum - interval obve&#353;&#269;anja:",
-	"srv_alert_no_sys_var"	=>	"V sporočilu lahko uporabite tudi sistemske spremenljivke, ki jih trenutno ni v anketi.",
+	"srv_alert_no_sys_var"	=>	"V anketi ni sistemskih spremenljivk.",
 	"srv_alert_respondent"  =>	  "Respondent",
-	"srv_alert_respondent_note_ok_email_ime"	=>	"(Dodani sta sistemski spremenljivki \"email\" in \"ime\")",
-	"srv_alert_respondent_note_ime"		=>	  "Želite dodati tudi sistemsko spremenljivko \"ime\"?",
-	"srv_alert_respondent_note_ok_email"	=>	  "(Dodana je sistemska spremenljivka \"email\")",
-	"srv_alert_respondent_note_notok_email"	=>	  "(Sistemske spremenljivke \"email\" ni bilo mogoče dodati!)",
-	"srv_alert_respondent_note_link"	=>	"Dodaj potrebne sistemske spremenljivke",
+	"srv_alert_respondent_note_ok_email_ime"	=>	"&nbsp;<span class=\"gray\">(Dodani sta sistemski spremenljivki \"email\" in \"ime\")</span>",
+	"srv_alert_respondent_note_ime"		=>	  "&nbsp;<span class=\"red\">&#381;elite dodati tudi sistemsko spremenljivko \"ime\"</span>",
+	"srv_alert_respondent_note_ok_email"	=>	  "&nbsp;<span class=\"gray\">(Dodana je sistemska spremenljivka \"email\")</span>",
+	"srv_alert_respondent_note_notok_email"	=>	  "&nbsp;<span class=\"red\">(Sistemske spremenljivke \"email\" ne morem dodati!)</span>",
+	"srv_alert_respondent_note_link"	=>	"Dodaj potrebne sistemske spremenljivke!",
     "srv_alert_respondent_cms" 		=>	  "Respondent, registriran v CMS",
-    "srv_alert_respondent_cms_note"	=>	  "(V nastavitah mora biti označeno, da prepozna uporabnika iz CMS!)",
-	"srv_alert_respondent_cms_note_ok"	=>	  "(Uporabnik bo prepoznan iz sisplet CMS)",
+    "srv_alert_respondent_cms_note"	=>	  "&nbsp;<span class=\"red\">(V nastavitah mora biti ozna&#269;eno, da prepozna uporabnika iz CMS!)</span>",
+	"srv_alert_respondent_cms_note_ok"	=>	  "&nbsp;<span class=\"gray\">(Uporabnik bo prepoznan iz sisplet CMS)</span>",
 	"srv_alert_respondent_cms_note_link"	=>	"Dodaj nastavitev!",
-    "srv_alert_author"		=>	"Avtor ankete oziroma souredniki",
+    "srv_alert_author"		=>	"Avtor ankete oziroma druge osebe, katerim je omogo&#269;en dostop:",
     "srv_alert_msg"         =>	 "je izpolnil formo/anketo",
     "srv_alert_prejemnik"	=>	 "Obvestilo dobijo naslednji prejemniki:",
-    "srv_alert_surveydelete"	=>	 "Obveščanje o izbrisu ankete",
-    "srv_alert_surveydelete_text"	=>	 "Obvestilo o izbrisu ankete prejmejo naslednji prejemniki:",
     "srv_alert_oblika"		=>	 "Oblika e-mail sporočila:",
     "srv_alert_oblika_deactivate_note"	=>	 "Sporo&#269;ilo ob deaktivaciji ankete",
     "srv_alert_oblika_activate_note"	=>	 "Sporo&#269;ilo ob aktivaciji ankete",
@@ -2325,7 +2273,7 @@ $lang = array (
     "srv_user_base_individual_invitaition"		=>	 "Individualizirana vabila:",
     "srv_user_base_individual_invitaition_note"	=>	 "Individualizirana vabila omogočajo sledenje respondentom.",
     "srv_user_base_individual_invitaition_note2"	=>	 "Z izbiro \"Ne\" je modul individualiziranih vabil izklopljen. Anketira se lahko vsak, ki vidi ali pozna URL naslov. Respondentov v takem primeru ne moremo slediti; ne vemo kdo je odgovoril in kdo ne. Sistem 1KA lahko kljub temu pošlje (email) oziroma dokumentira (pošta, SMS, drugo) pošiljanje splošnega ne-individualiziranega vabila, kjer vsi respondenti prejmejo enotni URL. To pomeni, da se zabeležilo, komu, kdaj in kako je bilo vabilo poslano, ne bo pa označeno, kdo je odgovoril in kdo ne.",
-    "srv_user_base_access_check"				=>	 "Omogoči dostop do ankete tudi brez individualiziranega vabila (kode)",
+    "srv_user_base_access_check"				=>	 "Omogoči dostop do ankete tudi brez individualiziranega vabila (kode):",
     "srv_user_base_access"						=>	 "Dostop brez kode:",
     "srv_user_base_access_alert_0"				=>	 "Pri privzeti nastavitvi »NE«, respondenti brez kode oziroma vabila ne bodo mogli dostopati do ankete!",
     "srv_user_base_access_alert_1"				=>	 "Pri nastavitvi »DA« bodo v anekto lahko vstopali vsi respondenti!",
@@ -2334,7 +2282,7 @@ $lang = array (
     "srv_email_server_settings_warning"			=>	 "Opozorilo! Iste nastavitve poštnega strežnika se upoštevajo pri obveščanju in pri pošiljanju email vabil!",
     "srv_massinsert"        =>	 "Masovni vnos",
     "srv_massdelete"        =>	 "Pobri&#154;i vse vnose",
-    "srv_masstxt"           =>	 "Respondente dodajajte po enega v vrstico. Stolpce ločite z vejico, v enakem vrstnem redu kot so prikazani spodaj v odebeljenem tisku.<br /><br />Primeri:<br />janez.novak@example.com,Janez Novak<br />janez.novak@example.com<br />Janez Novak,M,Ljubljana",
+    "srv_masstxt"           =>	 "Respondente dodajajte po enega v vrstico. Stolpce lo&#269;ite z vejico, v enakem vrstnem redu kot so prikazani spodaj v odebeljenem tisku.<br /><br />Primeri:<br />janez.novak@example.com,Janez Novak<br />janez.novak@example.com<br />Janez Novak,M,Ljubljana",
     "srv_basecode"          =>	 "Vnesite svojo kodo",
     "srv_usermails"         =>	 "Po&#154;iljanje e-po&#154;te",
     "srv_usermailing_setting"    =>	 "Nastavitve e-po&#154;te",
@@ -2342,14 +2290,12 @@ $lang = array (
     "srv_arhivi_printouts"  =>	 "Arhivi in izpisi",
     "srv_arhivi"			=>	 "Arhivi",
     "srv_progressbar"       =>	 "Prika&#382;i vrstico napredka (progress bar)",
-    "srv_ask_delete"        =>	 "Ali ste prepričani, da želite trajno izbrisati?",
-    "srv_ask_delete_multiple_data"   =>	 "Ali ste prepričani, da želite trajno izbrisati izbrane enote?",
-    "srv_ask_delete_data"   =>	 "Ali ste prepričani, da želite trajno izbrisati enoto?",
-    "srv_ask_delete_inv"    =>	 "Ali ste prepričani, da želite trajno izbrisati?\n\nPobrisali boste tudi odgovore, ki so vezani na vabila! To lahko povzroči napake pri obravnavanju odgovorov poslanih preko vabil.",
+    "srv_ask_delete"        =>	 "Ali ste prepricani, da želite trajno izbrisati?",
+    "srv_ask_delete_inv"    =>	 "Ali ste prepricani, da želite trajno izbrisati?\n\nPobrisali boste tudi odgovore, ki so vezani na vabila! To lahko povzroči napake pri obravnavanju odgovorov poslanih preko vabil.",
     "srv_crosstabs"         =>	 "Tabele",
 	"srv_multicrosstabs"    =>	 "Multitabele",
     "srv_means"				=>	 "Povprečja",
-    "srv_average" 	        =>	 "Povprečja",
+    "srv_average" 	        =>	 "Povpre&#269;ja",
     "srv_statistics" 		=>	 "Osnovni pregled",
 	"srv_statistics_edit" 	=>	 "Uvodni tekst h rezultatom",
     "srv_zapri"             =>	 "Zapri",
@@ -2358,11 +2304,11 @@ $lang = array (
     "srv_create_new"        =>	 "Kreiraj",
 	"srv_create_survey"     =>	 "Ustvari Anketo",
     "srv_zapri_novo"        =>	 "Zapri in dodaj novo vpra&#154;anje",
-    "srv_timer_on"          =>	 "Timer je vključen",
+    "srv_timer_on"          =>	 "Timer je vklju&#269;en",
     "srv_timer_on_time"		=>	 "Timer: ",
-    "srv_timer_off"         =>	 "Timer je izključen",
-	"srv_timer_on2"			=>	 "Vključen",
-    "srv_timer_off2"		=>	 "Izključen",
+    "srv_timer_off"         =>	 "Timer je izklju&#269;en",
+	"srv_timer_on2"			=>	 "Vklju&#269;en",
+    "srv_timer_off2"		=>	 "Izklju&#269;en",
     "srv_seconds"           =>	 "sec",
     "srv_minutes"           =>	 "min",
 	"srv_sistemska"         =>	 "Sistemska spremenljivka",
@@ -2372,9 +2318,8 @@ $lang = array (
     "srv_newfolder"         =>	 "Nova mapa",
     "srv_deletefolder"      =>	 "Izbri&#154;i mapo",
     "srv_backup"         	=>	 "Kreiraj arhivsko anketo",
-    "srv_backup_label"      =>	 "Izdelava arhivske verzije vprašalnika:",
-    "srv_backup_data_text" =>	 "Pred spreminjanjem vprašalnika ali urejanjem podatkov lahko obstoječo verzijo podatkov shranite tako, da izdelate arhivsko verzijo. S klikom na 'Izdelaj arhivsko verzijo podatkov' se v spodnjem seznamu generira arhivska verzija vprašalnika in podatkov. Vsako arhivsko verzijo vprašalnika lahko aktivirate. Z aktivacijo se arhivska verzija avtomatsko ustvari kot nova anketa.",
-    "srv_backup_data_label" =>	 "Izdelaj arhivsko verzijo podatkov",
+    "srv_backup_label"      =>	 "Izdelava arhivske verzije vpra&#353;alnika:",
+    "srv_backup_data_label" =>	 "Izdelava arhivske kopije podatkov:",
     "srv_backup_button"     =>	 "Izdelaj arhivsko verzijo vprašalnika",
     "srv_backup_data_button"=>	 "Izdelaj arhivsko kopijo podatkov",
     "srv_concl_link"        =>	 "Ob koncu ankete",
@@ -2388,41 +2333,9 @@ $lang = array (
 	"srv_concl_link_recnum"	=>	 "Recnum responedenta",
 	"srv_concl_link_datapiping"	=>	 "V url lahko vključite tudi vrednosti odgovorov s sintakso <b>#IME_VPRAŠANJA#</b><br />(npr. https://www.1ka.si?q1=#Q1#)",
     "srv_library"           =>	 "Knji&#382;nica",
-    "srv_library_survey_title"  =>	 "Knjižnica vprašanj",
-    "srv_library_survey_tab_questions"  =>	 "Samostojna vprašanja",
-    "srv_library_survey_tab_surveys"    =>	 "Vprašanja v anketah",
-    "srv_library_survey_add"    =>	 "Dodaj v anketo",
-    "srv_library_item_counter"  =>	 "Št. izbranih vprašanj",
-    "srv_library_folder_add"    =>	 "Dodaj podmapo",
-    "srv_library_folder_delete" =>	 "Odstrani podmapo",
-    "srv_library_folder_rename" =>	 "Preimenuj podmapo",
-    "srv_library_folder_name"   =>	 "Ime podmape",
-    "srv_library_delete_q"      =>	 "Odstrani vprašanje",
-    "srv_library_delete_if"     =>	 "Odstrani pogoj",
-    "srv_library_delete_block"  =>	 "Odstrani blok",
-    "srv_library_delete_loop"   =>	 "Odstrani zanko",
-    "srv_library_rename_q"      =>	 "Preimenuj vprašanje",
-    "srv_library_rename_if"     =>	 "Preimenuj pogoj",
-    "srv_library_rename_block"  =>	 "Preimenuj blok",
-    "srv_library_rename_loop"   =>	 "Preimenuj zanko",
-    "srv_library_add_to_lib_title_q"        =>	 "Dodaj vprašanje v knjižnico",
-    "srv_library_add_to_lib_title_if"       =>	 "Dodaj pogoj v knjižnico",
-    "srv_library_add_to_lib_title_block"    =>	 "Dodaj blok v knjižnico",
-    "srv_library_add_to_lib_title_loop"     =>	 "Dodaj zanko v knjižnico",
-    "srv_library_add_to_lib"                =>	 "Dodaj v knjižnico",
-    "srv_library_add_to_lib_name_q"         =>	 "Ime vprašanja",
-    "srv_library_add_to_lib_name_if"        =>	 "Ime pogoja",
-    "srv_library_add_to_lib_name_block"     =>	 "Ime bloka",
-    "srv_library_add_to_lib_name_loop"      =>	 "Ime zanke",
-    "srv_library_add_to_lib_folder"         =>	 "Dodaj v mapo",
-    "srv_library_add_to_lib_success_q"      =>	 "Vprašanje je bilo uspešno dodano v knjižnico.",
-    "srv_library_add_to_lib_success_if"     =>	 "Pogoj je bil uspešno dodan v knjižnico.",
-    "srv_library_add_to_lib_success_block"  =>	 "Blok je bil uspešno dodan v knjižnico.",
-    "srv_library_add_to_lib_success_loop"   =>	 "Zanka je bila uspešno dodana v knjižnico.",
-    "srv_library_add_to_lib_success_err"    =>	 "Prišlo je do napake pri dodajanju v knjižnico!",
     "srv_nadzor"            =>	 "Nadzor",
     "srv_knjiznica_add"     =>	 "&#268;e &#382;elite dodati spremenljivko v knji&#382;nico, jo povlecite v to polje",
-    "srv_knjiznica_copy"    =>	 "&#268;e &#382;elite kopirati vpra&#154;anje, ga označite z ikono COPY",
+    "srv_knjiznica_copy"    =>	 "&#268;e &#382;elite kopirati vpra&#154;anje, ga ozna&#269;ite z ikono COPY",
     "srv_deleteall"         =>	 "Izbri&#154;i vse vnose",
     "srv_expand"            =>	 "Odpri vse",
     "srv_collapse"          =>	 "Zapri vse",
@@ -2445,11 +2358,11 @@ $lang = array (
     "srv_moja_vprasanja"    =>	 "Moja vprasanja",
     "srv_ankete"            =>	 "Ankete",
     "srv_moje_ankete"       =>	 "Moje ankete",
-    "srv_prestevilci"       =>	 "Pre&#154;tevilči",
+    "srv_prestevilci"       =>	 "Pre&#154;tevil&#269;i",
     "srv_ank_lib_on"        =>	 "Dodaj anketo v javno knjižnico",
-    "srv_ank_lib_off"        =>	 "Odstrani anketo iz javne knjižnice",
+    "srv_ank_lib_off"        =>	 "Odstrani anketo iz javne knji&#382;nice",
     "srv_ank_mylib_on"        =>	 "Dodaj anketo v mojo knjižnico",
-    "srv_ank_mylib_off"        =>	 "Odstrani anketo iz moje knjižnice",
+    "srv_ank_mylib_off"        =>	 "Odstrani anketo iz moje knjiznice",
     "srv_ank_phone_off"        =>	 "Ni telefonska anketa.",
     "srv_ank_phone_on"        =>	 "Je telefonska anketa.",
     "srv_anketa_copy"       	=>	"Kopiranje bo zbrisalo vsa obstojeca vprasanja. Nadaljujem?",
@@ -2457,19 +2370,15 @@ $lang = array (
     "srv_library_help_prva"		=>	"&#268;e &#382;elite novo anketo ustvariti iz knji&#382;nice, vpi&#154;ite ime ankete na vrhu in kliknite na ikono kopiraj %s na desni.",
     "srv_library_help_druga"	=>	"&#268;e &#382;elite novo anketo ustvariti iz knji&#382;nice, vpi&#154;ite ime ankete na vrhu in kliknite na ikono kopiraj %s na levi.",
     "srv_library_anketa_help"   =>	"Anketo shranite v knjiznico na prvi strani s klikom na ikono vozicka. Za kopiranje kliknite na ikono kopiraj na desni.",
-    "srv_library_title_my"              =>	"Vse ankete v moji knjižnici",
-    "srv_library_title_public"          =>	"Vse ankete v javni knjižnici",
-    "srv_library_title_search_my"       =>	"Rezultati iskanja po anketah v moji knjižnici",
-    "srv_library_title_search_public"   =>	"Rezultati iskanja po anketah v javni knjižnici",
     "srv_vstavi"          		=>	"Vstavi",
     "srv_1cs"          			=>	"1KA",
     "srv_no_library"        =>	 "brez predloge",
     "srv_cookie_return"        =>	 "Ko se uporabnik vrne",
-    "srv_cookie_return_start"       =>	 "Začne od začetka",
+    "srv_cookie_return_start"       =>	 "Za&#269;ne od za&#269;etka",
     "srv_cookie_return_middle"      =>	 "Nadaljuje na strani, kjer je ostal",
-    "srv_return_finished"        	=>	 "Uporabnik, ki je zaključil anketo",
+    "srv_return_finished"        	=>	 "Uporabnik, ki je zaklju&#269;il anketo",
     "srv_return_finished_yes"       =>	 "Lahko kasneje ureja svoje odgovore",
-    "srv_return_finished_no"        =>	 "Ne more več urejati svojih odgovorov",
+    "srv_return_finished_no"        =>	 "Ne more ve&#269; urejati svojih odgovorov",
     "srv_subsequent_answers"        =>	 "Uporabnik med izpolnjevanjem",
     "srv_subsequent_answers_no"     =>	 "Ne more naknadno urejati svojih odgovorov",
     "srv_subsequent_answers_yes"    =>	 "Lahko naknadno ureja svoje odgovore",
@@ -2479,36 +2388,35 @@ $lang = array (
     "srv_cookie_continue_alert"     =>	 "Če želite izpolniti anketo, se morate strinjati z uporabo piškotka.",
     "srv_block_ip"        			=>	 "Blokiraj ponovni IP naslov",
     "srv_block_ip_warning"       	=>	 "Pozor! Vklop oziroma omejevanje IP naslova ima lahko negativne posledice. <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/uporaba-ip-naslovov-piskotkov-za-nadzor-nad-podvojenimi-vnosi?&from1ka=1\" target=\"_blank\">Več >></a>",
-    "srv_from_library"                 =>     "predloga",
-    "srv_last_insrt"                =>     "Zadnji vnos",
-    "srv_created"                   =>     "Ustvarjeno",
+    "srv_from_library"     		=>	 "predloga",
+    "srv_last_insrt"        =>	 "Zadnji vnos",
     "srv_anketarestore"        =>	 "Aktiviraj arhivsko verzijo vprašalnika",
     "srv_anketarestoredata"        =>	 "Aktiviraj arhiv podatkov",
-    "srv_show_inserts"      =>	 "Enote na stran:",
-    "srv_show_questions"      =>	"Vprašanja na stran:",
+    "srv_show_inserts"      =>	 "Enote",
+    "srv_show_questions"      =>	"Vprašanja",
     "srv_allpages"          =>	 "Vse strani",
     "srv_move"              =>	 "Premakni",
-    "srv_call_start"        =>	 "Začni s klicanjem",
+    "srv_call_start"        =>	 "Za&#269;ni s klicanjem telefonskih &#154;tevilk",
     "srv_call_next"        =>	 "Naslednja telefonska &#154;tevilka",
-    "srv_call_nonumber"        =>	 "Trenutno ni več prostih telefonskih &#154;tevilk.",
-    "srv_call_call"        	=>	 "Kliči",
-    "srv_call_open"        	=>	 "Odpri anketo in začni",
+    "srv_call_nonumber"        =>	 "Trenutno ni ve&#269; prostih telefonskih &#154;tevilk.",
+    "srv_call_call"        	=>	 "Kli&#269;i",
+    "srv_call_open"        	=>	 "Odpri anketo",
     "srv_call_open_startCall"	=>	 "»A« Začnimo z anketiranjem - ",
     "srv_call_history"      =>	 "Zgodovina klicev",
-    "srv_call_calling"      =>	 "Kličem",
+    "srv_call_calling"      =>	 "Kli&#269;em",
     "srv_call_unsuccessful"	=>	 "Neuspeli izidi",
-    "srv_call_successful"	=>	 "»U« - Uspe&#154;no končano",
-    "srv_call_successful2"	=>	 "»U« - Uspe&#154;no zaključena anketa, pojdi na naslednji klic",
+    "srv_call_successful"	=>	 "»U« - Uspe&#154;no kon&#269;ano",
+    "srv_call_successful2"	=>	 "»U« - Uspe&#154;no zaklju&#269;ena anketa, pojdi na naslednji klic",
     "srv_call_zaseden"		=>	 "»Z« - Zaseden",
     "srv_call_ga_ni"		=>	 "»N« - Nedosegljiv",
     "srv_call_zavrnil"		=>	 "»R« - Zavrnil",
     "srv_call_zmenjen"		=>	 "»T« - Zmenjen",
     "srv_call_prekinjen"	=>	 "»P« - Prekinjen",
     "srv_call_prelozen"		=>	 "»D« - Preložen",
-    "srv_call_cancel"		=>	 "Prekliči klic",
-    "srv_call_settings_z" 	=>	 "Če je status \"Z\" (Zaseden) kliči čez",
-    "srv_call_settings_n"	=>	 "Če je status \"N\" (Nedosegljiv) kliči čez",
-    "srv_call_settings_d"	=>	 "Če je status \"D\" (Preložen) kliči čez",
+    "srv_call_cancel"		=>	 "Prekli&#269;i klic",
+    "srv_call_settings_z" 	=>	 "&#268;e je status \"Z\" (Zaseden) kli&#269;i &#269;ez",
+    "srv_call_settings_n"	=>	 "&#268;e je status \"N\" (Nedosegljiv) kli&#269;i &#269;ez",
+    "srv_call_settings_d"	=>	 "&#268;e je status \"D\" (Preložen) kli&#269;i &#269;ez",
     "srv_call_settings_min"	=>	 "minut",
     "srv_call_settings_max"	=>	 " Maksimalno",
     "srv_call_settings_calls"	=>	 "klicev",
@@ -2518,37 +2426,35 @@ $lang = array (
 	"srv_call_settings_call_order_2"	=>	 "A-Z",
 	"srv_call_settings_call_order_3"	=>	 "Z-A",
     "srv_call_nextcall"						=>	 "Naslednji klic",
-    "srv_call_nonumbers"					=>	 "Ni več &#154;tevilk v bazi!",
+    "srv_call_nonumbers"					=>	 "Ni ve&#269; &#154;tevilk v bazi!",
     "srv_call_nonumbers_time"				=>	 "Naslednji klic mogoč ob:",
     "srv_call"								=>	 "Klic",
     "srv_survey_repsonse_limit"   			=>	 "Anketa ima preseženo število odgvorov.",
-    "srv_survey_non_active"        			=>	 "Anketa je zaključena.",
+    "srv_survey_non_active"        			=>	 "Anketa je zaklju&#269;ena.",
     "srv_survey_non_active1"        			=>	 "Anketa je zaključena.",
     "srv_survey_deleted"        			=>	 "Anketa je izbrisana.",
     "srv_survey_non_active_notActivated"	=>	 "Anketa &#353;e ni bila aktivirana.",
 	"srv_survey_non_active_notActivated1"	=>	 "Anketa še ni bila aktivirana.",
-    "srv_survey_non_active_notStarted"		=>	 "Anketa &#353;e ni aktivna. Začne se dne: ",
+    "srv_survey_non_active_notStarted"		=>	 "Anketa &#353;e ni aktivna. Za&#269;ne se dne: ",
     "srv_survey_non_active_notStarted1"		=>	 "Anketa še ni aktivna. Začne se dne: ",
-    "srv_survey_non_active_expired"			=>	 "Anketa več ni aktivna. Končala se je dne: ",
+    "srv_survey_non_active_expired"			=>	 "Anketa ve&#269; ni aktivna. Kon&#269;ala se je dne: ",
     "srv_survey_non_active_expired1"			=>	 "Anketa več ni aktivna. Končala se je dne: ",
-	"srv_starts"        					=>	 "Datum začetka ankete",
-	"srv_starts2"        					=>	 "Začetek ankete",
+	"srv_starts"        					=>	 "Datum za&#269;etka ankete",
 	"srv_expire"        					=>	 "Datum zaključka ankete",
-	"srv_expire2"        					=>	 "Zaključek ankete",
 	"srv_vote_limit"						=>	 "Omejitev &#154;tevila odgovorov",
 	"srv_vote_quotas"						=>	 "Kvote (omejitev &#154;tevila odgovorov)",
 	"srv_vote_quotas_2"						=>	 "Kvote",
-	"srv_vote_count"						=>	 "Največje &#154;tevilo odgovorov",
-	"srv_survey_non_active_voteLimit"  		=>	 "Anketa ni več aktivna, ker jo je izpolnilo določeno &#353;tevilo respondentov.",
+	"srv_vote_count"						=>	 "Najve&#269;je &#154;tevilo odgovorov",
+	"srv_survey_non_active_voteLimit"  		=>	 "Anketa ni ve&#269; aktivna, ker jo je izpolnilo dolo&#269;eno &#353;tevilo respondentov.",
 	"srv_survey_voteLimit_warning"  		=>	 "V primeru dosežene omejitve števila odgovorov se respondentu izpiše obvestilo",
     "srv_mailing"        		=>	 "E-po&#154;to po&#154;lji",
     "srv_mailing_all"        	=>	 "Vsem",
     "srv_mailing_nonrsp"        =>	 "Tistim, ki &#154;e niso odgovorili na anketo",
     "srv_mailing_rsp"        	=>	 "Tistim, ki so &#382;e odgovorili na anketo",
     "srv_mailing_all_with_status"	=>	"Vsem ki imajo status",
-    "srv_mailing_add_help"      =>	 "<p><ul><li>V razdelku \"Spremenljivke\" izberite &#382;eljene spremenljivke. Izbrane spremenljivke bodo dodane na konec ankete kot sistemske spremenljivke.</li><li>V razdelku \"Respondenti\" dodajajte respondente po enega v vrstico.<br/>Stolpce ločite z vejico, v enakem vrstnem redu kot so navedeni zgoraj (Spremenljivke).<br /><br />Primer:<div style=\"padding-left:30px;\">Spremenljivke: <i>email,ime</i></div><div style=\"padding-left:30px;\">Respondenti: <i>janez.novak@example.com,Janez Novak</i></div></li><br/><li>Lahko pa respondente prenesete iz tekstovne datoteke. S pomočjo spodnjega okna za prenos.</li></ul></p>",
-    #"srv_mailing_set_help"      =>	 "<p>Za po&#154;iljanje e-po&#154;te mora biti dodana sistemska spremenljivka <strong>email</strong>!</p><br /><ul><li>Za vstavljanje povezave na url ankete vpi&#154;ite <strong>#URL#</strong> v besedilo.</li><li>Za izpis kode anketiranca vpi&#154;ite <strong>#CODE#</strong> v besedilo.</li><li>Za povezavo na odjavo iz mailing liste, dodajte <strong>#UNSUBSCRIBE#</strong></li><li>Za izpis anketirančeve vrednosti na drugi spremenljivki ali sistemski spremenljivki iz ankete, vnesite ime spremenljivke med znaka <strong>#</strong>. <br/><div style=\"margin-left:20px;\"><i>Primer: za izpis anketirančevega e-po&#353;tnega naslova vpi&#154;ite v besedilo <strong>#EMAIL#</strong>. </i></div></li></ul><strong>Sistemske spremenljivke, ki so na voljo:<br/></strong></p>",
-    "srv_mailing_upload_list"   =>	 "Naloži seznam respondentov iz datoteke",
+    "srv_mailing_add_help"      =>	 "<p><ul><li>V razdelku \"Spremenljivke\" izberite &#382;eljene spremenljivke. Izbrane spremenljivke bodo dodane na konec ankete kot sistemske spremenljivke.</li><li>V razdelku \"Respondenti\" dodajajte respondente po enega v vrstico.<br/>Stolpce lo&#269;ite z vejico, v enakem vrstnem redu kot so navedeni zgoraj (Spremenljivke).<br /><br />Primer:<div style=\"padding-left:30px;\">Spremenljivke: <i>email,ime</i></div><div style=\"padding-left:30px;\">Respondenti: <i>janez.novak@example.com,Janez Novak</i></div></li><br/><li>Lahko pa respondente prenesete iz tekstovne datoteke. S pomo&#269;jo spodnjega okna za prenos.</li></ul></p>",
+    #"srv_mailing_set_help"      =>	 "<p>Za po&#154;iljanje e-po&#154;te mora biti dodana sistemska spremenljivka <strong>email</strong>!</p><br /><ul><li>Za vstavljanje povezave na url ankete vpi&#154;ite <strong>#URL#</strong> v besedilo.</li><li>Za izpis kode anketiranca vpi&#154;ite <strong>#CODE#</strong> v besedilo.</li><li>Za povezavo na odjavo iz mailing liste, dodajte <strong>#UNSUBSCRIBE#</strong></li><li>Za izpis anketiran&#269;eve vrednosti na drugi spremenljivki ali sistemski spremenljivki iz ankete, vnesite ime spremenljivke med znaka <strong>#</strong>. <br/><div style=\"margin-left:20px;\"><i>Primer: za izpis anketiran&#269;evega e-po&#353;tnega naslova vpi&#154;ite v besedilo <strong>#EMAIL#</strong>. </i></div></li></ul><strong>Sistemske spremenljivke, ki so na voljo:<br/></strong></p>",
+    "srv_mailing_upload_list"   =>	 "Nalo&#382;i seznam respondentov iz datoteke",
     "srv_ub_added"        		=>	 "Dodan v bazo",
     "srv_ub_addedby"        	=>	 "Dodal v bazo",
     "srv_ub_mailed"        		=>	 "Poslana e-po&#154;ta",
@@ -2574,22 +2480,21 @@ $lang = array (
     "srv_userstatus_total"		=> "Vsi statusi",
     "srv_userstatus_appropriate"=> "Ustrezni",
     "srv_userstatus_inappropriate"=> "Neustrezni",
-    "srv_edithelp"           	=>	 "Urejanje oken s pomočjo",
+    "srv_edithelp"           	=>	 "Urejanje oken s pomo&#269;jo",
     "srv_tracking"           	=>	 "Prika&#382;i spremembe ankete",
     "srv_diagnostics"           =>	 "Aktivnost",
     "srv_sar"           		=>	 "Strežnik",
     "srv_addfilter"           	=>	 "Dodaj filtriranje",
     "srv_editcalculation"       =>	 "Uredi kalkulacijo",
     "srv_editcalculation_missing"	=>	 "Neodgovor upoštevaj kot vrednost 0",
-    "srv_editcalculation_new"	=>	 "Ime nove spremenljivke",
     "srv_edit_quota"       		=>	 "Uredi kvoto",
     "cats_for_r_db_ttl"			=>	"Prikazani filtri v r-bazi",
-	"FinancialSite"				=>	"Finančno spletno mesto",
+	"FinancialSite"				=>	"Finan&#269;no spletno mesto",
 	"whatsthis"					=>	"Kaj je to?",
-	"aboutOneClick"			=>	"OneClick Upload vam omogoča, da z enostavno operacijo povleci-spusti ali kopiraj-prilepi va&#154;emu sporočilu dodate poljubno &#154;tevilo prilog iz va&#154;ega trdega diska ali USB ključka.<br />Deluje v vseh operacijskih sistemih, v Microsoftovih oknih pa je potrebno za njegovo delovanje nalo&#382;iti mali dodatek, ki ga lahko <a href=\"http://www.sisplet.org/uploadi/editor/1162159255OneClick.zip\">dobite tukaj</a>.<br /><br /> Ve&#154; o OneClick uploadu si lahko <a href=\"http://www.sisplet.org/index.php?fl=1&nt=3&sid=7\">preberete tukaj.</a>",
-	"create_thread"			=>	"Iz tega sporočila kreiraj novo temo",
-	"create_thread_q"		=>	"Ali ste prepričani, da &#382;elite iz tega sporočila ustvariti novo temo?",
-	"delete_project"		=>	"Ali ste prepričani, da &#382;elite trajno izbrisati ta projekt?",
+	"aboutOneClick"			=>	"OneClick Upload vam omogo&#269;a, da z enostavno operacijo povleci-spusti ali kopiraj-prilepi va&#154;emu sporo&#269;ilu dodate poljubno &#154;tevilo prilog iz va&#154;ega trdega diska ali USB klju&#269;ka.<br />Deluje v vseh operacijskih sistemih, v Microsoftovih oknih pa je potrebno za njegovo delovanje nalo&#382;iti mali dodatek, ki ga lahko <a href=\"http://www.sisplet.org/uploadi/editor/1162159255OneClick.zip\">dobite tukaj</a>.<br /><br /> Ve&#154; o OneClick uploadu si lahko <a href=\"http://www.sisplet.org/index.php?fl=1&nt=3&sid=7\">preberete tukaj.</a>",
+	"create_thread"			=>	"Iz tega sporo&#269;ila kreiraj novo temo",
+	"create_thread_q"		=>	"Ali ste prepri&#269;ani, da &#382;elite iz tega sporo&#269;ila ustvariti novo temo?",
+	"delete_project"		=>	"Ali ste prepri&#269;ani, da &#382;elite trajno izbrisati ta projekt?",
     "SurveyDostop"            =>    "Ankete lahko urejajo",
 	"SurveyForum"			=>	"Forum za komentiranje anket",
     "SurveyCookie"            =>	   "Privzeto shranjevanje pi&#154;kotka",
@@ -2683,7 +2588,6 @@ $lang = array (
 	"e-mail_name_surname"	=>	"e-maile, imena in priimke",
 	"email_prejemniki"		=>	"Dodatni prejemniki ",
 	"email_one_per_line"	=>	"<span class=\"red\" >(Vsak e-po&#154;tni naslov vnesite v svojo vrstico.)</span>",
-	"email_prejemniki_one_per_line"	=>	"E-mail naslovi dodatnih prejemnikov (vsak e-poštni naslov vnesite v svojo vrstico)",
 //	"email_one_per_line"		=>	"Vnesite e-po&#353;tne naslove, po enega v vrstico.",
 	"tab_delimited_one_per_line"	=>	"Vnesite e-po&#154;tne naslove, imena, in priimke, lo&#269;ene s tabulatorji (tab-delimited); po eno osebo v vrstico.",
 	"you_are_on_page"		=>	"Nahaja&#154; se na strani",
@@ -2702,8 +2606,8 @@ $lang = array (
 	"bruto"				=>	"Bruto",
 	"cost_label"			=>	"Oznaka stro&#154;ka",
 	"fin_import_3_of_3"		=>	"Korak 3 od 3: Opravljeno",
-	"fin_import_ok"			=>	"Podatki so bili uspešno uvoženi",
-	"fin_import_ok_text"	=>	"Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na več straneh, izberite zadnjo stran).",
+	"fin_import_ok"			=>	"Podatki so bili uspe&#154;no uvo&#382;eni",
+	"fin_import_ok_text"	=>	"Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na več straneh, izberite zadnjo stran)",
 	"fin_show_substm"		=>	"Prika&#382;i tudi  podstro&#154;kovna mesta",
 	"texts"				=>	"Teksti",
 	"logotype"			=>	"Logotip",
@@ -2758,8 +2662,6 @@ $lang = array (
 	"show_menu_forum"		=>	"Prika&#382;i menu v forumu",
 	"using_mail_template"	=>	"Pri obve&#154;&#269;anju se uporablja predloga ki je definirana v skinu",
 	"SurveyMetaOnly"		=>	"Prika&#382;i survey samo meta adminom",
-    "other"                    =>    "Ostalo",
-    "more2"                    =>    "Več",
 	"srv_analiza_info"		=>	"Podatki",
 	"srv_analiza_stVprasanj"	=>	"Vpra&#353;anj",
 	"srv_analiza_stVariable"	=>	"Spremenljivk",
@@ -2833,7 +2735,7 @@ $lang = array (
 	"srv_analiza_opisne_povprecje1"			=>	"Povprečje", // "Povprečna<br/>vrednost",
 	"srv_analiza_opisne_povprecje_odstotek"	=>	"Povpre&#269;je<br/>/&nbsp;odstotek", // "Povpre&#269;na<br/>vrednost",
 	"srv_analiza_opisne_povprecje_odstotek1"	=>	"Povprečje<br/>/&nbsp;odstotek", // "Povpre&#269;na<br/>vrednost",
-	"srv_analiza_opisne_odklon"				=>	"Std. odklon",// "Standardni<br/>odklon",
+	"srv_analiza_opisne_odklon"				=>	"Std. Odklon",// "Standardni<br/>odklon",
 	"srv_analiza_opisne_min"				=>	"Minimum", //"Najmanj&#353;a<br/>vrednost",
 	"srv_analiza_opisne_max"				=>	"Maksimum", //"Najve&#269;ja<br/>vrednost",
 	"srv_analiza_opisne_valid"				=>	"Veljavni", 
@@ -2862,8 +2764,6 @@ $lang = array (
 	"srv_analiza_crosstab_average" 			=>	"Povprečje",
 	"srv_analiza_crosstab_navedbe" 			=>	"Po navedbah",
 	"srv_analiza_crosstab_enote" 			=>	"Po enotah",
-	"srv_analiza_crosstab_table_settings" 	=>	"V tabeli prikaži",
-	"srv_analiza_crosstab_answer_settings"	=>	"Odgovore prikaži",
 	"srv_standardna_porocila"				=>	"Standardna poro&#269;ila",
 	"srv_rep_text"							=>	"Tekstovno poro&#269;ilo",
 	"srv_rep_graph"							=>	"Grafi&#269;no poro&#269;ilo",
@@ -3001,7 +2901,6 @@ $lang = array (
 	"srv_orientacija_horizontalna_3"  =>	"Vodoravno",
 	"srv_orientacija_expand"          =>	"Z razpiranjem",
 	"srv_dynamic_multigrid"  		=>	"Postopno reševanje",
-	"srv_more_info"					=>	"Več informacij",
 	"srv_more"						=>	"ve&#269",
 	"srv_less"						=>	"manj",
 	"user_tracker"					=>	"Nadzor uporabnika",
@@ -3058,11 +2957,9 @@ $lang = array (
 	"glasovanja_embed_on"			=>	"Vklju&#269;ena v drugo spletno mesto",
 	"glasovanja_embed_off"			=>	"Samostojna anketa",
 	"glasovanja_theme"				=>	"Izberi temo za anketo",
-	"glasovanja_theme2"				=>	"Tema za anketo",
 	"glasovanja_stat_theme"			=>	"Izberi temo za statistiko",
-	"glasovanja_stat_theme2"        =>	"Tema za statistiko",
-	"oblikovanje_if" 				=>	"Nastavitve pogoja",
-	"oblikovanje_blok" 				=>	"Nastavitve bloka",
+	"oblikovanje_if" 				=>	"Urejanje pogojev",
+	"oblikovanje_blok" 				=>	"Urejanje bloka",
 	"sintaksa_if" 					=>	"Predogled pogojev",
     "urejanje_podif_alert" 			=>	"Urejate pogoj za prikaz izbrane vrstice (kategorije, podvpra&#353;anja) in ne celega vpra&#353;anja!",
     "urejanje_pogoj_popup"          =>	"Uredi pogoj",
@@ -3072,7 +2969,7 @@ $lang = array (
 	"srv_url" 						=>	"URL",
 	"srv_embed_link" 				=>	"Embed",
 	"srv_pop-up" 					=>	"Pop-up",
-	"srv_email-vabila" 				=>	"E-poštna vabila",
+	"srv_email-vabila" 				=>	"E-po&#353;tna Vabila",
 	"srv_email-vabila_form"			=>	"Hitre nastavitve email vabil",
 	"srv_url_intro_active" 			=>	"Anketa je aktivirana.",
 	"srv_url_intro1" 				=>	"Anketa je aktivirana. URL:",
@@ -3116,7 +3013,7 @@ $lang = array (
 	"srv_h_sl_spreminjal"			=>	"Spremenil",
 	"srv_h_sl_trajanjeod"			=>	"Od",
 	"srv_h_sl_trajanjedo"			=>	"Do",
-	"srv_h_sl_stvprasanj"			=>	"št. vprašanj",
+	"srv_h_sl_stvprasanj"			=>	"Št. vprašanj",
 	"srv_h_sl_phone"				=>	"Telefonska anketa",
 	"srv_sl_error_msg"				=>	"Vidnost posameznih stolpcev lahko vklju&#269;ite s pomo&#269;jo potrditvenih polj.<br>Vrstni red pa nastavite s preme&#353;&#269;anjem posameznih elementov.",
 	"srv_sl_setting_show"			=>	"Prikaži ",					
@@ -3166,7 +3063,7 @@ $lang = array (
 	"srv_vrsta_survey_note_0_4"		=>	"Glasovanje",
 					
 	"srv_vrsta_survey_note_0_1"		=>	"Vklju&#269;iti &#382;elite: <strong>Glasovanja</strong><br/><br/>",
-	"srv_vrsta_survey_note_0_2"		=>	"Glasovanje je anketa z enim vpra&#353;anjem, mo&#382;nost vklju&#269;itve v poljubno stran, mo&#382;nost sprotne analize rezultatov za respondente, mo&#382;nost registriranega glasovanja, volitev, peticij...<br/>",
+	"srv_vrsta_survey_note_0_2"		=>	"Glasovanje je anketa z enim vpra&#353;anjem, mo&#382;nost vklju&#269;itve v poljubno stran, mo&#382;nost sprotne analize rezultov za respondente, mo&#382;nost registriranega glasovanja, volitev, peticij...<br/>",
 	
 	"srv_vrsta_survey_note_1_1"		=>	"Vklju&#269;iti &#382;elite: <strong>Formo</strong><br/><br/>",
 	"srv_vrsta_survey_note_1_2"		=>	"Forma je enostavna anketa na eni strani in brez pogojev.<br/>",
@@ -3178,33 +3075,28 @@ $lang = array (
 	"srv_vrsta_survey_note_3_2"		=>	"Vklju&#269;ili boste napreden vmesnik za uporabo pogojev (vejitev, preskokov).",
 	"srv_vrsta_survey_note_3_3"		=>	"<strong>Anketa s pogoji</strong> - kompleksna anketa, pogojni stavki (IF), vejitve, preskoki, bloki.",
 	"srv_vrsta_survey_note_4_1"		=>	"Vklju&#269;iti &#382;elite: <strong>Evalvacija strani</strong><br/>",
-	"srv_vrsta_survey_note_4_3"		=>	"Modul 'Evalvacija strani' je namenjen ocenjevanju spletnih mest. Uporabniki lahko na eni polovici zaslona gledajo in uporabljajo spletno mesto, ki ga ocenjujejo preko ankete na drugi polovici zaslona.",
-	"srv_vrsta_survey_note_4_3a"	=>	"Vklopi modul 'Evalvacija strani'",
-	"srv_vrsta_survey_note_4_3b"	=>	"Modul 'Evalvacija strani' omogoča tudi, da se hkrati ocenjuje več spletnih strani, vsako na svoji strani ankete. Tako lahko povezavo spletne strani za ocenjevanje določimo za vsako stran ankete posebej.",
+	"srv_vrsta_survey_note_4_2"		=>	"<br/>Razdeljen ekran, kjer z 1KA ocenjujemo poljubno spletno mesto ",
+	"srv_vrsta_survey_note_4_3"		=>	"Razdeljen ekran, kjer z 1KA ocenjujemo poljubno spletno mesto ",
 	"srv_vrsta_survey_note_5_1"		=>	"Vklju&#269;iti &#382;elite: <strong>Vnos vpra&#353;alnikov</strong><br/>",
 	"srv_vrsta_survey_note_5_2"		=>	"<br/>Možnost hitrega vnosa <b>pisemskih</b> vprašalnikov. <br/> Opcija pride v upoštev pri vnašanju že pridobljenih podatkov preko pisemskih vprašalnikov. Z vklopom tega modula se vam v vprašalniku pojavijo prazna polja za vnos vrednosti odgovorov, zato ta modul <b>ni primeren za spletno anketiranje </b>.",
 	"srv_vrsta_survey_note_5_3"		=>	"Možnost hitrega vnosa <b>pisemskih</b> vprašalnikov. <br/>Opcija pride v upoštev pri vnašanju že pridobljenih podatkov preko pisemskih vprašalnikov. Z vklopom tega modula se vam v vprašalniku pojavijo prazna polja za vnos vrednosti odgovorov, zato ta modul <b>ni primeren za spletno anketiranje </b>.",
-	"srv_vrsta_survey_note_6_4"		=>	"Modul kviz je namenjen preverjanju pravilnih odgovorov na vprašanja. Avtomatsko preverjanje pravilnih odgovorov je mogoče samo pri vprašanjih tipa 'Kategorije - En odgovor', 'Kategorije - En odgovor - Roleta' in 'Kategorije - Več odgovorov'.",
-	"srv_vrsta_survey_note_6_4a"		=>	"Vklopi modul 'Kviz'",
-	"srv_vrsta_survey_note_6_4b"		=>	"V zaključku kviza se respondentu prikažejo rezultati:",
+	"srv_vrsta_survey_note_6_1"		=>	"Vklju&#269;iti &#382;elite: <strong>Kviz</strong><br/>",
+	"srv_vrsta_survey_note_6_2"		=>	"<br/>Mo&#382;nost preverjanja rezultatov se&#353;tevanja to&#269;k in obve&#353;&#269;anja o dose&#382;enih rezultatih",
+	"srv_vrsta_survey_note_6_3"		=>	"Mo&#382;nost preverjanja rezultatov se&#353;tevanja to&#269;k in obve&#353;&#269;anja o dose&#382;enih rezultatih",
+	"srv_vrsta_survey_note_6_4"		=>	"Mo&#382;nost preverjanja pravilnih odgovorov pri vprašanjih",
 	"srv_vrsta_survey_note_7_1"		=>	"Vklju&#269;iti &#382;elite: <strong>Telefonska anketa</strong><br/>",
 	"srv_vrsta_survey_note_7_2"		=>	"<br/>Podpora izvedbi, nadzoru in opravljanju telefonskega anketiranja",
 	"srv_vrsta_survey_note_7_3"		=>	"Podpora izvedbi, nadzoru in opravljanju telefonskega anketiranja",
 	"srv_vrsta_survey_note_8_1"		=>	"Vklju&#269;iti &#382;elite: <strong>Socialna omre&#382;ja</strong><br/>",
-	"srv_vrsta_survey_note_8_3"		=>	"Modul socialna omrežja je namenjen podpori zajemu egocentričnih socialnih omrežij (ego-alter) vključno z Antonuccijevimi krogi.",
-	"srv_vrsta_survey_note_8_3a"	=>	"Vklopi modul 'Socialna omrežja'",
+	"srv_vrsta_survey_note_8_2"		=>	"<br/>Podpora zajemov egocentri&#269;nih socialnih omre&#382;ij (ego-alter) vklju&#269;no z Antonuccijevimi krogi",
+	"srv_vrsta_survey_note_8_3"		=>	"Podpora zajemov egocentri&#269;nih socialnih omre&#382;ij (ego-alter) vklju&#269;no z Antonuccijevimi krogi",
 	"srv_vrsta_survey_note_9_1"		=>	"Vklju&#269;iti &#382;elite: <strong>Prezentacijo</strong><br/>",
 	"srv_vrsta_survey_note_9_2"		=>	"<br/>Prezentacija (slideshow) je namenjena prikazovanju posameznih strani kot predstavitev. Strani se prikazujejo oz. zamenjujejo avtomatično, zaradi tega tudi ni gumbov \"Naprej\", \"Prejšnja stran\", \"Naslednja stran\"... Odgovori respondentov se ne beležijo.",
 	"srv_vrsta_survey_note_9_3"		=>	"Prezentacija (slideshow) je namenjena prikazovanju posameznih strani kot predstavitev. Strani se prikazujejo oz. zamenjujejo avtomatično, zaradi tega tudi ni gumbov \"Naprej\", \"Prejšnja stran\", \"Naslednja stran\"... Odgovori respondentov se ne beležijo.",
 	"srv_vrsta_survey_note_11_1"	=>	"<br/>Modul 360 stopinj omogoča posebno analizo ankete.",
 	"srv_vrsta_survey_note_12_1"	=>	"<br/>Modul omogoča izpis poročila z analizo 360°, kjer se ocenjuje posameznika znotraj organizacije. Zaposleni (nadrejeni, podrejeni, sodelavci in samoocenjevalec) izpolnijo vprašalnik na osnovi katerega se avtomatsko generira poročilo.<br /><br />Za prilagajanje izpisa poročila ali spremembe vprašalnika kontaktirajte Center za pomoč uporabnikom 1KA na tel. št. 030/702-788.",
-	"srv_vrsta_survey_note_14_1"	=>	"Modul omogoča pogovarjanje med respondenti in urednikom ankete preko storitve TAWK.",
-    "srv_vrsta_survey_note_14_1b"	=>	"Vklopi modul 'Klepet'",
-	"srv_vrsta_survey_note_14_1a"	=>	"Najprej je potrebno ustvariti uporabniški račun na <a href= \"http:\\www.tawk.to\" target=\"_blank\">www.tawk.to</a>. Po prijavi morate najprej vpisati informacije za ime spletnega mesta: 1KA, nato pa še URL: www.1ka.si. Povabite lahko vse anketarje, ki bodo odgovarjali na klepet, nato pa v zadnjem koraku prejmete kodo <span class='bold'>Widget Code</span>, ki jo morate kopirati in prilepiti na 1KA v spodnje okno <span class='bold'>Widget koda</span>.",
-	"srv_vrsta_survey_note_14_1c"	=>	"S spodnjimi nastavitvami izberete, na kakšen način se prikaže okno za klepet v anketi.",
-    "srv_vrsta_survey_note_15_1"	=>	"Modul omogoča povezovanje ankete s spletnim panelom (npr. Valicon, GFK, ipd.).",
-    "srv_vrsta_survey_note_15_1a"	=>	"<a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/napredni-moduli/panel\" target=\"_blank\">Več informacij o modulu 'Panel'</a>",
-    "srv_vrsta_survey_note_15_1b"	=>	"Vklopi modul 'Panel'",
+	"srv_vrsta_survey_note_14_1"	=>	"<br/>Modul omogoča pogovarjanje med respondenti in urednikom ankete preko storitve TAWK. <br /><br />Najprej je potrebno ustvariti uporabniški račun na <a href= \"http:\\www.tawk.to\" target=\"_blank\">www.tawk.to</a>. Po prijavi morate najprej vpisati informacije za ime spletnega mesta: 1KA, nato pa še URL www.1ka.si. Povabite lahko vse anketarje, ki bodo odgovarjali na klepet, nato pa v zadnjem koraku prejmete kodo <b>Widget Code</b>, ki jo morate kopirati in prilepiti na 1KA v spodnje okno <b>TAWK koda</b>.<br /><br />S spodnjimi nastavitvami izberete na kakšen način se prikaže okno za klepet.<br /><br />",
+    "srv_vrsta_survey_note_15_1"	=>	"<br/>Modul omogoča povezovanje ankete s spletnim panelom (npr. Valicon, GFK...). <a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/napredni-moduli/panel\" target=\"_blank\">Več >></a>",
     "srv_vrsta_survey_note_16_1"	=>	"<br/>Prikaz grafa (excelleration matrix) po koncu reševanja ankete.",
 	"srv_vrsta_survey_create"		=>	"Naprej",
 	"srv_vrsta_survey_with_pages_error"	=>	"Ankete vsebuje pogoje, zato je ne morete spremeniti v preprosto anketo!<br><span class=\"red\">Najprej odstranite vse pogoje.</span>",
@@ -3261,20 +3153,20 @@ $lang = array (
 	"srv_slideshow_sett_pause_button_lbl"	=>	"Prikaz gumba 'Pavza'",
 	"srv_slideshow_sett_button_opt_0"	=>	"Ne prikaži gumba",
 	"srv_slideshow_sett_button_opt_1"	=>	"Prikaži gumb",
-	"srv_chat_code"					=>	"Widget koda",
-	"srv_chat_type"					=>	"Prikaz okna za klepet",
+	"srv_chat_code"					=>	"TAWK koda",
+	"srv_chat_type"					=>	"Prikaz klepet okna",
 	"srv_chat_type_0"				=>	"Vedno na dnu",
 	"srv_chat_type_1"				=>	"Aktivacija znotraj besedila vprašanja",
-	"srv_chat_type_2"				=>	"Aktivacija na vrhu, v glavi ankete",
+	"srv_chat_type_2"				=>	"Aktivacija vedno na vrhu",
 	"srv_chat_turn_on"				=>	"Vklopi klepet",
 	"srv_chat_question_text"		=>	"Aktivirajte klepet s klikom na gumb",
-	"srv_quiz_results"				=>	"Prikaz rezultatov kviza v zaključku",
-	"srv_quiz_results_chart"		=>	"Prikaz grafa rezultatov kviza v zaključku",
+	"srv_quiz_results"				=>	"Prikaz rezultov kviza v zaključku",
+	"srv_quiz_results_chart"		=>	"Prikaz grafa rezultov kviza v zaključku",
 	"srv_quiz_results_chart_correct"	=>	"Pravilni odgovori",
 	"srv_quiz_results_chart_incorrect"	=>	"Napačni odgovori",
-	"srv_panel_user_id_name"		=>	"Ime parametra za ID respondenta",
+	"srv_panel_user_id_name"		=>	"Ime parametra za id respondenta",
 	"srv_panel_status_name"			=>	"Ime parametra za status",
-	"srv_panel_status_default"		=>	"Privzeta vrednost za parameter status",
+	"srv_panel_status_default"		=>	"Privzeta vrednost status parametra",
 	"srv_panel_url"					=>	"URL po koncu ankete",
 	"srv_panel_url1_example"		=>	"Primer URL-ja za prihod na anketo",
 	"srv_panel_url2_example"		=>	"Primer URL-ja za preusmeritev po koncu ankete",
@@ -3287,14 +3179,14 @@ $lang = array (
     "srv_fieldwork_device_surveyID" =>  "ID te ankete na napravi",
     "srv_fieldwork_sync_data"       =>  "Sinhroniziraj podatke",
     "srv_hint"							=>	"Namig",
-	"srv_hint_datapiping"				=>	"Pri urejanju zaključka ali vsebini e-pošte, ki ga prejme respondent uporabite za prikaz &#353;tevila to&#269;k <b>Prenos vrednosti</b>.</p><p>Vpi&#353;ite labelo spremenljivke z izra&#269;unano vrednostjo, obdano z lojtro, npr.: <B>#rezultat#</B>",
-	"srv_missing_profile_title1"		=>	"Označeni odgovori se <font class=\"red bold\">ne</font> upoštevajo pri analizah, in se obravnavajo kot manjkajo&#269;e vrednosti!",
-	"srv_missing_profile_title2"		=>	"Manjkajoče vrednosti – neopredeljeni odgovori",
-	"srv_missing_profile_title3"		=>	"Manjkajoče vrednosti – nedogovor spremenljivke",
-	"srv_missing_profile_title4"		=>	"Ustrezne enote – enote, ki se upoštevajo v analizah",
+	"srv_hint_datapiping"				=>	"Pri urejanju zaklju&#269;ka ali vsebini e-po&#353;te, ki ga prejme respondent uporabite za prikaz &#353;tevila to&#269;k <b>Prenos vrednosti</b>.</p><p>Vpi&#353;ite labelo spremenljivke z izra&#269;unano vrednostjo, obdano z lojtro, npr.: <B>#rezultat#</B>",
+	"srv_missing_profile_title1"		=>	"Ozna&#269;eni odgovori se <font class=\"red bold\">ne</font> upo&#353;tevajo pri analizah, in se obravnavajo kot manjkajo&#269;e vrednosti!",
+	"srv_missing_profile_title2"		=>	"Manjkajo&#269;e vrednosti – neopredeljeni odgovori",
+	"srv_missing_profile_title3"		=>	"Manjkajo&#269;e vrednosti – nedogovor spremenljivke",
+	"srv_missing_profile_title4"		=>	"Ustrezne enote – enote, ki se upo&#353;tevajo v analizah",
 	"srv_missing_profile_title5"		=>	"Ostale nastavitve",
 	"srv_invalid_units"					=>	"Neustrezne enote",
-	"srv_missing_profile_means"			=>	"Povprečje",
+	"srv_missing_profile_means"			=>	"Povpre&#269;je",
 	"srv_missing_profile_sums"			=>	"Sumarnik",
 	"srv_missing_profile_crosstab"		=>	"Tabulacije",
 	"srv_missing_profile_freqency"		=>	"Frekvence",
@@ -3452,12 +3344,11 @@ $lang = array (
     "add_alternative_email_subject"   		=> "Potrditev dodatnega elektronskega naslova na spletnem mestu #PAGENAME#",
 	"add_alternative_email"					=>	"Spo&#353;tovani, #NAME#!<br /><br />Na spletnem mestu <strong>#PAGENAME#</strong> ste dodali poleg primarnega elektronskega naslova #PRIMARNIEMAIL#,  dodali še dodatni elektronski naslov <strong>#ALTERNATIVNIEMAIL#</strong>. Geslo za prijavo je enako kot za primarni elektronski naslov.<br/><br/>
  															 Omenjeni elektronski naslov aktivirate s klikom na to #CODESTART# povezavo#CODEEND#.<br /><br />Lep pozdrav,",
-    "add_alternative_primary_email_subject" => "Dodan nov elektronski dostop do vašega računa na spletnem mestu #PAGENAME#",
-    "add_alternative_primary_email"         =>	"Spo&#353;tovani, #NAME#!<br /><br />Na spletnem mestu <strong>#PAGENAME#</strong> ste dodali nov elektronsk naslov <strong>#ALTERNATIVNIEMAIL#</strong>.<br/>
+    "add_alternative_primary_email_subject"   => "Dodan nov elektronski dostop do vašega računa na spletnem mestu #PAGENAME#",
+    "add_alternative_primary_email"			=>	"Spo&#353;tovani, #NAME#!<br /><br />Na spletnem mestu <strong>#PAGENAME#</strong> ste dodali nov elektronsk naslov <strong>#ALTERNATIVNIEMAIL#</strong>.<br/>
  															 				V kolikor tega niste storili, nas o tem obvestite ali izbrišite elektronski naslov iz vašega profila.<br /><br />Lep pozdrav,",
-    "alternative_email_confirm_error"       =>	"Pri aktivaciji dodatnega elektronskega naslova je pri&#353;lo do napake.<br />Prosimo, kontaktirajte urednika spletnega mesta za pomo&#269;",
+    "alternative_email_confirm_error"			=>	"Pri aktivaciji dodatnega elektronskega naslova je pri&#353;lo do napake.<br />Prosimo, kontaktirajte urednika spletnega mesta za pomo&#269;",
     "alternative_email_confirm_success"		=>	"Poslali smo vam elektronsko sporočilo s kodo za aktivacijo omenjenega elektronskega naslova.",
-    "alternative_email_delete"		        =>	"Ste prepričani, da želite odstraniti alternativni email",
 	"confirm_user_in_db"      				=> "Potrdi",
 	"delete_user_in_db"      				=> "Izbriši",
 	"user_confirm_h"						=>	"Potrditev veljavnosti e-naslova",
@@ -3475,7 +3366,7 @@ $lang = array (
 	"user_confirm_p_admin_success"	=>	"Uporabnik je bil uspešno aktiviran.",
 	"reg_confirm_error"				=>	"Pri aktivaciji je pri&#353;lo do napake.<br />Prosimo, kontaktirajte urednika spletnega mesta za pomo&#269;",
 	"srv_vprasalnik_finnished"		=>	"Ali je vpra&#353;alnik zaključen?",
-	"srv_vprasalnik_autosave"		=>	"Avtomatično shranjevanje",
+	"srv_vprasalnik_autosave"		=>	"Avtomatično shranjevanje.",
 	"upload_exe"					=>	"Nalaganje datoteke prepre&#269;eno- prosimo, ne nalagajte izvr&#352;ilnih in skriptnih datotek (exe, php,..).<br />Uporabite ZIP / ARJ in jih nalo&#382;ite stisnjene.",
 	"upload_done"					=>	"Datoteka je bila uspe&#353;no nalo&#382;ena.<br />Njen URL je zapisan zgoraj v URL polju.",
 	"upload_not_ok"					=>	"Datoteke ni bilo mo&#269; nalo&#382;iti.<br />Prosimo, kontaktirajte administratorja stre&#382;nika.",
@@ -3493,14 +3384,14 @@ $lang = array (
 	"srv_list_library_no_access"	=>	"Potrebujete administratorski dostop!",
 	"srv_default"					=>	"Privzeto",
 	"srv_vsota_text"				=>	"Skupaj",
-	"srv_vsota_exact"				=>	"Zahtevana vsota",
-	"srv_vsota_both"				=>	"Dodatna omejitev vsote",
-	"srv_vsota_limit"				=>	"Zgornja",
-	"srv_vsota_min"					=>	"Spodnja",
-	"srv_vsota_show"				=>	"Prikaži omejitev vsota pri izpolnjevanju",
-	"srv_num_limit"					=>	"Max",
-	"srv_num_min"					=>	"Min",
-	"srv_num_limit_show"			=>	"Prikaži meje pri izpolnjevanju",
+	"srv_vsota_exact"				=>	"Zahtevana vsota: ",
+	"srv_vsota_both"				=>	"Dodatna omejitev vsote: ",
+	"srv_vsota_limit"				=>	"Zgornja: ",
+	"srv_vsota_min"					=>	"Spodnja: ",
+	"srv_vsota_show"				=>	"Prikaži omejitev vsota pri izpolnjevanju: ",
+	"srv_num_limit"					=>	"Max: ",
+	"srv_num_min"					=>	"Min: ",
+	"srv_num_limit_show"			=>	"Prikaži meje pri izpolnjevanju: ",
 	"srv_num_limit_reminder"		=>	"Opozorilo za preseg meje",
 	"srv_vsota_reminder"			=>	"Opozorilo za preseg vsote",
 	"srv_num_reminder"				=>	"Minimum in maksimum",
@@ -3535,7 +3426,6 @@ $lang = array (
 	"srv_info_variables"			=>	"Spremenljivk",
 	"srv_info_pages"				=>	"Strani", 
 	"srv_info_answers"				=>	"Odgovorov",
-    "srv_info_answers_no"            =>    "Št. odgovorov",
 	"srv_info_answers_valid"		=>	"Ustreznih",
 	"srv_info_type"					=>	"Tip ankete",
 	"srv_info_author"				=>	"Avtor",
@@ -3581,7 +3471,6 @@ $lang = array (
 	"srv_forum_back"				=>	"Nazaj na urejanje ankete",
 	"srv_admin_comment"				=>	"Komentarji urednikov",
 	"srv_repondent_comment"			=>	"Komentarji respondentov",
-	"srv_add_comment_toggle"				=>	"Dodaj nov komentar",
 	"srv_add_comment"				=>	"Dodaj komentar",
 	"srv_view_comment"				=>	"Poglej komentarje",
 	"srv_delete_respondent"			=>	"Izbri&#353;i respondenta in njegove vnose.",
@@ -3607,17 +3496,12 @@ $lang = array (
 	"srv_admin_q_comments"			=>	"Komentarji na vpra&#353;anja",
 	"srv_admin_q_comments_txt"		=>	" – obla&#269;ek za komentarje urednikov na vsako vpra&#353;anje posebej (spodaj pod vsakim vpra&#353;anjem)",
 	"srv_admin_s_comments"			=>	"Komentarji na anketo",
-	"srv_admin_s_comments_editor"	=>	"Uredniki",
-	"srv_admin_s_comments_resp"		=>	"Respondenti",
-	"srv_admin_s_comments_links"	=>	"Povezave",
-	"srv_admin_s_comments_view"		=>	"Pregled vseh komentarjev",
-	"srv_admin_s_comments_set"		=>	"Pokaži napredne nastavitve",
 	"srv_admin_s_comments2"			=>	"Komentarji na anketo",
 	"srv_admin_s_comments_txt"		=>	" – obla&#269;ek za komentarje urednikov na anketo (zgoraj desno pri vpra&#353;alniku)",
-	"srv_resp_s_comments_txt"		=>	"<span class=\"semi-bold\">Oblaček za komentarje respondentov na anketo</span> (zgoraj desno pri vprašalniku)",
+	"srv_resp_s_comments_txt"		=>	" – obla&#269;ek za komentarje respondentov na anketo (zgoraj desno pri vpra&#353;alniku)",
 	"srv_comments_only_admin"			=>	"Vpisane komentarje vidijo samo administratorji",
 	"srv_comments_respondents"			=>	"Komentarji respondentov",
-	"srv_comments_respondents_txt"		=>	"<span class=\"semi-bold\">Dodatno okno</span>, ki se za vsako vpra&#353;anje prika&#382;e respondentom, ki ob odgovarjanju lahko podajo &#353;e svoj vtis oziroma komentar. Uredniki ankete vidijo te komentarje spodaj desno pod vsebino vpra&#353;anja",
+	"srv_comments_respondents_txt"		=>	" – dodatno okno, ki se za vsako vpra&#353;anje prika&#382;e respondentom, ki ob odgovarjanju lahko podajo &#353;e svoj vtis oziroma komentar. Uredniki ankete vidijo te komentarje spodaj desno pod vsebino vpra&#353;anja",
 	"srv_comments_show_open"			=>	"Okno za komentar naj bo na začetku",
 	"srv_comment_history"			=>	"Prikaz zgodovine splošnih komentarjev",
 	"srv_comment_history_0"			=>	"Brez",
@@ -3633,49 +3517,41 @@ $lang = array (
     "srv_survey_comment_show"           =>	"Okno s komentarji je vedno odprto",
     "srv_c_to_mail"						=>	"Pošlji ta komentar urednikom na e-mail",
     "srv_c_alert"						=>	"Prikaži ta komentar vsem urednikom, ko urejajo anketo",
-	"srv_diagnostics_basis"				=>	"Osnova:",
 	"srv_diagnostics_user_surveys"		=>	"&#352;tevilo anket v",
 	"srv_diagnostics_total"				=>	"Skupno &#353;tevilo",
 	"srv_diagnostics_in"				=>	"v",
-	"srv_diagnostics_orfrom"			=>	"Od:",
-	"srv_diagnostics_to"				=>	"Do:",
-	"srv_diagnostics_respondentov"		=>	"Ustrezne enote", // respondentov
+	"srv_diagnostics_orfrom"			=>	", ali od",
+	"srv_diagnostics_to"				=>	"do",
+	"srv_diagnostics_respondentov"		=>	"Ustreznih", // respondentov
 	"srv_diagnostics_strani"			=>	"Strani",
-	"srv_diagnostics_analiza"			=>	"Analize",
-	"srv_diagnostics_editing"			=>	"Urejanja",
-	"srv_diagnostics_graph"				=>	"Grafi",
-	"srv_diagnostics_emails"			=>	"E-mail vabila",
-	"srv_diagnostics_upostevane"		=>	"Upoštevane enote",
-	"srv_diagnostics_upostevaj"			=>	"Upoštevaj enote:",
-	"srv_diagnostics_jezik"				=>	"Jezik:",
-	"srv_diagnostics_filter"			=>	"Filtriraj",
-	"srv_diagnostics_date"				=>	"Določi obdobje",
-	"srv_diagnostics_date2"				=>	"Izberi obdobje:",
-	"srv_diagnostics_1 minute"			=>	"1 minuta",
-	"srv_diagnostics_5 minute"			=>	"5 minut",
-	"srv_diagnostics_10 minute"			=>	"10 minut",
-	"srv_diagnostics_30 minute"			=>	"30 minut",
-	"srv_diagnostics_1 hour"			=>	"1 ura",
-	"srv_diagnostics_6 hour"			=>	"6 ur",
-	"srv_diagnostics_12 hour"			=>	"12 ur",
-	"srv_diagnostics_1 day"				=>	"1 dan",
-	"srv_diagnostics_2 day"				=>	"2 dneva",
-	"srv_diagnostics_5 day"				=>	"5 dni",
-	"srv_diagnostics_7 day"				=>	"Zadnji teden",
-	"srv_diagnostics_14 day"			=>	"14 dni",
-	"srv_diagnostics_1 month"			=>	"Zadnji mesec",
-	"srv_diagnostics_3 month"			=>	"3 mesecev",
-	"srv_diagnostics_6 month"			=>	"6 mesecev",
-	"srv_diagnostics_choose_date"		=>	"Po meri",
+	"srv_diagnostics_analiza"			=>	"Analiz",
+	"srv_diagnostics_editing"			=>	"Urejanj",
+	"srv_diagnostics_graph"				=>	"Grafov",
+	"srv_diagnostics_1 minute"			=>	"1 minuti",
+	"srv_diagnostics_5 minute"			=>	"5 minutah",
+	"srv_diagnostics_10 minute"			=>	"10 minutah",
+	"srv_diagnostics_30 minute"			=>	"30 minutah",
+	"srv_diagnostics_1 hour"			=>	"1 uri",
+	"srv_diagnostics_6 hour"			=>	"6 urah",
+	"srv_diagnostics_12 hour"			=>	"12 urah",
+	"srv_diagnostics_1 day"				=>	"1 dnevu",
+	"srv_diagnostics_2 day"				=>	"2 dneh",
+	"srv_diagnostics_5 day"				=>	"5 dneh",
+	"srv_diagnostics_7 day"				=>	"zadnji teden",
+	"srv_diagnostics_14 day"			=>	"14 dneh",
+	"srv_diagnostics_1 month"			=>	"zadnji mesec",
+	"srv_diagnostics_3 month"			=>	"3 mesecih",
+	"srv_diagnostics_6 month"			=>	"6 mesecih",
+	"srv_diagnostics_choose_date"		=>	"Izberi datum",
 	"srv_diagnostics_sum_total"			=>	"n = ",
 	"srv_diagnostics_sum_total_survey"	=>  "Število anket: ",	
-	"srv_diagnostics_filter_test"		=>  "Testne",	
-	"srv_diagnostics_filter_autotest"	=>  "Avtomatske testne",	
-	"srv_diagnostics_filter_import"		=>  "Uvožene",	
-	"srv_diagnostics_filter_6"			=>  "Enote s statusom 6",	
-	"srv_diagnostics_filter_5"			=>  "Enote s statusom 5",	
-	"srv_diagnostics_filter_34"			=>  "Neustrezne enote (status 3 in 4)",	
-	"srv_diagnostics_filter_012"		=>  "E-pošta brez odgovora (status 1 in 2)",	
+	"srv_diagnostics_filter_test"		=>  "Testni",	
+	"srv_diagnostics_filter_autotest"	=>  "Avtomatski testni",	
+	"srv_diagnostics_filter_import"		=>  "Uvoženi",	
+	"srv_diagnostics_filter_6"			=>  "Status 6",	
+	"srv_diagnostics_filter_5"			=>  "Status 5",	
+	"srv_diagnostics_filter_34"			=>  "Neustrezni (status 3,4)",	
+	"srv_diagnostics_filter_012"		=>  "E-pošta brez odgovora (status 0,1,2)",	
 	"srv_diagnostics_filter_lang_all"	=>  "Vsi",	
 	"srv_diagnostics_filter_lang_slo"	=>  "Slovenščina",	
 	"srv_diagnostics_filter_lang_ang"	=>  "Angleščina",	
@@ -3699,10 +3575,6 @@ $lang = array (
 	"srv_language_admin_0"			=>	"Jezik",
 	"srv_language_admin_1"			=>	"Osnovni jezik",
 	"srv_language_admin_survey"		=>	"Jezik administrativnega vmesnika",
-	"srv_language_admin_surveyA"		=>	"Trenutni ",
-	"srv_language_admin_surveyB"		=>	" je Slovenščina.",
-	"srv_language_std_bes1"		=>	"Standardne besede lahko urejate v ",
-	"srv_language_std_bes2"		=>	"nastavitvah vprašalnika",
 	"srv_language_admin_survey2"	=>	"Jezik administrativnega vmesnika lahko urejate <a href=\"%s\"><span class=\"bold\">tukaj</span></a>",
 	"srv_language_respons"			=>	"Osnovni jezik vpra&#353;alnika za respondente",
 	"srv_language_respons_1"		=>	"Osnovni jezik za respondente",
@@ -3725,29 +3597,26 @@ $lang = array (
 	"srv_alert_active_text0"		=>	"Pozdravljeni,<br/><br/>obveščamo vas, da je bila anketa \"[SURVEY]\" deaktivirana!<br/><br/>Povezava: [URL]",
 	"srv_alert_active_text1"		=>	"Pozdravljeni,<br/><br/>obveščamo vas, da je bila anketa \"[SURVEY]\" aktivirana!<br/><br/>Povezava: [URL]",
 	"srv_alert_delete_text"			=>	"Spoštovani,<br/><br/>obveščamo vas, da je bila anketa \"[SURVEY]\" izbrisana!",
-	"srv_alert_expire_days"		=>	"Število dni pred potekom ankete, ko je obvestilo o izteku ankete avtomatsko poslano",
+	"srv_alert_expire_days1"		=>	"Avtomatsko pošlji obvestilo ",
+	"srv_alert_expire_days2"		=>	" dni pred potekom ankete. Vrednost 0 pomeni, da bo obvestilo bo poslano isti dan.<br/>",
 	"srv_alert_expire_expire_at"		=>	" Anketa poteče: ",
 	"srv_alert_expire_note_at"		=>	" Obvestilo bo poslano: ",
-    "srv_alert_expire_prejemniki"	=>	 "Obvestilo o izteku ankete prejmejo naslednji prejemniki:",
-	"srv_alert_instruction1"					=>	"Navodila za oblikovanje sporočil",
-	"srv_alert_instruction1a"					=>	"Legenda spremenljivk iz baze",
-	"srv_alert_instruction1b"					=>	"V sporočilu lahko uporabite tudi sistemske spremenljivke, ki jih trenutno ni v anketi",
-	"srv_alert_instruction2"					=>	" [NAME] - ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime<br/> ",
-	"srv_alert_instruction_name"				=>	" [NAME] - ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime",
-	"srv_alert_instruction_survey"				=>	"[SURVEY] - ime ankete",
-	"srv_alert_instruction_date"				=>	"[DATE] - datum",
-	"srv_alert_instruction_site"				=>	"[SITE] - povezava do ankete",
-	"srv_alert_instruction_url"					=>	"[URL] - povezava do urejanja ankete",
-	"srv_alert_instruction_pdf"					=>	"[PDF] - povezava do PDF datoteke z odgovori respondenta ",
-	"srv_alert_instruction_rtf"					=>	"[RTF] - povezava do RTF datoteke z odgovori respondenta",
-	"srv_alert_instruction_meta_referer_url"	=>	"[META_REFERER_URL] - Referer URL",
-	"srv_alert_instruction_system"				=>	"Sistemske spremenljivke navedite med dva znaka #.",
-	"srv_alert_instruction_sample"				=>	"Primer: Če želimo izpisati odgovor, ki ga je uporabnik vnesel pri sistemskem vprašanju email, bomo uporabili #email#",
-	"srv_alert_instruction_available"	=>	"Sistemske spremenljivke v anketi:",
-	"srv_alert_instruction3"			=>	"[SURVEY] - ime ankete<br/> [DATE] - datum<br/> [SITE] - povezava do ankete<br/> [URL] -> povezava do urejanja ankete<br/><br/></p><p class=\"bold\">Dodatne sistemske spremenljivke iz ankete navedite med dva znaka #. </p><p>Primer:</p><p> &#269;e &#382;elimo izpisati odgovor, ki ga je uporabnik vnesel pri sistemskem vpra&#353;anju email, bomo uporabili #email#<br/></p><p class=\"bold\">Sistemske spremenljivke, ki so v anketi &#382;e na voljo:</p><p>",
-	"srv_alert_instruction4"			=>	"<p> [SURVEY] - ime ankete<br/> [SITE] - povezava do ankete<br/> [URL] - povezava do urejanja ankete<br/> [DAYS] - število dni pred potekom ankete <br/> [DURATION] - čas aktivnosti ankete</p>",
-	"srv_alert_instruction5"			=>	"[SURVEY] - ime ankete<br/> [DATE] - datum<br/> [SITE] - povezava do ankete<br/> [URL] - povezava do urejanja ankete",
-	"srv_alert_instruction5a"			=>	"[SURVEY] - ime ankete<br/> [DATE] - datum",
+	"srv_alert_instruction1"					=>	"<span class=\"red bold\">Navodila oblikovanja sporo&#269;il za obve&#353;&#269;anje!</span><br/><p class=\"bold\">Uporabite lahko naslednje spremenljivke iz baze:</p>",
+	"srv_alert_instruction2"					=>	" [NAME] => ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime<br/> ",
+	"srv_alert_instruction_name"				=>	" [NAME] => ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime",
+	"srv_alert_instruction_survey"				=>	"[SURVEY] => ime ankete",
+	"srv_alert_instruction_date"				=>	"[DATE] => datum",
+	"srv_alert_instruction_site"				=>	"[SITE] => URL do ankete",
+	"srv_alert_instruction_url"					=>	"[URL] => URL do urejanja ankete",
+	"srv_alert_instruction_pdf"					=>	"[PDF] => povezava do PDF datoteke z odgovori respondenta ",
+	"srv_alert_instruction_rtf"					=>	"[RTF] => povezava do RTF datoteke z odgovori respondenta",
+	"srv_alert_instruction_meta_referer_url"	=>	"[META_REFERER_URL] => Referer URL",
+	"srv_alert_instruction_system"				=>	"<p class=\"bold\">Dodatne sistemske spremenljivke iz ankete navedite med dva znaka #. </p>",
+	"srv_alert_instruction_sample"				=>	"<p>Primer:</p><p> &#269;e &#382;elimo izpisati odgovor, ki ga je uporabnik vnesel pri sistemskem vpra&#353;anju email, bomo uporabili #email#</p>",
+	"srv_alert_instruction_available"	=>	"<p class=\"bold\">Sistemske spremenljivke, ki so v anketi &#382;e na voljo:</p>",
+	"srv_alert_instruction3"			=>	"[SURVEY] => ime ankete<br/> [DATE] => datum<br/> [SITE] => URL do ankete<br/> [URL] => URL do urejanja ankete<br/><br/></p><p class=\"bold\">Dodatne sistemske spremenljivke iz ankete navedite med dva znaka #. </p><p>Primer:</p><p> &#269;e &#382;elimo izpisati odgovor, ki ga je uporabnik vnesel pri sistemskem vpra&#353;anju email, bomo uporabili #email#<br/></p><p class=\"bold\">Sistemske spremenljivke, ki so v anketi &#382;e na voljo:</p><p>",
+	"srv_alert_instruction4"			=>	"<p> [SURVEY] => ime ankete<br/> [DATE] => datum<br/> [SITE] => URL do ankete<br/> [URL] => URL do urejanja ankete<br/> [DAYS] => &#353;tevilo dni nastavljeno v intervalu<br/><br/></p>",
+	"srv_alert_instruction5"			=>	"<p> [SURVEY] => ime ankete<br/> [DATE] => datum<br/> [SITE] => URL do ankete<br/> [URL] => URL do urejanja ankete<br/><br/></p>",
 	"versions"						=>	"Verzije",
 	"ip_browser_login"				=>	"Prijava glede na IP in brskalnik:",
 	"select_user"					=>	"Izberite Uporabnika",
@@ -3770,7 +3639,7 @@ $lang = array (
 	"srv_statistic_period_day_month"	=>	"Dnevi v mesecu",
 	"srv_statistic_period_day_week"		=>	"Dnevi v tednu",
 	"srv_statistic_period_hour_day"		=>	"Ure v dnevu",
-	"srv_statistic_hide_null"		=>	"Skrij vrednosti 0",
+	"srv_statistic_hide_null"		=>	"Skrij 0: ",
 	"srv_statistic_show_referals"	=>	"Referali:",
 	"srv_statistic_show_no_referals"=>	"V bazi ni zapisov o referalih.",
 	"srv_statistic_detail"			=>	"(podrobnost)",
@@ -3796,7 +3665,6 @@ $lang = array (
 	"srv_statistic_redirection_sum_view"		=>	"Skupaj ogledov povezave",
 	"srv_statistic_redirection_sum_invitation"	=>	"Skupaj emaili-neodgovori",
 	"srv_statistic_redirection_test"			=>	"od tega testnih",
-	"srv_statistic_metric"					=>	"Metrika",
 	"srv_statistic_lang_title"					=>	"Jezikovna različica vprašalnika",
 	"srv_statistic_lang"						=>	"Jezik",
 	"srv_statistic_sum"							=>	"Skupaj enot",
@@ -3966,12 +3834,12 @@ $lang = array (
 	"srv_respondents_admin"				=>	"Admin",
 	"srv_respondents_error_create"		=>	"Napaka pri kreiranju novega profila",
 	"srv_respondents_error_data"		=>	"Manjkajo podatki!",
+	"srv_success_save"					=>	"Nastavitve so bile shranjene...",
 	"PastEventsInt"						=>	"; kot pretekli se &#154;tejejo dogodki, starej&#154;i od ",
 	"srv_statistic_choose_interval"		=>	"Izberite interval",
 	"srv_statistic_choose_dates"		=>	"Izberite datume",
 	"srv_extra_translations"			=>	"Standardne besede",
 	"srv_extra_translations2"			=>	"- v ostale jezike pa lahko prevajate v zavihku <a href=\"%s\">Jezik</a>",
-	"srv_check_pogoji_ok2"				=>	"Preverjanje pogojev",
 	"srv_check_pogoji_ok"				=>	"Vsi pogoji v anketi so ustrezno nastavljeni",
 	"srv_check_pogoji_not_ok"			=>	"Anketa vsebuje napake!",
 	"srv_check_pogoji_spremenljivka"	=>	"Napaka v pogoju na vrednosti spremenljivke",
@@ -3986,12 +3854,10 @@ $lang = array (
 	"srv_resp_change_lang_type_0"		=>	"Radio gumbi",
 	"srv_resp_change_lang_type_1"		=>	"Roleta",
 	"srv_multilang"						=>	"Dodatni jeziki za respondente",
-	"srv_multilang_link"				=>	"Povezava do ankete",
-	"srv_multilang_users"				=>	"Dostop do ankete",
 	"srv_add_lang"						=>	"Omogo&#269;i ve&#269;jezi&#269;no podporo v anketi",
 	"srv_prevajanje"					=>	"Prevajanje",
 	"srv_mobile_settings"				=>	"Mobilne nastavitve",
-	"srv_mobile_settings_title"			=>	"Nastavitve prikaza pri mobilnih napravah",
+	"srv_mobile_settings_title"			=>	"Nastavitve prikaza pri mobinih napravah",
 	"srv_mobile_survey"					=>	"Anketa ustvarjena v mobilni aplikaciji",
 	"srv_mobile_add_question"			=>	"Dodaj vprašanje",
 	"srv_standardne_besede"				=>	"Standardne besede",
@@ -4001,9 +3867,7 @@ $lang = array (
 	"srv_trans_lang"					=>	"Prevod",
 	"srv_trans_langs"					=>	"Prikaži dodatni jezik",
 	"srv_default_lang"					=>	"Osnovni jezik",
-	"srv_lang_rem"						=>	"Izbris prevoda",
-	"srv_lang_pdf"						=>	"Izvoz v PDF",
-	"srv_lang_rtf"						=>	"Izvoz v Word (RTF)",
+	"srv_lang_rem"						=>	"Odstrani ta prevod",
 	"srv_lang_rem_confirm"				=>	"Ali ste prepri&#269;ani, da &#382;elite odstraniti ta prevod?",
 	"srv_testiranje"					=>	"Testiranje",			
 	"srv_testiranje_oblivanje"			=>	"Testni podatki",			
@@ -4030,25 +3894,24 @@ $lang = array (
 	"srv_active_editing"				=>	"Pozor, urejate anketo ki je aktivna!",
 	"srv_no_comments"				=>	"Anketa nima nobenih komentarjev.",
 	"srv_no_comments_solved"				=>	"Komentarji so vklopljeni, vendar anketa nima nerešenih komentarjev.",
-	"srv_timing_page"					=>	"Predviden čas, ki ga respondent porabi za eno stran:",
-	"srv_timing_vprasanje"				=>	"Čas za vprašanje (na 100 znakov)",
-	"srv_timing_kategorija"				=>	"Čas za odgovor (na 100 znakov)",
-	"srv_timing_kategorija_max"			=>	"Najdaljši čas za izbiro odgovora",	
+	"srv_timing_page"					=>	"&#268;as za 1 stran",
+	"srv_timing_vprasanje"				=>	"&#268;as za vpra&#353;anje (na 100 znakov besedila)",
+	"srv_timing_kategorija"				=>	"&#268;as za kategorijo (na 100 znakov besedila)",
+	"srv_timing_kategorija_max"			=>	"Najdaljši čas za izbiro kategorij",	
 	"srv_pagebreak_all"					=>	"Dodaj prelom strani med vsa vpra&#353;anja",
 	"srv_bruto_cas"						=>	"Bruto &#269;as",
 	"srv_neto_cas"						=>	"Neto &#269;as",
 	"srv_bruto_v_cas"					=>	"Brez pogojev",
-	"srv_bruto_v_cas_long"				=>	"Trajanje brez pogojev",
 	"srv_neto_v_cas"					=>	"Dejansko trajanje",
-	"srv_bruto_t_cas"					=>	"Trajanje z upoštevanjem vseh vprašanj (brez pogojev)",
+	"srv_bruto_t_cas"					=>	"Trajanje z upo&#353;tevanjem vseh vpra&#353;anj (brez pogojev)",
 	"srv_neto_t_cas"					=>	"Dejansko trajanje",
 	"srv_verjetnost_pojavitve"			=>	"Verjetnost pojavitve",
 	"srv_vnosi_no_entry"				=>	"Anketa trenutno &#353;e nima vnosov!<br/>",
 	"srv_vnosi_no_entry_filter"			=>	"Nobena enota ne ustreza izbranim filtrom!<br/>",
-	"srv_stevilo_vnosov"				=>	"Število testnih vnosov",
+	"srv_stevilo_vnosov"				=>	"Dodaj testne vnose",
 	"srv_testni_samo_veljavni"			=>	"Samo veljavni odgovori",
 	"srv_dodaj_vnose"					=>	"Generiraj testne vnose",
-	"srv_delete_testdata"				=>	"Izbriši vse testne vnose",
+	"srv_delete_testdata"				=>	"Pobri&#353;i testne vnose",
 	"srv_delete_autogen_testdata"		=>	"Pobri&#353;i avtomatsko generirane vnose",
 	"srv_autogen_testni_podatki_alert"	=>	"Med njimi so tudi avtomatsko generirani testni vnosi.",		
 	"srv_sklop_osnovna"					=>	"Osnovna vpra&#154;anja - kategorije",
@@ -4073,26 +3936,21 @@ $lang = array (
 	"srv_tip_standard_993"				=>	"Upload datoteke",
 	"srv_tip_standard_994"				=>	"Ime priimek",
 	"srv_tip_standard_996"				=>	"Podpis",
-	"srv_vkljuci_predvidene"			=>	"V tabeli prikaži tudi predvidene čase",
-	"srv_vkljuci_preskocene"			=>	"Prikaži tudi čase za preskočene strani",
+	"srv_vkljuci_predvidene"			=>	"Prika&#382;i tudi predvidene &#269;ase",
+	"srv_vkljuci_preskocene"			=>	"Prika&#382;i tudi &#269;ase za presko&#269;ene strani",
 	"srv_total_trajanje"				=>	"Celoten čas trajanja ankete",
 	"srv_dejansko_trajanje"				=>	"Predvideno dejansko trajanje ankete",
-	"srv_dejansko_trajanje_real"		=>	"Dejansko trajanje ankete",
-	"srv_casi_po_straneh"				=>	"Časi po straneh",
-	"srv_casi_po_straneh_stran"			=>	"Stran",
-	"srv_casi_po_blokih"				=>	"Časi po blokih",
-	"srv_casi_po_blokih_blok"			=>	"Blok",
-	"srv_casi_po_vprasanjih_vprasanje"	=>	"Vprašanje",
-	"srv_casi_po_vprasanjih_skupaj"		=>	"Skupaj",
-	"srv_casi_po_vprasanjih_strani"		=>	"Časi po vprašanjih (Strani)",
-	"srv_casi_po_vprasanjih_bloki"		=>	"Časi po vprašanjih (Bloki)",
+	"srv_casi_po_straneh"				=>	"&#268;asi po straneh",
+	"srv_casi_po_blokih"				=>	"&#268;asi po blokih",
+	"srv_casi_po_vprasanjih_strani"		=>	"&#268;asi po vpra&#353;anjih (Strani)",
+	"srv_casi_po_vprasanjih_bloki"		=>	"&#268;asi po vpra&#353;anjih (Bloki)",
 	"srv_frekvencna_porazdelitev"		=>	"Frekven&#269;na porazdelitev trajanja",
 	"srv_dejanski_casi"					=>	"Dejanski &#269;asi trajanja (brez morebitnih testnih enot)",
-	"srv_testni_nagovor"					=>	"Vnesite število avtomatskih vnosov, ki jih želite generirati. Za številske spremenljivke se generira slučajna 4-mestna številka, v primeru besedila pa slučajno 10-mestno besedilo. V primeru več kategorij se odgovori porazdeljujejo enakomerno.",
-	"srv_testni_nakonec"					=>	"Statistično analizo testnih podatkov v zavihku 'ANALIZE' naredite tako, da v Statusih izberete Vse statuse oziroma status null.",
+	"srv_testni_nagovor"					=>	"Predvideno &#353;tevilo odgovorov po vpra&#353;anjih. V primeru ve&#269; kategorij se odgovori porazdeljujejo enakomerno. <br /><br />Za &#353;tevilske spremenljivke se generira slu&#269;ajna 4 mestna &#353;tevilka, v primeru besedila pa slu&#269;ajno 10 mestno besedilo.",
+	"srv_testni_nakonec"					=>	"Statisti&#269;no analizo testnih podatkov v analizah naredite tako, da v Statusih izberete Vse statuse oziroma status null.",
 	"srv_analiza_arhiv"     				=>	"Arhiv",
 	"srv_analiza_arhiviraj"					=>	"Arhiviraj",
-	"srv_analiza_arhiviraj_ttl"				=>	"Izdelaj arhiv analize",
+	"srv_analiza_arhiviraj_ttl"				=>	"Ustvari arhiv analize",
 	"srv_analiza_arhiviraj_email"			=>	"Po&#353;lji",
 	"srv_analiza_arhiviraj_email_ttl"		=>	"Po&#353;lji arhiv analize prijatelju",
 	"srv_analiza_arhiviraj_ime"				=>	"Ime arhiva",
@@ -4108,14 +3966,14 @@ $lang = array (
 	"srv_analiza_archive_access_wrong_pass"	=>	"Napa&#269;no geslo",
 	"srv_analiza_archive_duration"			=>	"Trajanje",
 	"srv_analiza_archive_duration_default"	=>	"Privzeto 3 mesece (do: %s)",
-	"srv_analiza_archive_duration_custom"	=>	"Poljubno:",
-	"srv_analiza_arhiviraj_create"			=>	"Ustvari arhiv",
+	"srv_analiza_archive_duration_custom"	=>	"Poljubno. Izberi datum:",
+	"srv_analiza_arhiviraj_create"			=>	"Ustvari arhivski naslov",
 	"srv_analiza_arhiviraj_save"			=>	"Shrani",
 	"srv_analiza_arhiviraj_delete"			=>	"Izbri&#353;i",
 	"srv_analiza_arhiviraj_cancle"			=>	"Prekli&#269;i",
 	"srv_analiza_arhiviraj_close"			=>	"Zapri",
-	"srv_analiza_arhiviraj_success"			=>	"Arhiv analize z imenom: <span class=\"semi-bold\">%s</span> je bil uspešno ustvarjen!",
-	"srv_analiza_arhiviraj_success_note"	=>	"Dostopen je na naslovu",
+	"srv_analiza_arhiviraj_success"			=>	"Arhiv analize z imenom: <b><i>%s</i></b> je bil uspe&#353;no ustvarjen!",
+	"srv_analiza_arhiviraj_success_note"	=>	"Dostopen je na naslovu:",
 	"srv_analiza_arhiviraj_error_note"		=>	"Pri ustvarjanju arhiva analize je pri&#353;lo do napake!",
 	"srv_analiza_arhiviraj_access_0"		=>	"Vsi",
 	"srv_analiza_arhiviraj_access_1"		=>	"Administratorji ankete",
@@ -4152,7 +4010,7 @@ $lang = array (
 	"srv_analiza_archive_lbl_access"		=>	"Dostop",
 	"srv_analiza_archive_lbl_type"			=>	"Tip",
 	"srv_analiza_archive_lbl_date"			=>	"Datum",
-	"srv_analiza_archive_lbl_duration"		=>	"Traja do",
+	"srv_analiza_archive_lbl_duration"		=>	"Trajanje",
 	"srv_analiza_archive_lbl_author"		=>	"Avtor",
 	"srv_analiza_archive_lbl_editor"		=>	"Spremenil",
 	"srv_analiza_archive_title"				=>	"Analiza - ",
@@ -4184,9 +4042,8 @@ $lang = array (
 	"srv_lurkers_subnote"				=>	"(Uporabniki, kateri so samo preklikali čez anketo - lurkerji)",	
 	"srv_testni_vnos"					=>	"Prikaži testne enote:",	
 	"srv_show_pages"					=>	"Prika&#382;i frekven&#269;no porazdelitev za vsako stran posebej",	
-	"srv_stevilo_enot"					=>	"Število enot",	
+	"srv_stevilo_enot"					=>	"&#352;tevilo enot",	
 	"srv_skupaj_predvideni"				=>	"Skupaj predvideni",	
-	"srv_testni_podatki_alert_title"	=>	"Vaša anketa vsebuje testne podatke",	
 	"srv_testni_podatki_alert"			=>	"Pozor, v bazi so tudi testni podatki!",	
 	"srv_anketacopy"					=>	"Kopiraj anketo",	
 	"s_survey"							=>	"Anketa",
@@ -4211,37 +4068,23 @@ $lang = array (
 	"srv_printouts_q"					=>	"Izpisi vpra&#353;alnika",
 	"srv_printouts_q"					=>	"Izpisi vpra&#353;alnika",
 	"srv_archival_version_q"			=>	"Arhivske verzije vpra&#353;alnika",
-	"srv_questionnaire_archives"		=>	"Arhivi vprašalnika",
-	"srv_questionnaire_archives_text"		=>	"Pred spreminjanjem vprašalnika lahko obstoječo verzijo vprašalnika shranite tako, da izdelate arhivsko verzijo. Arhiv se izdela brez podatkov respondentov. S klikom na 'Izdelaj arhivsko verzijo vprašalnika' se v spodnjem seznamu generira arhivska verzija vprašalnika. Vsako arhivsko verzijo vprašalnika lahko aktivirate. Z aktivacijo se arhivska verzija avtomatsko ustvari kot nova anketa.",
-	"srv_questionnaire_archives_note"		=>	"Opomba k arhivski verziji",
-	"srv_questionnaire_archives_date"		=>	"Datum arhiviranja",
-	"srv_questionnaire_archives_by"		=>	"Arhiviral/-a",
-	"srv_questionnaire_archives_note2"		=>	"Opomba",
-	"srv_questionnaire_archives_activate"		=>	"Aktivacija",
-	"srv_survey_archives"				=>	"Izvozi",
+	"srv_questionnaire_archives"		=>	"Arhivi vpra&#353;alnika",
+	"srv_survey_archives"				=>	"Izvoz",
 	"srv_survey_archives_ie"			=>	"Vprašalnik",
 	"srv_survey_archives_ie_title"		=>	"Izvoz vprašalnika",
 	"srv_survey_archives_ie_data"		=>	"Vprašalnik in podatki",
 	"srv_survey_archives_ie_data_title"		=>	"Izvoz vprašalnika in podatkov",
 	"srv_survey_archives_tracking"		=>	"Spremembe",
 	"srv_survey_archives_tracking_survey"	=>	"Spremembe vprašalnika",
-	"srv_survey_archives_tracking_survey_text1"	=>	"V spodnji tabeli je navedenih zadnjih 25 sprememb",
-	"srv_survey_archives_tracking_survey_text_appendmerge"	=>	"povezanih z dodajanjem ali združevanjem podatkov",
-	"srv_survey_archives_tracking_survey_text1a"	=>	"v vprašalniku",
-	"srv_survey_archives_tracking_survey_text1b"	=>	"v zavihku",
-	"srv_survey_archives_tracking_survey_text1c"	=>	"za vprašalnik",
-	"srv_survey_archives_tracking_survey_text1d"	=>	"še ni bilo sprememb",
-	"srv_survey_archives_tracking_survey_text2"	=>	"Za vpogled v vse spremembe prenesite",
-	"srv_survey_archives_tracking_survey_text3"	=>	"Excel datoteko",
 	"srv_survey_archives_tracking_data"		=>	"Spremembe podatkov",
 	"srv_survey_archives_tracking_append"	=>	"Append/Merge (uvozi)",
     "srv_survey_archives_tracking_hierarchy"            =>	"Spremembe samoevalvacije v šolah",
     "srv_survey_archives_tracking_hierarchy_structure"  =>	"Spremembe hierarhije",
     "srv_survey_archives_tracking_hierarchy_users"      =>	"Spremembe uporabnikov",
-    "srv_survey_archives_tracking_last_changes"         =>	"Zadnjih 25 sprememb (za vpogled v vse spremembe prenesite <a href=\"ajax.php?a=user_tracking&d=download\">Excel datoteko</a>)",
+    "srv_survey_archives_tracking_last_changes"         =>	"Zadnjih 25 sprememb (za vpogled v vse spremembe prenesite <a href=\"ajax.php?a=user_tracking&d=download\" class=\"bold\">Excel datoteko</a>)",
 	"srv_survey_archives_note"			=>	"Shrani arhivsko datoteko vprašalnika in podatkov na svoj računalnik.",
-	"srv_survey_archives_note_survey"		=>	"S klikom na gumb 'Izvoz' prenesete in shranite arhivsko datoteko za vprašalnik. Datoteka s končnico .1ka se bo shranila na vaš računalnik v privzeto mapo za prenose.",
-	"srv_survey_archives_note_survey_data"	=>	"S klikom na gumb 'Izvoz' prenesete in shranite arhivsko datoteko za vprašalnik in podatke. Datoteka s končnico .1ka se bo shranila na vaš računalnik v privzeto mapo za prenose.",
+	"srv_survey_archives_note_survey"		=>	"Shranjevanje in prenos arhivske datoteke za vprašalnik.",
+	"srv_survey_archives_note_survey_data"	=>	"Shranjevanje in prenos arhivske datoteke za vprašalnik in podatke.",
 	"srv_survey_archives_import"		=>	"Uvoz",
 	"srv_survey_archives_import_text"	=>	"Restavriranje vprašalnika iz arhivske datoteke",
 	"srv_survey_archives_import_import"	=>	"Restavriraj",
@@ -4251,7 +4094,6 @@ $lang = array (
 	"srv_survey_archives_survey"		=>	"<b>Shrani arhivsko datoteko vprašalnika</b>",
 	"srv_survey_archives_data"			=>	"<b>Shrani arhivsko datoteko vprašalnika s podatki</b>",
 	"srv_survey_archives_delete_survey"	=>	"Izbriši arhivsko verzijo vprašalnika",
-	"srv_survey_archives_other"			=>	"Ostalo",
 	"srv_tracking_label"				=>	"Sledenje spremembam (tracking)",
 	"link_parent_content"				=>	"Odpri meni, a ohrani vsebino star&#154;a",
 	"link_prev_content"				=>	"Odpri meni, a ohrani vsebino prej odprte strani",
@@ -4306,7 +4148,7 @@ $lang = array (
 	"srv_dashboard_no_file"					=>	"Datoteka s podatki še ne obstaja!",
 	"srv_dashboard_new_units"				=>	" Število nedodanih enot: ",
 	"srv_dashboard_up_to_date"				=>	"Datoteka s podatki je ažurna.",
-	"srv_dashboard_paradata_date_warning"	=>	"Shranjevanje datumov odgovarjanja na vprašanja (parapodatki) je izklopljeno. Zato nekateri statusi ne bodo prikazani.",
+	"srv_dashboard_paradata_date_warning"	=>	"Opozorilo! Shranjevanje datumov odgovarjanja na vprašanja (parapodatki) je izklopljeno. Zato nekateri statusi ne bodo prikazani.",
 	"srv_data_no_data"						=>	"V bazi ni podatkov o izpolnjenih anketah!",
 	"srv_data_no_data_filtred"				=>	"Ni podatkov.",
 	"srv_diferencial2"      			=>	"Tabela diferencial",
@@ -4338,19 +4180,7 @@ $lang = array (
 #	"srv_collect_full_meta"				=> "Para podatke (lastnosti ra&#269;unalika, podrobni podatki o e-po&#353;tnih vabilih in telefonskih klicih).",
 	"srv_publication_base"				=> "Pregled",#"Nastavitve",#"Objava URL",					
 	"srv_publication_base_title"		=> "Osnovne URL povezave",
-	"srv_publication_survey_warnings"	=> "Anketa ima napake, opozorila, priporočila ali nerešene komentarje, ki jih lahko pregledate v zavihku ",
-	"srv_publication_survey_noactive"	=> "Vaša anketa še ni aktivirana",
-	"srv_publication_survey_links"		=> "Delite povezavo do ankete",
-	"srv_publication_survey_links_note"		=> "Spodaj je povezava do vprašalnika, kjer se podatki normalno shranjujejo v bazo. To povezavo sporočite dejanskim respondentom, denimo z objavo na družbenih omrežjih, forumih, prek e-maila, ipd.",
-	"srv_publication_survey_noactive_note"	=> "Če želite zbirati realne podatke, je anketo treba aktivirati.",
-	"srv_publication_survey_noactive_note2"	=> "Z aktiviranjem potrjujete <a href=\"#\" onclick=\"publishPopupOpen('settings')\">privzete nastavitve</a>.",
-	"srv_publication_survey_settings"	=> "Privzete nastavitve ankete",
-	"srv_publication_survey_settings_more"	=> "Več nastavitev",
-	"srv_publication_survey_settings_less"	=> "Manj nastavitev",
-	"srv_publication_survey_grouplang"	=> "Povezave za skupine in jezike",
-	"srv_publication_survey_niceurl"	=> "Lepe URL povezave",
-	"srv_publication_survey_more"		=> "Več načinov deljenja ankete",
-	"srv_publication_survey_copylink"	=> "Kopiraj povezavo",
+	"srv_publication_survey_warnings"	=> "Anketa ima napake, opozorila, priporočila, nerešene komentarje.",
 	"srv_publication_advanced_url"		=> "Napredne URL povezave",
 	"srv_publication_advanced_url_text"	=> "HTML koda, QR koda, vdelava, pop-up, Twitter, Facebook...",
 	"srv_publication_invitations"		=> "Vabila v anketo",
@@ -4375,10 +4205,10 @@ $lang = array (
 	"no_stats_for_this_file"			=>	"Za to povezavo ni statistik",
 	"back_to_statistics"				=>	"Nazaj na statistike",
 	"srv_loop"							=>	"Zanka",
-	"srv_loop_urejanje"					=>	"Nastavitve zanke",
+	"srv_loop_urejanje"					=>	"Urejanje zanke",
 	"srv_loop_no_nesting"				=>	"Gnezdenje zank (zanka v zanki) ni dovoljeno!",
 	"srv_loop_desc"						=>	"Izberite spremenljivko in vrednosti, ki jih &#382;elite uporabiti v zanki. Za vsako ozna&#269;eno vrednost bo respondent (seveda, le če bo odgovarjajočo možnost tudi označil) dobil vsa vpra&#353;anja v zanki. Podrobnosti o uporabi zanke so <a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/vprasalnik/zanka\" target=\"_blank\">tukaj</a>.<br /><br />Za prikaz vrednosti vprašanja, o katerem sprašujete v zanki uporabite prenos vrednosti, npr. #Q1#",
-	"srv_spss_export_base_instructions"	=>	"********************\n* UVOZ PODATKOV V SPSS\n********************\n* Koraki za uvoz:\n*   1) v vrstici 19 dolo&#269;ite pot do datoteke;\n*   2) po&#382;enite sintakso, tako da v meniju tega okna izberete Run, nato All;\n*   3) baza podatkov se bo samodejno ustvarila.\n* Podrobnej&#353;a navodila so na voljo na www.1ka.si.\n********************",
+	"srv_spss_export_base_instructions"	=>	"********************\n* UVOZ PODATKOV V SPSS\n********************\n* Koraki za uvoz:\n*   1) v vrstici 18 dolo&#269;ite pot do datoteke;\n*   2) po&#382;enite sintakso, tako da v meniju tega okna izberete Run, nato All;\n*   3) baza podatkov se bo samodejno ustvarila.\n* Podrobnej&#353;a navodila so na voljo na www.1ka.si.\n********************",
 	"srv_spss_export_file_instructions"	=>	"/* NAVODILO: Med enojna narekovaja vpi&#353;ite pot do datoteke. Narekovajev ne izbri&#353;ite. */ ",
 	"srv_sppss_checkbox_value_0"		=>	"ni izbran",
 	"srv_sppss_checkbox_value_1"		=>	"izbran",
@@ -4398,7 +4228,7 @@ $lang = array (
 	"srv_loop_always"					=>	"Vedno",
 	"srv_loop_never"					=>	"Nikoli",
 	"srv_loop_max"						=>	"Število ponovitev je lahko manjše od števila odgovorov. Izberete lahko samo prvih nekaj odgovorov",
-	"srv_missing_values"				=>	"Manjkajoče vrednosti",
+	"srv_missing_values"				=>	"Manjkajo&#269;e vrednosti",
 	"srv_missing_values_questions"		=>	"Rekodiranje",
 	"srv_missing_confirm_use_system"	=>	"Obstoječe nastavitve manjkajočih vrednosti bodo izbrisane. Nadomestile jih bodo sistemske nastavitve. Ali ste prepričani da želite nadaljevati?",
 	"srv_missing_confirm_delete"		=>	"Ali ste prepričani da želite izbrisati profil: ",
@@ -4444,7 +4274,7 @@ $lang = array (
 	"srv_invitation_nonActivated_title"			=>	"Pošiljanje vabil v anketo",
 	"srv_invitation_nonActivated_text1"			=>	"V spletnih anketah običajno zadoščata dve splošni emaili vabili vsem enotam (drugo vabilo je hkrati zahvala respondentom). V primeru manjšega števila enot (npr. nekaj sto) uporabimo kar privzeti email sistem (npr. Gmail, Outlook...), če je enot več, pa orodja za masovno pošiljanje (npr. SqualoMail, MailChimp...).",
 	"srv_invitation_nonActivated_text2"			=>	"Večje število vabil in sledenje respondentom je večinoma nepotrebno, hkrati pa tudi zahtevno (glej <a class=\"bold\" href=\"%s\">priporočila za pošiljanje vabil</a>).",
-	"srv_invitation_nonActivated_text3"			=>	"Email vabila lahko pošiljamo tudi preko sistema 1KA, in to tako splošna kot individualizirana vabila s kodo in sledenjem. Sistem 1KA poleg tega podpira (dokumentira) tudi pošiljanje vabil preko pošte, SMS, ipd.",
+	"srv_invitation_nonActivated_text3"			=>	"Email vabila lahko pošiljamo tudi preko sistema 1KA, in to tako splošna kot individualizirana vabila s kodo in sledenjem. Sistem 1KA poleg tega podpira (dokumentira) tudi pošiljanje vabil na preko pošta, SMS, ipd.",
 	"srv_invitation_nonActivated_button_details"	=>	"Podrobnosti o 1KA sistemu vabil",
 	"srv_invitation_nonActivated_button_activate"	=>	"Omogoči 1KA sistem vabil",
 	"srv_invitation_nonActivated_more"			=>	"Več >>",
@@ -4459,16 +4289,11 @@ $lang = array (
 	"srv_invitation_recipients"					=>	"Prejemniki",
 	"srv_invitation_preview"					=>	"Predogled",
 	"srv_invitation_send"						=>	"Pošlji e-maile",
-	"srv_displaydata_columns"					=>	"Prikaz stolpcev",
-	"srv_displaydata_fullscreen_0"				=>	"Osnovni",
-	"srv_displaydata_fullscreen_1"				=>	"Cel zaslon",
-	"srv_displaydata_columns"					=>	"Prikaz stolpcev",
-	"srv_displaydata_relevance"					=>	"Ustreznost enote (DA/NE)",
+	"srv_displaydata_relevance"					=>	"Ustreznost",
 	"srv_displaydata_invitation"				=>	"Vabilo",
-	"srv_displaydata_data"						=>	"Odgovori respondentov",
+	"srv_displaydata_data"						=>	"Podatke",
 	"srv_displaydata_status"					=>	"Status",
 	"srv_displaydata_meta"						=>	"Para podatki",
-	"srv_displaydata_meta2"						=>	"Parapodatki respondentov",
 	"srv_displaydata_system_data"				=>	"Identifikatorji",
 	"srv_displaydata_pdf_type"					=>	"Dolg izpis odgovorov v PDF",
 	"srv_displaydata_type"						=>	"Izpis PDF/RTF",
@@ -4498,9 +4323,9 @@ $lang = array (
 	"srv_activate_duration_auto_to"				=>	" do: ",
 	"srv_activate_duration_manual"				=>	" Ročno od: ",
 	"srv_activate_duration_manual_1"			=>	" Ročno ",
-	"srv_activate_duration_manual_from"			=>	"Od:",
-	"srv_activate_duration_manual_to"			=>	"Do:",
-	"srv_activate_duration_autostart"			=>	"Avtomatska aktivacija čez",
+	"srv_activate_duration_manual_from"			=>	" od: ",
+	"srv_activate_duration_manual_to"			=>	" do: ",
+	"srv_activate_duration_autostart"			=>	"Avtomatska aktivacija čez ",
 	"srv_activate_duration_button"				=>	"Aktiviraj",
 	"srv_processing"							=>	"Obdelava",
 	"srv_status_profile_system_1"				=>	"Vsi",
@@ -4542,12 +4367,6 @@ $lang = array (
 	"srv_comments_anketa_ured"					=>	"Splošni komentarji urednikov",
 	"srv_comments_anketa_resp"					=>	"Splošni komentarji respondentov",
 	"srv_comments_link"							=>	"Pregled komentarjev",
-	"srv_comments_user"							=>	"Uporabnik ",
-	"srv_comments_user2"						=>	" je komentiral:",
-	"srv_comments_archive"						=>	"Arhiviraj komentar",
-	"srv_comments_unarchive"						=>	"Označi kot nerešeno",
-	"srv_comments_archived"						=>	"Komentar je arhiviran",
-	"srv_comments_new"							=>	"Komentiraj",
 	"srv_zanka_profile_all"						=>	"Brez",
 	"srv_zanka_profile_session"						=>	"Za&#269;asno",
 	"srv_zanka_note"							=>	"Skupina za: ",
@@ -4556,12 +4375,14 @@ $lang = array (
 	"srv_compute_list"							=>	"Anketa vsebuje naslednje izračunane vrednosti",
 	"srv_compute_start"							=>	"Poženi novo računanje izračunanih vrednosti",
 	"srv_loop_multiplication_error"				=>	"Pri množenju lahko uporabite naveč dve spremenljivki.",
-	"srv_social_settings_text1"					=>	"Omrežja so sestavljena vprašanja. Začnejo se z generatorjem imen (name generator). S tem respondent (ego) navede objekte, prijatelje (alterje), za katere v nadaljevanju (zanki) postavljamo podvprašanja. Druga komponenta je zanka, v kateri za vse alterje določenega ega postavimo enaka vprašanja. Tretja komponenta so podvprašanja za alterje.",
-	"srv_social_settings_text2"					=>	"Primer vprašalnika egocentričnih socialnih omrežij je <a href='http://www.1ka.si/a/3510'>tukaj</a>, nahaja pa se tudi v ",
-	"srv_social_settings_text3"					=>	"<a href='http://www.1ka.si/admin/survey/index.php?a=knjiznica'>knjižnici</a>",
-	"srv_social_settings_text4"					=>	" med tipskimi vprašalniki in ga lahko kopirate kot predlogo za vprašalnik.",
-	"srv_social_settings_text5"					=>	"Nova vprašanja s podporo socialnim omrežjem dodajamo v zavihku ",
-	"srv_social_settings_text6"					=>	"'UREJANJE' - 'Vprašalnik'",
+	"srv_social_settings_text1"					=>	"Omrežja so sestavljena vprašanja.",
+	"srv_social_settings_text2"					=>	"Začnejo se z generatorjem imen (name generator). S tem respondent <b>(ego)</b> navede objekte, prijatelje <b>(alterje)</b>, za katere v nadaljevanju (zanki) postavljamo podvprašanja.",
+	"srv_social_settings_text3"					=>	"Druga kompnenta je zanka, v kateri za vse alterje določenega ega postavimo enaka vprašanja.",
+	"srv_social_settings_text4"					=>	"Tretja komponenta so podvprašanja za alterje.",
+	"srv_social_settings_text5"					=>	"Primer egocentričnih socialnih omrežij je tukaj:",
+	"srv_social_settings_text6"					=>	"vprašalnik pa najdemo v knjižnjici med tipskimi vprašalniki:",
+	"srv_social_settings_text7"					=>	"in ga lahko skopiramo kot podlago za naš morebitni vprašalnik.",
+	"srv_social_settings_text8"					=>	", nova vprašanja s podporo socialnim omrežjem dodajamo v naboru novih vprašanj (popup)",
 	"srv_export_questionnare"					=>	"Izpis vseh odgovorov",
 	"srv_export_questionnare_0"					=>	"Navodila za izpis odgovorov respondentov",
 	"srv_export_questionnare_1"					=>	"Izpisati je mogoče vse odgovore respondentov, kar je smiselno predvsem pri FORMAH/OBRAZCIH (npr. izpis spiska prijavljencev) ali pri TESTIH (kjer nato ocenjujemo odgovore respondentov).",
@@ -4586,12 +4407,10 @@ $lang = array (
 	"srv_email_vabila_simple_popup_title"       =>	"Enostavna vabila - brez sledenja",
 	"srv_here"									=>	"tukaj",
 	"srv_email_simple_button"              		=>	"Oblikuj email sporočilo",
-	"srv_survey_missing_title"					=>	"Manjkajoče vrednosti", 
-	"srv_survey_missing_text"					=>	"Po meri spremenite vrednosti in labele, ki so označene kot manjkajoče vrednosti.",
+	"srv_survey_missing_title"					=>	"Manjkajoče vrednosti uporabljene v anketi", 
 	"srv_survey_missing_system"					=>	"Sistemske manjkajoče vrednosti", 
 	"srv_survey_missing_special"				=>	"Posebne manjkajoče vrednosti (na nivoju ankete)", 
-	"srv_survey_missing_default"				=>	"Ponastavi na privzeto",
-	"srv_survey_missing_add"					=>	"Dodaj manjkajočo vrednost",
+	"srv_survey_missing_default"				=>	"Uporabi privzeto (sistemske manjkajoče vrednosti)",
 	"srv_survey_missing_error1"					=>	"Napaka! Ta manjkajoča vrednost že obstaja!", 
 	"srv_survey_missing_error2"					=>	"Anketa še nima nastavljenih manjkajočih vrednosti.",
 	"srv_stolpci"								=>	"Prikaži kategorije v večih stolpcih",
@@ -4603,21 +4422,18 @@ $lang = array (
     "admin_please_enable_this_b"				=>	"Prosimo, vklopite B za to navigacijo v urejanju navigacij",
     "admin_too_many_b"                          =>	"&#381;tevilo prikazanih kategorij je zaradi hitrosti omejeno na 2000.",
 	"srv_nice_url"								=>  "Lep URL",
-	"srv_nice_url_add"							=>  "Ustvari lepo URL povezavo",
+	"srv_nice_url_add"							=>  "Dodaj nov lep URL",
 	"srv_nice_url_remove"						=>  "Odstrani lep URL",
 	"srv_nice_url_taken"						=>  "je že zaseden!",
 	"srv_nice_url_short"						=>  "je prekratek! Minimalna dolžina so 3 znaki.",
 	"srv_nice_url_long"							=>  "je predolg! Maksimalna dolžina je 20 znakov.",
 	"srv_nice_url_title"						=>  "Anketa ima naslednji URL naslov:",
-	"srv_nice_url_note"							=>	"V spodnji tabeli je seznam vseh lepih URL povezav na tej namestitvi in povezave do anket, za katere so bile ustvarjene.",
-	"srv_nice_url_surveyname"					=>  "Ime ankete",
-	"srv_nice_url_extension"					=>  "Končnica lepe URL povezave",
 	"activate_this_cat_in_edit_db"				=>	"Filter je potrebno aktivirati v urejanju baze, saj trenutno ni obkljukan.",
 	"srv_undecided"								=>	"Nedoločen",
 	"srv_todo"									=>	"Za narediti",
 	"srv_done"									=>	"Končano",
 	"srv_not_relevant"							=>	"Nerelevantno",
-	"srv_comment_comment"						=>	"Odgovori",
+	"srv_comment_comment"						=>	"Replika",
 	"srv_edit_data_title"						=>	"Uredi podatke vprašanja",
 	"srv_edit_data_row"							=>	"Uredi celotno anketo respondenta",
 	"srv_edit_data_row_quick"					=>	"Hitro urejanje celotne ankete respondenta",
@@ -4634,8 +4450,7 @@ $lang = array (
 	"srv_quick_view_off"						=>	"Onemogoči spreminjanje vnosov",
 	"without_changes"							=>	"Brez sprememb",
 	"srv_time_profile_default"					=>	"Vsi",
-	"srv_time_profile_time"						=>	"Za obdobje:",
-	"srv_time_profile_from"						=>	"od",
+	"srv_time_profile_from"						=>	"za obdobje od",
 	"srv_time_profile_to"						=>	"do",
 	"srv_time_profile_choose_interval"			=>	"Izberite interval",
 	"srv_time_profile_link"						=>	"Obdobje", # časovni interval					
@@ -4679,10 +4494,6 @@ $lang = array (
 	"srv_change_default_profile"				=> 	"Privzetega profila ne morete spreminjati. Lahko pa kreirate nov profil.",
 	"srv_anketa_locked_1"						=> 	"Anketa je zaklenjena. Zaklenjene ankete se ne da urejati.",
 	"srv_anketa_locked_0"						=> 	"Anketa je odklenjena. Odklenjeno anketo se lahko normalno ureja.",
-	"srv_anketa_locked"	    					=> 	"Anketa je zaklenjena",
-	"srv_anketa_locked_text"	    			=> 	"Zaklenjene ankete se ne da urejati.",
-	"srv_anketa_unlocked"    					=> 	"Anketa je odklenjena",
-	"srv_anketa_unlocked_text"    			    => 	"Odklenjeno anketo se lahko normalno ureja.",
 	"srv_captcha_edit"							=> 	"Vpis CAPTCHA kode",
 	"srv_captcha_edit_note"						=> 	"Ne pozabite izbrati trdega opozorila za vprašanje!",
 	"srv_signature_edit"						=> 	"Elektronski podpis",
@@ -4701,8 +4512,8 @@ $lang = array (
 	"srv_dsp_link"								=>	"Nastavitve",
 	"srv_position"								=>	"Mesto",
 	"srv_add_condition_question"				=>	"Dodajte pogoj za prikaz",
-	"srv_edit_condition_question"				=>	"Vprašanja v pogoju se bodo prikazala, če je pogoj izpolnjen. <a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/vprasalnik/pogoji?from1ka=1\" target=\"_blank\">Preberi več</a>.",
-	"srv_edit_condition_question1"				=>	"Vprašanje %s se bo prikazalo, če je izpolnjen spodnji pogoj. <a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/vprasalnik/pogoji?from1ka=1\" target=\"_blank\">Preberi več</a>.",
+	"srv_edit_condition_question"				=>	"Vprašanja v pogoju se bodo prikazala, če je pogoj izpolnjen. <a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/vprasalnik/pogoji?from1ka=1\" target=\"_blank\">Več >></a>",
+	"srv_edit_condition_question1"				=>	"Vprašanje %s se bo prikazalo, če je izpolnjen spodnji pogoj. <a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/vprasalnik/pogoji?from1ka=1\" target=\"_blank\">Več >></a>",
 	"srv_edit_condition_conjunction"			=>	"Klikni za spremembo operatorja",
 	"srv_random_groups"							=>	"Naključne skupine",
 	"srv_device"								=>	"Naprava",
@@ -4841,7 +4652,7 @@ $lang = array (
 	"srv_chart_table_type_1"					=>	"Navadna",
 	"srv_chart_table_align"						=>	"Sredinska poravnava",
 	"srv_chart_table_freq"						=>	"Prikaži frekvence",	
-	"srv_chart_edit_warning"					=>	"Vstopate v vmesnik kjer lahko urejate in dodajate labele grafov. Ali ste prepričani da želite nadaljevati?",
+	"srv_chart_edit_warning"					=>	"Vstopate v vmesnik kjer lahko urejate in dodajate labele grafov. Ali ste prepricani da želite nadaljevati?",
 	"srv_chart_numerusText"						=>	"Položaj numerusa",
 	"srv_chart_numerusText_0"					=>	"Ob naslovu",
 	"srv_chart_numerusText_1"					=>	"Na grafu",
@@ -4864,7 +4675,7 @@ $lang = array (
 	"srv_chart_advancedLink_colors"				=>	"Spreminjanje barv",
 	"srv_chart_advancedLink_recoding"			=>	"Rekodiranje",
 	"srv_chart_advancedLink_limits"				=>	"Meje",
-	"srv_chart_advanced_default_color"			=>	"Ponastavi na privzeto",
+	"srv_chart_advanced_default_color"			=>	"Nastavi privzeto",
 	"srv_chart_advanced_skin"					=>	"Izberi skin",
 	"srv_chart_ttest_title"						=>	"Povprečna vrednost za",
 	"srv_chart_settings_fullScale"				=>	"Polna skala",
@@ -4932,16 +4743,14 @@ $lang = array (
 	'srv_inv_settings_code_0'					=> "koda je v URL",
 	'srv_inv_settings_code_1'					=> "ročni vnos kode",
 	'srv_inv_settings_code_2'					=> "brez kode",
-	'srv_inv_add_recipients_heading'			=> "Dodaj respondente",
-	'srv_inv_recipiens_field_note' 				=> "<span class=\"semi-bold\">Izberite polja, ki jih boste vnesli.</span> Dodatne spremenljivke lahko dodate v zavihku 'Urejanje'. S premikanjem lahko določite vrstni red spremenljivk:",
-	'srv_inv_recipiens_email_note' 				=> "<span class=\"semi-bold\">Vpišite ali kopirajte seznam prejemnikov, vsakega prejemnika dodajte v svojo vrstico.</span> Če uvažate tudi dodatna polja, jih ločite z vejico in jih dodajte v enakem vrstnem redu, kot ste označili polja zgoraj. Podvojeni zapisi bodo odstranjeni.",
+	'srv_inv_add_recipients_heading'			=> "Dodajanje prejemnikov",
+	'srv_inv_recipiens_field_note' 				=> "Izberite polja, ki jih boste vnesli. Dodatne spremenljivke lahko dodate v urejanju. S premikanjem lahko določite vrstni red:",
+	'srv_inv_recipiens_email_note' 				=> "Vpišite ali kopirajte seznam prejemnikov, vsakega prejemnika dodajte v svojo vrstico. Če uvažate tudi dodatna polja, jih ločite s spodaj izbranim ločnikom in jih dodajte v enakem vrstnem redu kot ste označili polja zgoraj. Podvojeni zapisi bodo odstranjeni.",
 	'srv_inv_recipiens_email_note_append' 		=> "Vpišite ali kopirajte podatke v tekstovni obliki, vsak zapis dodajte v svojo vrstico. Če dodajate več polj, jih ločite s spodaj izbranim ločilnikom in jih dodajte v enakem vrstnem redu kot ste označili polja zgoraj.",
 	'srv_inv_recipiens_pass_warning'			=> "Opozorilo! Maksimalna dolžina znakov za polje <i>PASSWORD</i> je 20 znakov.",
-	'srv_inv_recipiens_fields' 					=> "Vnesite podatke respondentov po sledečem vrstnem redu:",
+	'srv_inv_recipiens_fields' 					=> "Polja:",
 	'srv_inv_recipiens_sample' 					=> "Primer:",
 	'srv_inv_recipiens_sample1' 				=> "janez.novak@example.com,Janez,Novak,g.<br/>janja.novak@example.com,,,ga.",
-	"srv_inv_recipiens_sample2" 				=>	"<span class=\"bold\">Primer</span> - vnos podatkov za primer, ko želimo za dva respondenta vnesti podatke za njuno telefonsko številko, ime in priimek:",
-	"srv_inv_recipiens_insert" 				    =>	"Vnesite prejemnike",
 	'srv_inv_edit_recipients_heading' 			=> "Vpogled in urejanje prejemnikov",
 	'srv_inv_recipients_email' 					=> "EMAIL", #"Email",
 	'srv_inv_recipients_password' 				=> "PASSWORD", #"Geslo",
@@ -4990,14 +4799,13 @@ $lang = array (
 	'srv_inv_recipiens_add_invalid_note' 		=> "Preverite naslove in njihov položaj v spodnjem oknu!",
 	'srv_inv_recipiens_add_invalid_note2' 		=> "Enote z neveljavnim emailom ali geslom se ne dodajo v seznam",
 	'srv_inv_recipiens_add_invalid_upload_note' => "Preverite naslove v datoteki!",
-	'srv_inv_recipiens_upload_error' 			=> "Uporabnikov ni mogoče dodati, prosim odpravite spodnje napake!",
+	'srv_inv_recipiens_upload_error' 			=> "Uporabnikov ne morem dodati, prosim odpravite spodnje napake!",
 	'srv_inv_recipiens_upload_error_no_fields' 	=> "Nobeno polje ni izbrano!",
 	'srv_inv_recipiens_onlyThisSurvey' 			=> "Samo ta anketa",
-	'srv_inv_recipiens_from' 				    => "Vnos prejemnikov",
 	'srv_inv_recipiens_from_list' 				=> "Ročni vnos",
 	'srv_inv_recipiens_from_file' 				=> "Datoteke (csv)",
 	'srv_inv_recipiens_from_system' 				=> "Iz obstoječe spremenljivke",
-	'srv_inv_recipiens_temporary_list' 			=> "Začasen seznam",
+	'srv_inv_recipiens_temporary_list' 			=> "Začasni seznam",
 	'srv_inv_recipiens_list_created_by' 	=> "Kreiral: ",
 	'srv_inv_recipiens_list_created_day' 		=> "Kreiral dne: ",
 	'srv_inv_recipiens_list_comment' 			=> "komentar: ",
@@ -5013,9 +4821,6 @@ $lang = array (
 	'srv_inv_recipient_list_comment' 			=> "Komentar: ",
 	'srv_inv_recipient_list_recipients' 		=> "Prejemniki: ",
 	'srv_inv_recipient_list_new' 				=> "Seznam respondentov",
-	'srv_inv_recipient_delete' 			=> "Izbris respondenta",
-	'srv_inv_recipient_edit' 			=> "Urejanje respondenta",
-	'srv_inv_recipient_delete_text' 			=> "Ali ste prepričani da želite izbrisati respondenta?",
 	'srv_inv_recipient_delete_error' 			=> "Ne morem izbrisati respondenta!",
 	'srv_inv_recipient_show_only_duplicates' 	=> "Prikaži samo podvojene",
 	'srv_inv_list_profiles_edit' 				=> "Uredi",
@@ -5057,13 +4862,11 @@ $lang = array (
 	'srv_inv_message_delete_profile' 			=> "Izbriši sporočilo",
 	'srv_inv_message_rename_profile' 			=> "Preimenuj sporočilo",
 	'srv_inv_message_rename_new_name' 			=> "Ime sporočila:",
-	'srv_inv_message_help_title'    			=> "Navodila za oblikovanje sporočil",
-	"srv_inv_message_help"      				=> "<p>Za vstavljanje povezave na url ankete vpi&#154;ite <strong>#URL#</strong> v besedilo.</p>
-                                                    <p>Za vstavljanje povezave na URL ankete na besedilo ali sliko, označite besedo ali sliko in kliknite na ikono za vstavljanje povezave. Pod \"protokol\" izberite \"drugo\", pod URL vpišite <strong>#URLLINK#</strong>.</p>
-                                                    <p>Za izpis kode anketiranca vpi&#154;ite <strong>#CODE#</strong> v besedilo.</p>
-                                                    <p>Za povezavo na odjavo iz mailing liste, dodajte <strong>#UNSUBSCRIBE#</strong></p>
-                                                    <p>Za izpis anketiran&#269;eve vrednosti na drugi spremenljivki ali sistemski spremenljivki iz ankete, vnesite ime spremenljivke med znaka <strong>#</strong>.</p>
-                                                    <p>Primer: za izpis anketiran&#269;evega e-po&#353;tnega naslova vpi&#154;ite v besedilo <strong>#EMAIL#</strong>.</p>",		
+	"srv_inv_message_help"      				=> "<ul><li>Za vstavljanje povezave na url ankete vpi&#154;ite <strong>#URL#</strong> v besedilo.</li>
+                                                        <li>Za vstavljanje povezave na URL ankete na besedilo ali sliko, označite besedo ali sliko in kliknite na ikono za vstavljanje povezave. Pod \"protokol\" izberite \"drugo\", pod URL vpišite <strong>#URLLINK#</strong>.</li>
+                                                        <li>Za izpis kode anketiranca vpi&#154;ite <strong>#CODE#</strong> v besedilo.</li>
+                                                        <li>Za povezavo na odjavo iz mailing liste, dodajte <strong>#UNSUBSCRIBE#</strong></li>
+                                                        <li>Za izpis anketiran&#269;eve vrednosti na drugi spremenljivki ali sistemski spremenljivki iz ankete, vnesite ime spremenljivke med znaka <strong>#</strong>. <br/><div style=\"margin-left:20px;\"><i>Primer: za izpis anketiran&#269;evega e-po&#353;tnega naslova vpi&#154;ite v besedilo <strong>#EMAIL#</strong>. </i></div></li></ul>",		
 	"srv_inv_message_help_identifikators"		=> "<strong>Identifikatorji, ki so na voljo:</strong>",		
 	"srv_inv_message_help_systemvars"			=> "<strong>Sistemske spremenljivke, ki so na voljo:</strong>",		
 	"srv_inv_message_help_system_email"      	=> " - email respondenta",		
@@ -5099,18 +4902,18 @@ $lang = array (
 	'srv_inv_potencial_respondents' 			=> "Sporočilo bo poslano na spodnje naslove:",
 	'srv_inv_potencial_respondents_limit' 		=> "Vabilo želite poslati več kot 5000 respondentom. Prosimo, če nas pred pošiljanjem o tem obvestite na <a href=\"mailto:info@1ka.si\">info@1ka.si</a>!",
 	'srv_inv_btn_add_recipients_add' 			=> "Dodaj",
-	'srv_inv_recipiens_file_note_1' 			=> "<span class=\"semi-bold\">Izberite datoteko z e-poštnimi naslovi prejemnikov. Vsak prejemnik mora biti v svoji vrstici.</span> Če uvažate tudi dodatna personalizacijska polja, jih ločite z vejicami. Polja v datoteki morajo biti v enakem vrstnem redu, kot ste označili zgoraj. Podvojeni zapisi se ne bodo dodajali.",
+	'srv_inv_recipiens_file_note_1' 			=> "Izberite datoteko z e-poštnimi naslovi prejemnikov. Vsak prejemnik mora biti v svoji vrstici. Če uvažate tudi dodatna personalizacijska polja, jih ločite z vejicami. Polja v datoteki morajo biti v enakem vrstnem redu kot ste označili zgoraj. Podvojeni zapisi se ne bodo dodajali.",
 	'srv_inv_archive_heading' 					=> "Arhivi pošiljanja",									
 	'srv_inv_archive_date_send' 				=> "Datum pošiljanja",									
 	'srv_inv_archive_hour_send' 				=> "Ura pošiljanja",									
-	'srv_inv_archive_subject_text' 				=> "Zadeva sporočila",									
-	'srv_inv_archive_naslov' 					=> "Ime sporočila",									
+	'srv_inv_archive_subject_text' 				=> "Naslov sporočila",									
+	'srv_inv_archive_naslov' 					=> "Email sporočilo",									
 	'srv_inv_archive_subject' 					=> "Naslov sporočila",									
 	'srv_inv_archive_body_text' 				=> "Vsebina sporočila",									
 	'srv_inv_archive_cnt_succsess' 				=> "Uspešno poslanih",									
 	'srv_inv_archive_cnt_error' 				=> "Napak",									
 	'srv_inv_archive_comment' 					=> "Komentar",									
-	'srv_inv_archive_sender' 					=> "Poslal/-a",
+	'srv_inv_archive_sender' 					=> "Poslal",
 	'srv_inv_archive_email_address' 			=> "Email prejemnika",
 	'srv_inv_archive_status' 					=> "Status",
 	'srv_inv_archive_edit' 						=> "Uredi",
@@ -5160,26 +4963,26 @@ $lang = array (
 	'srv_inv_dashboard_view_list' 				=> "Preglej sezname ankete >>",
 	'srv_inv_dashboard_view_other_list'			=> "Preglej ostale sezname >>",
 	'srv_inv_dashboard_add_link' 				=> "Dodaj",
-	'srv_inv_dashboard_tbl_all' 				=> "Vseh enot",
-	'srv_inv_dashboard_tbl_send' 				=> "Skupno poslano enotam",
-	'srv_inv_dashboard_tbl_clicked' 			=> "neustrezno - neveljavni odgovori",
-	'srv_inv_dashboard_tbl_finished' 			=> "ustrezne enote",
-	'srv_inv_dashboard_tbl_unanswered' 			=> "neustrezno - neodgovori",
-	'srv_inv_dashboard_tbl_unknown' 			=> "Neznani status",
-	'srv_inv_dashboard_tbl_error' 				=> "Napake (neuspelo pošiljanje)",
+	'srv_inv_dashboard_tbl_all' 				=> "Vseh enot:",
+	'srv_inv_dashboard_tbl_send' 				=> "Skupno poslano enotam:",
+	'srv_inv_dashboard_tbl_clicked' 			=> "&nbsp;&nbsp;&nbsp;neustrezno - neveljavni odgovori:",
+	'srv_inv_dashboard_tbl_finished' 			=> "&nbsp;&nbsp;&nbsp;ustrezne enote:",
+	'srv_inv_dashboard_tbl_unanswered' 			=> "&nbsp;&nbsp;&nbsp;neustrezno - neodgovori:",
+	'srv_inv_dashboard_tbl_unknown' 			=> "Neznani status:",
+	'srv_inv_dashboard_tbl_error' 				=> "Napake (neuspelo pošiljanje):",
 	'srv_inv_dashboard_lists' 					=> "Seznami",
 	'srv_inv_dashboard_lists_cnt_this_survey'	=> "Število seznamov respondentov te ankete:",
 	'srv_inv_dashboard_lists_cnt_all'			=> "Število seznamov respondentov v drugih anketah:",
-	'srv_inv_dashboard_list_cnt_title'			=> ". pošiljanje.",
+	'srv_inv_dashboard_list_cnt_title'			=> ". pošiljanje. Poslal:&nbsp;",
 	'srv_activation_header'						=> "Anketo ste aktivirali! Aktivna bo 3 mesece",
 	'srv_activation_expire'						=> "Anketa poteče dne: ",
-	'srv_activation_setting'					=> "Nastavitve aktivnosti lahko spremenite <a href=\"index.php?anketa=%1s&a=trajanje\">tukaj</a>.",
+	'srv_activation_setting'					=> "Nastavitve aktivnosti lahko spremenite <a href=\"index.php?anketa=%1s&a=trajanje\"><span class=\"bold\">tukaj</span></a>.",
 	'srv_activation_header_gdpr'				=> "Anketo ste aktivirali! Aktivna bo 3 mesece",
 	'srv_activation_text_gdpr'					=> "Anketa vsebuje vprašanja oz. nastavitve, ki kažejo na zbiranje osebnih podatkov. Če v anketi zbirate osebne podatke, gre za GDPR anketo in morate izpolniti dodatne nastavitve. GDPR nastavitve ankete lahko urejate <a href=\"index.php?anketa=%1s&a=gdpr_settings\"><span class=\"bold\">tukaj</span></a>.",
-	'srv_activation_text_nongdpr'				=> "Če v anketi zbirate osebne podatke, gre za GDPR anketo in morate izpolniti dodatne nastavitve. GDPR nastavitve ankete lahko urejate <a href=\"index.php?anketa=%1s&a=gdpr_settings\">tukaj</a>.",
-	'srv_activation_text_nongdpr2'				=> "V skladu z GDPR uredbo upoštevajte naslednje:<ul><li>Obdelujte le tiste osebne podatke, ki so nujno potrebni za izvedbo ankete. </li><li>Podatke lahko obdelujte le za namen, za katerega so bili podatki pridobljeni.</li><li><a href=\"https://www.1ka.si/d/sl/gdpr\">Več >></a></li></ul>",
+	'srv_activation_text_nongdpr'				=> "Če v anketi zbirate osebne podatke, gre za GDPR anketo in morate izpolniti dodatne nastavitve. GDPR nastavitve ankete lahko urejate <a href=\"index.php?anketa=%1s&a=gdpr_settings\"><span class=\"bold\">tukaj</span></a>.",
+	'srv_activation_text_nongdpr2'				=> "V skladu z GDPR uredbo upoštevajte naslednje:<ul><li>Obdelujte le tiste osebne podatke, ki so nujno potrebni za izvedbo ankete. </li><li>Podatke lahko obdelujte le za namen, za katerega so bili podatki pridobljeni.</li></ul><a href=\"https://www.1ka.si/d/sl/gdpr\"><b>Več >></b></a>",
 	'srv_activation_expire_gdpr'				=> "Anketa poteče dne: ",
-	'srv_activation_setting_gdpr'				=> "Nastavitve aktivnosti lahko spremenite <a href=\"index.php?anketa=%1s&a=trajanje\">tukaj</a>.",	
+	'srv_activation_setting_gdpr'				=> "Nastavitve aktivnosti lahko spremenite <a href=\"index.php?anketa=%1s&a=trajanje\"><span class=\"bold\">tukaj</span></a>.",	
 	'srv_mass_input' 							=>	"Masovno (hitro) izpolnjevanje ankete",
 	'srv_mass_input_0' 							=>	"Izključeno",
 	'srv_mass_input_1' 							=>	"Vključeno",
@@ -5224,17 +5027,16 @@ $lang = array (
 	'srv_svetovanje_uporaba'				    =>	"Uporaba 1KA",
 	'srv_svetovanje_statistika'				    =>	"Statistika",
 	'srv_svetovanje_metodologija'				    =>	"Metodologija",
-    'srv_footer_links'							=>	"<span class=\"footer_item\"><a href=\"https://www.1ka.si/d/sl/o-1ka/splosen-opis\" target=\"_blank\">O 1KA</a></span>
-                                                     <span class=\"footer_item\"><a href=\"https://www.1ka.si/d/sl/pomoc\" target=\"_blank\">Pomoč</a></span>
-                                                     <span class=\"footer_item\"><a href=\"https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-1ka\" target=\"_blank\">Pogoji uporabe</a></span>
-                                                     <span class=\"footer_item\"><a href=\"https://www.1ka.si/d/sl/cenik/zasebni-paketi\" target=\"_blank\">Cenik</a></span>",
+    'srv_footer_links'							=>	"<a href=\"https://www.1ka.si/d/sl/o-1ka/splosen-opis\" target=\"_blank\">O 1KA</a>
+                                                        | <a href=\"https://www.1ka.si/d/sl/pomoc\" target=\"_blank\">Pomoč</a>
+                                                        | <a href=\"https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-1ka\" target=\"_blank\">Pogoji uporabe</a>
+                                                        | <a href=\"https://www.1ka.si/d/sl/cenik/zasebni-paketi\" target=\"_blank\">Cenik</a>",
 	'srv_footer_1ka_version'					=>	"1KA verzija",
 	'srv_footer_drupal_version'					=>	"Drupal",
 	'srv_footer_copyright'					    =>	"UL FDV, CDI",
 	'srv_password'								=>	"Geslo za dostop do izpolnjevanja ankete",
-	'srv_password_remove'						=>	"Odstrani",
-	'srv_password_add_mass'						=>	"Masovni vnos gesel",
-    'srv_password_add_mass_instructions'		=>	"Vnesite seznam gesel, kjer je vsako geslo v svoji vrstici:",
+	'srv_password_add_mass'						=>	"Masoven vnos gesel",
+    'srv_password_add_mass_instructions'		=>	"Vnesite seznam gesel kjer je vsako geslo v svoji vrstici:",
     'srv_password_add_mass_sample'		        =>  "(npr. Geslo1,Geslo2,Geslo3...)",
 	'srv_password_add_mass_execute'				=>	"Dodaj gesla",
 	'srv_interno_ime'							=>	"(Interno ime se uporablja pri urejanju ankete.)",
@@ -5311,13 +5113,8 @@ $lang = array (
 	"srv_sledenje_identifikatorji"				=>	"Poveži identifikatorje (email, ime iz zavihka OBJAVA) s podatki respondenta",	
 	"offer_plain_login"							=>  'Napacna prijava.\r\nAli se zelite prijaviti preko klasicne prijavne forme na naslovni strani?',
 	'srv_change_q_tip'							=>	"Spremeni tip vprašanja",
-	'srv_mass_coding'							=>	"Avtomatsko kodiraj besedilno spremenljivko:",
-	'srv_mass_coding_count'						=>	"Število kodiranih vrednosti na odgovor:",
-	'srv_mass_coding_run'						=>	"Kodiraj",
-	'srv_mass_coding_txt1'						=>	"Avtomatsko lahko kodirate le eno spremenljivko naenkrat. Za dve, tri … spremenljivke je treba postopek dvakrat, trikrat, … ponoviti.",
-	'srv_mass_coding_txt2'						=>	"Avtomatsko kodiranje je primerno za kratke odgovore, kjer se besede (oz. koreni besed) pogosto ponavljajo. Avtomatsko kodiranje to zazna ter jih združi v skupno vrednost (npr. Jabolko, Jabolka, ipd.). Uporabe avtomatskega kodiranja ne priporočamo na vprašanjih z dolgimi odprtimi odgovori.",
-	'srv_mass_coding_txt3'						=>	"Pri kodiranju večih vrednosti na odgovor se za deliminator (ločitveni znak) uporablja vejica.",
-	'srv_mass_coding_txt4'						=>	"Avtomatsko kodirano spremenljivko lahko kasneje še dodatno popravljate v zavihku Ročno kodiranje.",
+	'srv_mass_coding'							=>	"Izvedi avtomatsko kodiranje na besedilni spremenljivki",
+	'srv_mass_coding_txt'						=>	"Avtomatsko lahko kodirate le eno spremenljivko naenkrat. Za dve, tri… spremenljivke, je treba postopek dvakrat, trikrat,… ponoviti.<br>Avtomatsko kodiranje je primerno za kratke odgovore, kjer se besede (oz. koreni besed) pogosto ponavljajo. Avtomatsko kodiranje to zazna ter jih združi v skupno vrednost (npr. Jabolko, Jabolka ipd.).<br>Uporabe avtomatskega kodiranja ne priporočamo na vprašanjih z dolgimi odprtimi odgovori.<br><br>Pri kodiranju večih vrednosti na odgovor se za deliminator (ločitveni znak) uporablja vejica.<br><br>Avtomatsko kodirano spremenljivko lahko kasneje še dodatno popravljate v zavihku Ročno kodiranje.",
 	'srv_auto_coding'							=>	"Avtomatsko kodiranje",
 	'srv_hand_coding'							=>	"Ročno kodiranje",
 	'srv_coding_merge'							=>	"Združi v",
@@ -5329,7 +5126,6 @@ $lang = array (
 	"reg_before_posting"						=>	"Prosimo, prijavite se pred pisanjem.",
 	"srv_testiranje_review"						=>	"Pregled",
 	"srv_testiranje_diagnostika"				=>	"Diagnostika",
-	"srv_testiranje_diagnostika_lastnosti"		=>	"Lastnosti ankete",
 	"srv_testiranje_diagnostika_base"			=>	"Osnovna diagnostika",
 	"srv_testiranje_komentarji"					=>	"Komentarji",
 	"srv_testiranje_komentarji_anketa"			=>	"Komentarji na anketo",
@@ -5359,13 +5155,10 @@ $lang = array (
 	"srv_survey_settings"						=>	"Nastavitve ankete",
 	"srv_interface_settings"					=>	"Nastavitve vmesnika",
 	"srv_testing_time"							=>	"Časi",
-	"srv_analiza_archive_generate_quick"		=>	'Arhiv posamezne analize lahko ustvarite tudi s klikom na gumb \'Izdelaj arhivsko verzijo analize\'.',
-	"srv_analiza_archive_generate_quick_button"		=>	'Izdelaj arhivsko verzijo analize',
-	"srv_analiza_archive_note_no_archive"		=>	"Anketa nima arhivov analiz.",
-	"srv_analiza_archive_note1"					=>	"Arhiv lahko generirate s klikom na ikono <span class=\"faicon arhiv blue\"></span> pri posameznih analizah.",
-	"srv_analiza_archive_list"					=>	"Seznam arhivov analiz",
+	"srv_analiza_archive_generate_quick"		=>	'Arhiv trenutne analize lahko zgenerirate tudi<span class="as_link" onclick="doArchiveAnaliza();"> tukaj</span>',
+	"srv_analiza_archive_note_no_archive"		=>	"Anketa nima arhivov analiz.<br/><br/>Arhiv lahko generirate s klikom na ikonco <span class=\"faicon arhiv\"></span> pri posameznih analizah.",
 	"srv_wait_a_moment"							=>	"Prosimo počakajte trenutek.",
-	"srv_saving"								=>	"Nalaganje",
+	"srv_saving"								=>	"Obdelujem...",
 	"srv_grid_defaults_1_1"						=>	"Sploh ne velja",
 	"srv_grid_defaults_1_2"						=>	"Ne velja",
 	"srv_grid_defaults_1_3"						=>	"Niti niti",
@@ -5408,8 +5201,9 @@ $lang = array (
 	"srv_diagnostic_5_element_2" 				=> 'Preverjanje podvojenosti imen variabel',
 	"srv_diagnostic_5_element_3" 				=> 'Preverjanje validacij na spremenljivkah',
 	"srv_diagnostic_ustreza" 					=> 'OK',
-	"srv_diagnostic_neustreza" 					=> 'Napaka',
-	"srv_diagnostic_rec" 						=> 'Priporočilo',
+	"srv_diagnostic_neustreza1" 				=> 'Odpravite napako',
+	"srv_diagnostic_neustreza2" 				=> 'Priporočamo popravek',
+	"srv_diagnostic_neustreza" 					=> 'Priporočamo razmislek',
 	"srv_diagnostic_time_1" 					=> 'Zelo kratka anketa',
 	"srv_diagnostic_time_2" 					=> 'Kratka anketa',
 	"srv_diagnostic_time_3" 					=> 'Srednje dolga anketa',
@@ -5476,7 +5270,7 @@ $lang = array (
 	"srv_replace"								=> 'Zamenjaj',
 	"srv_inspect_setting"						=> 'Zoom',
 	"srv_inspect_setting_enabled"				=> '"Zoom" je omogočen:',
-	"srv_inspect_setting_link"					=> 'Preberite več o funkcionalnosti "Zoom" <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/zoom?from1ka=1" target="_blank">tukaj.</a>',
+	"srv_inspect_setting_link"					=> 'Preberite več o funkcionalnosti "Zoom" <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/zoom?from1ka=1" target="_blank"><span class="bold">tukaj</span></a>',
 	"srv_inspect_setting_show_variables"		=> 'Pri pregledovanju prikaži dodatne spremenljivke:',
 	"srv_inspect_goto_note"						=> '"Zoom" kaže na:',
 	"srv_inspect_goto_0"						=> 'Obstoječe analize',
@@ -5547,28 +5341,26 @@ $lang = array (
 	"reg_donthave_uname"						=> 'Nimate uporabni&#154;kega imena',
 	"reg_can_social"							=> 'Prijavite ali registrirate se lahko tudi z uporabni&#154;kim imenom va&#154;ega socialnega omre&#382;ja.',
 	"login_or_register"							=> 'Prijava ali registracija',
-	"srv_not_default_setting"					=> 'Izbrane imate lastne nastavitve, ki se razlikujejo od privzetih (default) 1KA nastavitev.',
-	"srv_dataIcons_write"						=> 'Izvoz posamezne ankete',
+	"srv_not_default_setting"					=> '»Izbrane imate lastne nastavitve, ki se razlikujejo od privzetih (default) 1KA nastavitev«',
+	"srv_dataIcons_write"						=> 'Izpisi',
 	"srv_dataIcons_labels"						=> 'Labele',
 	"srv_dataIcons_note"						=> 'Ikone:',
-	"srv_dataIcons_quick_view"					=> 'Vpogled v posamezno anketo',
-	"srv_dataIcons_edit"						=> 'Urejanje posamezne ankete',
-	"srv_dataTable_settings_show"				=> 'V tabeli naj bodo prikazani:',
-	"srv_dataTable_settings_shortcuts"			=> 'Bljižnice za:',
+	"srv_dataIcons_quick_view"						=> 'Vpogled',
+	"srv_dataIcons_edit"						=> 'Urejanje',
 	"login_for_existing"						=>	'Prijava za obstoje&#269;e uporabnike',
 	"login_for_existing2"						=>	'Obstoje&#269;i uporabniki',
 	"simplified_social_login"					=> 'Poenostavljena prijava preko socialnih omre&#382;ij',
 	"social_login"								=> 'Prijava preko socialnih omre&#382;ij',
 	"srv_max_answers"							=> 'max število odgovorov',
 	"srv_analysis_links_allAnswers"				=> 'Izpis odgovorov vseh ustreznih respondentov',
-	"srv_analysis_links_allAnswers_note"		=> '<span class="red">Opozorilo!</span> Pri tej možnosti ne gre za izpis podatkov, ampak za dobeseden izpis vprašanj in odgovorov za vsakega respondenta. Izpis je časovno zamuden, zato je možno izpisati odgovore za največ 300 enot.',
+	"srv_analysis_links_allAnswers_note"		=> '(pozor – ne gre za podatke, ampak za dobeseden izpis vprašalnikov in odgovorov za vsakega respondenta, kar je lahko izjemno obsežno; privzeta omejitev je zato 300 enot)',
 	"srv_analysis_links_vpogled"				=> 'Vpogled v individualne ankete',
 	"srv_means_izberi_prvo" 					=>	"Izberite prvo vpra&#353;anje",
 	"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:",
-	"srv_means_label2" 							=>	"Odvisna spremenljivka:",
+	"srv_means_label1" 							=>	"Neodvisna spremenljivka (kategorije):",
+	"srv_means_label2" 							=>	"Odvisna spremenljivka (numerična):",
 	"srv_means_label3" 							=>	"Skupaj",
 	"srv_means_label4" 							=>	"Št. enot",
 	"srv_means_setting_1"						=>	"Odvisne spremenljivke prikazuj v ločenih tabelah",
@@ -5599,31 +5391,22 @@ $lang = array (
 	"srv_skin_tablet"							=>	'Stran za tablice',
 	"srv_loop_for_variable"						=>	'Zanka po spremenljivki:',
 	"srv_loop_antonucci_circle"					=>	'Krog Antonuccija:',
-	"srv_current_theme"							=>	'Aktivna tema',
-	"srv_current_theme_general"					=>	'Splošna tema',
-	"srv_current_theme_mobile"					=>	'Mobilna tema',
+	"srv_current_theme"							=>	'Trenutno izbrana tema',
 	"srv_show_all_settings"						=>	"Prikaži napredne nastavitve",
-	"srv_skin_disclamer"						=>	"Vaše naložene in urejene teme bodo vidne izključno vam in morebitnim urednikom ankete. Ostali uporabniki ne morejo uporabljati vaših tem.",
-	"srv_skin_warning"							=>	"<span class=\"red\">Opozorilo!</span> Ustvarjanje teme na lastno odgovornost. Ob poseganju v CSS lahko pride do napake in s tem potencialno do napačnega ali nedelujočega prikaza ankete na strani respondenta.",
-	"srv_skin_warning_edit"						=>	"<span class=\"red\">Opozorilo!</span> Posegov v kodo ne priporočamo brez poznavanja jezika CSS. Urejanje teme je na lastno odgovornost.",
+	"srv_skin_disclamer"						=>	"Vaše naložene in urejene teme bodo vidne izključno vam. Ostali uporabniki ne morejo uporabljati vaših tem.",
 	"srv_SN_nagovor_title"						=>	'Odgovarjate za osebo ',
 	"srv_system_themes"							=>	'Splošne teme',
 	"srv_mobile_themes"							=>	'Mobilne teme',
-	"srv_mobile_theme"							=>	'Mobilna tema',
+	"srv_mobile_theme"							=>	'mobilna',
 	"srv_safe_themes"							=>	'Safe teme',
 	"srv_user_themes"							=>	'Lastne prilagoditve in CSS teme',
 	"srv_user_themes_css"						=>	'Lastne CSS teme',
     "srv_user_custom_checkbox"                  =>  'Izbira velikosti checkbox/radio gumbov',
 	"srv_online_edit"							=>	'Online urejanje teme',
 	"srv_offline_edit"							=>	'Offline urejanje teme',
-	"srv_diagnostika_testiranje"				=>	'Testiranje',
-	"srv_diagnostika_testiranje_notea"			=>	'Spodaj je povezava do ročnega testnega vnosa, kjer se podatki shranijo kot testni. V zavihku ',
-	"srv_diagnostika_testiranje_noteb"			=>	'\'TESTIRANJE\' - \'Avtomatski vnosi\'',
-	"srv_diagnostika_testiranje_notec"			=>	' lahko testne podatke vnesete tudi avtomatsko.',
-	"srv_diagnostika_testiranje_copy"			=>	'Kopiraj',
 	"srv_diagnostika_table_title"				=>	'Status',
-	"srv_diagnostika_table_title1"				=>	'Kriterij',
-	"srv_diagnostika_table_title2"				=>	'Podrobnosti',
+	"srv_diagnostika_table_title1"				=>	'Napake',
+	"srv_diagnostika_table_title2"				=>	'Opozorila',
 	"srv_diagnostika_table_title3"				=>	'Priporočila',
 	"srv_diagnostika_table_title4"				=>	'Lastnost',
 	"srv_ttest"									=>	'T-test',
@@ -5643,17 +5426,16 @@ $lang = array (
 	"srv_data_lurker"							=>  "Prazna",
 	"srv_data_test"								=>  "Testni",
 	"srv_data_date"								=>  "Datum",
-	"srv_data_date2"							=>  "Datum izpolnjevanja ankete",
 	"srv_library_edit"							=>	"Urejanje knjižnice",
 	"srv_library_edit_add"						=>	"Dodaj to anketo v mojo knjižnico",
 	"srv_library_q_txt"							=>	"Za prenos vprašanj (ali blokov) uporabite povleci in spusti",
 	"srv_library_show"							=>	"Prikaži knjižnico",
 	"srv_library_hide"							=>	"Skrij knjižnico",
 	"srv_list_author"							=>	"Avtor ankete",
-	"srv_list_my_surveys"						=>	"Moje ankete",
-	"srv_list_all_surveys"						=>	"Vse ankete",
-	"srv_list_gdpr_no_gdpr"						=>	"Ankete brez GDPR",
-	"srv_list_gdpr_gdpr"						=>	"GDPR ankete",
+	"srv_list_my_surveys"						=>	"Prikaži samo moje ankete",
+	"srv_list_all_surveys"						=>	"Prikaži vse ankete",
+	"srv_list_gdpr_no_gdpr"						=>	"Prikaži samo ankete brez GDPR",
+	"srv_list_gdpr_gdpr"						=>	"Prikaži samo GDPR ankete",
 	"srv_list_userFilter_surveys"				=>	"Seznam je filtriran po uporabniku",
 	"srv_default_setting"						=>	"Privzete nastavitve za objavo",
 	"srv_default_setting_unactive"				=>	"Z aktiviranjem potrjujete privzete nastavitve",
@@ -5672,7 +5454,6 @@ $lang = array (
 	"srv_invitation_recipients_add_type4"		=>	'Dodaj v anketo',
 	"srv_invitation_recipients_add_type5"		=>	'Shrani kot nov seznam',
 	"srv_invitation_recipients_filter"			=>	'Filtriraj:',
-	"srv_invitation_recipients_filter_button"			=>	'Filtriraj',
 	"srv_invitation_recipients_filter_advanced" =>	'Napredno filtriranje',
 	"srv_invitation_recipients_filter_sent"		=>	'Poslano:',
 	"srv_invitation_recipients_filter_answered" =>	'Odgovorjeno:',
@@ -5697,7 +5478,7 @@ $lang = array (
 	"srv_invitation_choosen"					=>	'(izbran)',
 	"srv_invitation_note1"						=>	'Polje s prejemniki je prazno!',
 	"srv_invitation_note2"						=>	'Izbrano ni nobeno polje!',
-	"srv_invitation_note3"						=>	'Ni ustreznih respondentov!',
+	"srv_invitation_note3"						=>	'Ni ustrezih respondentov!',
 	"srv_invitation_note4"						=>	'Nič sporočil še ni bilo poslanih!',
 	"srv_invitation_note5"						=>	'Sporočilo je bilo uspešno poslano na vse naslove!',
 	"srv_invitation_note5_noEmailing"			=>	'Obvestilo o vabilu je bilo dokumentirano in shranjeno v sistem 1KA. Podrobnosti so v <a href="%s" class="bold">arhivih</a>.',
@@ -5774,18 +5555,17 @@ $lang = array (
 	"srv_data_delete_not_selected"				=>	"Niste izbrali nobenega respondenta!",
 	"srv_if_error"								=>	"Dopolnite ali odstranite pogoj!",
 	"srv_export_spss"							=>	"Izvozi v spss",
-	"srv_export_excel"							=>	"Izvozi v Excel",
+	"srv_export_excel"							=>	"Izvozi v excel",
 	"srv_export_txt"							=>	"Izvozi v tekstovno datoteko",
 	"srv_expaned_text"							=>	"Priporočamo vam tudi uporabo skrčenega pogleda",
 	"srv_library_q_added"						=>	"Vprašanje uspešno dodano v knjižnico!",
 	"srv_library_b_added"						=>	"Pogoj oz. blok je uspešno dodan v knjižnico!",
-	"srv_expor_excel_cell_delimiter"			=>	"Ločitveni znak med polji naj bo",
+	"srv_expor_excel_cell_delimiter"			=>	"Ločitveni znak med polji naj bo:",
 	"srv_expor_excel_cell_delimiter1"			=>	"Podpičje (;)",
 	"srv_expor_excel_cell_delimiter2"			=>	"Vejica (,)",		
 	"srv_statistic_menu"						=>	"Izberite:&nbsp;",		
 	"srv_back_to_email"							=>	"Nazaj na objavo",		
 	"srv_data_valid_units_settings"				=>	"Nastavitve prikazov v analizah in podatkih",	
-	"srv_data_valid_label"						=>	"Prikaži enote",		
 	"srv_data_only_valid"						=>	"Samo ustrezni",		
 	"srv_data_valid_units"						=>	"Ustrezne",		
 	"srv_data_finished_units"					=>	"Končani",		
@@ -5866,34 +5646,32 @@ $lang = array (
 	"XSTARleta"									=>	'Starost: vnos starosti (min: 10 let, max: 90 let)',
 	"XLETNICA"									=>	'Starost: izbira letnice rojstva v roleti z letnicami od 1910 do 2010.',
 	"XDATUMROJ"									=>	'Starost: Izbira datuma rojstva na koledarju',
-	"srv_find_text"								=>	'Samo za iskanje besed v vprašalniku uporabite bližnjico Ctrl+F.',
+	"srv_find_text"								=>	'Zgolj za iskanje uporabite Ctrl + F',
 	"srv_find_replace_count"					=>	'Najdenih besed',
 	"srv_demografija_text"						=>	'Na konec ankete lahko dodate že pripravljena demografska vprašanja',
 	"srv_demografska_vprasanja"					=>	'Demografska vprašanja',
 	"srv_head_demografska_vprasanja"			=>	'Priporočamo standardna socio-demografska vprašanja (<a href="https://www.1ka.si/d/sl/pomoc/prirocniki/standardna-demografija" target="_blank"><span class="bold">Podrobnosti</span></a>)',
-	"srv_manager_add_user_label"				=>	'Izberite uporabnika',
-	"srv_manager_add_user"						=>	'Dodajte novega uporabnika, nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo o podrobnostih dostopa obveščen na e-mail.</span>',
-	"srv_manager_add_user2"						=>	'Dodajte si obstoječega uporabnika, nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail.</span>',
-	"srv_manager_add_user3"						=>	'Dodajte si obstoječega uporabnika, nad katerim boste imeli pregled (dodajate lahko samo uporabnike registrirane z emaili %s)',
+	"srv_manager_add_user"						=>	'Dodajte novega uporabnika nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo o podrobnostih dostopa obveščen na e-mail</span>',
+	"srv_manager_add_user2"						=>	'Dodajte si obstoječega uporabnika nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail</span>',
+	"srv_manager_add_user3"						=>	'Dodajte si obstoječega uporabnika nad katerim boste imeli pregled (dodajate lahko samo uporabnike registrirane z emaili %s)',
 	"srv_manager_add_user4"						=>	'<span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail</span>',
 	"srv_manager_rem_user2"						=>	'Odstranite uporabnika iz svojega pregleda',
 	"srv_manager_manager"						=>	'Uporabniki, ki imajo managerski pregled nad vašimi anketami',
 	"srv_manager_count"			    			=>	'Dodeljeni uporabniki',
 	"srv_manager_remove_alert"	    			=>	'Ste prepričani, da želite odstraniti uporabnika iz pregleda?',
 	"srv_manager_add_admin"	    			    =>	'Dodaj uporabnika v pregled',
-	"srv_manager_add_user_popup"				=>	'Dodajte obstoječega uporabnika, nad katerim bo uporabnik imel pregled',
+	"srv_manager_add_user_popup"				=>	'Dodajte obstoječega uporabnika nad katerim bo uporabnik pregled',
 	"srv_manager_count_manager"				    =>	'Managerji',
 	"create"		            				=>	'Ustvari',
 	"create_add"		            		    =>	'Ustvari in dodaj',
     "srv_library_left"							=>	'Standardna vprašanja lahko dodajate v anketo',
 	"srv_library_left_right"					=>	'Moja vprašanja, ki jih lahko dodajate v knjižnico in iz knjižnice v anketo',
 	"srv_language_settings"						=>	'Jezikovne nastavitve',
-	"srv_add_new_language"						=>	'Dodaj nov prevod',
+	"srv_add_new_language"						=>	'Dodaj nov jezik',
 	"srv_std_first"								=>	'Osnovni jezik',
 	"srv_std_second"							=>	'Privzeti prevod',
 	"srv_std_translation"						=>	'Popravek privzetega prevoda',
 	"srv_select_type"							=>	'Izberite tip vprašanja',
-	"srv_common_settings"   					=>	'Pogoste nastavitve',
 	"srv_question_type"							=>	'Tip vprašanja',
 	"srv_dropdown_select"						=>	'Izberite',
 	"srv_added_false"							=>	'Uporabnik s tem e-mail naslovom je že registriran.',
@@ -5910,15 +5688,15 @@ $lang = array (
 	"srv_edit_in_edit"							=>	'Urejanje je možno v zavihku',
 	"srv_analize_preview_sample_choose"			=>	'Kliknite na izbrano možnost v roleti.',
 	"srv_analize_preview_sample"				=>	'Primer izpisa: ',
-	"srv_analize_preview_1"						=>	'<span class="first">Primer izpisa: Sumarnik</span> - Analize prilagojene tipu spremenljivke.',
-	"srv_analize_preview_2"						=>	'<span class="first">Primer izpisa: Opisne statistike</span> - povprečja, standardni odklon, minimum, maximum.',
-	"srv_analize_preview_3"						=>	'<span class="first">Primer izpisa: Frekvence</span> - Izpis frekvenčnih porazdelitev.',
-	"srv_analize_preview_4"						=>	'<span class="first">Primer izpisa: Tabele</span> - Dvodimenzionalna tabela kategorialnih spremenljivk.',
-	"srv_analize_preview_5"						=>	'<span class="first">Primer izpisa: Povprečja</span> - Tabele povprečij glede na kontrolno kategorialno spremenljivko.',
-	"srv_analize_preview_6"						=>	'<span class="first">Primer izpisa: T-test</span> - Preverjanje domnev o statistično značilnih razlikah.',
-	"srv_analize_preview_7"						=>	'<span class="first" class="first">Primer izpisa: Razbitje</span> - Analiza vseh spremenljivk glede na kategorije kontrolnih spremenljivk.',
-	"srv_analize_preview_8"						=>	'<span class="first">Primer izpisa: Multitabele</span> - Večdimenzionalna tabela kategorialnih spremenljivk.',	
-	"srv_analize_preview_9"						=>	'<span class="first">Primer izpisa: Neodgovori spremenljivk</span>',	
+	"srv_analize_preview_1"						=>	'<b>Sumarnik</b> - Analize prilagojene tipu spremenljivke.',
+	"srv_analize_preview_2"						=>	'<b>Opisne statistike</b> - povprečja, standardni odklon, minimum, maximum.',
+	"srv_analize_preview_3"						=>	'<b>Frekvence</b> - Izpis frekvenčnih porazdelitev.',
+	"srv_analize_preview_4"						=>	'<b>Tabele</b> - Dvodimenzionalna tabela kategorialnih spremenljivk.',
+	"srv_analize_preview_5"						=>	'<b>Povprečja</b> - Tabele povprečij glede na kontrolno kategorialno spremenljivko.',
+	"srv_analize_preview_6"						=>	'<b>T-test</b> - Preverjanje domnev o statistično značilnih razlikah.',
+	"srv_analize_preview_7"						=>	'<b>Razbitje</b> - Analiza vseh spremenljivk glede na kategorije kontrolnih spremenljivk.',
+	"srv_analize_preview_8"						=>	'<b>Multitabele</b> - Večdimenzionalna tabela kategorialnih spremenljivk.',	
+	"srv_analize_preview_9"						=>	'<b>Neodgovori spremenljivk</b>',	
 	"srv_analize_preview_watermark"				=>	'VZOREC',
 	"srv_dostop_maili"							=>	'Lahko pošilja e-maile',
 	"srv_dostop_mail_server"					=>	'Lahko pošilja e-maile preko 1KA strežnika',
@@ -5933,22 +5711,14 @@ $lang = array (
 	"srv_dostop_dashboard"						=>	'Vidi zavihek status',
 	"srv_dostop_phone"							=>	'Je anketar ankete (lahko izvaja le telefonsko anketo)',
 	"srv_anketa_deleted"						=>	'Izbrisane ankete',
-	"srv_anketa_deleted_note"					=>	'V spodnji tabeli je seznam vseh izbrisanih anket in možnost obnovitve teh anket.',
-	"srv_anketa_deleted_restore"				=>	'Obnovi anketo',
-	"srv_anketa_deleted_restore_confirm"		=>	'Ste prepričani, da želite obnoviti anketo?',
 	"srv_data_deleted"							=>	'Izbrisani podatki',
-	"srv_data_deleted_surveyname"				=>	'Ime ankete',
-	"srv_data_deleted_user"						=>	'E-mail uporabnika',
-	"srv_data_deleted_restore"					=>	'Obnovi podatke',
-	"srv_data_deleted_restore_confirm"          =>	'Ste prepričani, da želite obnoviti podatke?',
-	"srv_data_deleted_note"						=>	'V spodnji tabeli je seznam vseh anket, kjer so bili izbrisani podatki, in možnost obnovitve izbrisanih podatkov.',
 	"srv_restore"								=>	'Obnovi',
 	"srv_all_types"								=>	'Vsi tipi',
 	"srv_demografija_all"						=>	'V editiranju vprašanja so na voljo tudi dodatni tipi vprašanj',
 	"srv_delete_infotext"						=>	'Namesto izbrisa svetujemo izbiro ustreznih enot',
 	"srv_unlock"								=>	"Odkleni",
 	"srv_unlock_alert"							=>	"Pri urejanju ankete z že zbranimi podatki je potrebno biti posebej pazljiv! Ob brisanju vprašanj ali kategorij se bodo izbrisali tudi pripadajoči podatki respondentov. Želite nadaljevati?",
-	"srv_unlock_popup"							=>	"Vaša anketa se je z aktivacijo zaklenila.<br>Urejanje ankete je možno, če jo odklenete s klikom na <span class=\"faicon lock_close blue\"></span>.",
+	"srv_unlock_popup"							=>	"Vaša anketa se je z aktivacijo zaklenila, urejanje ankete je možno, če jo odklenete s klikom na <img src=\"img_0/lock.png\">",
 	"srv_unlock_popup2"							=>	"Pri urejanju ankete z že zbranimi podatki je potrebno biti posebej pazljiv! Ob brisanju vprašanj ali kategorij se bodo izbrisali tudi pripadajoči podatki respondentov. Urejanje ankete je zopet možno, če jo odklenete s klikom na odkleni.",
 	"srv_unlock_popup3"							=>	"Anketa je zaklenjena. Nimate dovoljenja za odklepanje ankete.",
 	"srv_unlock_mobile"							=>	"Anketa je ustvarjena z mobilno aplikacijo. Če anketo odklenete, bo postala navadna anketa in je ne bo več mogoče urejati z mobilno aplikacijo.",
@@ -5970,8 +5740,6 @@ $lang = array (
 	"srv_deleteSurveyDataFile_success_note"		=>	"Datoteka s podatki je bila uspešno izbrisana!",
 	"srv_archive_survey"						=>	"Arhivi vprašalnika",
 	"srv_archive_invitation"					=>	"Arhivi vabil",
-	"srv_archive_invitation_text"				=>	"Vsako poslano email vabilo se avtomatsko shrani v spodnji seznam, kjer je navedena tudi statistika pošiljanja.",
-	"srv_archive_invitation_text2"				=>	"Seznam poslanih email vabil",
 	"srv_archive_analysis"						=>	"Arhivi analiz",
 	"srv_toolbox_if"							=>	"Določite pogoje za prikaz vprašanja",
 	"srv_toolbox_block"							=>	"Bloki za strukturiranje daljših vprašalnikov",
@@ -5980,15 +5748,12 @@ $lang = array (
 	"srv_data_emailstatus_1"					=>	"Da",
 	"srv_data_emailstatus_2"					=>	"Napaka",
 	"srv_bottom_data_legend_note"				=>	'Legenda manjkajočih (negativnih) vrednosti',
-	"srv_bottom_data_legend_note_li0"			=>	'<a href="https://www.1ka.si/d/sl/pomoc/prirocniki/statusi-enot-ustreznost-veljavnost-manjkajoce-vrednosti?from1ka=1" target="_blank" class="read-more">Preberi več<span class="faicon arrow2_r"></span></a>',
+	"srv_bottom_data_legend_note_li0"			=>	'<a href="https://www.1ka.si/d/sl/pomoc/prirocniki/statusi-enot-ustreznost-veljavnost-manjkajoce-vrednosti?from1ka=1" target="_blank">Več>></a>',
 	"srv_bottom_data_legend_note_li1"			=>	"'-1' neodgovorjeno vprašanje,",
 	"srv_bottom_data_legend_note_li2"			=>	"'-2' preskok zaradi pogoja (IF),",
 	"srv_bottom_data_legend_note_li3"			=>	"'-3' prekinitev izpolnjevanja,",
 	"srv_bottom_data_legend_note_li4"			=>	"'-4' naknadno vprašanje,",
-	"srv_bottom_data_legend_note_li5"			=>	"'-5' prazna anketa (NEUSTREZNA enota),",
-	"srv_bottom_data_legend_note_li99"			=>	"'-99' ne vem,",
-	"srv_bottom_data_legend_note_li98"			=>	"'-98' zavrnil,",
-	"srv_bottom_data_legend_note_li97"			=>	"'-97' neustrezno.",
+	"srv_bottom_data_legend_note_li5"			=>	"'-5' prazna anketa (NEUSTREZNA enota).",
 	"srv_bottom_data_legend_note_li1a"			=>	"neodgovorjeno vprašanje",
 	"srv_bottom_data_legend_note_li2a"			=>	"preskok zaradi pogoja",
 	"srv_bottom_data_legend_note_li3a"			=>	"prekinitev izpolnjevanja",
@@ -6015,13 +5780,13 @@ $lang = array (
 	"srv_user_notbanned"						=>	"Uporabnik je aktiven",
 	"srv_displayifs"							=>	"Prikaži pogoje in bloke pred vprašanjem",
 	"srv_user_settings"							=>	"Nastavitve uporabnika",
-	"srv_lock_survey_when_activate"				=>	"Zakleni urejanje ankete",
+	"srv_lock_survey_when_activate"				=>	"Zakleni anketo ob aktivaciji:",
 	"srv_validation"							=>	"Validacija",
 	"srv_validation_no"							=>	"Vprašanje nima nastavljenih validacijskih omejitev",
 	"srv_validation_new"						=>	"Dodaj validacijo",
 	"srv_validation_remove"						=>	"Odstrani validacijo",
 	"srv_data_recoded_note"						=>	"Nekateri podatki so rekodirani.",
-	"srv_analysys_perview_sample"				=>	'Vzorec',
+	"srv_analysys_perview_sample"				=>	'<span class="sampleView">Vzorec</span>',
 	"srv_preview_text"							=>	'Podatki se ne shranjujejo',
 	"srv_testdata_text"							=>	'Podatki se shranijo kot testni',
 	"srv_testdata_text_long"					=>	"Podatki se shranijo kot testni s čimer se lahko pretestira analize in jih kasneje z 1 klikom tudi izbriše",
@@ -6030,8 +5795,7 @@ $lang = array (
 	"srv_no_reminder_all"						=>	"Odstrani opozorila iz vseh vprašanj",
 	"srv_reminder_popup_warning"				=>	"Ta funkcionalnost se zelo dolgo izvaja. Želite nadaljevati?",
 	"srv_jump_to"								=>	"Skoči na",
-	"srv_recode_h_variable"						=>	"Spremenljivka",
-	"srv_recode_h_scale"						=>	"Merska lestvica",
+	"srv_recode_h_variable"						=>	"Variable",
 	"srv_recode_h_actions"						=>	"Funkcije rekodiranja",
 	"srv_recode_add"							=>	"Dodaj",
 	"srv_recode_remove"							=>	"Odstrani",
@@ -6054,14 +5818,13 @@ $lang = array (
 	"srv_continue_later_subject"				=>	'Shranjena anketa',
 	"srv_continue_later_content"				=>	'Pozdravljeni, <br><br>Na spletni strani 1ka.si ste si shranili spodnjo anketo za kasnejše izpolnjevanje.<br><br> Z izpolnjevanjem lahko nadaljujete s klikom na povezavo',
 	"srv_continue_later_content_rs-rs"  		=>	'Pozdravljeni, <br><br>Na spletni strani vprasalniki.rs-rs.si ste si shranili spodnjo anketo za kasnejše izpolnjevanje.<br><br> Z izpolnjevanjem lahko nadaljujete s klikom na povezavo',
-	"srv_upload_pic"							=>	'Naložite svoj logotip',
+	"srv_upload_pic"							=>	'Uporabite svoj logo ali sliko',
 	"srv_upload_pic2"							=>	'Naložite svojo sliko',
 	"srv_upload_logo"							=>	'Naložite svoj logotip',
 	"srv_upload_pic_disclaimer"					=>	'Za uporabo slike v temi, skopirajte njen URL (iz seznama spodaj) in ga vključite v CSS datoteko, ki jo lahko urejate zgoraj',
 	"srv_data_subnavigation_append"				=>	'Dodaj podatke',
 	"srv_data_subnavigation_merge"				=>	'Združi podatke',
 	"srv_custom_report"							=>	"Poro&#269;ilo po meri",
-	"srv_custom_report_begin"					=>	"Dodajte prvi element ali besedilo, ki ga želite vključiti v analizo raziskave.",
 	"srv_custom_report_title"					=>	"Izdelava poro&#269;ila po meri",
 	"srv_custom_report_preview"					=>	"Predogled poročila po meri",
 	"srv_custom_report_preview_short"			=>	"Predogled",
@@ -6089,7 +5852,6 @@ $lang = array (
 	"srv_custom_report_time_edited"				=>	"Poročilo spreminjano",
 	"srv_custom_report_default"					=>	"Poročilo 1",
 	"srv_custom_report_create"					=>	"Ustvari novo poročilo",
-	"srv_custom_report_create2"					=>	"Novo poročilo",
 	"srv_custom_report_edit"					=>	"Preglej vsa poročila",
 	"srv_custom_report_name"					=>	"Ime poročila",
 	"srv_custom_report_delete_confirm" 			=>	"Ali &#382;elite izbrisati poročilo",
@@ -6108,50 +5870,34 @@ $lang = array (
 	"srv_custom_report_share_long"				=>	"Deli poročilo z drugimi uredniki ankete",
 	"srv_color"									=>	"Barva",
 	"src_coding_refresh"						=>	"Poženi novo računanje rekodiranih vrednosti", #Osveži podatke
-	"src_coding_alert"							=>	"Opozorilo: Priporočamo, da ustvarite <a href=\"index.php?anketa=%1s&a=arhivi&m=data\">arhiv podatkov</a>, preden začnete z urejanjem.",
+	"src_coding_alert"							=>	"Priporočamo, da <a href=\"index.php?anketa=%1s&a=arhivi&m=data\">arhiv podatkov</a> ustvarite, preden pričnete z urejanjem.",
 	"srv_coding_spr"							=>	"Prikaži izbrano spremenljivko",
 	"srv_coding_spr_1"							=>	"Prikaži vse spremenljivke",
 	"srv_coding_spr2"							=>	"Za več opcij pojdite v Napredne možnosti ter nato Spremenljivke",
 	"srv_coding_filter"							=>	"Filtriraj",
 	
-	"srv_append_note" 							=>	"Dodajanje podatkov pomeni dodajanje odgovorov  za nove respondente, ki jih še ni v bazi podatkov vaše ankete. Dodani odgovori se shranijo v obstoječo bazo podatkov.",
-	"srv_append_step1" 							=>	"1. korak: Označite spremenljivke, ki jih boste vnesli:",
-	"srv_append_step1_notea" 					=>	"Spodaj so navedena imena obstoječih spremenljivk vašega vprašalnika.",
-	"srv_append_step1_noteb" 					=>	"Dodajanje podatkov je možno le za spremenljivke tekstovnih in numeričnih tipov ter vprašanja z enim in več odgovori.",
-	"srv_append_step1_notec" 					=>	"Če v vprašalniku še nimate vprašanj, jih je najprej treba dodati.",
-	"srv_append_step1_noted" 					=>	"S premikanjem spremenljivk lahko spremenite vrstni red (od leve proti desni), v katerem boste vnesli podatke.",
-	"srv_append_step2" 							=>	"2. korak: Izberite vir podatkov, ki jih želite vnesti:",
-	"srv_append_step3" 							=>	"3. korak: Vpišite ali kopirajte podatke:",
-	"srv_append_step3_note1" 					=>	"Za vsakega respondenta vnesite podatke v svojo vrstico.",
-	"srv_append_step3_note2" 					=>	"Podatke vnesite le za tiste spremenljivke, ki ste jih označili v 1. koraku.",
-	"srv_append_step3_note3" 					=>	"Za vprašanja z enim ali več možnimi odgovori je treba vnesti vrednosti odgovorov - npr. 1, 2, 3 (in ne besedila). Do vrednosti posameznega odgovora lahko dostopate s klikom na opcijo 'Uredi vrednosti odgovorov', ki se nahaja v naprednem urejevalniku vprašanja v zavihku 'UREJANJE'- Vprašalnik.",
-	"srv_append_step3_note4" 					=>	"Če dodajate podatke za več spremenljivk, morate za vsako izmed njih:",
-	"srv_append_step3_note5" 					=>	"Podatke ločiti z vejico (,).",
-	"srv_append_step3_note6" 					=>	"Podatke vnesti v enakem vrstnem redu (od leve proti desni), kot so spremenljivke prikazane v 1. koraku.",
-	"srv_append_step3_note7" 					=>	"Primer - vnos podatkov za primer, ko želimo za dva respondenta vnesti podatke za njun elektronski naslov in ime:",
-	"srv_append_step3_note8" 					=>	"janez.novak@example.com,Janez",
-	"srv_append_step3_note9" 					=>	"janja.novak@example.com,Janja",
-	"srv_append_step3_note10" 					=>	"Podatke vnesite v tem vrstnem redu:",
-	"srv_append_add" 							=>	"Dodaj podatke",
-	"srv_append_step3_xls" 						=>	"3. korak: Naložite podatke iz datoteke:",
-	"srv_append_xls_note" 						=>	"Pri dodajanju podatkov iz Excelove datoteke bodo uvoženi podatki za naslednje spremenljivke (izbrali ste jih v prejšnjem koraku):",
-	"srv_append_xls_step1" 						=>	"<span class=\"bold\">1. korak: izberite stolpce iz Excelove datoteke</span>, v katerih se nahajajo podatki za izbrane spremenljivke:",
-	"srv_append_xls_step2" 						=>	"<span class=\"bold\">2. korak: izberite vrstice iz Excelove datoteke</span>, v katerih se nahajajo podatki:",
+	"srv_append_note" 							=>	"<b>Dodajanje pomeni nove zapise (records)</b><br><br>Izberite polja, ki jih boste vnesli. S premikanjem lahko določite vrstni red.<br><br>Dodajate lahko spremenljivke tekstovnih in numeričnih tipov ter vprašanja z enim in več odgovori - vse trenutno obstoječe spremenljivke so spodaj tudi že prikazane. Ostalih tipov zaenkrat ni mogoče vnašati. Dodatne spremenljivke lahko dodate v urejanju.",
+	"srv_append_note" 							=>	"<p>Uvoz odgovorov pomeni dodajanje novih zapisov (records).</p>",
+	"srv_append_step1" 							=>	"<p><b>1. korak: Definirajte polja (spremenljivke), ki jih boste vnesli.</b></p>",
+	"srv_append_step1_note" 					=>	"<p>S premikanjem lahko določite vrstni red.</p><p>Če v vprašalniku še nimate vprašanj, jih je potrebno predhodno vnesti.</p><p>Dodajate lahko spremenljivke tekstovnih in numeričnih tipov ter vprašanja z enim in več odgovori - vse trenutno obstoječe spremenljivke so spodaj tudi že prikazane.<br />Ostalih tipov zaenkrat ni mogoče vnašati. Dodatne spremenljivke lahko dodate v urejanju.</p>",
+	"srv_append_step2" 							=>	"<p><b>2. korak: Izberite vir podatkov, ki jih želite vnesti:</b></p>",
+	"srv_append_step3" 							=>	"<p><b>3. korak: Vpišite ali kopirajte podatke.</b></p>",
+	"srv_append_step3_note" 					=>	"<p>Podatke vnesite v tekstovni obliki, vsak zapis dodajte v svojo vrstico.<br />Če dodajate več polj, jih ločite z vejico in jih dodajajte v enakem vrstnem redu, kot ste jih označili zgoraj.</p>",
+	"srv_append_step3_xls" 						=>	"<p><b>3. korak: Naložite podatke iz datoteke.</b></p>",
+	"srv_append_xls_note" 						=>	"<p>Pri dodajanju podatkov iz Excelove datoteke, bodo uvoženi podatki za naslednje spremenljivke <i>(ki ste jih izbrali v prejšnjem koraku)</i></p>",
+	"srv_append_xls_step1" 						=>	"<p><b>1. korak: izberite pripadajoča polja (stolpce)</b> iz Excelove datoteke h zgornjim spremenljivkam:</p>",
+	"srv_append_xls_step2" 						=>	"<p><b>2. korak: </b>vpišite številko začetne in zadnje vrstice podatkov respondentov v Excelovi datoteki</p>",
 	"srv_append_xls_step2_begin" 				=>	"Številka začetne vrstice",
 	"srv_append_xls_step2_end" 					=>	"Številka zadnje vrstice",
     
-    "srv_merge_note" 							=>	"Združevanje podatkov omogoča dodajanje odgovorov za obstoječe respondente, ki so že v bazi podatkov vaše ankete. Dodani odgovori se shranijo v bazo podatkov skupaj z ostalimi odgovori. ",
-	"srv_merge_step1" 							=>	"1. korak: Označite spremenljivke, ki jih boste vnesli, vključno s spremenljivko, po kateri bo izvedeno združevanje (ključ):",
-	"srv_merge_step1_notea" 					=>	"Spodaj so navedena imena obstoječih spremenljivk vašega vprašalnika.",
-	"srv_merge_step1_noteb" 					=>	"Dodajanje podatkov je možno le za spremenljivke tekstovnih in numeričnih tipov ter vprašanja z enim in več odgovori.",
-	"srv_merge_step1_notec" 					=>	"Če želite dodati podatke za nove spremenljivke, jih je prvotno treba ustvariti v zavihku 'UREJANJE' - 'Vprašalnik'.",
-	"srv_merge_step1_noted" 					=>	"S premikanjem spremenljivk lahko spremenite vrstni red (od leve proti desni), v katerem boste vnesli podatke.",
-	"srv_merge_step2" 							=>	"2. korak: Izberite vir podatkov, ki jih želite vnesti:",
-	"srv_merge_step3" 							=>	"3. korak: Izberite polje, po katerem želite izvesti združevanje (ključ):",
-	"srv_merge_step4" 							=>	"4. korak: Vpišite ali kopirajte podatke:",
-	"srv_merge_step4_note" 						=>	"Podatke vnesite v tekstovni obliki, vsak zapis dodajte v svojo vrstico.<br />Če dodajate več polj, jih ločite z vejico in jih dodajajte v enakem vrstnem redu, kot ste jih označili zgoraj.",
-	"srv_merge_step4_xls" 						=>	"4. korak: Naložite podatke iz datoteke:",
-	"srv_merge_add" 							=>	"Združi podatke",
+    "srv_merge_note" 							=>	"<p>Združevanje podatkov (join merge) ne povečuje števila zapisov (records) ampak dodaja podatke spremenljivkam</p>",
+	"srv_merge_step1" 							=>	"<p><b>1. korak: Definirajte polja (spremenljivke), ki jih boste vnesli.</b></p>",
+	"srv_merge_step1_note" 						=>	"<p>S premikanjem lahko določite vrstni red.</p><p>Če v vprašalniku še nimate vprašanj, jih je potrebno predhodno vnesti.</p><p>Dodajate lahko spremenljivke tekstovnih in numeričnih tipov ter vprašanja z enim in več odgovori - vse trenutno obstoječe spremenljivke so spodaj tudi že prikazane.<br />Ostalih tipov zaenkrat ni mogoče vnašati. Dodatne spremenljivke lahko dodate v urejanju.</p>",
+	"srv_merge_step2" 							=>	"<p><b>2. korak: Izberite vir podatkov, ki jih želite vnesti:</b></p>",
+	"srv_merge_step3" 							=>	"<p><b>3. korak: Izberite polje, po katerem želite izvesti združevanje (identifikator)</b></p>",
+	"srv_merge_step4" 							=>	"<p><b>4. korak: Vpišite ali kopirajte podatke.</b></p>",
+	"srv_merge_step4_note" 						=>	"<p>Podatke vnesite v tekstovni obliki, vsak zapis dodajte v svojo vrstico.<br />Če dodajate več polj, jih ločite z vejico in jih dodajajte v enakem vrstnem redu, kot ste jih označili zgoraj.</p>",
+	"srv_merge_step4_xls" 						=>	"<p><b>4. korak: Naložite podatke iz datoteke.</b></p>",
     
     "srv_append-merge_error_file" 				=>	"Napaka! Datoteka ne obstaja!",
     "srv_append-merge_added_1" 					=>	"Dodanih",
@@ -6165,8 +5911,8 @@ $lang = array (
     "srv_append-merge_process_2"			    =>	"vrstic podatkov",
     "srv_append-merge_process_o_1"			    =>	"V postopku bo združenih",
     "srv_append-merge_process_o_2"			    =>	"vrstic podatkov. Obstoječe vrednosti se bodo prepisale!",
-    "srv_append-merge_error_value"			    =>	"Pri združevanju po ključu se nobena od vrednosti ne ujema.",
-    "srv_append-merge_fin"			            =>	"Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na večih straneh, izberite zadnjo stran).",
+    "srv_append-merge_error_value"			    =>	"Pri združevanju po identifikatorju se nobena od vrednosti ne ujema.",
+    "srv_append-merge_fin"			            =>	"Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na večih straneh, izberite zadnjo stran)",
 
     "srv_question_respondent_comment"			=>	"Vaš komentar k vprašanju",
 	"1cul_select_file"							=>	"Izberite datoteko iz svojega ra&#269;unalnika",
@@ -6212,12 +5958,11 @@ $lang = array (
 	'srv_inv_pagination_shown'					=>	'Prikazanih ',
 	'srv_inv_pagination_shown_records'			=>	' zapisov na stran.',
 	'srv_inv_list_edit_header'					=>	'Urejanje seznamov',
-	'srv_inv_list_edit_list'		            =>	'Prikaži sezname',
 	'srv_inv_list_edit_from_this_survey'		=>	'Samo ta anketa',
 	'srv_inv_list_edit_from_all_surveys'		=>	'Vse moje ankete',
 	'srv_inv_list_edit_from_archive'			=>	'Arhivi pošiljanja',
 	'srv_inv_list_table_name'					=>	'Ime seznama',
-	'srv_inv_list_table_cnt_receive'			=>	'Št. prej.',
+	'srv_inv_list_table_cnt_receive'			=>	'Št.prej.',
 	'srv_inv_list_table_comment'				=>	'Komentar',
 	'srv_inv_list_table_date_create'			=>	'Datum kreiranja',
 	'srv_inv_list_table_author'					=>	'Avtor',
@@ -6241,7 +5986,7 @@ $lang = array (
 	'srv_recode_to_label'						=>	'labela',
 	'srv_recode_to_value'						=>	'vrednost',
 	'srv_recode_naknadnoVprasanje'				=>	'Naknadno vprašanje [-4]',
-	'srv_recode_note'							=>	'Rekodiranje je primerno za spremembo ali združevanje vrednosti numeričnih in kategorialnih spremenljvk, kot tudi za uvrstitev določene vrednosti med manjkajoče. Za večje posege priporočamo rekodiranje v novo spremenljivko. <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/rekodiranje?from1ka=1" target="_blank">Več informacij.</a>',
+	'srv_recode_note'							=>	'Rekodiranje je primerno za spremembo ali združevanje vrednosti numeričnih in kategorialnih spremenljvk, kot tudi za uvrstitev določene vrednosti med manjkajoče. Za večje posege priporočamo rekodiranje v novo spremenljivko. <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/rekodiranje?from1ka=1" target="_blank">Več >></a>',
 	'srv_recode_note_text'						=>	'Za tekstovne spremenljivke izberite kodiranje.',
 	'srv_recode_confirm_delete'					=>	'Ali ste prepričani da želite izbrisati rekodirane vrednosti?',
 	'srv_recode_confirm_delete_sub'				=>	'Ali želite pobrisati tudi rekodirano spremenljivko:',
@@ -6262,46 +6007,44 @@ $lang = array (
 	'srv_recoded_advancetNote_recoded2'			=>	' je že rekodirana v drugo spremenljivko: ',
 	'srv_recoded_advancetNote_recoded3'			=>	'Spremenljivka: ',
 	'srv_recoded_advancetNote_recoded4'			=>	' je že rekodirana iz druge spremenljivke, zato nadalnje rekodiranje ni mogoče.',
-	'srv_auto_coding_end_title'					=>	'Uspešno kodiranje',
 	'srv_auto_coding_end'						=>	'Uspešno ste kodirali <b>%s</b> vrednosti.<br><br>Za ogled rezultatov in  nadaljnje popravke kliknite na %s',
-	'srv_hand_coding_text'						=>	'Kliknite za izbrano vrednost v tabeli in jo spremenite (kodirajte) v oknu, ki se odpre. <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kaksna-razlika-med-kodiranjem-rekodiranjem?from1ka=1" target="_blank">Več informacij.</a>',
+	'srv_hand_coding_text'						=>	'Kliknite za izbrano vrednost v tabeli in jo spremenite (kodirajte) v oknu, ki se odpre <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kaksna-razlika-med-kodiranjem-rekodiranjem?from1ka=1" target="_blank">Več >></a>',
 	'srv_popup_title'							=>	'Vključitev ankete v pop-up oknu (znotraj istega okna brskalnika)',
 	'srv_grid_add'								=>	'Dodaj možni odgovor',
 	'srv_grid_remove'							=>	'Odstrani odgovor',
 	'srv_te_progressbar'						=>	'Vrstica/indikator napredka',
 	'srv_te_progressbar_show'					=>	'Prikaži vrstico/indikator napredka',
 	'srv_te_survey_text'						=>	'Besedilo ankete',
-	'srv_te_survey_h_text'						=>	'Naslov ankete',
+	'srv_te_survey_h_text'						=>	'Besedilo naslova ankete',
 	'srv_te_outer_frame'						=>	'Zunanji okvir',
 	'srv_te_question_text'						=>	'Besedilo vprašanja',
-	'srv_te_question'							=>	'Vprašanja',
-	'srv_te_question_border'					=>	'Obroba',
+	'srv_te_question_border'					=>	'Okvir vprasanja',
 	'srv_te_question_border_0'					=>	'Brez',
 	'srv_te_question_border_1'					=>	'Črta',
 	'srv_te_question_border_2'					=>	'Okvir',
-	'srv_te_answers_text'						=>	'Odgovori',
+	'srv_te_answers_text'						=>	'Besedilo odgovorov',
 	'srv_te_remove_setting'						=>	'Odstrani lastno nastavitev',
 	'srv_te_font_family'						=>	'Pisava',
 	'srv_te_font_size'							=>	'Velikost pisave',
 	'srv_te_font_color'							=>	'Barva pisave',
 	'srv_te_background_color'					=>	'Barva ozadja',
 	'srv_te_default'							=>	'Privzeta',
-    'srv_te_custom_checkbox_radio'				=>	'IZBIRNI GUMBI IN POTRDITVENA POLJA',
+    'srv_te_custom_checkbox_radio'				=>	'Ikone za osebni računalnik',
     'srv_te_custom_mobile_checkbox_radio'		=>	'Ikone za mobilni telefon',
-    'srv_te_custom_icon_pc'                     =>  'Velikost',
-    'srv_te_custom_icon_pc_color' 				=> 	'Barva',
-    'srv_te_custom_icon_mobile'                 =>  'Velikost',
-    'srv_te_custom_icon_mobile_color'           =>  'Barva',
+    'srv_te_custom_icon_pc'                     =>  'Velikost ikon checkbox/radio',
+    'srv_te_custom_icon_pc_color' 				=> 	'Barva ikon checkbox/radio',
+    'srv_te_custom_icon_mobile'                 =>  'Velikost ikon checkbox/radio',
+    'srv_te_custom_icon_mobile_color'           =>  'Barva ikon checkbox/radio',
     'srv_te_custom_icon_accessibility'          =>  'Accessibility ikone',
 	'srv_te_custom_glossary_popup'				=> 	'Oblaček pri slovarju',
 	'srv_te_custom_glossary_keywords'			=> 	'Ključna beseda pri slovarju',
-	'srv_te_custom_border_size'              	=>  'Velikost obrobe',
-	'srv_te_custom_border_style'              	=>  'Oblika obrobe',
-	'srv_te_custom_border_color'              	=>  'Barva obrobe',
-	'srv_te_custom_border_radius'              	=>  'Ostrina roba',
-	'srv_te_custom_background_keywords'			=> 	'Barva ozadja',
-	'srv_te_custom_font_style_keywords'			=>  'Stil',
-	'srv_te_custom_font_style_keywords_bold'	=>  'Odebeljeno',
+	'srv_te_custom_border_size'              	=>  'Velikost obrobe oblačka',
+	'srv_te_custom_border_style'              	=>  'Oblika obrobe oblačka',
+	'srv_te_custom_border_color'              	=>  'Barva obrobe oblačka',
+	'srv_te_custom_border_radius'              	=>  'Ostrina roba oblačka',
+	'srv_te_custom_background_keywords'			=> 	'Barva ozadja ključne besede',
+	'srv_te_custom_font_style_keywords'			=>  'Stil ključne besede',
+	'srv_te_custom_font_style_keywords_bold'	=>  'Odobeljeno',
 	'srv_te_custom_font_style_keywords_italic'	=> 	'Poševno',
 	'srv_te_custom_font_style_keywords_underline'=> 'Podčrtano',
 	'srv_mv_Neustrezno'							=>	'Neustrezno',
@@ -6319,19 +6062,15 @@ $lang = array (
 	'srv_te_base_theme'							=>	'Tema za osnovo',
 	'srv_te_profile_name'						=>	'Izbrana prilagoditev teme',
 	'srv_te_theme_edit'							=>	'Prilagodi',
-	'srv_te_theme_activate'						=>	'Aktiviraj',
-	'srv_te_theme_activate2'					=>	'Aktiviraj temo',
-	'srv_te_theme_delete2'						=>	'Izbriši temo',
-	'srv_te_no_profiles'						=>	'Nimate še lastnih tem. Za prilagoditev teme kliknite na "Prilagodi" poleg imena trenutne teme. Uporabite lahko tudi naprednješe CSS urejanje teme.',
-	'srv_variableView_h_name'					=>	'Spremenljivka',
+	'srv_te_no_profiles'						=>	'Nimate še lastnih tem. Za prilagoditev teme, kliknite na "Prilagodi" poleg imena trenutne teme. Uporabite lahko tudi naprednješe CSS urejanje teme.',
+	'srv_variableView_h_name'					=>	'Ime',
 	'srv_variableView_h_type'					=>	'Tip',
 	'srv_variableView_h_width'					=>	'Št. celih mest',
 	'srv_variableView_h_decimals'				=>	'Št. decimalk',
-	'srv_variableView_h_label'					=>	'Vprašanje',
-	'srv_variableView_h_measure'				=>	'Merska lestvica',
+	'srv_variableView_h_label'					=>	'Labela',
+	'srv_variableView_h_measure'				=>	'Merjenje',
 	'srv_save_set_theme'						=>	'Izberi to temo za temo ankete',
 	'srv_lnk_back_to_data'						=>	'Nazaj',
-	'srv_lnk_data'							    =>	'Pregled podatkov',
 	'srv_lnk_vpogled'							=>	'Vpogled',
 	'srv_lnk_pregled_variabel'					=>	'Spremenljivke',
 	'srv_lnk_ego'								=>	'Ego',
@@ -6346,7 +6085,6 @@ $lang = array (
 	'srv_show_continue_later'					=>	'Opcija za nadaljevanje kasneje',
 	'srv_themes_select'							=>	'Izbira teme',
 	'srv_themes_mod'							=>	'Prilagoditev teme',
-	'srv_themes_mod2'							=>	'Trenutno urejate temo',
 	'srv_themes_edit'							=>	'CSS urejanje teme',
 	'srv_themes_edit_warning'					=>	'Opozorilo! Urejanje teme na lastno odgovornost!',
 	'srv_themes_upload_css'						=>	'Naložite lasten CSS',
@@ -6374,7 +6112,7 @@ $lang = array (
 	'srv_editing_mode_new_anketa'				=>	'Način urejanja ankete',
 	'srv_editing_mode_new_anketa_0'				=>	'Osnovni način',
 	'srv_editing_mode_new_anketa_1'				=>	'Napredni način',
-	'srv_email_example_txt'						=>	'Če želite ta e-mail uporabljati za pošiljanje, je treba v naprednih nastavitvah nastaviti, da je spremenljivka sistemska.',
+	'srv_email_example_txt'						=>	'Če želite ta e-mail uporabljati za pošiljanje je treba v naprednih nastavitvah označiti, da je sistemski.',
 	'srv_prikaz_default_valid'					=>	'Privzeta izbira ustreznih enot:',
 	'srv_prikaz_showItime'						=>	'Prikaži datum respondenta:',
 	'srv_prikaz_showLineNumber'					=>	'Prikaži številko vrstice respondenta:',
@@ -6405,7 +6143,7 @@ $lang = array (
 	'srv_telephone_save_new'					=>	'Shrani kot nov profil',
 	'srv_telephone_save'						=>	'Shrani profil',
 	'srv_telephone_add'							=>	'Dodaj',
-	'srv_telephone_navi_dashboard'				=>	'Analiza',
+	'srv_telephone_navi_dashboard'				=>	'Pregled',
 	'srv_telephone_navi_add'					=>	'Dodaj',
 	'srv_telephone_navi_view'					=>	'Preglej',
 	'srv_telephone_navi_start_call'				=>	'Začni',
@@ -6420,7 +6158,7 @@ $lang = array (
 	'srv_telephone_respondents_unsubscribed'	=>	'Odjavljeno',
 	'srv_telephone_respondents_pass'			=>	'Geslo',
 	'srv_telephone_respondents_password'		=>	'PASSWORD',
-	'srv_telephone_respondents_status'			=>	'Status klica',
+	'srv_telephone_respondents_status'			=>	'Status',
 	'srv_telephone_respondents_ime'				=>	'Ime',
 	'srv_telephone_respondents_firstname'		=>	'FIRSTNAME',
 	'srv_telephone_respondents_lastname'		=>	'LASTNAME',
@@ -6428,7 +6166,7 @@ $lang = array (
 	'srv_telephone_respondents_custom'			=>	'CUSTOM',
 	'srv_telephone_respondents_priimek'			=>	'Priimek',
 	'srv_telephone_respondents_telefon'			=>	'Telefon',
-	'srv_telephone_respondents_phone'			=>	'Telefonska številka',
+	'srv_telephone_respondents_phone'			=>	'PHONE',
 	'srv_telephone_respondents_email'			=>	'EMAIL',
 	'srv_telephone_respondents_schedule_call_time'	=>	'Naslednji klic',
 	'srv_telephone_respondents_comment'			=>	'Komentar',
@@ -6443,26 +6181,16 @@ $lang = array (
 	'srv_telephone_table_call_status'			=>	'Status klica',
 	'srv_telephone_status_'						=>	'Uporabnik še ni bil kontaktiran',
 	'srv_telephone_status_A'					=>	'»A« - Respondent je začel z anketiranjem',
-	'srv_telephone_status_A2'					=>	'Začel',
 	'srv_telephone_status_U'					=>	'»U« - Uspešno zaključena anketa',
-	'srv_telephone_status_U2'					=>	'Zaključen',
 	'srv_telephone_status_T'					=>	'»T« - Dogovorjen za drug termin',
-	'srv_telephone_status_T2'					=>	'Prestavljen',
 	'srv_telephone_status_P'					=>	'»P« - Anketa je bila prekinjena',
-	'srv_telephone_status_P2'					=>	'Prekinjen',
 	'srv_telephone_status_R'					=>	'»R« - Zavrnil',
-	'srv_telephone_status_R2'					=>	'Zavrnil',
 	'srv_telephone_status_Z'					=>	'»Z« - Zaseden',
-	'srv_telephone_status_Z2'					=>	'Zaseden',
 	'srv_telephone_status_N'					=>	'»N« - Nedosegljiv',
-	'srv_telephone_status_N2'					=>	'Nedosegljiv',
 	'srv_telephone_status_D'					=>	'»D« - Preložen',
-	'srv_telephone_status_D2'					=>	'Preložen',
-	'srv_telephone_add_sample' 					=> "000 111 222,Janez,Novak,<br/>000 333 444,,Novak",
-	'srv_telephone_call_start'				=>	'Začni s klicanjem',
+	'srv_telephone_add_sample' 					=> "040 987 654,Janez,Novak,g.<br/>040 987 654,,,ga.",
 	'srv_telephone_call_available'				=>	'Prostih telefonskih številk na voljo:',
 	'srv_telephone_calling_number'				=>	'Kličete številko:',
-	'srv_telephone_calling_number_info'				=>	'Podatki',
 	'srv_telephone_calling_number_end'			=>	'Zaključujete številko:',
 	'srv_telephone_calling_next_step'			=>	'Izberite naslednji korak izmed naslednjih možnosti:',
 	'srv_telephone_calling_step_action'			=>	'<span class="strong red">Izberite kaj se je zgodilo:</span>',
@@ -6475,21 +6203,19 @@ $lang = array (
 	'srv_telephone_call_action_cant_edit_R'		=>	'Uporabnik je zavrnil sodelovanje v telefonski anketi!',
 	'srv_telephone_call_action_cancel_preview'	=>	'Prekliči',
 	'srv_telephone_call_action_undo_status'		=>	'Pobriši zadnji status respondenta',
-	'srv_telephone_call_introduction'			=>	'Uvod',
-	'srv_telephone_call_comment'				=>	'Komentar anketarja na klic:',
-	'srv_telephone_call_anketar'				=>	'Anketar',
-	'srv_telephone_settings_access_list'		=>	'Seznam anketarjev in urednikov z dostopom',
-	'srv_telephone_settings_access_list_link'	=>	' (podrobno lahko urednike urejate <a href="%s">tukaj</a>):',
-	'srv_telephone_no_respondents'				=>	'V bazi nimate respondentov s telefonskimi številkami.',
+	'srv_telephone_call_introduction'			=>	'Uvod:',
+	'srv_telephone_call_comment'				=>	'Morebitni komentar anketarja na to številko:',
+	'srv_telephone_settings_access_list'		=>	'Seznam anketarjev in urednikov z dostopom:',
+	'srv_telephone_settings_access_list_link'	=>	' (podrobno lahko urednike urejate <a href="%s">tukaj</a>)',
+	'srv_telephone_no_respondents'				=>	'V bazi nimate respondentov z telefonskimi številkami.',
 	'srv_telephone_dashboard_legend'			=>	'Sumarni pregled telefonske ankete:',
 	'srv_telephone_dashboard_legend_finished'	=>	'Sumarni pregled zaključenih anket:',
-	'srv_telephone_dashboard_legend_datum'	=>	'Počisti datum',
-	'srv_telephone_dashboard_legend_anketar'	=>	'Pregled stanja klicev po anketarjih',
+	'srv_telephone_dashboard_legend_anketar'	=>	'Pregled stanja klicev po anketarjih:',
 	'srv_telephone_dashboard_all_respondents'	=>	'Vseh enot s telefonsko številko:',
 	'srv_telephone_dashboard_all_contacted'		=>	'Vseh klicanih enot:',
 	'srv_telephone_dashboard_all_started'		=>	'Enot, ki so začele izpolnjevati:',
-	'srv_telephone_call_mark_T_note'			=>	'Številka je dogovorjena čez 60min, oziroma določite nov datum in uro.',
-	'srv_telephone_call_mark_P_note'			=>	'Številka je prekinjena za 60min, oziroma določite nov datum in uro.',
+	'srv_telephone_call_mark_T_note'			=>	'Številka je dogovorjena čez 60min,<br/>oziroma določite nov datum in ure.',
+	'srv_telephone_call_mark_P_note'			=>	'Številka je prekinjena za 60min,<br/>oziroma določite nov datum in ure.',
 	'srv_coding_one'							=>	'Kodiraj eno vrednost na odgovor',
 	'srv_coding_multi'							=>	'Kodiraj več vrednosti na odgovor',
 	'srv_profileManager_link'					=>	'Profili',	
@@ -6520,26 +6246,10 @@ $lang = array (
 	'srv_enote_navedbe_2'						=>	'Navedbe: vsaka enota se lahko upošteva večkrat; število navedb je lahko večje kot število enot.',
 	'srv_line_number'							=>	'Zap. št.',
 	'srv_dostop_users'							=>	'Dostop do ankete imajo',
-	'srv_dostop_users_list'						=>	'Seznam uporabnikov z dostopom do urejanja ankete',
-	'srv_dostop_users_username'					=>	'Uporabniško ime',
-	'srv_dostop_users_email'					=>	'Email naslov',
-	'srv_dostop_users_removeselected'			=>	'Odstrani označene',
 	'srv_dataIcons_multiple'					=>	'Kombinirana tabela',
 	'srv_incremental_lock_message'				=>	'Poteka priprava podatkov za pregled in analize. Prosimo počakajte trenutek!',
-	'srv_archive_test_data_text1'				=> 	'Vsak testni vnos podatkov (',
-	'srv_archive_test_data_text1a'				=> 	'\'TESTIRANJE\' - \'Avtomatski vnosi\'',
-	'srv_archive_test_data_text2'				=> 	' ali ',
-	'srv_archive_test_data_text2a'				=> 	'ročni testni vnos',
-	'srv_archive_test_data_text3'				=>	') se avtomatsko shrani v spodnjo časovnico.',
-	'srv_archive_test_data_count'				=>	'Število testnih vnosov',
-	'srv_archive_test_data_date'				=>	'Datum testnih vnosov',
-	'srv_archive_test_data_timeline_manual'		=>	'Časovnica ročnih testnih vnosov za vprašalnik ',
-	'srv_archive_test_data_timeline_auto'		=>	'Časovnica avtomatskih testnih vnosov za vprašalnik ',
-	'srv_archive_test_data_none1'				=>	'V vprašalniku ',
-	'srv_archive_test_data_none2'				=>	' še ni ',
-	'srv_archive_test_data_none_manual'		=>	'ročnih ',
-	'srv_archive_test_data_none_automatic'			=>	'avtomatskih ',
-	'srv_archive_test_data_none3'				=>	'testnih vnosov',
+	'srv_archive_test_data_count'				=>	'Število testnih podatkov: ',
+	'srv_archive_test_data_auto'				=>	'. Avtomatsko dodanih: ',
 	'srv_inv_condition_filter'					=>	'Pogoji: ',
 	'srv_inv_condition_no_filter'				=>	'Brez ',
 	'srv_inv_condition_new_filter'				=>	'Nov filter',
@@ -6568,7 +6278,6 @@ $lang = array (
 	'srv_test_sett_txt'							=>	'Uredniške nastavitve testiranja in komentarjev',
 	'srv_users_viewing'							=>	'aktivnih urednikov',
 	'srv_users_viewing2'						=>	'Trenutno aktivni uredniki',
-	'srv_users_viewing3'						=>	'Število aktivnih urednikov',
 	'srv_users_add_new'							=>  'Nov uporabnik',
 	"srv_users_add_new_title"					=>	'Ustvarite novega uporabnika v sistemu <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span>',
 	'srv_users_add_assigned'					=>  'Dodajte pregled nad uporabniki',
@@ -6576,9 +6285,9 @@ $lang = array (
 	'srv_users_add_assigned_max_reached'		=>  'Dosegli ste maksimalno število uporabnikov v pregledu.',
 	'srv_users_add_assigned_max_1'				=>  'Dostop do vaše domene lahko dodelite največ',
 	'srv_users_add_assigned_max_2'			    =>  'uporabnikom.',
-	"srv_users_add_assigned_title"				=>	'Ustvarite novega uporabnika, nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span></span>',
+	"srv_users_add_assigned_title"				=>	'Ustvarite novega uporabnika nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span></span>',
 	"srv_users_assigned_title"				    =>	'Uporabniki nad katerimi imate pregled',
-	'srv_uredniske_nastavitve'					=>	'Uredniške nastavitve testiranja',
+	'srv_uredniske_nastavitve'					=>	'Uredniške nastavitve',
 	'srv_q_inicialke'							=>	'Respondenti naj vnesejo tudi svoje inicialke',
 	'srv_q_inicialke_alert'						=>	'Opozorilo za inicialke',
 	'srv_enter_inicialke'						=>	'Prosimo, vnesite še vaše inicialke (zgoraj desno)',
@@ -6659,8 +6368,7 @@ $lang = array (
 	'srv_data_column_naslov_map'				=>	'Naslov',
 	'srv_data_column_vrednost_map'				=>	'Vrednost',
 	'srv_data_column_koordinate_map'			=>	'Koordinate',
-	'srv_comments_on_alert'						=>	'Komentarji so sedaj vklopljeni',
-	'srv_comments_on_alert1'					=>	'Če vklop komentarjev ni bil storjen namerno, lahko komentarje izklopite',
+	'srv_comments_on_alert'						=>	'Komentarji so sedaj vklopljeni.',
 	'srv_comments_on_alert2'					=>	'Dodatne nastavitve lahko uredite spodaj.',
 	'srv_off'									=>	'Izklopi',
 	'srv_para_neodgovori'						=>	'Neodgovor spremenljivke',
@@ -6715,7 +6423,7 @@ $lang = array (
 	'srv_edits_analysis_num_sessions'			=>	'Število seans',
 	'srv_edits_analysis_editing_details'		=>	'Podrobnosti urejanja',
 	'srv_edits_analysis_graph'					=>	'Graf urejanja',
-	'srv_cookie_alert_title'					=>	'Uporaba piškotkov',
+	'srv_cookie_alert_title'					=>	'<b>Pozor!</b>',
 	'srv_cookie_alert_1'						=>	'Vklopili ste piškotke oziroma kukije (cookies).',
 	'srv_cookie_alert_2'						=>	'Preverite, če jih res potrebujete, posebej pa preverite potencialen konflikt z drugimi identifikatorji! <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/nastavitve-za-dostop-respondentov-piskotki-ip-naslovi-gesla-sistemsko-prepoznavanja?from1ka=1" target="_blank">Več >></a>',
 	'srv_cookie_alert'							=>	'Respondent bo ob prihodu na stran dobil obvestilo, da stran uporablja piškotke! <a href="https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/politika-zasebnosti?from1ka=1" target="_blank">Več >></a>',
@@ -6730,14 +6438,12 @@ $lang = array (
 	'srv_privacy_text_1'						=>	'S klikom na Naslednja stran se strinjate z našo <a href="https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/politika-zasebnosti?from1ka=1" target="_blank">Politiko zasebnosti</a>.',
 	'srv_privacy_text_2'						=>	'Strinjam se s <a href="https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/politika-zasebnosti?from1ka=1" target="_blank">Politiko zasebnosti</a>.',
 	'srv_comment_splosen'						=>	'Splošen komentar',
-	'srv_appendmerge_source'					=>	'Vir podatkov - podatke bom:',
-	'srv_iz_seznama'							=>	'Vnesel iz seznama (ločeno z vejico)',
-	'srv_iz_excela'								=>	'Uvozil iz Excelove datoteke (v formatu .xls)',
+	'srv_iz_seznama'							=>	'Iz seznama (ločeno z vejico)',
+	'srv_iz_excela'								=>	'Iz Excelove datoteke (v formatu .xls)',
 	'srv_iz_excela_xls_error'					=>	'Napačen format datoteke! Datoteka mora biti v formatu .xls.',
-	'srv_izberite_identifikator'				=>	'Izberite polje, po katerem želite izvesti združevanje (ključ):',
+	'srv_izberite_identifikator'				=>	'Izberite polje po katerem želite izvesti združevanje (identifikator):',
 	'srv_show'									=>	'Prikaži',
 	'srv_recnum'								=>	'Zap. št.',
-	'srv_recnum_long'							=>	'Zaporedna številka respondenta',
 	'srv_recnum2'								=>	'Recnum',
 	'srv_aapor'									=>	'AAPOR kalkulacije',
 	'srv_languages_statistics'					=>	'Statistika jezikov',
@@ -6763,12 +6469,12 @@ $lang = array (
 	'srv_email_setting_encryption_none'			=>  'Brez',
 	'srv_email_setting_encryption_ssl'			=>  'SSL',
 	'srv_email_setting_encryption_tls'			=>  'TLS',
-	'srv_email_setting_port'					=>  'Vrata ',
-	'srv_email_setting_port_note'				=>  '(v večini standardna: 25, 465, 587)',
+	'srv_email_setting_port'					=>  'Vrata: ',
+	'srv_email_setting_port_note'				=>  '(V večini primerov, standardna vrata: 25, 465 ali 587)',
 	'srv_email_setting_host'					=>  'Strežnik: ',
 	'srv_email_setting_btn_test'				=>  'Preveri nastavitve',
 	'srv_email_setting_btn_save'				=>  'Shrani',
-	'srv_email_setting_smtp_delay'				=>  'Čas. zamik pri posam. pošiljanju',
+	'srv_email_setting_smtp_delay'				=>  'Časovni zamik pri posameznem pošiljanju',
 	'srv_parapodatki'							=>	'Napredni parapodatki',
 	'pasteFromWordAlert'						=>	'<b>Kopiranje besedila močno odsvetujemo!</b> <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/zakaj-priporocljivo-kopiranje-besedila?from1ka=1" target="_blank">Več >></a>',
 	'srv_interaktivni_elementi'					=>	'Interaktivni elementi',
@@ -6780,7 +6486,7 @@ $lang = array (
 	'srv_para_show_rows_other'					=>	'Prikaži polja "drugo"',
 	'srv_para_show_rows_text'					=>	'Prikaži polja tipa "besedilo"',
 	'srv_para_variable'							=>	'Spremenljivka',
-	'srv_para_question'							=>	'Labela',
+	'srv_para_question'							=>	'Vprašanje',
 	'srv_para_valid'							=>	'Veljavni',
 	'srv_para_approp'							=>	'Ustrezni',
 	'srv_para_nonconceptual'					=>	'Prikazano',
@@ -6789,7 +6495,6 @@ $lang = array (
 	'srv_para_unaswered'						=>	'Neodgovor spremenljivk',
 	'srv_para_unaswered_short'					=>	'NS',
 	'srv_para_unaswered_graph_title'			=>	'Neodgovor spremenljivke (NS) - grafični prikaz', #'Grafični prikaz stopnje neodgovora spremenljivke (%)',
-	'srv_para_unaswered_graph_title_br'			=>	'Neodgovor spremenljivke<br>(NS) - grafični prikaz',
 	'srv_para_breaks'							=>	'Prekinitve',
 	'srv_para_breaks_delta'						=>	'Porast prekinitve',
 	'srv_para_breaks_value'						=>	'Stopnja prekinitev',
@@ -6801,12 +6506,12 @@ $lang = array (
 	'srv_para_breaks_value_bruto_short'			=>	'BSP<br/>[%]',
 	'srv_para_breaks_value_neto_short'			=>	'NSP<br/>[%]',
 	'srv_para_breaks_graph_title'				=>	'Stopnja prekinitve (SP) - grafični prikaz', #'Grafični prikaz stopnje neodgovora spremenljivke (%)',
-	'srv_para_show_question_advanced'			=>	'Labela',
-	'srv_para_show_show_graph_advanced'			=>	'Graf',
-	'srv_para_show_question_basic'				=>	'Labela',
-	'srv_para_show_show_graph_basic'			=>	'Graf',
-	'srv_para_show_question_breaks'				=>	'Labela',
-	'srv_para_show_show_graph_breaks'			=>	'Graf',
+	'srv_para_show_question_advanced'			=>	'Prikaži besedilo vprašanja',
+	'srv_para_show_show_graph_advanced'			=>	'Prikaži grafe',
+	'srv_para_show_question_basic'				=>	'Prikaži besedilo vprašanja',
+	'srv_para_show_show_graph_basic'			=>	'Prikaži graf',
+	'srv_para_show_question_breaks'				=>	'Prikaži besedilo vprašanja',
+	'srv_para_show_show_graph_breaks'			=>	'Prikaži graf',
 	'srv_para_close_settings'					=>	'Zapri nastavitve',
 	'srv_para_graph_type'						=>	'V grafu prikaži',
 	'srv_para_graph_type0'						=>	'Stopnjo prekinitve',
@@ -6845,8 +6550,7 @@ $lang = array (
 	'srv_para_graph_ustrezni'					=>	'Ustrezni',
 	'srv_para_graph_text'						=>	'Parapodatki beležijo tehnične lastnosti respondentove naprave, preko katere odgovarja na anketo. <a href="https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/parapodatki" target="_blank">Več >></a>',
 	'srv_other_size'							=>	'Polje drugo',
-	'srv_predvidenicasi_help'					=>	'Vsem uporabnikom lastne inštalacije 1KA odsvetujemo spreminjanje časovnih nastavitev, saj se bo z vsako posodobitvijo verzije vsebina prepisala. Za spremembo obvestite <a href="https://www.1ka.si/d/sl/o-1ka/kontakt" target="_blank">Center za pomoč</a>.',
-	'srv_predvidenicasi_note'					=>	'V spodnji tabeli je za vsak tip vprašanja predviden čas, ki ga respondent porabi za vprašanje in odgovore. Izračuni so narejeni glede na število znakov, ki jih vsebuje vprašanje.',
+	'srv_predvidenicasi_help'					=>	'<p>Vsem uporabnikom lastne inštalacije 1KA odsvetujemo spreminjanje časovnih nastavitev, saj se bo z vsako posodobitvijo verzije vsebina prepisala. Za spremembo obvestite <a href="https://www.1ka.si/d/sl/o-1ka/kontakt" target="_blank">Center za pomoč</a>.</p>',
 	'srv_replay_to'								=> 	'Odgovor za',
 	'srv_noSurvey_settings'						=> 	'Vpiši osnovne značilnosti ankete',
 	'srv_noSurvey_skin'							=> 	'Izberi vizualno predlogo ankete',
@@ -6895,14 +6599,13 @@ $lang = array (
 	'srv_zanka_settings'						=>	'Nastavitve skupin',
 	'srv_missing_settings'						=>	'Nastavitve manjkajočih vrednosti',
 	'srv_preview'								=>	'Predogled',
-	'srv_preview_computer'						=>	'Računalnik',
-	'srv_preview_mobile'						=>	'Mobitel',
+	'srv_preview_mobile'						=>	'Mobilnik',
 	'srv_preview_tablet'						=>	'Tablica',
 	'srv_all_vars'								=>	'Vse variable',
 	'srv_default_without'						=>	'Privzeto - brez',
 	'srv_survey_info'							=>	'Podatki o anketi',
-	'srv_monitor_toolbox_title'					=>	'Predogled ankete',
-	'srv_monitor_toolbox_preview'				=>	'Predogled brez komentiranja in shranjevanja vnosov.',
+	'srv_monitor_toolbox_title'					=>	'Predogled in testni vnosi',
+	'srv_monitor_toolbox_preview'				=>	'brez komentarjev in shranjevanja vnosov',
 	'srv_monitor_toolbox_test'					=>	'možnost komentiranja, shranjevanje testnih vnosov',
 	'sort_by_title'								=>	'Naslov ankete',
 	'sort_by_qcount'							=>	'Število vprašanj',
@@ -6952,16 +6655,13 @@ $lang = array (
 	'more'										=>	'še',
 	'more2'										=>	'Več',
 	'srv_settings_activity'						=>	'Aktivnost / kvote',
-	'srv_settings_oncreation'					=>	'Ob kreaciji ankete',
-	'srv_settings_onactivation'					=>	'Ob aktivaciji ankete',
-	'srv_settings_autoActiveSurvey'				=>	'Anketa je aktivna',
-	'srv_settings_activeComments'				=>	'Komentarji so vklopljeni',
+	'srv_settings_autoActiveSurvey'				=>	'Anketa je ob kreaciji aktivna',
+	'srv_settings_activeComments'				=>	'Komentarji so ob kreaciji vklopljeni',
 	'srv_settings_advancedMySurveys'			=>	'Napredni vmesnik za "Moje ankete"',
-	'srv_settings_interfaceshow'				=>	'V vmesniku prikaži',
-	'srv_settings_oneClickCreate'				=>	'Možnost kreiranja ankete z enim klikom (ENKLIK kreiranje)',
-	'srv_settings_language_shortcut' 			=> 	'Ikono za izbiro jezika v statusni vrstici ankete',
-	'srv_settings_showSAicon'					=> 	'Ikono za hitro aktiviranje SA modula',
-	'srv_language_mySurveys'					=>	'Jezik za "Moje ankete" lahko urejate v <a href="index.php?a=nastavitve&m=global_user_settings">nastavitvah uporabnika</a>',
+	'srv_settings_oneClickCreate'				=>	'Možnost enklik kreiranja ankete',
+	'srv_settings_language_shortcut' 			=> 	'Prikaži ikono za izbiro jezika v statusni vrstici ankete',
+	'srv_settings_showSAicon'					=> 	'Prikaži ikono za hitro aktiviranje SA modula',
+	'srv_language_mySurveys'					=>	'Jezik za "Moje ankete" lahko urejate v <a href="index.php?a=nastavitve&m=global_user_settings"><b>nastavitvah uporabnika</b></a>',
 	'srv_public_link_title'						=>	'Javne povezave do podatkov',
 	'srv_public_link_noLink'					=>	'Anketa še nima povezav!',
 	'srv_public_link_addLink'					=>	'Dodaj novo povezavo',
@@ -7070,9 +6770,9 @@ $lang = array (
 	'edit_hide'			                		=>  "Skrij",
 	'edit_show'			                		=>  "Prikaži",
 	'srv_show_title'			               	=>  "Naslov ankete za uporabnike",
-	'srv_create_show_intro'			            =>  "Uvod je viden respondentom",
-	'srv_create_show_concl'			            =>  "Zaključek je viden respondentom",
-	'srv_create_show_title'			            =>  "Naslov ankete je viden respondentom",
+	'srv_create_show_intro'			            =>  "Uvod je ob kreaciji prikazan",
+	'srv_create_show_concl'			            =>  "Zaključek je ob kreaciji prikazan",
+	'srv_create_show_title'			            =>  "Naslov ankete je ob kreaciji prikazan za respondente",
 	'srv_displayData_search'		            =>  "Podatki so filtrirani",
 	'srv_signature_clear'		            	=>  "Počisti podpis",
 	'srv_signature_name'		            	=>  "Podpis osebe:",
@@ -7278,23 +6978,17 @@ $lang = array (
 	'srv_notifications'							=>	"Sporočila",
 	'srv_notifications_recieved'				=>	"Prejeta sporočila",
 	'srv_notifications_sent'					=>	"Poslana sporočila",
-	'srv_notifications_sent_none'				=>	"Ni poslanih sporočil",
-	'srv_notifications_sent_success'			=>	"Sporočilo je bilo uspešno poslano uporabniku",
-	'srv_notifications_sent_nouser1'			=>	"Vnešeni e-mail (",
-	'srv_notifications_sent_nouser2'			=>	") ne pripada nobenemu uporabniku!",
-	'srv_notifications_sent_resolve'			=>	"Ne prikazuj več uporabnikom",
+	'srv_notifications_sent_resolve'			=>	"Razreši neprebrane",
 	'srv_notifications_unread'					=>	"Neprebrana sporočila",
 	'srv_notifications_alert'					=>	"Imate novo neprebrano sporočilo!",
 	'srv_notifications_admin_alert'				=>	"Pošiljanje je omogočeno samo administratorjem!",
-	'srv_notifications_send_reciever2'			=>	"Prejemnik (e-pošta)",
-	'srv_notifications_send_reciever2'			=>	"Prejemniki",
+	'srv_notifications_send_reciever'			=>	"Prejemnik (e-pošta)",
 	'srv_notifications_send_title'				=>	"Naslov",
-	'srv_notifications_send_text'				=>	"Sporočilo",
+	'srv_notifications_send_text'				=>	"Besedilo",
 	'srv_notifications_send'					=>	"Pošlji",
 	'srv_notifications_save_send'				=>	"Shrani in pošlji",
-	'srv_notifications_send_all_slo'			=>	"Vsi slovenski uporabniki",
-	'srv_notifications_send_all_ang'			=>	"Vsi angleški uporabniki",
-	'srv_notifications_send_custom'				=>	"E-poštni naslov po meri:",
+	'srv_notifications_send_all_slo'			=>	"Pošlji vsem slovenskim uporabnikom",
+	'srv_notifications_send_all_ang'			=>	"Pošlji vsem angleškim uporabnikom",
 	'srv_notifications_force_show'				=>	"Prikaži obvestilo avtomatsko po prijavi",
 	'slider_min_label_note'						=>	"Labela za Min",
 	'slider_max_label_note'						=>	"Labela za Max",
@@ -7324,12 +7018,11 @@ $lang = array (
 	'srv_newSurvey_survey_new'	      	 	=> "Nova anketa",
 	'srv_newSurvey_survey_new2'	      	 	=> "Ustvari novo anketo",
 	'srv_newSurvey_survey_new_folder' 	 	=> "Shrani anketo v mapo",
-	'srv_newSurvey_survey_new_folder_def' 	=> "-- Izberi mapo --",
+	'srv_newSurvey_survey_new_folder_def' 	=> "Izberi mapo",
 	'srv_newSurvey_survey_template'	       	=> "1KA predloge",
 	'srv_newSurvey_survey_template2'	    => "Ustvari anketo iz predloge",
 	'srv_newSurvey_survey_template_type'	=> "Tip ankete",
 	'srv_newSurvey_survey_template_preview'	=> "Predogled",
-	'srv_newSurvey_survey_template_choose'	=> "Izberi predlogo",
 	'srv_newSurvey_survey_template_cat0'	=> "Vse predloge",
 	'srv_newSurvey_survey_template_cat1'	=> "Evalvacija spletne strani",
 	'srv_newSurvey_survey_template_cat2'	=> "Izobraževanje",
@@ -7344,22 +7037,17 @@ $lang = array (
 	'srv_newSurvey_survey_template_error'	=> "Prosimo izberite predlogo",
 	'srv_newSurvey_survey_copy'	    		=> "Moje 1KA ankete",
 	'srv_newSurvey_survey_copy_title'	    => "Kopiraj svojo obstoječo anketo",
-	'srv_newSurvey_survey_copy_paragraph'	    => "Iz seznama izberi anketo in klikni gumb \"Naprej\". Ustvarila se bo kopija izbrane ankete.",
-	'srv_newSurvey_survey_copy_dropdown'	    => "-- Izberi anketo --",
 	'srv_newSurvey_survey_copy_text'	    => "Naslov obstoječe ankete",
-	'srv_newSurvey_survey_archive'	       	=> "Uvoz .1ka datoteke",
-	'srv_newSurvey_survey_archive_choosefile'	       	=> "Izberi datoteko",
+	'srv_newSurvey_survey_archive'	       	=> "Uvoz \".1ka\" format",
 	'srv_newSurvey_survey_archive2'	       	=> "Uvozi 1ka anketo iz arhiva",
-	'srv_newSurvey_survey_archive_title'   	=> "Restavriraj anketo iz arhivske .1ka datoteke",
+	'srv_newSurvey_survey_archive_title'   	=> "Uvozi 1ka anketo (restavriraj anketo iz arhivske datoteke)",
 	'srv_newSurvey_survey_archive_text'   	=> "Iz arhivske datoteke se bo ustvarila kopija arhivirane ankete",
-	'srv_newSurvey_survey_archive_text2'   	=> "Uvozi se lahko anketa, ki je bila v arhivu predhodno shranjena kot datoteka s končnico .1ka.",
+	'srv_newSurvey_survey_archive_text2'   	=> "Uvozite lahko anketo, ki ste jo iz arhiva predhodno shranili kot datoteko v formatu .1ka.",
 	'srv_newSurvey_survey_archive_error1'  	=> "Pri uvozu ankete je prišlo do napake. Preverite, če ste izbrali ustrezno datoteko s končnico .1ka.",
 	'srv_newSurvey_survey_archive_error2'  	=> "Pri uvozu ankete je prišlo do napake. Zbrane datoteke ni mogoče uvoziti.",
 	'srv_newSurvey_survey_from_text'	    => "Uvoz besedila",
 	'srv_newSurvey_survey_from_text_title'	=> "Prilepi besedilo",
-	'srv_newSurvey_survey_from_text_text1'	=> "Za vsako vprašanje morajo biti kategorije odgovorov v svoji vrstici. V primeru tabele je v svoji vrstici vsako vprašanje.",
-	'srv_newSurvey_survey_from_text_text2'	=> "Med vprašanji mora biti prazna vrstica.",
-	'srv_newSurvey_survey_from_text_text3'	=> "Ostale podrobnosti se lahko uredi po uvozu ankete (npr. sprememba vprašanja v tabelo podvprašanj, sprememba radio gumbov v checkbox).",
+	'srv_newSurvey_survey_from_text_text'	=> "Med vprašanji mora biti prazna vrstica.<br><br>Za vsako vprašanje morajo biti kategorije odgovorov v svoji vrstici. V primeru tabele je v svoji vrstici vsako vprašanje.<br><br>Ostale vidike se uredi v urejanju (npr. sprememba vprašanja v tabelo podvprašanj, sprememba radio gumbov v checbox).",
 	'srv_newSurvey_survey_from_text_example'	=> "Naslov vprašanja 1\r\nVrednost 1\r\nVrednost 2\r\nVrednost 3\r\n\r\nNaslov vprašanja 2\r\nVrednost 1\r\nVrednost 2\r\nVrednost 3",
 	
 	
@@ -7686,9 +7374,8 @@ $lang = array (
 	'srv_diferencial_trak_starting_num'			=>	"Trak začni s številom",
 	'srv_api'				=> 	"API",
 	'srv_api_auth'			=> 	"Pridobitev ključa za API",
-	'srv_api_auth2'			=> 	"Generiranje ključa",
+	'srv_api_auth2'			=> 	"Generiraj",
 	'srv_api_auth_title'	=> 	"Podatki za API dostop",
-	'srv_api_auth_private'	=> 	"Zasebni ključ",
 	'srv_login_tracking_title'	=> 	"Zgodovina prijav",
 	'srv_login_tracking_noData'	=> 	"Ni podatkov o prijavah",
 	'srv_login_tracking_time'	=> 	"Ura prijave",
@@ -7696,8 +7383,6 @@ $lang = array (
 	'srv_last_login'			=> 	"Zadnja prijava",
 	'ob'			=> 	"ob",
     'srv_profil_aai_warning'    => '1KA profil je vezan na vaš AAI račun. Vse spremembe urejate v vašem AAI profilu.',
-    'srv_profil_settings_text'    => 'Uporabniške podatke, ki ste jih nastavili ob prijavi, lahko spreminjate tukaj. Za vsako spremembo je obvezen vpis in potrditev gesla.',
-    'srv_profil_settings_addemail'    => 'Dodaj e-mail',
 	'srv_drag_and_drop_new_look_option'      				=>	"Prikaži odgovore v obliki",
 	'srv_drag_and_drop_new_look_option1'      				=>	"okvirjev",
 	'srv_drag_and_drop_new_look_option2'      				=>	"škatel",
@@ -7753,7 +7438,7 @@ $lang = array (
 	'srv_export_no_chart' => "Ni ustreznega grafa za prikazovanje",
 	'srv_export_2_xls_button' => "Izvozi v Excel",
 	'srv_pc_unavailable' => "Prikaz slike ni mogoč",
-    "additional_info_api"       =>      "<a href=\"https://www.1ka.si/d/sl/o-1ka/1ka-api\" target=\"_blank\"><p>Dodatne informacije</p></a>",
+    "additional_info_api"       =>      "<a href=\"https://www.1ka.si/d/sl/o-1ka/1ka-api\" target=\"_blank\"><span class=\"bold\">Dodatne informacije</span></a>",
 
     
 
@@ -7765,7 +7450,7 @@ $lang = array (
     'as_modules'    => "Nastavitve dodatnih modulov",
 
     'as_debug'              => "Debug mode",
-    'as_installation_type'  => "Tip namestitve",
+    'as_installation_type'  => "Tip namestitve (0-lastna, 1-www, 2-aai, 3-virtualka)",
 
     'as_app_settings-app_name'              => "Ime aplikacije",
     'as_app_settings-admin_email'           => "Email administratorja",
@@ -7866,14 +7551,8 @@ $lang = array (
     'srv_narocilo_paket'                => "Paket",
     'srv_narocilo_trajanje'             => "Trajanje",
     'srv_narocilo_trajanje_mesecev'     => "mesecev",
-	'srv_narocilo_trajanje_1'     => "mesec",
-    'srv_narocilo_trajanje_2'     => "meseca",
-    'srv_narocilo_trajanje_3_4'     => "meseci",
-    'srv_narocilo_trajanje_5'     => "mesecev",
-    'srv_narocilo_veljavnodo'     => "Paket veljaven do:",
     'srv_narocilo_cena_brez_popusta'    => "Cena brez popusta",
     'srv_narocilo_cena'                 => "Končna cena",
-    'srv_narocilo_samo_cena'                 => "Cena",
     'srv_narocilo_popust'               => "Popust",
     'srv_narocilo_nacin_placila'        => "Način plačila",
     'srv_narocilo_nacin_placila_1'      => "Bančno nakazilo",
@@ -7970,9 +7649,8 @@ $lang = array (
     // DOSTOP GLEDE NA PAKET
     'srv_access_no_access_not_author' => "Avtor ankete nima zakupljenega ustreznega paketa, ki vključuje to funkcionalnost.",
     'srv_access_no_access'          => "Funkcionalnost je na voljo samo v plačljivi verziji orodja 1KA v paketu",
-	'paket_opis_1ka'				=> "Osnovni 1KA",
-	'paket_opis_2ka'				=> "Napredni 2KA",
-	'paket_opis_3ka'				=> "Profesionalni 3KA",
+	'paket_opis_2ka'				=> "Napredni (2KA)",
+	'paket_opis_3ka'				=> "Profesionalni (3KA)",
     'srv_access_package'            => "Aktivni paket",
     'srv_access_package_free'       => "brezplačno",
     'srv_access_package_valid'      => "velja do",
@@ -8012,6 +7690,7 @@ $lang = array (
     'simple_footer_about_cookies'   => "<a href=\"https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/politika-piskotkov\" target=\"_blank\">Politika piškotkov</a>",
     'simple_footer_about_antispam'  => "<a href=\"https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/antispam-politika\" target=\"_blank\">Antispam politika</a>",
     'simple_footer_about_follow'    => "Spremljajte nas",
+	'simple_footer_namestitev'    => "Namestitev omogočajo",
 
     'simple_footer_company'         => "Organizacija",
     'simple_footer_company_contact' => "Kontakt",
@@ -8020,7 +7699,8 @@ $lang = array (
     'simple_cookie_1'     => "Spletno mesto uporablja piškotke zaradi boljše uporabniške izkušnje.",
     'simple_cookie_2'     => "Z uporabo naše spletne strani potrjujete, da se z njihovo uporabo strinjate. <a href=\"https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-1ka/politika-piskotkov\">Več o uporabi piškotkov >></a>",
     'simple_cookie_button'=> "Da, strinjam se",
-
+	
+	
 	
 	// GDPR //
 	'srv_gdpr' => "GDPR",
@@ -8028,11 +7708,11 @@ $lang = array (
 	'srv_gdpr_general_settings' => "Splošne GDPR nastavitve",
 	'srv_gdpr_general_settings_warning' => "Prosimo izpolnite osebne podatke GDPR profila!",
 	'srv_gdpr_user_settings' 		=> "Splošne nastavitve",
-	'srv_gdpr_user_settings_title' 	=> "Splošne GDPR nastavitve",
-	'srv_gdpr_user_settings_desc1' 	=> "S 25. majem 2018 je v veljavi nova Splošna uredba o varstvu podatkov (<a href=\"https://gdpr.eu/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>), ki opredeljuje tudi način zbiranja podatkov in respondentom zagotavlja možnost izbrisa, vpogleda, prenosa, omejitve obdelave ali spremembe zbranih osebnih in/ali anketnih podatkov.",
+	'srv_gdpr_user_settings_title' 	=> "GDPR nastavitve profila",
+	'srv_gdpr_user_settings_desc1' 	=> "S 25. majem 2018 je v veljavi nova Splošna uredba o varstvu podatkov (<a href=\"http://www.eugdpr.org/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>), ki opredeljuje tudi način zbiranja podatkov in respondentom zagotavlja možnost izbrisa, vpogleda, prenosa, omejitve obdelave ali spremembe zbranih osebnih in/ali anketnih podatkov.",
 	'srv_gdpr_user_settings_desc2' 	=> "V skladu s tem je na vaši strani, kot izvajalcu ankete in s tem upravljalcu osebnih podatkov, <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/pravice-respondentov-odgovornosti-urednikov-anket-okviru-gdpr\" target=\"_blank\"><span class=\"bold\">odgovornost</span></a>, da izvršite omenjene zahteve, ki jih na vaših anketah podajo respondenti (zahteva za izbris, vpogled ali spremembo osebnih in/ali anketnih podatkov).",
 	'srv_gdpr_user_settings_desc3' 	=> "Prosimo vas, da izpolnite spodnji obrazec s svojimi podatki. Podatke potrebujemo za pripravo informacij, ki morajo biti v skladu z GDPR na voljo posamezniku (respondentu). Če gre za organizacijo, vnesite tudi podatke o pooblaščeni osebi za varstvo osebnih podatkov (<a href=\"https://www.uradni-list.si/e-bilten/novica/pooblascena-oseba-za-varstvo-podatkov\" target=\"_blank\"><span class=\"bold\">DPO</span></a>). Vnesene podatke bomo uporabili zgolj za namene procesiranja zahtevkov.",
-	'srv_gdpr_user_settings_err' 	=> "Polja označena z * so obvezna.",
+	'srv_gdpr_user_settings_err' 	=> "Polja \"Ime\", \"Priimek\" in \"E-pošta\" so obvezna!",
 	'srv_gdpr_user_settings_err2' 	=> "Polji \"Ime organizacije\" in \"Matična številka\" sta obvezni!",
 	'srv_gdpr_user_settings_type' 	=> "Organizacija ali zasebnik",
 	'srv_gdpr_user_settings_type_0'	=> "Zasebnik",
@@ -8055,55 +7735,52 @@ $lang = array (
 	'srv_gdpr_user_settings_country_select' => "Izberi državo",
 	'srv_gdpr_user_settings_authority' => "Informacijski pooblaščenec",
 	'srv_gdpr_survey_list' 			=> "Seznam anket",
-	'srv_gdpr_survey_list_text' 	=> "Spodaj je seznam vseh vaših anket. Z ozadjem svetlo rdeče barve in vrednostjo “Da” (v stolpcu Potencialno GDPR) so označene vse ankete, pri katerih je orodje 1KA zaznalo prisotnost vprašanj, ki bi lahko vsebovala GDPR občutljive podatke.",
+	'srv_gdpr_survey_list_text' 	=> "Spodaj je seznam vseh vaših anket. Z rožnato barvo in vrednostjo 1 (v stolpcu Potencialno GDPR) so označene vse ankete, pri katerih je orodje 1KA zaznalo prisotnost vprašanj, ki bi lahko vsebovala GDPR občutljive podatke.",
 	'srv_gdpr_survey_list_text2' 	=> "Za GDPR se preverja:",
 	'srv_gdpr_survey_list_li_1' 	=> "email vabila",
 	'srv_gdpr_survey_list_li_2' 	=> "vklopljen modul telefonska anketa",
 	'srv_gdpr_survey_list_li_3' 	=> "spremenljivke 'ime', 'priimek', 'email', 'firstname', 'lastname'",
 	'srv_gdpr_survey_list_li_4' 	=> "vprašanje tipa lokacija",
-	'srv_gdpr_survey_list_text3' 	=> "V primeru, da gre za anketo, ki zahteva zavezanost h GDPR, slednje označite v prvem stolpcu. V tem primeru imate pri vsaki anketi (v zavihku ‘Urejanje’ - ‘Nastavitve’ - ‘GDPR’) na voljo dodatne možnosti urejanja soglasja respondentov, ki ga zahteva GDPR.",
+	'srv_gdpr_survey_list_text3' 	=> "V primeru, da gre za h GDPR zavezujočo anketo, označite to v zadnjem stolpcu. V tem primeru imate pri anketi na voljo dodatne možnosti urejanja v skladu z GDPR zahtevanega soglasja respondentov.",
 	'srv_gdpr_survey_list_survey' 	=> "Anketa",
 	'srv_gdpr_survey_list_activity' => "Aktivnost",
 	'srv_gdpr_survey_list_pot_gdpr' => "Potencialno GDPR",
 	'srv_gdpr_survey_list_gdpr' 	=> "GDPR",
 	'srv_gdpr_dpa' 	                => "DPA",
-	'srv_gdpr_dpa_text'             => "S strinjanjem s <a href=\"https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-1ka/splosni-pogoji\" target=\"_blank\">splošnimi pogoji uporabe orodja 1KA</a> (s katerimi ste se strinjali ob registraciji na spletno stran <a href=\"https://www.1ka.si\" target=\"_blank\">www.1ka.si</a>), se strinjate tudi s <a href=\"https://www.1ka.si/uploadi/dokumenti/DPA_SLO.pdf\" target=\"_blank\">pogoji in določbami v pogodbi o obdelavi podatkov</a> (angl. <span class=\"italic\">Data processing agreement</span>) med uporabnikom 1KA in storitvijo 1KA.<br /><br />Pisna različica nepodpisane pogodbe je na voljo na spodnjih povezavah:",
+	'srv_gdpr_dpa_text'             => "S strinjanjem s splošnimi pogoji uporabe orodja 1KA (s katerimi ste se strinjali ob registraciji na spletno stran <a href=\"https://www.1ka.si\">www.1ka.si</a>), se strinjate tudi s pogoji in določbami v pogodbi o obdelavi podatkov (angl. Data processing agreement) med uporabnikom 1KA in storitvijo 1KA.<br /><br />Pisna različica nepodpisane pogodbe je na voljo na spodnjih povezavah:",
 	'srv_gdpr_dpa_slo'              => "v slovenščini",
 	'srv_gdpr_dpa_eng'              => "v angleščini",
 	'srv_gdpr_dpa_info' 	        => "Za podpisano pogodbo DPA kontaktirajte <a href=\"mailto:help@1ka.si\">help@1ka.si</a> in DPA bomo ustrezno prilagodili.",
 	'srv_gdpr_requests' 			=> "Procesiranje zahtevkov",
-	'srv_gdpr_requests_list' 		=> "Seznam zahtevkov",
-	'srv_gdpr_requests_list_resolved' 		=> "Izvršeni zahtevki",
-	'srv_gdpr_requests_list_unresolved' 		=> "Neizvršeni zahtevki",
 	'srv_gdpr_requests_all' 		=> "Vsi zahtevki (admin)",
 	'srv_gdpr_requests_desc' 		=> "Spodaj je seznam zahtevkov, ki so jih oddali respondenti v vaših anketah.<br />Prosimo, da v roku enega meseca izvršite zahtevo in o tem obvestite respondenta na spodaj navedeni elektronski naslov respondenta (<a href=\"http://eur-lex.europa.eu/legal-content/SL/TXT/?uri=uriserv:OJ.L_.2016.119.01.0001.01.SLV&toc=OJ:L:2016:119:FULL\" target=\"_blank\">Člen 19 uredbe GDPR</a>).<br />Če v roku 30 dni zahtevek ni izveden in respondent o tem ni obveščen, si pridržujemo pravico, da vašo anketo izbrišemo oziroma respondentu neposredno zagotovimo vpogled oziroma popravek.",
 	'srv_gdpr_requests_none' 		=> "Ni zahtevkov",
-	'srv_gdpr_requests_survey' 		=> "Ime ankete",
+	'srv_gdpr_requests_survey' 		=> "Anketa",
 	'srv_gdpr_requests_recnum' 		=> "Recnum",
 	'srv_gdpr_requests_ip' 			=> "IP",
 	'srv_gdpr_requests_url' 		=> "URL",
 	'srv_gdpr_requests_email' 		=> "Email respondenta",
 	'srv_gdpr_requests_date' 		=> "Čas odgovora",
 	'srv_gdpr_requests_text' 		=> "Sporočilo respondenta",
-	'srv_gdpr_requests_resolved' 		=> "Izvršeno",
+	'srv_gdpr_requests_done' 		=> "Opravljeno",
 	'srv_gdpr_requests_comment' 	=> "Komentar avtorja",
 	'srv_gdpr_requests_status' 		=> "Status",
 	'srv_gdpr_requests_status_0' 	=> "V obdelavi",
 	'srv_gdpr_requests_status_1' 	=> "Opravljeno",
-	'srv_gdpr_requests_type' 		=> "Zahtevek",
+	'srv_gdpr_requests_type' 		=> "Vrsta zahtevka",
 	'srv_gdpr_requests_type_1' 		=> "Izbris",
 	'srv_gdpr_requests_type_2' 		=> "Vpogled",
 	'srv_gdpr_requests_type_3' 		=> "Popravek",
 	'srv_gdpr_requests_type_4' 		=> "Prenos",
 	'srv_gdpr_requests_type_5' 		=> "Omejitev obdelave",
 	'srv_gdpr_requests_type_6' 		=> "Preklic privolitve v obdelavo",
-	'srv_gdpr_requests_date_sent'	=> "Datum",
+	'srv_gdpr_requests_date_sent'	=> "Datum zahtevka",
 	'srv_gdpr_requests_author' 		=> "Avtor",
 	'srv_gdpr_requests_responsible' => "GDDPR podatki avtorja ankete",
 	'srv_gdpr_requests_organization' => "GDDPR podatki organizacije",
 	'srv_gdpr_requests_done' 		=> "Opravljeni zahtevki",
 	'srv_gdpr_survey_settings' 		=> "GDPR nastavitve ankete",
-	'srv_gdpr_survey_settings_desc1' => "S 25. majem 2018 je v veljavi nova uredba o varovanju osebnih podatkov (<a href=\"https://gdpr.eu/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>). Za zbiranje kakršnihkoli osebnih podatkov v anketah mora avtor ankete pridobiti ustrezno soglasje respondenta. Respondent se mora z zbiranjem osebnih podatkov izrecno strinjati, sicer ne more izpolnjevati vprašalnika.",
+	'srv_gdpr_survey_settings_desc1' => "S 25. majem 2018 je v veljavi nova uredba o varovanju osebnih podatkov (<a href=\"http://www.eugdpr.org/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>). Za zbiranje kakršnihkoli osebnih podatkov v anketah mora avtor ankete pridobiti ustrezno soglasje respondenta. Respondent se mora z zbiranjem osebnih podatkov izrecno strinjati, sicer ne more izpolnjevati vprašalnika.",
 	'srv_gdpr_survey_settings_desc2' => "Če v vaši anketi zbirate osebne podatke, prosimo ustrezno označite. Uporabite lahko pred pripravljeno soglasje za zbiranje podatkov ali ga uredite sami. Pred zbiranjem osebnih podatkov poskrbite tudi, da je ustrezno izpolnjen obrazec z vašimi podatki, ki je dostopen",
 	'srv_gdpr_survey_settings_desc3' => "<a href=\"https://www.1ka.si/d/sl/gdpr\" target=\"_blank\"><span class=\"bold\">Več o GDPR >></span></a>",
     
@@ -8242,7 +7919,7 @@ $lang = array (
 	'srv_gdpr_drupal_intro2' 		=> 'Če želite oddati zahtevo za izbris, dostop, popravek, prenos, omejitev ali preklic, prosimo izpolnite spodnji obrazec. V primeru težav kontaktirajte Center za pomoč uporabnikom 1KA (<a href="mailto:help@1ka.si?subject=GDPR">help@1ka.si</a>). ',
 	'srv_gdpr_drupal_field_email' 	=> 'Elektronski naslov',
 	'srv_gdpr_drupal_field_srv-name' => 'Ime ankete',
-	'srv_gdpr_drupal_field_srv-url' => 'URL ankete',
+	'srv_gdpr_drupal_field_srv-url' => 'Povezava do ankete',
 	'srv_gdpr_drupal_error_srv-url' => 'Nepravilen URL ankete. Vpišite pravilen URL 1KA ankete. V primeru težav kontaktirajte Center za pomoč uporabnikom 1KA (<a href="mailto:help@1ka.si?subject=GDPR">help@1ka.si</a>).',
 	'srv_gdpr_drupal_field_gdpr-action' => 'GDPR zahteva',
 	'srv_gdpr_drupal_q1_title' 		=> 'Želim podati zahtevo za:',
@@ -8254,7 +7931,7 @@ $lang = array (
 	'srv_gdpr_drupal_q1_answer6' 	=> '<b>Preklic privolitve v obdelavo</b> osebnih podatkov v določeni anketi',
 	'srv_gdpr_drupal_q2_note' 		=> 'Prosimo, čim bolj natančno opišite, na osnovi katerih podatkov lahko identificiramo vaš vnos v anketi (npr. email, ime, komentar, specifične kombinacije odgovorov) in za kateri podatek oziroma podatke želite oddati zahtevek za izbris, spremembo ali vpogled. ',
 	'srv_gdpr_drupal_check' 		=> 'Želim, da me avtor obvesti o izvedeni zahtevi na zgoraj navedeni elektronski naslov.',
-	'srv_gdpr_drupal_end' 			=> 'S klikom na Potrdi bo vaša zahteva poslana avtorju raziskave.',
+	'srv_gdpr_drupal_end' 			=> 'S klikom na POTRDI bo vaša zahteva poslana avtorju raziskave.',
 	'users_gdpr_title' 		=> 'GDPR soglasje',
 	'users_gdpr1'			=> 'Da',
 	'users_gdpr0'			=> 'Ne',
@@ -8584,29 +8261,30 @@ $lang = array (
 	'alert_too_many_arguments'	=>	"Preveč argumentov! Plugin: dataHolder",
 	'alert_missing_arguments'	=>	"Manjkajoči argumenti! Plugin: dataHolder",
 
+	// HEADER
+	'lang_flag' 				=>  '<img src="public/img/flags/english_flag.svg" alt="english flag"> <span>ENG</span>',
+	'AAI_prijava'				=>  'AAI prijava',
 
-    // Besedila popupa levo spodaj (obvestilo o akciji)
-    "action_note_lib_add_to_lib_type1"      =>  "Vprašanje je bilo dodano v knjižnico",
-    "action_note_lib_add_to_lib_type2_0"    =>  "Pogoj je bil dodan v knjižnico",
-    "action_note_lib_add_to_lib_type2_1"    =>  "Blok je bil dodan v knjižnico",
-    "action_note_lib_add_to_lib_type2_2"    =>  "Zanka je bila dodana v knjižnico",
+	// HERO
+	'hero_heading' => '1KA ARNES',
+	'hero_text'=> 'Brezplačna in neomejena uporaba orodja 1KA. Na voljo za vse AAI uporabnike.',
+	'hero_button'=> '<a href="#"> AAI-prijava </a>',
 
-    "action_note_lib_add_to_survey_m"       =>  "Elementi so bili dodani",
-    "action_note_lib_add_to_survey_1"       =>  "Vprašanje je bilo dodano",
-    "action_note_lib_add_to_survey_1m"      =>  "Vprašanja so bila dodana",
-    "action_note_lib_add_to_survey_2_0"     =>  "Pogoj je bil dodan",
-    "action_note_lib_add_to_survey_2_0m"    =>  "Pogoji so bili dodani",
-    "action_note_lib_add_to_survey_2_1"     =>  "Blok je bil dodan",
-    "action_note_lib_add_to_survey_2_1m"    =>  "Bloki so bili dodani",
-    "action_note_lib_add_to_survey_2_2"     =>  "Zanka je bil dodana",
-    "action_note_lib_add_to_survey_2_2m"    =>  "Zanke so bile dodane",
+	// Pomembne povezave
 
-	"action_note_link_copied"			    =>	'Povezava je bila kopirana',
-	"action_note_text_copied"			    =>	'Besedilo je bilo kopirano',
-	"action_note_success_save"			    =>	"Nastavitve so bile shranjene",
+	'povezave_pomembne_povezave' => 'Pomembne povezave',
 
+	'povezave__kako_deluje_h2' => 'KAKO DELUJE?',
+	'povezave__kako_deluje_text' => 'Vsem uporabnikom so na voljo priročniki, video vodiči in odgovori na pogosta vprašanja.',
+	'povezave_o_1ka_h2' => 'O 1KA',
+	'povezave_o_1ka_text' => '1KA je aplikacija, ki omogoča enostavno in dostopno spletno anketiranje.',
+	'povezave_1ka_podpora_h2' => '1KA PODPORA',
+	'povezave_1ka_podpora_text' => 'Ste ob izdelavi ankete naleteli na težavo? Kontaktirajte našo podporo uporabnikov.',
+	'povezave_arnes_podpora_h2' => 'ARNES PODPORA',
+	'povezave_arnes_podpora_text' => 'Če imate težave z AAI identiteto ali prijavo, kontaktirajte Arnesovo podporo uporabnikov.',
+
+	'povezave_preberi_vec' => 'Preberi več',
 
-	
 );
 
 
diff --git a/public/img/flags/english_flag.svg b/public/img/flags/english_flag.svg
new file mode 100644
index 000000000..90be2d5bb
--- /dev/null
+++ b/public/img/flags/english_flag.svg
@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2_30)">
+<path d="M0 4.02623V5.77778H2.50133L0 4.02623ZM2.07289 13.7778H5.77778V11.1836L2.07289 13.7778ZM10.2222 11.184V13.7778H13.9267L10.2222 11.184ZM0 10.2222V11.9738L2.50222 10.2222H0ZM13.9276 2.22223H10.2222V4.81645L13.9276 2.22223ZM16 11.9742V10.2222H13.4973L16 11.9742ZM16 5.77778V4.02623L13.4982 5.77778H16ZM5.77778 2.22223H2.07289L5.77778 4.81645V2.22223Z" fill="#00247D"/>
+<path d="M11.1733 10.2222L15.4898 13.2449C15.7006 13.0277 15.8521 12.76 15.9298 12.4675L12.7231 10.2222H11.1733ZM5.77779 10.2222H4.82624L0.510238 13.2444C0.741794 13.48 1.03868 13.6484 1.37157 13.7266L5.77779 10.6413V10.2222ZM10.2222 5.77776H11.1738L15.4898 2.75554C15.2543 2.51655 14.9557 2.34933 14.6289 2.27332L10.2222 5.35865V5.77776ZM4.82624 5.77776L0.510238 2.75554C0.299551 2.97286 0.147933 3.24045 0.0697937 3.53287L3.27646 5.77776H4.82624Z" fill="#CF1B2B"/>
+<path d="M16 9.33334H9.33333V13.7778H10.2222V11.184L13.9267 13.7778H14.2222C14.4583 13.7778 14.6921 13.7307 14.9098 13.6392C15.1274 13.5477 15.3246 13.4136 15.4898 13.2449L11.1733 10.2222H12.7231L15.9298 12.4676C15.9711 12.3178 16 12.1627 16 12V11.9742L13.4973 10.2222H16V9.33334ZM0 9.33334V10.2222H2.50222L0 11.9738V12C0 12.4849 0.195111 12.9236 0.510222 13.2445L4.82622 10.2222H5.77778V10.6413L1.37156 13.7262C1.50222 13.7573 1.63733 13.7778 1.77778 13.7778H2.07289L5.77778 11.1836V13.7778H6.66667V9.33334H0ZM16 4.00001C16.0003 3.53422 15.8169 3.0871 15.4898 2.75556L11.1738 5.77778H10.2222V5.35867L14.6289 2.27334C14.4958 2.24069 14.3593 2.22353 14.2222 2.22223H13.9276L10.2222 4.81645V2.22223H9.33333V6.66667H16V5.77778H13.4982L16 4.02623V4.00001ZM5.77778 2.22223V4.81645L2.07289 2.22223H1.77778C1.54161 2.22213 1.30781 2.26926 1.09012 2.36085C0.87244 2.45244 0.675273 2.58664 0.510222 2.75556L4.82622 5.77778H3.27644L0.0697778 3.5329C0.0256801 3.68477 0.00221041 3.84188 0 4.00001L0 4.02623L2.50133 5.77778H0V6.66667H6.66667V2.22223H5.77778Z" fill="#EEEEEE"/>
+<path d="M9.33333 6.66667V2.22223H6.66667V6.66667H0V9.33334H6.66667V13.7778H9.33333V9.33334H16V6.66667H9.33333Z" fill="#CF1B2B"/>
+</g>
+<defs>
+<clipPath id="clip0_2_30">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/icons/chevron.svg b/public/img/icons/chevron.svg
new file mode 100644
index 000000000..3a178776a
--- /dev/null
+++ b/public/img/icons/chevron.svg
@@ -0,0 +1,3 @@
+<svg width="7" height="13" viewBox="0 0 7 13" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.142822 10.3768L4.42854 6.09106L0.142822 1.80535L0.999965 0.0910645L6.99997 6.09106L0.999965 12.0911L0.142822 10.3768Z" fill="white"/>
+</svg>
diff --git a/public/img/icons/hero.svg b/public/img/icons/hero.svg
new file mode 100644
index 000000000..85d53b3ed
--- /dev/null
+++ b/public/img/icons/hero.svg
@@ -0,0 +1,92 @@
+<svg width="580" height="477" viewBox="0 0 580 477" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_356_2409)">
+<rect width="580" height="476" transform="translate(0 0.0910645)" fill="white"/>
+<rect x="230.029" y="15.0911" width="349.971" height="360" rx="10" fill="#FFEBE0"/>
+<rect x="215.434" y="1.09106" width="349.815" height="358" rx="9" stroke="#E35205" stroke-width="2" stroke-dasharray="12 12"/>
+<rect x="8.77234" y="276.091" width="194.428" height="200" rx="10" fill="#D4F0FC"/>
+<rect x="1" y="269.091" width="193.453" height="198" rx="9" stroke="#1E88E5" stroke-width="2" stroke-dasharray="12 12"/>
+<path d="M498.071 123.62C498.071 120.297 496.782 117.111 494.486 114.761C492.19 112.411 489.077 111.091 485.83 111.091H112.635C109.389 111.091 106.275 112.411 103.979 114.761C101.684 117.111 100.394 120.297 100.394 123.62V365.091H498.071V123.62Z" fill="#004A90"/>
+<path d="M480.527 127.091H117.939V348.091H480.527V127.091Z" fill="white"/>
+<path d="M362.588 469.091H242.7C253.759 445.424 257.029 421.758 252.509 398.091H352.78C347.522 421.764 350.792 445.431 362.588 469.091Z" fill="#ECECEC"/>
+<path d="M229.528 469.091H372.872C374.756 469.091 374.756 476.091 372.872 476.091H229.528C227.597 476.091 227.597 469.091 229.528 469.091Z" fill="#E2E2E2"/>
+<path d="M480.527 150.091H117.939V166.091H480.527V150.091Z" fill="#FAFAFA"/>
+<path d="M134.509 206.091H117.939V221.091H134.509V206.091Z" fill="#F8F8F8"/>
+<path d="M134.509 220.091H117.939V235.091H134.509V220.091Z" fill="#F8F8F8"/>
+<path d="M134.509 234.091H117.939V249.091H134.509V234.091Z" fill="#F8F8F8"/>
+<path d="M134.509 249.091H117.939V263.091H134.509V249.091Z" fill="#1E88E5"/>
+<path d="M134.509 263.091H117.939V277.091H134.509V263.091Z" fill="#FFC700"/>
+<path d="M134.509 277.091H117.939V291.091H134.509V277.091Z" fill="#FFC700"/>
+<path d="M184.218 169.091H133.534V174.091H184.218V169.091Z" fill="#1E88E5"/>
+<path d="M236.852 169.091H187.142V174.091H236.852V169.091Z" fill="#D8D8D8"/>
+<path d="M290.46 169.091H239.776V174.091H290.46V169.091Z" fill="#D8D8D8"/>
+<path d="M247.574 457.091C254.581 437.424 256.208 417.758 252.454 398.091H352.626C349.315 412.803 349.389 428.098 352.841 442.776C339.089 445.28 258.759 455.533 247.574 457.091Z" fill="#E2E2E2"/>
+<path d="M112.635 407.091H485.83C487.438 407.091 489.03 406.765 490.515 406.131C492 405.498 493.349 404.569 494.486 403.399C495.623 402.228 496.525 400.838 497.14 399.309C497.755 397.779 498.071 396.14 498.071 394.484V365.091H100.394V394.494C100.397 397.836 101.687 401.04 103.983 403.402C106.278 405.764 109.39 407.091 112.635 407.091Z" fill="#ECECEC"/>
+<path d="M377.209 211.091H167.648V229.091H377.209V211.091Z" fill="#F8F8F8"/>
+<path d="M262.194 226.091C265.424 226.091 268.042 223.405 268.042 220.091C268.042 216.777 265.424 214.091 262.194 214.091C258.964 214.091 256.346 216.777 256.346 220.091C256.346 223.405 258.964 226.091 262.194 226.091Z" fill="#F8F8F8" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M288.024 226.091C291.523 226.091 294.359 223.405 294.359 220.091C294.359 216.777 291.523 214.091 288.024 214.091C284.525 214.091 281.688 216.777 281.688 220.091C281.688 223.405 284.525 226.091 288.024 226.091Z" fill="#F8F8F8" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M313.366 226.091C316.865 226.091 319.701 223.405 319.701 220.091C319.701 216.777 316.865 214.091 313.366 214.091C309.867 214.091 307.03 216.777 307.03 220.091C307.03 223.405 309.867 226.091 313.366 226.091Z" fill="#F8F8F8" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M338.708 226.091C342.207 226.091 345.044 223.405 345.044 220.091C345.044 216.777 342.207 214.091 338.708 214.091C335.209 214.091 332.373 216.777 332.373 220.091C332.373 223.405 335.209 226.091 338.708 226.091Z" fill="#F8F8F8" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M365.512 226.091C368.742 226.091 371.361 223.405 371.361 220.091C371.361 216.777 368.742 214.091 365.512 214.091C362.283 214.091 359.664 216.777 359.664 220.091C359.664 223.405 362.283 226.091 365.512 226.091Z" fill="#F8F8F8" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M377.209 192.091H167.648V197.091H377.209V192.091Z" fill="#E0E0E0"/>
+<path d="M377.209 200.091H167.648V205.091H377.209V200.091Z" fill="#E0E0E0"/>
+<path d="M251.473 217.091H172.522V223.091H251.473V217.091Z" fill="#E0E0E0"/>
+<path d="M377.209 229.091H167.648V248.091H377.209V229.091Z" fill="white"/>
+<path d="M262.194 245.091C265.424 245.091 268.042 242.405 268.042 239.091C268.042 235.777 265.424 233.091 262.194 233.091C258.964 233.091 256.346 235.777 256.346 239.091C256.346 242.405 258.964 245.091 262.194 245.091Z" fill="white" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M288.024 245.091C291.523 245.091 294.359 242.405 294.359 239.091C294.359 235.777 291.523 233.091 288.024 233.091C284.525 233.091 281.688 235.777 281.688 239.091C281.688 242.405 284.525 245.091 288.024 245.091Z" fill="white" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M313.366 245.091C316.865 245.091 319.701 242.405 319.701 239.091C319.701 235.777 316.865 233.091 313.366 233.091C309.867 233.091 307.03 235.777 307.03 239.091C307.03 242.405 309.867 245.091 313.366 245.091Z" fill="white" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M338.708 245.091C342.207 245.091 345.044 242.405 345.044 239.091C345.044 235.777 342.207 233.091 338.708 233.091C335.209 233.091 332.373 235.777 332.373 239.091C332.373 242.405 335.209 245.091 338.708 245.091Z" fill="white" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M365.512 245.091C368.742 245.091 371.361 242.405 371.361 239.091C371.361 235.777 368.742 233.091 365.512 233.091C362.283 233.091 359.664 235.777 359.664 239.091C359.664 242.405 362.283 245.091 365.512 245.091Z" fill="white" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M251.473 236.091H172.522V242.091H251.473V236.091Z" fill="#E0E0E0"/>
+<path d="M377.209 248.091H167.648V267.091H377.209V248.091Z" fill="#F8F8F8"/>
+<path d="M262.194 263.091C265.424 263.091 268.042 260.405 268.042 257.091C268.042 253.777 265.424 251.091 262.194 251.091C258.964 251.091 256.346 253.777 256.346 257.091C256.346 260.405 258.964 263.091 262.194 263.091Z" fill="#F8F8F8" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M288.024 264.091C291.523 264.091 294.359 261.181 294.359 257.591C294.359 254.001 291.523 251.091 288.024 251.091C284.525 251.091 281.688 254.001 281.688 257.591C281.688 261.181 284.525 264.091 288.024 264.091Z" fill="#F8F8F8" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M313.366 263.091C316.865 263.091 319.701 260.405 319.701 257.091C319.701 253.777 316.865 251.091 313.366 251.091C309.867 251.091 307.03 253.777 307.03 257.091C307.03 260.405 309.867 263.091 313.366 263.091Z" fill="#F8F8F8" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M338.708 264.091C342.207 264.091 345.044 261.181 345.044 257.591C345.044 254.001 342.207 251.091 338.708 251.091C335.209 251.091 332.373 254.001 332.373 257.591C332.373 261.181 335.209 264.091 338.708 264.091Z" fill="#F8F8F8" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M365.512 263.091C368.742 263.091 371.361 260.405 371.361 257.091C371.361 253.777 368.742 251.091 365.512 251.091C362.283 251.091 359.664 253.777 359.664 257.091C359.664 260.405 362.283 263.091 365.512 263.091Z" fill="#F8F8F8" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M251.473 255.091H172.522V260.091H251.473V255.091Z" fill="#E0E0E0"/>
+<path d="M377.209 267.091H167.648V286.091H377.209V267.091Z" fill="white"/>
+<path d="M262.194 282.091C265.424 282.091 268.042 279.405 268.042 276.091C268.042 272.777 265.424 270.091 262.194 270.091C258.964 270.091 256.346 272.777 256.346 276.091C256.346 279.405 258.964 282.091 262.194 282.091Z" fill="white" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M288.024 282.091C291.523 282.091 294.359 279.405 294.359 276.091C294.359 272.777 291.523 270.091 288.024 270.091C284.525 270.091 281.688 272.777 281.688 276.091C281.688 279.405 284.525 282.091 288.024 282.091Z" fill="white" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M313.366 282.091C316.865 282.091 319.701 279.405 319.701 276.091C319.701 272.777 316.865 270.091 313.366 270.091C309.867 270.091 307.03 272.777 307.03 276.091C307.03 279.405 309.867 282.091 313.366 282.091Z" fill="white" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M338.708 282.091C342.207 282.091 345.044 279.405 345.044 276.091C345.044 272.777 342.207 270.091 338.708 270.091C335.209 270.091 332.373 272.777 332.373 276.091C332.373 279.405 335.209 282.091 338.708 282.091Z" fill="white" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M365.512 282.091C368.742 282.091 371.361 279.405 371.361 276.091C371.361 272.777 368.742 270.091 365.512 270.091C362.283 270.091 359.664 272.777 359.664 276.091C359.664 279.405 362.283 282.091 365.512 282.091Z" fill="white" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M251.473 274.091H172.522V279.091H251.473V274.091Z" fill="#E0E0E0"/>
+<path d="M462.982 135.091H383.057V141.091H462.982V135.091Z" fill="#1E88E5"/>
+<path d="M462.982 191.091H396.703V322.091H462.982V191.091Z" fill="#F8F8F8"/>
+<path d="M377.209 286.091H167.648V304.091H377.209V286.091Z" fill="#F8F8F8"/>
+<path d="M262.194 301.091C265.424 301.091 268.042 298.405 268.042 295.091C268.042 291.777 265.424 289.091 262.194 289.091C258.964 289.091 256.346 291.777 256.346 295.091C256.346 298.405 258.964 301.091 262.194 301.091Z" fill="#F8F8F8" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M288.024 301.091C291.523 301.091 294.359 298.405 294.359 295.091C294.359 291.777 291.523 289.091 288.024 289.091C284.525 289.091 281.688 291.777 281.688 295.091C281.688 298.405 284.525 301.091 288.024 301.091Z" fill="#F8F8F8" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M313.366 301.091C316.865 301.091 319.701 298.405 319.701 295.091C319.701 291.777 316.865 289.091 313.366 289.091C309.867 289.091 307.03 291.777 307.03 295.091C307.03 298.405 309.867 301.091 313.366 301.091Z" fill="#F8F8F8" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M338.708 301.091C342.207 301.091 345.044 298.405 345.044 295.091C345.044 291.777 342.207 289.091 338.708 289.091C335.209 289.091 332.373 291.777 332.373 295.091C332.373 298.405 335.209 301.091 338.708 301.091Z" fill="#F8F8F8" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M365.512 301.091C368.742 301.091 371.361 298.405 371.361 295.091C371.361 291.777 368.742 289.091 365.512 289.091C362.283 289.091 359.664 291.777 359.664 295.091C359.664 298.405 362.283 301.091 365.512 301.091Z" fill="#F8F8F8" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M251.473 293.091H172.522V298.091H251.473V293.091Z" fill="#E0E0E0"/>
+<path d="M377.209 304.091H167.648V323.091H377.209V304.091Z" fill="white"/>
+<path d="M262.194 320.091C265.424 320.091 268.042 317.405 268.042 314.091C268.042 310.777 265.424 308.091 262.194 308.091C258.964 308.091 256.346 310.777 256.346 314.091C256.346 317.405 258.964 320.091 262.194 320.091Z" fill="white" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M288.024 320.091C291.523 320.091 294.359 317.405 294.359 314.091C294.359 310.777 291.523 308.091 288.024 308.091C284.525 308.091 281.688 310.777 281.688 314.091C281.688 317.405 284.525 320.091 288.024 320.091Z" fill="white" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M313.366 320.091C316.865 320.091 319.701 317.405 319.701 314.091C319.701 310.777 316.865 308.091 313.366 308.091C309.867 308.091 307.03 310.777 307.03 314.091C307.03 317.405 309.867 320.091 313.366 320.091Z" fill="white" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M338.708 320.091C342.207 320.091 345.044 317.405 345.044 314.091C345.044 310.777 342.207 308.091 338.708 308.091C335.209 308.091 332.373 310.777 332.373 314.091C332.373 317.405 335.209 320.091 338.708 320.091Z" fill="white" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M365.512 320.091C368.742 320.091 371.361 317.405 371.361 314.091C371.361 310.777 368.742 308.091 365.512 308.091C362.283 308.091 359.664 310.777 359.664 314.091C359.664 317.405 362.283 320.091 365.512 320.091Z" fill="white" stroke="#E0E0E0" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M251.473 311.091H172.522V317.091H251.473V311.091Z" fill="#E0E0E0"/>
+<path d="M136.857 132.091V140.361H135.286V132.874H133.534V132.091H136.857Z" fill="#1E88E5"/>
+<path d="M137.993 132.091H139.492V140.361H137.993V132.091ZM143.879 132.091H145.679L141.594 136.134L145.848 140.361H144.011L139.818 136.134L143.879 132.091Z" fill="#707070"/>
+<path d="M151.722 140.361L151.081 138.726H146.573L145.933 140.361H144.434L147.782 132.091H149.885L153.244 140.361H151.722ZM146.888 137.942H150.767L148.833 133.036L146.888 137.942Z" fill="#707070"/>
+<path d="M135.383 141.594H136.567V141.893H135.721V142.193H136.458V142.492H135.721V142.803H136.579V143.102H135.383V141.594Z" fill="#1E88E5"/>
+<path d="M136.893 141.594H137.208L137.945 142.515V141.594H138.283V143.091H138.005L137.244 142.135V143.091H136.906V141.594H136.893Z" fill="#1E88E5"/>
+<path d="M138.67 141.594H139.02V142.25L139.661 141.594H140.084L139.443 142.227L140.12 143.091H139.697L139.214 142.446L139.032 142.63V143.091H138.682V141.594H138.67Z" fill="#707070"/>
+<path d="M140.313 141.594H140.664V142.791H141.449V143.091H140.313V141.594Z" fill="#707070"/>
+<path d="M141.727 141.594H142.078V143.091H141.727V141.594Z" fill="#707070"/>
+<path d="M142.465 141.594H142.815V142.25L143.456 141.594H143.879L143.238 142.227L143.915 143.091H143.504L143.021 142.446L142.839 142.63V143.091H142.489V141.594H142.465Z" fill="#707070"/>
+<path d="M145.329 141.582H145.643L146.32 143.091H145.957L145.812 142.757H145.147L145.002 143.091H144.652L145.329 141.582ZM145.691 142.469L145.486 141.985L145.28 142.469H145.691Z" fill="#707070"/>
+<path d="M146.573 141.594H146.888L147.625 142.515V141.594H147.963V143.091H147.673L146.912 142.135V143.091H146.573V141.594Z" fill="#707070"/>
+<path d="M148.35 141.594H148.7V142.25L149.341 141.594H149.764L149.123 142.227L149.8 143.091H149.365L148.882 142.446L148.7 142.63V143.091H148.35V141.594Z" fill="#707070"/>
+<path d="M149.994 141.594H151.178V141.893H150.332V142.193H151.069V142.492H150.332V142.803H151.19V143.102H149.994V141.594Z" fill="#707070"/>
+<path d="M151.867 141.893H151.383V141.594H152.688V141.893H152.205V143.091H151.855L151.867 141.893Z" fill="#707070"/>
+<path d="M153.293 141.582H153.607L154.284 143.091H153.921L153.776 142.757H153.111L152.966 143.091H152.628L153.293 141.582ZM153.667 142.469L153.462 141.985L153.256 142.469H153.667Z" fill="#707070"/>
+<path d="M462.982 191.091H396.703V210.091H462.982V191.091Z" fill="#1E88E5"/>
+</g>
+<defs>
+<clipPath id="clip0_356_2409">
+<rect width="580" height="476" fill="white" transform="translate(0 0.0910645)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/icons/icon_1ka_podpora.svg b/public/img/icons/icon_1ka_podpora.svg
new file mode 100644
index 000000000..41638a030
--- /dev/null
+++ b/public/img/icons/icon_1ka_podpora.svg
@@ -0,0 +1,17 @@
+<svg width="253" height="101" viewBox="0 0 253 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_356_3120)">
+<path d="M122 92.0911C145.196 92.0911 164 73.2871 164 50.0911C164 26.8952 145.196 8.09113 122 8.09113C98.804 8.09113 80 26.8952 80 50.0911C80 73.2871 98.804 92.0911 122 92.0911Z" fill="#FFEBE0"/>
+<path d="M122 100.091C149.614 100.091 172 77.7054 172 50.0911C172 22.4769 149.614 0.0911255 122 0.0911255C94.3857 0.0911255 72 22.4769 72 50.0911C72 77.7054 94.3857 100.091 122 100.091Z" stroke="#E35205" stroke-miterlimit="10" stroke-dasharray="5 5"/>
+<g clip-path="url(#clip1_356_3120)">
+<path d="M106.938 25.6224L106.219 26.3099L98.2188 34.3099L97.5312 35.0286L98.2188 35.7474L113.844 51.3724L101.313 63.9036C101.184 64.0208 101.086 64.1732 101.031 64.3411L99.0313 71.8411C98.9414 72.1849 99.043 72.5482 99.293 72.7982C99.543 73.0482 99.9063 73.1497 100.25 73.0599L107.75 71.0599C107.918 71.0052 108.07 70.9075 108.188 70.7786L142.75 36.2161C142.746 36.22 143.563 35.4036 143.563 35.4036C145.465 33.5013 145.461 30.4271 143.563 28.5286C141.66 26.6263 138.59 26.6302 136.688 28.5286L123.281 41.9349L107.656 26.3099L106.938 25.6224ZM106.938 28.4661L108.563 30.0911L107.281 31.3724L108.719 32.8099L110 31.5286L111.563 33.0911L109.281 35.3724L110.719 36.8099L113 34.5286L114.563 36.0911L113.281 37.3724L114.719 38.8099L116 37.5286L117.563 39.0911L115.281 41.3724L116.719 42.8099L119 40.5286L120.563 42.0911L119.281 43.3724L120.563 44.6536L115.281 49.9349L100.375 35.0286L106.938 28.4661ZM137.281 30.7474L141.344 34.8099L106.969 69.1849L102.906 65.1224L137.281 30.7474ZM131 49.6849L130.281 50.3724L128.281 52.3724L129.719 53.8099L131 52.5286L132.563 54.0911L130.281 56.3724L131.719 57.8099L134 55.5286L135.563 57.0911L134.281 58.3724L135.719 59.8099L137 58.5286L138.563 60.0911L136.281 62.3724L137.719 63.8099L140 61.5286L141.563 63.0911L140.281 64.3724L141.719 65.8099L143 64.5286L143.625 65.1536L137.063 71.7161L123 57.6849L121.594 59.0911L136.344 73.8724L137.063 74.5599L137.781 73.8724L145.781 65.8724L146.469 65.1536L145.781 64.4349L131 49.6849Z" fill="#E35205"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_356_3120">
+<rect width="252.5" height="100" fill="white" transform="translate(0 0.0911255)"/>
+</clipPath>
+<clipPath id="clip1_356_3120">
+<rect width="50" height="50" fill="white" transform="translate(97 25.0911)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/icons/icon_arnes_podpora.svg b/public/img/icons/icon_arnes_podpora.svg
new file mode 100644
index 000000000..5815b20fd
--- /dev/null
+++ b/public/img/icons/icon_arnes_podpora.svg
@@ -0,0 +1,12 @@
+<svg width="101" height="101" viewBox="0 0 101 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M50.5 92.0911C73.6959 92.0911 92.5 73.2871 92.5 50.0911C92.5 26.8952 73.6959 8.09113 50.5 8.09113C27.304 8.09113 8.5 26.8952 8.5 50.0911C8.5 73.2871 27.304 92.0911 50.5 92.0911Z" fill="#FFEBE0"/>
+<path d="M50.5 100.091C78.1142 100.091 100.5 77.7054 100.5 50.0911C100.5 22.4769 78.1142 0.0911255 50.5 0.0911255C22.8857 0.0911255 0.5 22.4769 0.5 50.0911C0.5 77.7054 22.8857 100.091 50.5 100.091Z" stroke="#E35205" stroke-miterlimit="10" stroke-dasharray="5 5"/>
+<g clip-path="url(#clip0_356_3129)">
+<path d="M64 24.9974C63.7031 25.0052 63.3945 25.0247 63.0937 25.0599C61.8945 25.1966 60.6562 25.5247 59.4687 25.9661C57.0937 26.8489 54.9062 28.1849 53.5 29.5911C51.9804 31.1107 51.2344 32.9661 51.25 34.8724C51.2617 36.5208 51.8789 38.1849 52.7812 39.7786L50.5 42.0911C50.2031 42.3333 50.0664 42.72 50.1523 43.095C50.2383 43.4661 50.5312 43.7591 50.9023 43.845C51.2773 43.931 51.664 43.7943 51.9062 43.4974L54.7187 40.6849C55.0508 40.3489 55.1015 39.8294 54.8437 39.4349C53.8203 37.8528 53.2617 36.2903 53.25 34.8724C53.2383 33.4544 53.7265 32.1771 54.9062 30.9974C56 29.9036 58.0625 28.6341 60.1875 27.8411C61.5234 27.345 62.7969 27.1575 63.9687 27.1224L60.1875 30.8724C60.1758 30.8919 60.164 30.9153 60.1562 30.9349C59.1289 32.1068 59.082 33.8919 60.1875 34.9974L65.5 40.3099C65.5117 40.3216 65.5195 40.3294 65.5312 40.3411C66.7031 41.3685 68.4883 41.4153 69.5937 40.3099L73.375 36.5286C73.3437 37.72 73.1562 39.0052 72.6562 40.3411C71.8672 42.4544 70.5976 44.4935 69.5 45.5911C68.3203 46.7708 67.0664 47.2044 65.6562 47.1849C64.2461 47.1653 62.6484 46.6107 61 45.6224C60.6054 45.388 60.1054 45.4544 59.7812 45.7786L58.1875 47.3724C57.789 47.7591 57.7851 48.3958 58.1719 48.7943C58.5586 49.1927 59.1953 49.1966 59.5937 48.8099L60.7187 47.6849C62.3437 48.556 63.9765 49.1614 65.625 49.1849C67.5156 49.2122 69.3867 48.5169 70.9062 46.9974C72.3086 45.595 73.6484 43.4232 74.5312 41.0599C75.414 38.6966 75.8789 36.1341 75.1562 33.9661C75.0429 33.638 74.7695 33.3958 74.4336 33.3177C74.0937 33.2435 73.7422 33.345 73.5 33.5911L68.1875 38.8724C67.9062 39.1536 67.3281 39.1927 66.9062 38.8724C66.8867 38.8568 66.8633 38.8568 66.8437 38.8411L61.5937 33.5911C61.2969 33.2943 61.2812 32.6732 61.6562 32.2474L66.9062 26.9974C67.1523 26.7552 67.2539 26.4036 67.1797 26.0638C67.1015 25.7278 66.8594 25.4544 66.5312 25.3411C65.7304 25.0677 64.8867 24.97 64 24.9974ZM28.8437 25.0911C28.6328 25.1224 28.4336 25.22 28.2812 25.3724L25.7812 27.8724C25.457 28.1966 25.3906 28.6966 25.625 29.0911L29.8437 36.4036C30.0547 36.7474 30.4453 36.931 30.8437 36.8724L33.0312 36.5286L46.5937 50.0911L46.0937 50.5911C44.9883 51.6966 44.9883 53.4857 46.0937 54.5911L46.7812 55.3099C47.5781 56.1068 48.6758 56.1028 49.6562 55.7786L51.3437 57.4349C51.2304 58.7825 51.625 60.1224 52.5937 61.0911L64.7812 73.3099C67.25 75.7786 71.25 75.7786 73.7187 73.3099C73.7187 73.2982 73.7187 73.2903 73.7187 73.2786C76.0898 70.7864 76.1211 66.7747 73.7187 64.3724L61.5 52.1849C60.4922 51.1771 59.1523 50.8646 57.8437 50.9349L56.1875 49.2474C56.5117 48.2669 56.5156 47.1693 55.7187 46.3724L55 45.6849C54.4492 45.1341 53.7265 44.8411 53 44.8411C52.2734 44.8411 51.5508 45.1341 51 45.6849L50.5 46.1849L36.9375 32.6224L37.2812 30.4349C37.3398 30.0364 37.1562 29.6458 36.8125 29.4349L29.5 25.2161C29.3281 25.1185 29.1328 25.0755 28.9375 25.0911C28.9062 25.0911 28.875 25.0911 28.8437 25.0911ZM29.1875 27.3411L35.2187 30.8099L34.9062 32.8411C34.8633 33.1497 34.9687 33.4622 35.1875 33.6849L49.0937 47.5911L48 48.6849L34.0937 34.7786C33.8711 34.5599 33.5586 34.4544 33.25 34.4974L31.2187 34.8099L27.75 28.7786L29.1875 27.3411ZM53 46.8724C53.2226 46.8724 53.4453 46.9427 53.5937 47.0911L54.2812 47.8099C54.6094 48.138 54.6054 48.6263 54.3437 48.9349C53.9961 49.3372 54.0234 49.9427 54.4062 50.3099L56.6875 52.5911C56.9179 52.8216 57.2422 52.9271 57.5625 52.8724C58.4883 52.72 59.457 52.9544 60.0937 53.5911L72.2812 65.8099C73.875 67.4036 73.8906 70.1614 72.2812 71.8724C70.5508 73.6028 67.9492 73.6028 66.2187 71.8724L54 59.6849C53.3359 59.0208 53.0742 58.0794 53.2812 57.2474C53.3711 56.8958 53.2617 56.5286 53 56.2786L50.7187 53.9974C50.3515 53.6146 49.7461 53.5872 49.3437 53.9349C49.0351 54.1966 48.5469 54.2005 48.2187 53.8724L47.5 53.1849C47.2031 52.888 47.2031 52.2943 47.5 51.9974L52.4062 47.0911C52.5547 46.9427 52.7773 46.8724 53 46.8724ZM43.1875 49.8724C42.9609 49.9036 42.75 50.0169 42.5937 50.1849L37.8437 54.9349C37.164 54.8021 36.4961 54.6849 35.8125 54.6849C30.1758 54.6849 25.5937 59.2669 25.5937 64.9036C25.5937 70.5403 30.1758 75.0911 35.8125 75.0911C41.4492 75.0911 46 70.5403 46 64.9036C46 64.1732 45.8359 63.4505 45.6562 62.7474L49.0937 59.3099C49.4922 58.9232 49.4961 58.2864 49.1094 57.888C48.7226 57.4896 48.0859 57.4857 47.6875 57.8724L43.9062 61.6849C43.6211 61.9583 43.5234 62.3763 43.6562 62.7474C43.9062 63.4114 44 64.0794 44 64.9036C44 69.4661 40.375 73.0911 35.8125 73.0911C31.25 73.0911 27.5937 69.4661 27.5937 64.9036C27.5937 60.3411 31.25 56.6849 35.8125 56.6849C36.5273 56.6849 37.2461 56.7864 37.9687 56.9661C38.3086 57.0403 38.664 56.9349 38.9062 56.6849L44 51.5911C44.2969 51.306 44.3867 50.8646 44.2265 50.4857C44.0703 50.1068 43.6914 49.8646 43.2812 49.8724C43.25 49.8724 43.2187 49.8724 43.1875 49.8724ZM57.2187 55.3724L55.7812 56.8099L67.7812 68.8099L69.2187 67.3724L57.2187 55.3724ZM36.875 59.0911C36.8203 59.0989 36.7695 59.1068 36.7187 59.1224L32.0312 60.4349C31.6992 60.5286 31.4375 60.7903 31.3437 61.1224L30.0312 65.8099C29.9219 66.1653 30.0195 66.5482 30.2812 66.8099L33.7812 70.3099C34.0351 70.5599 34.4062 70.6575 34.75 70.5599L39.5625 69.2474C39.914 69.1575 40.1914 68.8802 40.2812 68.5286L41.4687 63.8411C41.5664 63.4974 41.4687 63.1263 41.2187 62.8724L37.7187 59.3724C37.4961 59.1536 37.1836 59.0482 36.875 59.0911ZM36.6875 61.2161L39.375 63.9036L38.4687 67.4974L34.8125 68.4661L32.125 65.7786L33.0937 62.1849L36.6875 61.2161Z" fill="#E35205"/>
+</g>
+<defs>
+<clipPath id="clip0_356_3129">
+<rect width="50" height="50" fill="white" transform="translate(25.5 25.0911)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/icons/icon_kako_deluje.svg b/public/img/icons/icon_kako_deluje.svg
new file mode 100644
index 000000000..66a432813
--- /dev/null
+++ b/public/img/icons/icon_kako_deluje.svg
@@ -0,0 +1,5 @@
+<svg width="102" height="101" viewBox="0 0 102 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M51 92.0911C74.1959 92.0911 93 73.2871 93 50.0911C93 26.8952 74.1959 8.09113 51 8.09113C27.804 8.09113 9 26.8952 9 50.0911C9 73.2871 27.804 92.0911 51 92.0911Z" fill="#FFEBE0"/>
+<path d="M51 100.091C78.6142 100.091 101 77.7054 101 50.0911C101 22.4769 78.6142 0.0911255 51 0.0911255C23.3857 0.0911255 1 22.4769 1 50.0911C1 77.7054 23.3857 100.091 51 100.091Z" stroke="#E35205" stroke-miterlimit="10" stroke-dasharray="5 5"/>
+<path d="M41 30.0911C34.8164 30.0911 30.5625 32.1849 30.5625 32.1849C30.2148 32.3528 29.9961 32.7044 30 33.0911V36.0911H29C27.3555 36.0911 26 37.4466 26 39.0911V65.0911C26 66.7357 27.3555 68.0911 29 68.0911H48.7812C49.332 68.7005 50.1172 69.0911 51 69.0911C51.8828 69.0911 52.668 68.7005 53.2188 68.0911H73C74.6445 68.0911 76 66.7357 76 65.0911V39.0911C76 37.4466 74.6445 36.0911 73 36.0911H72V33.0911C72.0039 32.7044 71.7852 32.3528 71.4375 32.1849C71.4375 32.1849 67.1836 30.0911 61 30.0911C55.7227 30.0911 52.0195 31.5521 51 31.9974C49.9805 31.5521 46.2773 30.0911 41 30.0911ZM41 32.0911C46.1172 32.0911 49.2852 33.4544 50 33.7786V62.6536C48.5156 62.0599 45.6602 61.0911 41 61.0911C36.3398 61.0911 33.4844 62.0599 32 62.6536V37.2786C32.0273 37.1458 32.0273 37.0052 32 36.8724V33.7786C32.7148 33.4544 35.8828 32.0911 41 32.0911ZM61 32.0911C66.1172 32.0911 69.2852 33.4544 70 33.7786V36.9036C69.9727 37.0364 69.9727 37.1771 70 37.3099V62.6536C68.5156 62.0599 65.6602 61.0911 61 61.0911C56.3398 61.0911 53.4844 62.0599 52 62.6536V33.7786C52.7148 33.4544 55.8828 32.0911 61 32.0911ZM61 37.0911C59.8945 37.0911 59 37.9857 59 39.0911C59 40.1966 59.8945 41.0911 61 41.0911C62.1055 41.0911 63 40.1966 63 39.0911C63 37.9857 62.1055 37.0911 61 37.0911ZM29 38.0911H30V64.0911C29.9961 64.4388 30.1758 64.7591 30.4648 64.9427C30.7578 65.1302 31.125 65.1497 31.4375 64.9974C31.4375 64.9974 35.2227 63.0911 41 63.0911C46.6406 63.0911 50.3281 64.8802 50.5 64.9661C50.5117 64.9778 50.5195 64.9857 50.5312 64.9974H50.5625C50.5938 65.0091 50.625 65.0208 50.6562 65.0286C50.6758 65.0403 50.6992 65.0521 50.7188 65.0599C50.7305 65.0599 50.7383 65.0599 50.75 65.0599C50.7695 65.0716 50.793 65.0833 50.8125 65.0911C50.8242 65.0911 50.832 65.0911 50.8438 65.0911C50.9062 65.0989 50.9688 65.0989 51.0312 65.0911C51.043 65.0911 51.0508 65.0911 51.0625 65.0911C51.125 65.0872 51.1875 65.0755 51.25 65.0599C51.2812 65.0521 51.3125 65.0403 51.3438 65.0286C51.375 65.0208 51.4062 65.0091 51.4375 64.9974C51.4375 64.9974 51.5234 64.97 51.5312 64.9661C51.5547 64.9466 51.5742 64.9271 51.5938 64.9036C52.0156 64.7005 55.5703 63.0911 61 63.0911C66.7773 63.0911 70.5625 64.9974 70.5625 64.9974C70.875 65.1497 71.2422 65.1302 71.5352 64.9427C71.8242 64.7591 72.0039 64.4388 72 64.0911V38.0911H73C73.5664 38.0911 74 38.5247 74 39.0911V65.0911C74 65.6575 73.5664 66.0911 73 66.0911H29C28.4336 66.0911 28 65.6575 28 65.0911V39.0911C28 38.5247 28.4336 38.0911 29 38.0911ZM57.8125 44.0911C57.2617 44.1419 56.8555 44.6341 56.9062 45.1849C56.957 45.7357 57.4492 46.1419 58 46.0911H59V56.0911H63V45.0911C63 44.5403 62.5508 44.0911 62 44.0911H58C57.9688 44.0911 57.9375 44.0911 57.9062 44.0911C57.875 44.0911 57.8438 44.0911 57.8125 44.0911Z" fill="#E35205"/>
+</svg>
diff --git a/public/img/icons/icon_o_1ka.svg b/public/img/icons/icon_o_1ka.svg
new file mode 100644
index 000000000..0a8b85b2c
--- /dev/null
+++ b/public/img/icons/icon_o_1ka.svg
@@ -0,0 +1,5 @@
+<svg width="101" height="101" viewBox="0 0 101 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M50.5 92.0911C73.6959 92.0911 92.5 73.2871 92.5 50.0911C92.5 26.8952 73.6959 8.09113 50.5 8.09113C27.304 8.09113 8.5 26.8952 8.5 50.0911C8.5 73.2871 27.304 92.0911 50.5 92.0911Z" fill="#FFEBE0"/>
+<path d="M50.5 100.091C78.1142 100.091 100.5 77.7054 100.5 50.0911C100.5 22.4769 78.1142 0.0911255 50.5 0.0911255C22.8857 0.0911255 0.5 22.4769 0.5 50.0911C0.5 77.7054 22.8857 100.091 50.5 100.091Z" stroke="#E35205" stroke-miterlimit="10" stroke-dasharray="5 5"/>
+<path d="M27.2188 27.8724C26.754 27.9778 26.4258 28.3958 26.4376 28.8724V64.5599C26.4376 68.806 28.6446 71.2005 30.8126 72.2786C32.9805 73.3568 35.1251 73.3099 35.1251 73.3099H65.8751V73.2161C66.3555 73.2708 66.8751 73.3099 66.8751 73.3099C66.8751 73.3099 68.7969 73.3216 70.7188 72.2161C72.5938 71.138 74.4415 68.8568 74.5313 64.9036C74.543 64.8841 74.5547 64.8607 74.5626 64.8411C74.5626 64.8177 74.5626 64.8021 74.5626 64.7786C74.5665 64.7278 74.5665 64.6732 74.5626 64.6224V39.5286C74.5626 39.5169 74.5626 39.5091 74.5626 39.4974C74.5626 39.4974 74.5782 38.3255 73.9688 37.1224C73.3594 35.9193 71.9415 34.6224 69.7188 34.6224V34.5911H60.2501V36.5911H65.8126C65.6915 36.763 65.5899 36.9193 65.5001 37.0911C64.8907 38.2825 64.8751 39.4661 64.8751 39.4661V63.7161C64.8712 64.0755 65.0587 64.4114 65.3712 64.595C65.6837 64.7747 66.0665 64.7747 66.379 64.595C66.6915 64.4114 66.879 64.0755 66.8751 63.7161V39.4661C66.8751 39.4388 66.9141 38.7161 67.2813 37.9974C67.6563 37.2669 68.1837 36.6224 69.7188 36.6224C71.2501 36.6224 71.7774 37.2825 72.1563 38.0286C72.5274 38.763 72.5938 39.5013 72.5938 39.5286H72.5626V64.6224C72.5626 68.181 71.1407 69.681 69.7188 70.4974C68.2969 71.3138 66.8751 71.3099 66.8751 71.3099C66.8751 71.3099 65.1837 71.2864 63.5001 70.4349C61.8165 69.5833 60.1876 68.0872 60.1876 64.5599V28.8724C60.1876 28.3216 59.7383 27.8724 59.1876 27.8724H27.4376C27.3633 27.8646 27.293 27.8646 27.2188 27.8724ZM28.4376 29.8724H58.1876V64.5599C58.1876 67.8489 59.5821 70.0013 61.2188 71.3099H35.1251C35.1133 71.3099 35.1055 71.3099 35.0938 71.3099C35.0938 71.3099 34.6641 71.3138 34.0313 71.2161C33.7149 71.1653 33.3633 71.0833 32.9688 70.9661C32.5743 70.8489 32.1368 70.7044 31.7188 70.4974C31.5079 70.3919 31.2969 70.2825 31.0938 70.1536C29.6641 69.2552 28.4376 67.7044 28.4376 64.5599V29.8724ZM32.4376 36.0911C31.8868 36.1693 31.5001 36.681 31.5782 37.2318C31.6563 37.7825 32.168 38.1693 32.7188 38.0911H52.4376C52.7969 38.095 53.1329 37.9075 53.3165 37.595C53.4962 37.2825 53.4962 36.8997 53.3165 36.5872C53.1329 36.2747 52.7969 36.0872 52.4376 36.0911H32.7188C32.6876 36.0911 32.6563 36.0911 32.6251 36.0911C32.5938 36.0911 32.5626 36.0911 32.5313 36.0911C32.5001 36.0911 32.4688 36.0911 32.4376 36.0911ZM32.4376 40.0911C31.8868 40.1693 31.5001 40.681 31.5782 41.2318C31.6563 41.7825 32.168 42.1693 32.7188 42.0911H52.4376C52.7969 42.095 53.1329 41.9075 53.3165 41.595C53.4962 41.2825 53.4962 40.8997 53.3165 40.5872C53.1329 40.2747 52.7969 40.0872 52.4376 40.0911H32.7188C32.6876 40.0911 32.6563 40.0911 32.6251 40.0911C32.5938 40.0911 32.5626 40.0911 32.5313 40.0911C32.5001 40.0911 32.4688 40.0911 32.4376 40.0911ZM32.9063 48.0911C32.3555 48.1693 31.9688 48.681 32.0469 49.2318C32.1251 49.7825 32.6368 50.1693 33.1876 50.0911H39.9688C40.3282 50.095 40.6641 49.9075 40.8477 49.595C41.0274 49.2825 41.0274 48.8997 40.8477 48.5872C40.6641 48.2747 40.3282 48.0872 39.9688 48.0911H33.1876C33.1563 48.0911 33.1251 48.0911 33.0938 48.0911C33.0626 48.0911 33.0313 48.0911 33.0001 48.0911C32.9688 48.0911 32.9376 48.0911 32.9063 48.0911ZM44.4376 48.0911C43.8868 48.1693 43.5001 48.681 43.5782 49.2318C43.6563 49.7825 44.168 50.1693 44.7188 50.0911H52.4376C52.7969 50.095 53.1329 49.9075 53.3165 49.595C53.4962 49.2825 53.4962 48.8997 53.3165 48.5872C53.1329 48.2747 52.7969 48.0872 52.4376 48.0911H44.7188C44.6876 48.0911 44.6563 48.0911 44.6251 48.0911C44.5938 48.0911 44.5626 48.0911 44.5313 48.0911C44.5001 48.0911 44.4688 48.0911 44.4376 48.0911ZM32.9063 52.0911C32.3555 52.1693 31.9688 52.681 32.0469 53.2318C32.1251 53.7825 32.6368 54.1693 33.1876 54.0911H39.9688C40.3282 54.095 40.6641 53.9075 40.8477 53.595C41.0274 53.2825 41.0274 52.8997 40.8477 52.5872C40.6641 52.2747 40.3282 52.0872 39.9688 52.0911H33.1876C33.1563 52.0911 33.1251 52.0911 33.0938 52.0911C33.0626 52.0911 33.0313 52.0911 33.0001 52.0911C32.9688 52.0911 32.9376 52.0911 32.9063 52.0911ZM44.4376 52.0911C43.8868 52.1693 43.5001 52.681 43.5782 53.2318C43.6563 53.7825 44.168 54.1693 44.7188 54.0911H52.4376C52.7969 54.095 53.1329 53.9075 53.3165 53.595C53.4962 53.2825 53.4962 52.8997 53.3165 52.5872C53.1329 52.2747 52.7969 52.0872 52.4376 52.0911H44.7188C44.6876 52.0911 44.6563 52.0911 44.6251 52.0911C44.5938 52.0911 44.5626 52.0911 44.5313 52.0911C44.5001 52.0911 44.4688 52.0911 44.4376 52.0911ZM44.4376 55.8724C43.8868 55.9505 43.5001 56.4622 43.5782 57.013C43.6563 57.5638 44.168 57.9505 44.7188 57.8724H52.4376C52.7969 57.8763 53.1329 57.6888 53.3165 57.3763C53.4962 57.0638 53.4962 56.681 53.3165 56.3685C53.1329 56.056 52.7969 55.8685 52.4376 55.8724H44.7188C44.6563 55.8646 44.5938 55.8646 44.5313 55.8724C44.5001 55.8724 44.4688 55.8724 44.4376 55.8724ZM32.9063 56.0911C32.3555 56.1693 31.9688 56.681 32.0469 57.2318C32.1251 57.7825 32.6368 58.1693 33.1876 58.0911H39.9688C40.3282 58.095 40.6641 57.9075 40.8477 57.595C41.0274 57.2825 41.0274 56.8997 40.8477 56.5872C40.6641 56.2747 40.3282 56.0872 39.9688 56.0911H33.1876C33.1563 56.0911 33.1251 56.0911 33.0938 56.0911C33.0626 56.0911 33.0313 56.0911 33.0001 56.0911C32.9688 56.0911 32.9376 56.0911 32.9063 56.0911ZM44.4376 59.8724C43.8868 59.9505 43.5001 60.4622 43.5782 61.013C43.6563 61.5638 44.168 61.9505 44.7188 61.8724H52.4376C52.7969 61.8763 53.1329 61.6888 53.3165 61.3763C53.4962 61.0638 53.4962 60.681 53.3165 60.3685C53.1329 60.056 52.7969 59.8685 52.4376 59.8724H44.7188C44.6563 59.8646 44.5938 59.8646 44.5313 59.8724C44.5001 59.8724 44.4688 59.8724 44.4376 59.8724ZM32.9063 60.0911C32.3555 60.1693 31.9688 60.681 32.0469 61.2318C32.1251 61.7825 32.6368 62.1693 33.1876 62.0911H39.9688C40.3282 62.095 40.6641 61.9075 40.8477 61.595C41.0274 61.2825 41.0274 60.8997 40.8477 60.5872C40.6641 60.2747 40.3282 60.0872 39.9688 60.0911H33.1876C33.1563 60.0911 33.1251 60.0911 33.0938 60.0911C33.0626 60.0911 33.0313 60.0911 33.0001 60.0911C32.9688 60.0911 32.9376 60.0911 32.9063 60.0911ZM44.4376 63.6224C43.8868 63.7005 43.5001 64.2122 43.5782 64.763C43.6563 65.3138 44.168 65.7005 44.7188 65.6224H52.4376C52.7969 65.6263 53.1329 65.4388 53.3165 65.1263C53.4962 64.8138 53.4962 64.431 53.3165 64.1185C53.1329 63.806 52.7969 63.6185 52.4376 63.6224H44.7188C44.6876 63.6224 44.6563 63.6224 44.6251 63.6224C44.5938 63.6224 44.5626 63.6224 44.5313 63.6224C44.5001 63.6224 44.4688 63.6224 44.4376 63.6224ZM32.9063 64.0911C32.3555 64.1693 31.9688 64.681 32.0469 65.2318C32.1251 65.7825 32.6368 66.1693 33.1876 66.0911H39.9688C40.3282 66.095 40.6641 65.9075 40.8477 65.595C41.0274 65.2825 41.0274 64.8997 40.8477 64.5872C40.6641 64.2747 40.3282 64.0872 39.9688 64.0911H33.1876C33.1563 64.0911 33.1251 64.0911 33.0938 64.0911C33.0626 64.0911 33.0313 64.0911 33.0001 64.0911C32.9688 64.0911 32.9376 64.0911 32.9063 64.0911Z" fill="#E35205"/>
+</svg>
diff --git a/public/img/logo/ministrstvo.svg b/public/img/logo/ministrstvo.svg
new file mode 100644
index 000000000..f0d0e329a
--- /dev/null
+++ b/public/img/logo/ministrstvo.svg
@@ -0,0 +1,69 @@
+<svg width="203" height="33" viewBox="0 0 203 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_356_2856)">
+<path d="M20.2341 2.45669C18.6428 1.63916 16.9598 1.01439 15.2208 0.595585C13.5536 0.200602 11.8462 0.000749121 10.133 3.51469e-05C8.36805 -0.0133425 6.60852 0.197493 4.89656 0.627493C3.20733 1.07157 1.56692 1.68438 0 2.45669L0.701025 13.7828C0.77821 15.1521 1.07963 16.4995 1.59324 17.7709C2.08935 19.0023 2.76594 20.1529 3.60072 21.1847C5.286 23.2454 7.56837 24.7317 10.133 25.4386C11.444 25.071 12.6882 24.4966 13.8187 23.7371C14.914 22.9986 15.8916 22.0987 16.7184 21.0677C18.3858 18.9807 19.3688 16.4291 19.5331 13.7616L20.2341 2.45669ZM10.133 8.83761L12.1724 12.9852L13.6063 11.0709L17.0477 15.6333C16.991 16.1333 16.7529 16.595 16.3785 16.9307C15.9185 17.2677 15.3537 17.4298 14.7853 17.388C14.5757 17.3952 14.3667 17.3627 14.1692 17.2923L13.6912 17.0903C13.5184 17.0093 13.3411 16.9383 13.1602 16.8776C12.9224 16.8073 12.6751 16.775 12.4273 16.7819C12.1863 16.7731 11.9457 16.8055 11.7156 16.8776C11.545 16.9381 11.3783 17.0092 11.2164 17.0903L10.7597 17.2923C10.5585 17.3626 10.346 17.395 10.133 17.388C9.91297 17.3967 9.69325 17.3642 9.48509 17.2923L9.00712 17.0903C8.84779 17.0158 8.67785 16.9414 8.49728 16.8776C8.26335 16.8064 8.01937 16.7741 7.77501 16.7819C7.53409 16.7731 7.29344 16.8055 7.06336 16.8776C6.8828 16.9414 6.71285 17.0158 6.55353 17.0903L6.07556 17.2923C5.87433 17.3626 5.66188 17.395 5.44888 17.388C4.89281 17.4353 4.3375 17.2888 3.87689 16.9733C3.50701 16.6269 3.2639 16.1663 3.18648 15.6652L6.58539 11.0709L8.06179 12.9852L10.133 8.83761ZM11.7581 18.409C11.5931 18.4705 11.4332 18.5452 11.2801 18.6323C11.1244 18.7215 10.9608 18.7962 10.7915 18.8557C10.5682 18.9254 10.335 18.9577 10.1011 18.9514C9.87422 18.9588 9.64774 18.9264 9.43198 18.8557C9.26437 18.7921 9.10115 18.7175 8.94339 18.6323C8.78195 18.5472 8.61519 18.4726 8.44417 18.409C8.22841 18.3382 8.00194 18.3058 7.77501 18.3133C7.54448 18.3034 7.31409 18.3358 7.09523 18.409L6.62788 18.6217C6.47218 18.6973 6.31263 18.7648 6.14991 18.8238C5.92349 18.8959 5.68632 18.9283 5.44888 18.9195C5.15544 18.9126 4.86498 18.8587 4.58853 18.7599C4.48838 18.6183 4.39959 18.4689 4.32299 18.3133C4.24864 18.1644 4.16367 18.0155 4.07869 17.8666L4.68412 18.1219C4.92868 18.2125 5.18819 18.2558 5.44888 18.2495C5.67581 18.2569 5.90228 18.2245 6.11804 18.1538C6.28077 18.0948 6.44031 18.0273 6.59601 17.9517C6.7579 17.8706 6.92462 17.7996 7.09523 17.739C7.31484 17.6691 7.54465 17.6367 7.77501 17.6433C8.00884 17.6369 8.24211 17.6692 8.46542 17.739C8.62999 17.7974 8.78979 17.8685 8.94339 17.9517C9.09088 18.0293 9.24347 18.0968 9.40012 18.1538C9.62653 18.2259 9.8637 18.2583 10.1011 18.2495C10.335 18.2558 10.5682 18.2235 10.7915 18.1538C10.9584 18.0966 11.1216 18.0291 11.2801 17.9517C11.4356 17.8724 11.5952 17.8014 11.7581 17.739C11.9739 17.6682 12.2003 17.6358 12.4273 17.6433C12.6611 17.6369 12.8944 17.6692 13.1177 17.739C13.2848 17.7996 13.448 17.8706 13.6063 17.9517C13.762 18.0273 13.9215 18.0948 14.0842 18.1538C14.3107 18.2259 14.5478 18.2583 14.7853 18.2495C15.0293 18.2512 15.2724 18.219 15.5075 18.1538C15.731 18.0891 15.9479 18.0036 16.1555 17.8985C16.0492 18.0687 15.9643 18.2176 15.9005 18.3345L15.6456 18.7599L15.2526 18.8876C15.1008 18.9318 14.9433 18.9533 14.7853 18.9514C14.5478 18.9602 14.3107 18.9278 14.0842 18.8557C13.9166 18.7921 13.7534 18.7175 13.5956 18.6323C13.4342 18.5472 13.2675 18.4726 13.0964 18.409C12.6594 18.2814 12.1951 18.2814 11.7581 18.409ZM10.133 23.099C8.29312 22.4491 6.65591 21.3269 5.38515 19.8447C5.65402 19.8539 5.9227 19.8216 6.18177 19.749C6.35622 19.6936 6.52658 19.6261 6.69161 19.5469L7.15896 19.3342C7.35648 19.2638 7.56548 19.2314 7.77501 19.2385C7.988 19.2315 8.20046 19.264 8.40168 19.3342L8.87966 19.5469C9.04912 19.6242 9.2229 19.6917 9.40012 19.749C9.63787 19.8193 9.8852 19.8516 10.133 19.8447C10.3774 19.8525 10.6213 19.8201 10.8553 19.749C11.0222 19.6918 11.1854 19.6244 11.3439 19.5469L11.8112 19.3342C12.0087 19.2638 12.2177 19.2314 12.4273 19.2385C12.6508 19.23 12.8739 19.2625 13.0858 19.3342L13.5638 19.5469C13.7332 19.6242 13.907 19.6917 14.0842 19.749C14.3326 19.8205 14.5907 19.8528 14.849 19.8447C13.5921 21.328 11.9648 22.4509 10.133 23.099ZM18.7684 13.6552C18.6915 14.9232 18.4192 16.1716 17.9611 17.3561C17.3039 19.0962 16.2563 20.6619 14.8991 21.9323C13.5418 23.2028 11.9112 24.1441 10.133 24.6836C7.7514 23.9738 5.64527 22.5481 4.09994 20.5998C3.33997 19.6323 2.72785 18.557 2.28365 17.4093C1.82429 16.2357 1.54843 14.9981 1.46578 13.7403L0.79662 2.92462L1.10465 2.78637L1.43392 2.63748L2.13494 13.7084C2.21399 14.896 2.47182 16.0649 2.8997 17.1753C3.30948 18.2442 3.8789 19.2447 4.58853 20.1425C6.0279 21.9312 7.95352 23.2645 10.133 23.9817C11.2734 23.6187 12.3489 23.0766 13.3195 22.3758C14.2454 21.7015 15.0715 20.8995 15.7731 19.9936C17.1673 18.1824 17.9818 15.9915 18.1098 13.7084L18.8109 2.63748C18.9284 2.67667 19.0422 2.7265 19.1507 2.78637L19.4481 2.92462L18.7684 13.6552ZM10.133 4.78573L10.4835 5.58334L11.3439 5.48763L10.834 6.18953L11.3439 6.89143L10.4835 6.79572L10.133 7.62523L9.77187 6.85953L8.84779 6.95524L9.42136 6.25333L8.89028 5.5408L9.78249 5.63651L10.133 4.78573ZM7.64755 1.56336L7.99807 2.36097L8.85841 2.26526L8.34858 2.96716L8.85841 3.66907L7.99807 3.57335L7.64755 4.40287L7.29704 3.57335L6.37296 3.66907L6.94653 2.96716L6.40483 2.26526L7.29704 2.36097L7.64755 1.56336ZM12.5547 1.56336L12.9584 2.35034L13.8187 2.25463L13.3089 2.95653L13.8187 3.65843L12.9584 3.57335L12.6078 4.40287L12.2573 3.57335L11.3332 3.66907L11.9068 2.96716L11.3651 2.26526L12.2573 2.36097L12.5547 1.56336Z" fill="#519DBA"/>
+<path d="M41.3074 8.55044H40.5002V0.935867H42.9325C43.3106 0.928595 43.6883 0.964275 44.0584 1.04222C44.3453 1.1029 44.6165 1.22239 44.855 1.39317C45.0647 1.56253 45.2229 1.78724 45.3117 2.04189C45.4226 2.35937 45.4731 2.69485 45.4604 3.03094C45.4946 3.54349 45.3563 4.05272 45.0675 4.47728C44.7606 4.84671 44.3229 5.08298 43.846 5.13664L45.6198 8.52917H44.6957L42.9962 5.22172H41.3074V8.55044ZM41.3074 4.56236H42.8688C43.1233 4.58125 43.379 4.58125 43.6335 4.56236C43.8322 4.53744 44.0217 4.46443 44.1859 4.34966C44.3434 4.23582 44.4621 4.07615 44.5257 3.89236C44.6158 3.64762 44.6556 3.38716 44.6426 3.12665C44.6527 2.87758 44.6167 2.6288 44.5364 2.39285C44.468 2.2174 44.3544 2.06325 44.2071 1.94618C44.0416 1.83208 43.853 1.75584 43.6548 1.72285C43.3931 1.70441 43.1305 1.70441 42.8688 1.72285H41.3074V4.56236Z" fill="#231F20"/>
+<path d="M47.128 8.55044V0.935867H51.6847V1.6165H47.9353V4.37093H51.1961V5.05157H47.9353V7.8698H51.6847V8.55044H47.128Z" fill="#231F20"/>
+<path d="M54.1064 8.55044H53.3204V0.935867H55.6997C56.0778 0.928595 56.4555 0.964275 56.8256 1.04222C57.1156 1.10481 57.3879 1.23203 57.6222 1.41444C57.8326 1.59188 57.9905 1.82358 58.0789 2.08443C58.1941 2.42659 58.2445 2.78725 58.2276 3.14792C58.2483 3.46723 58.2002 3.78726 58.0866 4.08634C57.9729 4.38542 57.7965 4.65656 57.5691 4.88141C57.0104 5.27902 56.3299 5.46724 55.6466 5.41315H54.1064V8.55044ZM54.1064 4.73252H55.6147C55.8711 4.73562 56.1271 4.71425 56.3794 4.66871C56.5772 4.65469 56.7677 4.58866 56.9318 4.47728C57.0896 4.35918 57.2081 4.19607 57.2717 4.00935C57.3572 3.74877 57.3967 3.47526 57.3885 3.2011C57.3982 2.93811 57.3623 2.67544 57.2823 2.42475C57.2173 2.24157 57.1034 2.07973 56.953 1.95682C56.7907 1.83485 56.6011 1.75452 56.4007 1.72285C56.1403 1.68666 55.8776 1.6689 55.6147 1.66968H54.1064V4.73252Z" fill="#231F20"/>
+<path d="M64.5687 5.90235C64.5815 6.32797 64.5204 6.75257 64.3881 7.15727C64.2829 7.48302 64.1007 7.77853 63.8571 8.01869C63.6169 8.2497 63.3258 8.42091 63.0073 8.51853C62.639 8.63028 62.2556 8.6841 61.8708 8.67805C61.1781 8.72233 60.4957 8.49328 59.9696 8.03996C59.7209 7.76982 59.5319 7.45028 59.4147 7.10213C59.2976 6.75399 59.255 6.38505 59.2898 6.01934V0.935867H60.097V5.93426C60.0668 6.2121 60.0916 6.49318 60.17 6.76143C60.2484 7.02968 60.3788 7.27983 60.5537 7.49758C60.7359 7.669 60.952 7.80018 61.1881 7.88263C61.4241 7.96507 61.6748 7.99693 61.9239 7.97615C62.1745 7.99454 62.4262 7.96158 62.6636 7.8793C62.901 7.79702 63.1192 7.66713 63.3047 7.49758C63.651 7.05411 63.8145 6.49467 63.7615 5.93426V0.935867H64.5687V5.90235Z" fill="#231F20"/>
+<path d="M71.4621 6.47663C71.4854 6.7667 71.4441 7.05833 71.3413 7.3305C71.2384 7.60267 71.0765 7.84861 70.8673 8.05059C70.2903 8.43211 69.602 8.60817 68.9129 8.55043H66.4912V0.935864H68.9129C69.5674 0.874377 70.2225 1.04776 70.7611 1.42507C70.9573 1.61743 71.1093 1.85026 71.2065 2.10738C71.3037 2.3645 71.3438 2.63974 71.324 2.91395C71.3709 3.25901 71.3053 3.61 71.1369 3.91469C70.9684 4.21937 70.7063 4.46145 70.3893 4.60489C70.7224 4.72582 71.0087 4.94919 71.2072 5.24299C71.4048 5.62257 71.4931 6.04971 71.4621 6.47663ZM70.5062 2.97776C70.5295 2.782 70.506 2.58349 70.4377 2.39859C70.3694 2.21369 70.2581 2.04769 70.1132 1.91427C69.7956 1.71466 69.4257 1.61466 69.051 1.62713H67.3516V4.33902H69.051C69.4275 4.35384 69.7991 4.24966 70.1132 4.04125C70.2596 3.90892 70.3718 3.74306 70.4402 3.55786C70.5087 3.37266 70.5313 3.17362 70.5062 2.97776ZM70.6443 6.42346C70.6603 6.22912 70.6345 6.03358 70.5685 5.8501C70.5025 5.66662 70.398 5.49947 70.2619 5.35997C69.9259 5.1096 69.5112 4.98878 69.0935 5.01965H67.2985V7.88044H69.0935C69.513 7.91328 69.9297 7.78813 70.2619 7.52948C70.4019 7.38393 70.5087 7.20961 70.5747 7.01862C70.6407 6.82764 70.6645 6.62455 70.6443 6.42346Z" fill="#231F20"/>
+<path d="M73.0978 8.55044V0.935867H73.9051V7.8698H77.4527V8.55044H73.0978Z" fill="#231F20"/>
+<path d="M78.8123 8.55044V0.935867H79.6195V8.55044H78.8123Z" fill="#231F20"/>
+<path d="M81.6801 0.935867H82.4873V4.29649H83.199L85.6738 0.935867H86.6085L83.8575 4.61554L86.6722 8.55044H85.6951L83.1459 4.98775H82.4873V8.55044H81.6801V0.935867Z" fill="#231F20"/>
+<path d="M91.8768 6.68934H88.6904L88.1062 8.55044H87.2777L89.7738 0.935867H90.8359L93.3426 8.55044H92.4929L91.8768 6.68934ZM88.8603 6.0087H91.6644L90.2836 1.65904L88.8603 6.0087Z" fill="#231F20"/>
+<path d="M101.234 6.54044C101.242 6.87116 101.199 7.20106 101.107 7.51885C101.026 7.77799 100.875 8.0098 100.672 8.18885C100.442 8.37305 100.173 8.50057 99.8855 8.56107C99.5053 8.64399 99.1169 8.68324 98.7278 8.67805C98.3721 8.67688 98.017 8.64843 97.6656 8.59297C97.3322 8.53571 97.0049 8.44668 96.6884 8.3271L96.869 7.66774C97.1825 7.78043 97.5062 7.86235 97.8355 7.91234C98.1858 7.97764 98.5414 8.00968 98.8977 8.00805C99.1365 8.01141 99.375 7.99003 99.6094 7.94424C99.7788 7.89087 99.9322 7.79581 100.055 7.66774C100.19 7.56123 100.29 7.41679 100.342 7.25298C100.411 7.03657 100.444 6.81009 100.438 6.58298C100.441 6.38961 100.42 6.19659 100.374 6.0087C100.322 5.85256 100.235 5.71059 100.119 5.59394C99.9688 5.46721 99.8006 5.3633 99.62 5.28552C99.3604 5.17686 99.0944 5.08452 98.8234 5.00902C98.5076 4.92225 98.1987 4.81205 97.8993 4.67934C97.6553 4.57966 97.432 4.43541 97.2407 4.25395C97.0633 4.08617 96.9286 3.87832 96.8477 3.64776C96.7565 3.38468 96.7133 3.10728 96.7203 2.82887C96.6997 2.54568 96.7403 2.26138 96.8393 1.99529C96.9383 1.72921 97.0933 1.48758 97.2938 1.28682C97.8071 0.905555 98.4413 0.724129 99.0783 0.776343C99.4128 0.778421 99.7466 0.806867 100.077 0.86142C100.393 0.91961 100.702 1.00866 101.001 1.12729L100.863 1.80793C100.585 1.71159 100.301 1.63343 100.013 1.57396C99.7154 1.51676 99.4131 1.48827 99.1101 1.48888C98.6878 1.44808 98.2643 1.55316 97.9099 1.78666C97.7793 1.91371 97.679 2.06863 97.6165 2.23987C97.554 2.41111 97.5308 2.59426 97.5488 2.7757C97.5431 2.97499 97.5755 3.17353 97.6444 3.36062C97.6972 3.51268 97.7887 3.64831 97.9099 3.75411C98.0454 3.8715 98.1999 3.965 98.3666 4.03061C98.5472 4.10506 98.7702 4.1795 99.0145 4.25395C99.3758 4.36884 99.7304 4.50376 100.077 4.65807C100.328 4.77178 100.56 4.92232 100.767 5.10473C100.926 5.2715 101.045 5.47122 101.118 5.68965C101.197 5.96629 101.236 6.25274 101.234 6.54044Z" fill="#231F20"/>
+<path d="M102.732 8.55044V0.935867H103.539V7.8698H107.087V8.55044H102.732Z" fill="#231F20"/>
+<path d="M110.56 8.73123C110.12 8.74198 109.681 8.67354 109.264 8.52917C108.903 8.4079 108.585 8.18219 108.351 7.88044C108.075 7.50248 107.889 7.06574 107.809 6.60425C107.68 5.99622 107.619 5.37545 107.629 4.75378C107.62 4.12511 107.68 3.49736 107.809 2.88205C107.899 2.43971 108.083 2.02228 108.351 1.65904C108.587 1.35735 108.904 1.12875 109.264 0.999677C110.104 0.731688 111.006 0.731688 111.845 0.999677C112.201 1.132 112.514 1.36018 112.748 1.65904C113.016 2.01827 113.201 2.43227 113.29 2.87142C113.42 3.47944 113.48 4.10021 113.471 4.72188C113.484 5.35018 113.427 5.97798 113.301 6.59362C113.21 7.03048 113.029 7.44349 112.77 7.80599C112.536 8.11075 112.219 8.34006 111.856 8.46536C111.444 8.6315 111.005 8.72157 110.56 8.73123ZM110.56 8.01869C110.902 8.0272 111.242 7.96568 111.559 7.8379C111.826 7.72307 112.049 7.52553 112.196 7.27425C112.371 6.96545 112.486 6.62626 112.536 6.27457C112.663 5.27541 112.663 4.26407 112.536 3.2649C112.485 2.917 112.369 2.58163 112.196 2.27586C112.042 2.03567 111.82 1.84684 111.559 1.73348C111.239 1.61852 110.9 1.56442 110.56 1.57396C110.224 1.56449 109.889 1.61861 109.572 1.73348C109.311 1.84684 109.089 2.03567 108.935 2.27586C108.757 2.57952 108.641 2.91581 108.595 3.2649C108.454 4.26312 108.454 5.27636 108.595 6.27457C108.64 6.6274 108.755 6.9675 108.935 7.27425C109.082 7.52553 109.305 7.72307 109.572 7.8379C109.886 7.94617 110.219 7.98958 110.55 7.96552L110.56 8.01869Z" fill="#231F20"/>
+<path d="M114.15 0.935867H114.979L117.05 7.76346L119.068 0.935867H119.854L117.57 8.55044H116.434L114.15 0.935867Z" fill="#231F20"/>
+<path d="M121.023 8.55044V0.935867H125.547V1.6165H121.83V4.37093H125.08V5.05157H121.83V7.8698H125.547V8.55044H121.023Z" fill="#231F20"/>
+<path d="M127.98 1.79729V8.55044H127.236V0.935867H128.426L131.793 7.66774V0.935867H132.536V8.55044H131.357L127.98 1.79729Z" fill="#231F20"/>
+<path d="M134.682 8.55044V0.935867H135.489V8.55044H134.682Z" fill="#231F20"/>
+<path d="M138.622 0.935867V7.94425C138.624 8.26526 138.596 8.58574 138.538 8.90139C138.481 9.15951 138.376 9.40476 138.23 9.62456C138.072 9.83859 137.873 10.0193 137.645 10.1563C137.362 10.3226 137.059 10.4513 136.742 10.5392L136.53 9.85853C136.744 9.79949 136.947 9.70995 137.135 9.59265C137.294 9.49758 137.431 9.37088 137.539 9.22043C137.641 9.06136 137.713 8.88468 137.752 8.69933C137.797 8.47176 137.818 8.24007 137.815 8.00806V0.935867H138.622Z" fill="#231F20"/>
+<path d="M144.305 6.68934H141.119L140.534 8.55044H139.706L142.202 0.935867H143.264L145.728 8.55044H144.879L144.305 6.68934ZM141.289 6.0087H144.093L142.712 1.65904L141.289 6.0087Z" fill="#231F20"/>
+<path d="M41.9978 12.496L43.5379 15.9523L45.0674 12.496H46.7775V20.1105H45.4923V14.4741L44.1965 17.4412H42.89L41.6367 14.4847V20.1105H40.2346V12.496H41.9978Z" fill="#231F20"/>
+<path d="M48.4239 20.1105V12.496H49.9003V20.1105H48.4239Z" fill="#231F20"/>
+<path d="M52.8849 14.3996V20.1105H51.5148V12.496H53.4691L56.0396 18.3771V12.496H57.3566V20.1105H55.4447L52.8849 14.3996Z" fill="#231F20"/>
+<path d="M59.0242 20.1105V12.496H60.5006V20.1105H59.0242Z" fill="#231F20"/>
+<path d="M66.8099 17.9091C66.8146 18.2691 66.7644 18.6277 66.6612 18.9726C66.5596 19.2526 66.3876 19.5017 66.1619 19.6958C65.8997 19.891 65.5993 20.0287 65.2804 20.0999C64.8511 20.192 64.4128 20.2348 63.9739 20.2275C63.5758 20.2288 63.1782 20.2003 62.7843 20.1424C62.4245 20.0934 62.0693 20.0151 61.7221 19.9085L61.9877 18.6323C62.307 18.7375 62.6336 18.8193 62.9648 18.8769C63.3154 18.9402 63.6708 18.9722 64.027 18.9726C64.1894 18.9898 64.3532 18.9898 64.5156 18.9726C64.6515 18.9483 64.7814 18.8978 64.898 18.8237C65.007 18.7479 65.0948 18.6454 65.1529 18.5259C65.2124 18.3736 65.2412 18.2109 65.2379 18.0474C65.2403 17.9169 65.2187 17.7871 65.1741 17.6645C65.129 17.5552 65.0557 17.4598 64.9617 17.388C64.844 17.2923 64.7111 17.2168 64.5687 17.1647C64.3681 17.0806 64.1624 17.0096 63.9527 16.952C63.6372 16.8685 63.3284 16.7618 63.0286 16.6329C62.7791 16.5281 62.552 16.3765 62.3594 16.1863C62.1784 16.0048 62.0373 15.7875 61.9452 15.5482C61.8434 15.2362 61.8002 14.9081 61.8177 14.5804C61.7847 14.2632 61.8272 13.9427 61.9417 13.6451C62.0561 13.3476 62.2393 13.0813 62.4763 12.8682C63.0565 12.4941 63.7423 12.3187 64.4306 12.3683C64.787 12.3639 65.1429 12.396 65.4928 12.4641C65.8294 12.5368 66.1598 12.6364 66.4806 12.7618L66.2788 14.0487C66.0014 13.937 65.713 13.8551 65.4184 13.8041C65.1074 13.7402 64.7906 13.7081 64.4731 13.7083C64.3246 13.697 64.1755 13.697 64.027 13.7083C63.902 13.7163 63.7812 13.7566 63.6765 13.8253C63.5758 13.8815 63.4944 13.9667 63.4428 14.0699C63.382 14.2032 63.3529 14.3489 63.3578 14.4953C63.3537 14.6486 63.3827 14.801 63.4428 14.942C63.4994 15.0653 63.5873 15.1717 63.6977 15.2504C63.8285 15.3439 63.9715 15.419 64.1226 15.4737C64.2819 15.5375 64.4837 15.6014 64.7068 15.6652C65.0445 15.757 65.3747 15.8743 65.6946 16.0161C65.9374 16.1169 66.1577 16.2651 66.3425 16.4521C66.5066 16.6247 66.63 16.8318 66.7036 17.0583C66.7808 17.3351 66.8166 17.6218 66.8099 17.9091Z" fill="#231F20"/>
+<path d="M70.6761 13.7828V20.1637H69.2528V13.7828H67.2135V12.496H72.6624V13.7828H70.6761Z" fill="#231F20"/>
+<path d="M79.0035 14.7612C79.0186 15.2246 78.9201 15.6847 78.7167 16.1012C78.5145 16.4738 78.1814 16.758 77.782 16.8988L79.4602 20.0893H77.7501L76.2737 17.1009H75.1584V20.1105H73.682V12.496H76.3056C76.7422 12.488 77.1779 12.5381 77.6014 12.6449C77.9084 12.7161 78.193 12.8623 78.4299 13.0703C78.6358 13.2667 78.7892 13.5117 78.876 13.7828C78.9656 14.101 79.0085 14.4306 79.0035 14.7612ZM77.4952 14.7612C77.5161 14.6101 77.501 14.4562 77.4511 14.312C77.4013 14.1679 77.3181 14.0375 77.2084 13.9317C76.9038 13.7638 76.5565 13.6898 76.21 13.719H75.1478V15.846H76.21C76.422 15.8655 76.6353 15.8655 76.8473 15.846C76.9911 15.813 77.1256 15.7475 77.2403 15.6545C77.3374 15.5617 77.4072 15.444 77.4421 15.3142C77.4781 15.1465 77.4959 14.9753 77.4952 14.8037V14.7612Z" fill="#231F20"/>
+<path d="M85.1852 17.9091C85.1899 18.2691 85.1398 18.6277 85.0365 18.9726C84.9349 19.2526 84.763 19.5017 84.5373 19.6958C84.2751 19.891 83.9747 20.0287 83.6557 20.0999C83.2265 20.192 82.7882 20.2348 82.3493 20.2275C81.9512 20.2288 81.5535 20.2003 81.1596 20.1424C80.7998 20.0934 80.4446 20.0151 80.0975 19.9085L80.363 18.6323C80.6824 18.7375 81.009 18.8193 81.3402 18.8769C81.6907 18.9402 82.0462 18.9722 82.4024 18.9726C82.5648 18.9898 82.7285 18.9898 82.891 18.9726C83.0269 18.9483 83.1568 18.8978 83.2733 18.8237C83.3824 18.7479 83.4701 18.6454 83.5283 18.5259C83.5877 18.3736 83.6166 18.2109 83.6132 18.0474C83.6156 17.9169 83.594 17.7871 83.5495 17.6645C83.5043 17.5552 83.431 17.4598 83.3371 17.388C83.2193 17.2923 83.0865 17.2168 82.9441 17.1647C82.7435 17.0806 82.5377 17.0096 82.328 16.952C82.0126 16.8685 81.7037 16.7618 81.4039 16.6329C81.1545 16.5281 80.9274 16.3765 80.7348 16.1863C80.5538 16.0048 80.4127 15.7875 80.3205 15.5482C80.2154 15.2477 80.165 14.9307 80.1718 14.6123C80.1389 14.2951 80.1814 13.9746 80.2958 13.677C80.4103 13.3795 80.5935 13.1132 80.8304 12.9001C81.4106 12.526 82.0964 12.3506 82.7847 12.4003C83.1411 12.3958 83.497 12.4279 83.8469 12.496C84.1836 12.5687 84.5139 12.6683 84.8347 12.7937L84.6329 14.0487C84.3555 13.937 84.0671 13.8551 83.7726 13.8041C83.4615 13.7402 83.1448 13.7081 82.8272 13.7083C82.6787 13.697 82.5296 13.697 82.3811 13.7083C82.2561 13.7163 82.1353 13.7566 82.0306 13.8253C81.9299 13.8815 81.8485 13.9667 81.7969 14.0699C81.7361 14.2032 81.707 14.3489 81.712 14.4953C81.7078 14.6486 81.7368 14.801 81.7969 14.942C81.8535 15.0653 81.9414 15.1717 82.0519 15.2504C82.1827 15.3439 82.3256 15.419 82.4767 15.4737C82.636 15.5375 82.8379 15.6014 83.0609 15.6652C83.3986 15.757 83.7288 15.8743 84.0487 16.0161C84.2915 16.1169 84.5118 16.2651 84.6966 16.4521C84.8607 16.6247 84.9841 16.8318 85.0578 17.0583C85.1421 17.3341 85.185 17.6208 85.1852 17.9091Z" fill="#231F20"/>
+<path d="M89.0302 13.7828V20.1637H87.5538V13.7828H85.5676V12.496H91.0165V13.7828H89.0302Z" fill="#231F20"/>
+<path d="M95.7112 20.1105H93.4913L91.4307 12.496H92.9921L94.6066 18.8769L96.2317 12.496H97.7293L95.7112 20.1105Z" fill="#231F20"/>
+<path d="M101.394 20.2382C100.931 20.2442 100.469 20.1833 100.024 20.0574C99.6468 19.9478 99.3107 19.7296 99.057 19.4299C98.7692 19.0818 98.5689 18.6697 98.4728 18.2282C98.2182 16.9719 98.2182 15.6772 98.4728 14.4209C98.5688 13.9729 98.769 13.5539 99.057 13.1979C99.307 12.8918 99.6442 12.6692 100.024 12.5598C100.468 12.4249 100.93 12.3603 101.394 12.3684C101.854 12.3601 102.313 12.4247 102.753 12.5598C103.13 12.6745 103.466 12.8962 103.72 13.1979C104 13.5494 104.196 13.9604 104.293 14.3996C104.434 15.0205 104.498 15.6562 104.485 16.2926C104.496 16.939 104.435 17.5845 104.304 18.2175C104.205 18.6591 104.009 19.0732 103.731 19.4299C103.477 19.7296 103.141 19.9478 102.764 20.0574C102.318 20.1833 101.857 20.2442 101.394 20.2382ZM101.394 18.9513C101.658 18.9595 101.921 18.9162 102.169 18.8237C102.371 18.7289 102.539 18.5726 102.647 18.3771C102.777 18.1208 102.859 17.8435 102.891 17.5582C102.938 17.1344 102.959 16.7083 102.955 16.282C102.96 15.8592 102.939 15.4366 102.891 15.0164C102.859 14.7345 102.777 14.4606 102.647 14.2082C102.543 14.014 102.374 13.8631 102.169 13.7828C101.921 13.6903 101.658 13.647 101.394 13.6552C101.133 13.647 100.873 13.6904 100.629 13.7828C100.424 13.8631 100.255 14.014 100.151 14.2082C100.016 14.4586 99.9334 14.7334 99.9068 15.0164C99.8499 15.4358 99.825 15.8589 99.8324 16.282C99.8261 16.7086 99.851 17.1352 99.9068 17.5582C99.9337 17.8445 100.017 18.1228 100.151 18.3771C100.26 18.5726 100.427 18.7289 100.629 18.8237C100.87 18.9148 101.126 18.9581 101.383 18.9513H101.394Z" fill="#231F20"/>
+<path d="M107.756 20.1105V18.8131L111.155 13.7615H107.969V12.496H112.801V13.7722L109.36 18.845H112.876V20.1105H107.756Z" fill="#231F20"/>
+<path d="M117.985 18.5047H115.393L114.926 20.1105H113.375L115.68 12.496H117.666L119.982 20.1105H118.388L117.985 18.5047ZM115.733 17.2391H117.645L116.71 13.8147H116.657L115.733 17.2391Z" fill="#231F20"/>
+<path d="M123.232 20.1105V12.496H124.708V20.1105H123.232Z" fill="#231F20"/>
+<path d="M125.962 20.1105V18.8131L129.36 13.7615H126.121V12.496H131.017V13.7722L127.576 18.845H131.092V20.1105H125.962Z" fill="#231F20"/>
+<path d="M134.947 20.2382C134.484 20.2442 134.023 20.1833 133.577 20.0574C133.2 19.9478 132.864 19.7296 132.611 19.4299C132.323 19.0818 132.123 18.6697 132.026 18.2282C131.772 16.9719 131.772 15.6772 132.026 14.4209C132.122 13.9729 132.323 13.5539 132.611 13.1979C132.861 12.8918 133.198 12.6692 133.577 12.5598C134.021 12.4249 134.484 12.3603 134.947 12.3684C135.408 12.3601 135.867 12.4247 136.307 12.5598C136.684 12.6745 137.02 12.8962 137.274 13.1979C137.554 13.5494 137.75 13.9604 137.847 14.3996C137.987 15.0205 138.051 15.6562 138.038 16.2926C138.049 16.939 137.989 17.5845 137.858 18.2175C137.758 18.6591 137.562 19.0732 137.284 19.4299C137.031 19.7296 136.694 19.9478 136.318 20.0574C135.872 20.1833 135.41 20.2442 134.947 20.2382ZM134.947 18.9513C135.212 18.9595 135.475 18.9162 135.723 18.8237C135.925 18.7289 136.092 18.5726 136.201 18.3771C136.33 18.1208 136.413 17.8435 136.445 17.5582C136.491 17.1344 136.513 16.7083 136.509 16.282C136.514 15.8592 136.492 15.4366 136.445 15.0164C136.413 14.7345 136.33 14.4606 136.201 14.2082C136.097 14.014 135.928 13.8631 135.723 13.7828C135.475 13.6903 135.212 13.647 134.947 13.6552C134.687 13.647 134.427 13.6904 134.183 13.7828C133.978 13.8631 133.808 14.014 133.705 14.2082C133.57 14.4586 133.487 14.7334 133.46 15.0164C133.404 15.4358 133.379 15.8589 133.386 16.282C133.38 16.7086 133.405 17.1352 133.46 17.5582C133.487 17.8445 133.57 18.1228 133.705 18.3771C133.813 18.5726 133.98 18.7289 134.183 18.8237C134.423 18.9148 134.68 18.9581 134.937 18.9513H134.947Z" fill="#231F20"/>
+<path d="M144.794 18.0048C144.821 18.309 144.776 18.6154 144.662 18.8984C144.547 19.1815 144.367 19.433 144.135 19.632C143.516 19.9961 142.801 20.163 142.085 20.1105H139.355V12.496H142.053C142.46 12.4905 142.866 12.5298 143.264 12.613C143.553 12.6724 143.826 12.7959 144.061 12.9745C144.261 13.1325 144.416 13.342 144.507 13.5807C144.607 13.8674 144.654 14.1703 144.645 14.4741C144.651 14.7067 144.626 14.9392 144.571 15.1653C144.525 15.3331 144.457 15.494 144.369 15.6439C144.282 15.7712 144.174 15.8827 144.05 15.9736C143.932 16.0575 143.804 16.1254 143.668 16.1756C143.823 16.2372 143.972 16.3119 144.114 16.399C144.253 16.4828 144.372 16.5952 144.464 16.7286C144.557 16.8877 144.625 17.0598 144.666 17.2391C144.744 17.4872 144.787 17.7449 144.794 18.0048ZM143.115 14.6655C143.127 14.5428 143.113 14.4189 143.075 14.3018C143.037 14.1847 142.974 14.0767 142.892 13.9848C142.652 13.8225 142.362 13.7509 142.075 13.7828H140.832V15.6226H141.894C142.237 15.6614 142.583 15.5786 142.871 15.3887C142.958 15.2903 143.024 15.1758 143.066 15.0516C143.108 14.9275 143.125 14.7962 143.115 14.6655ZM143.264 17.8559C143.267 17.7116 143.246 17.5677 143.2 17.4305C143.17 17.308 143.098 17.1994 142.999 17.1221C142.881 17.0273 142.743 16.9617 142.595 16.9307C142.382 16.8835 142.165 16.8621 141.947 16.8669H140.832V18.8131H142.191C142.491 18.8463 142.791 18.7625 143.03 18.5791C143.199 18.3815 143.283 18.1256 143.264 17.8666V17.8559Z" fill="#231F20"/>
+<path d="M151.39 14.7612C151.405 15.2246 151.306 15.6847 151.103 16.1012C150.901 16.4738 150.568 16.758 150.168 16.8988L151.846 20.0893H150.147L148.671 17.1009H147.545V20.1105H146.068V12.496H148.692C149.128 12.488 149.564 12.5381 149.988 12.6449C150.295 12.7161 150.579 12.8623 150.816 13.0703C151.022 13.2667 151.175 13.5117 151.262 13.7828C151.352 14.101 151.395 14.4306 151.39 14.7612ZM149.881 14.7612C149.902 14.6101 149.887 14.4562 149.837 14.312C149.787 14.1679 149.704 14.0375 149.595 13.9317C149.29 13.7638 148.943 13.6898 148.596 13.719H147.534V15.846H148.596C148.805 15.866 149.014 15.866 149.223 15.846C149.371 15.815 149.509 15.7494 149.626 15.6545C149.721 15.5611 149.787 15.4433 149.818 15.3142C149.863 15.1479 149.884 14.976 149.881 14.8037V14.7612Z" fill="#231F20"/>
+<path d="M156.7 18.5047H154.109L153.684 20.1105H152.101L154.406 12.496H156.392L158.708 20.1105H157.115L156.7 18.5047ZM154.449 17.2391H156.35L155.415 13.8147L154.449 17.2391Z" fill="#231F20"/>
+<path d="M159.239 20.1105V18.8131L162.638 13.7615H159.451V12.496H164.348V13.7722L160.907 18.845H164.422V20.1105H159.239ZM160.471 10.018L161.873 10.8476L163.307 10.0074L163.785 10.8582L161.778 12.028L159.834 10.9646L160.471 10.018Z" fill="#231F20"/>
+<path d="M165.58 20.1105V12.496H170.445V13.7828H167.057V15.6439H170.009V16.9094H167.057V18.8237H170.445V20.1105H165.58Z" fill="#231F20"/>
+<path d="M175.309 20.1105H173.09L171.029 12.496H172.59L174.205 18.8769H174.258L175.883 12.496H177.381L175.309 20.1105Z" fill="#231F20"/>
+<path d="M181.693 18.5047H179.101L178.655 20.1105H177.105L179.409 12.496H181.396L183.711 20.1105H182.118L181.693 18.5047ZM179.441 17.2391H181.353L180.418 13.8147L179.441 17.2391Z" fill="#231F20"/>
+<path d="M185.995 14.3996V20.1105H184.678V12.496H186.632L189.203 18.3771H189.256V12.496H190.573V20.1105H188.608L185.995 14.3996Z" fill="#231F20"/>
+<path d="M191.051 21.1315C191.265 21.071 191.472 20.9853 191.667 20.8762C191.823 20.7953 191.96 20.6831 192.07 20.5466C192.171 20.4075 192.24 20.2477 192.272 20.0786C192.318 19.8655 192.339 19.6479 192.336 19.4299V12.496H193.812V19.3661C193.815 19.7486 193.776 20.1302 193.695 20.504C193.63 20.8181 193.499 21.115 193.313 21.3761C193.119 21.6363 192.873 21.8535 192.591 22.0142C192.234 22.2118 191.852 22.3586 191.454 22.4502L191.051 21.1315Z" fill="#231F20"/>
+<path d="M195.416 20.1105V12.496H200.281V13.7828H196.893V15.6439H199.898V16.9094H196.946V18.8237H200.334V20.1105H195.416Z" fill="#231F20"/>
+<path d="M202.416 21.7377L201.502 21.4718L201.832 20.1424L201.46 20.0467V18.5791H203V19.8659L202.416 21.7377Z" fill="#231F20"/>
+<path d="M39.8947 32.8724V31.5749L43.2936 26.5234H40.1072V25.2578H45.0037V26.534L41.5623 31.6068H45.0781V32.8724H39.8947Z" fill="#231F20"/>
+<path d="M47.606 27.1615H47.5529V32.8724H46.2358V25.2578H48.1902L50.7606 31.1389V25.2578H52.0777V32.8724H50.1339L47.606 27.1615Z" fill="#231F20"/>
+<path d="M57.5691 31.2665H54.9986L54.5738 32.8724H53.023L55.3279 25.2578H57.3142L59.6297 32.8724H58.0364L57.5691 31.2665ZM55.3385 30.001H57.2504L56.3157 26.5765L55.3385 30.001Z" fill="#231F20"/>
+<path d="M61.8921 27.1615V32.8724H60.5219V25.2578H62.4763L65.0042 31.1389V25.2578H66.3213V32.8724H64.4519L61.8921 27.1615Z" fill="#231F20"/>
+<path d="M70.8461 33C70.383 33.0061 69.9215 32.9452 69.4759 32.8192C69.0991 32.7097 68.7629 32.4914 68.5093 32.1918C68.2215 31.8436 68.0212 31.4316 67.9251 30.99C67.6705 29.7337 67.6705 28.439 67.9251 27.1827C68.0211 26.7347 68.2213 26.3157 68.5093 25.9597C68.7593 25.6537 69.0964 25.4311 69.4759 25.3216C69.9198 25.1867 70.3822 25.1221 70.8461 25.1302C71.3065 25.122 71.7653 25.1866 72.2056 25.3216C72.5826 25.4364 72.9183 25.658 73.1722 25.9597C73.4525 26.3112 73.6487 26.7223 73.7458 27.1615C73.8858 27.7824 73.95 28.418 73.937 29.0545C73.9479 29.7008 73.8874 30.3464 73.7564 30.9794C73.657 31.421 73.4611 31.835 73.1828 32.1918C72.9292 32.4914 72.593 32.7097 72.2163 32.8192C71.7706 32.9452 71.3091 33.0061 70.8461 33ZM70.8461 31.7132C71.1103 31.7214 71.3737 31.678 71.6214 31.5856C71.8237 31.4907 71.991 31.3344 72.0994 31.1389C72.2288 30.8827 72.3116 30.6054 72.3437 30.32C72.4007 29.8969 72.4326 29.4707 72.4393 29.0438C72.4441 28.6211 72.4228 28.1984 72.3756 27.7783C72.3435 27.4963 72.2608 27.2225 72.1313 26.97C72.0276 26.7758 71.8581 26.625 71.6533 26.5446C71.4056 26.4522 71.1422 26.4088 70.8779 26.417C70.6171 26.4088 70.3572 26.4522 70.1132 26.5446C69.9084 26.625 69.7389 26.7758 69.6352 26.97C69.5006 27.2204 69.4176 27.4952 69.3909 27.7783C69.3127 28.196 69.2665 28.6191 69.2528 29.0438C69.2465 29.4705 69.2714 29.897 69.3272 30.32C69.3541 30.6064 69.4371 30.8846 69.5715 31.1389C69.6799 31.3344 69.8472 31.4907 70.0494 31.5856C70.3002 31.6808 70.5675 31.7242 70.8354 31.7132H70.8461Z" fill="#231F20"/>
+<path d="M79.8744 30.671C79.8791 31.031 79.829 31.3896 79.7257 31.7345C79.6241 32.0145 79.4522 32.2635 79.2265 32.4576C78.9643 32.6528 78.6639 32.7905 78.3449 32.8617C77.9157 32.9538 77.4774 32.9966 77.0385 32.9894C76.6404 32.9906 76.2427 32.9622 75.8488 32.9043C75.489 32.8552 75.1338 32.777 74.7867 32.6703L75.0522 31.3941C75.3716 31.4994 75.6982 31.5811 76.0294 31.6387C76.3799 31.702 76.7354 31.7341 77.0916 31.7345C77.254 31.7516 77.4177 31.7516 77.5802 31.7345C77.7161 31.7102 77.8459 31.6596 77.9625 31.5856C78.0716 31.5098 78.1593 31.4073 78.2175 31.2878C78.2769 31.1354 78.3058 30.9728 78.3024 30.8092C78.3048 30.6788 78.2832 30.549 78.2387 30.4264C78.1935 30.317 78.1202 30.2216 78.0263 30.1499C77.9085 30.0541 77.7757 29.9787 77.6333 29.9265C77.4327 29.8425 77.2269 29.7714 77.0172 29.7138C76.7018 29.6303 76.3929 29.5237 76.0931 29.3948C75.8437 29.2899 75.6166 29.1383 75.424 28.9481C75.243 28.7666 75.1019 28.5493 75.0097 28.31C74.9046 28.0095 74.8542 27.6925 74.861 27.3742C74.8281 27.057 74.8706 26.7365 74.985 26.4389C75.0995 26.1413 75.2826 25.8751 75.5196 25.6619C76.0998 25.2878 76.7856 25.1124 77.4739 25.1621C77.8303 25.1577 78.1862 25.1897 78.5361 25.2578C78.8728 25.3306 79.2031 25.4302 79.5239 25.5556L79.3858 26.8105C79.1084 26.6989 78.8201 26.6169 78.5255 26.5659C78.2144 26.502 77.8977 26.4699 77.5802 26.4702C77.4317 26.4589 77.2825 26.4589 77.134 26.4702C77.0091 26.4781 76.8883 26.5184 76.7835 26.5872C76.6829 26.6433 76.6014 26.7286 76.5499 26.8318C76.489 26.9651 76.4599 27.1107 76.4649 27.2572C76.4607 27.4104 76.4897 27.5628 76.5499 27.7038C76.6064 27.8272 76.6943 27.9335 76.8048 28.0122C76.9356 28.1057 77.0785 28.1809 77.2296 28.2356C77.389 28.2994 77.5908 28.3632 77.8138 28.427C78.1515 28.5188 78.4817 28.6361 78.8016 28.778C79.0444 28.8787 79.2647 29.0269 79.4496 29.214C79.6136 29.3865 79.737 29.5936 79.8107 29.8202C79.8735 30.0991 79.895 30.3858 79.8744 30.671Z" fill="#231F20"/>
+<path d="M83.7832 26.5446V32.9256H82.3068V26.5446H80.3205V25.2578H85.7694V26.5446H83.7832Z" fill="#231F20"/>
+<path d="M89.1046 32.8724V25.2578H90.581V32.8724H89.1046Z" fill="#231F20"/>
+<path d="M93.5657 27.1615V32.8724H92.1955V25.2578H94.1499L96.7203 31.1389V25.2578H98.0374V32.8724H96.1255L93.5657 27.1615Z" fill="#231F20"/>
+<path d="M106.715 30.671C106.72 31.031 106.67 31.3896 106.567 31.7345C106.465 32.0145 106.293 32.2635 106.067 32.4576C105.805 32.6528 105.505 32.7905 105.186 32.8617C104.756 32.9538 104.318 32.9966 103.879 32.9894C103.481 32.9906 103.084 32.9622 102.69 32.9043C102.33 32.8552 101.975 32.777 101.627 32.6703L101.893 31.3941C102.212 31.4994 102.539 31.5811 102.87 31.6387C103.221 31.702 103.576 31.7341 103.932 31.7345C104.095 31.7516 104.259 31.7516 104.421 31.7345C104.557 31.7102 104.687 31.6596 104.803 31.5856C104.912 31.5098 105 31.4073 105.058 31.2878C105.118 31.1354 105.147 30.9728 105.143 30.8092C105.146 30.6788 105.124 30.549 105.079 30.4264C105.034 30.317 104.961 30.2216 104.867 30.1499C104.749 30.0541 104.616 29.9787 104.474 29.9265C104.273 29.8425 104.068 29.7714 103.858 29.7138C103.543 29.6303 103.234 29.5237 102.934 29.3948C102.684 29.2899 102.457 29.1383 102.265 28.9481C102.084 28.7666 101.943 28.5493 101.851 28.31C101.745 28.0095 101.695 27.6925 101.702 27.3742C101.669 27.057 101.711 26.7365 101.826 26.4389C101.94 26.1413 102.123 25.8751 102.36 25.6619C102.941 25.2878 103.626 25.1124 104.315 25.1621C104.671 25.1577 105.027 25.1897 105.377 25.2578C105.714 25.3306 106.044 25.4302 106.365 25.5556L106.184 26.8105C105.907 26.6989 105.618 26.6169 105.324 26.5659C105.013 26.502 104.696 26.4699 104.378 26.4702C104.23 26.4589 104.081 26.4589 103.932 26.4702C103.807 26.4781 103.687 26.5184 103.582 26.5872C103.481 26.6434 103.4 26.7286 103.348 26.8318C103.287 26.9651 103.258 27.1107 103.263 27.2572C103.259 27.4104 103.288 27.5628 103.348 27.7038C103.405 27.8272 103.493 27.9335 103.603 28.0122C103.734 28.1057 103.877 28.1809 104.028 28.2356C104.187 28.2994 104.389 28.3632 104.612 28.427C104.95 28.5188 105.28 28.6361 105.6 28.778C105.843 28.8787 106.063 29.0269 106.248 29.214C106.412 29.3865 106.535 29.5936 106.609 29.8202C106.686 30.097 106.722 30.3837 106.715 30.671ZM102.828 22.7799L104.23 23.6094L105.664 22.7693L106.184 23.6519L104.177 24.8218L102.233 23.7583L102.828 22.7799Z" fill="#231F20"/>
+<path d="M113.184 27.5656C113.191 27.925 113.145 28.2835 113.046 28.6291C112.959 28.9206 112.798 29.1844 112.578 29.3948C112.341 29.6115 112.058 29.7714 111.75 29.8627C111.339 29.9776 110.913 30.0314 110.486 30.0222H109.317V32.8724H107.841V25.2578H110.486C110.919 25.2504 111.351 25.3005 111.771 25.4067C112.084 25.4829 112.372 25.6365 112.61 25.8534C112.817 26.0536 112.97 26.3022 113.056 26.5765C113.146 26.8984 113.189 27.2315 113.184 27.5656ZM111.675 27.64C111.68 27.4606 111.659 27.2815 111.612 27.1083C111.573 26.9775 111.5 26.8598 111.399 26.768C111.285 26.6782 111.15 26.6196 111.006 26.5978C110.801 26.5787 110.595 26.5787 110.39 26.5978H109.328V28.7886H110.39C110.6 28.791 110.81 28.7732 111.017 28.7354C111.161 28.7025 111.295 28.637 111.41 28.544C111.508 28.4502 111.581 28.3332 111.622 28.2037C111.663 28.0187 111.681 27.8294 111.675 27.64Z" fill="#231F20"/>
+<path d="M116.965 33C116.502 33.0061 116.041 32.9452 115.595 32.8192C115.218 32.7097 114.882 32.4914 114.628 32.1918C114.341 31.8436 114.14 31.4316 114.044 30.99C113.789 29.7337 113.789 28.439 114.044 27.1827C114.14 26.7347 114.34 26.3157 114.628 25.9597C114.878 25.6537 115.215 25.4311 115.595 25.3216C116.039 25.1867 116.501 25.1221 116.965 25.1302C117.425 25.122 117.884 25.1866 118.325 25.3216C118.702 25.4364 119.037 25.658 119.291 25.9597C119.571 26.3112 119.768 26.7223 119.865 27.1615C120.005 27.7824 120.069 28.418 120.056 29.0545C120.067 29.7008 120.006 30.3464 119.875 30.9794C119.776 31.421 119.58 31.835 119.302 32.1918C119.048 32.4914 118.712 32.7097 118.335 32.8192C117.89 32.9452 117.428 33.0061 116.965 33ZM116.965 31.7132C117.229 31.7214 117.493 31.678 117.74 31.5856C117.943 31.4907 118.11 31.3344 118.218 31.1389C118.348 30.8827 118.431 30.6054 118.463 30.32C118.509 29.8962 118.53 29.4701 118.526 29.0438C118.531 28.6211 118.51 28.1984 118.463 27.7783C118.431 27.4963 118.348 27.2225 118.218 26.97C118.115 26.7758 117.945 26.625 117.74 26.5446C117.493 26.4522 117.229 26.4088 116.965 26.417C116.704 26.4088 116.444 26.4522 116.2 26.5446C115.995 26.625 115.826 26.7758 115.722 26.97C115.588 27.2204 115.505 27.4952 115.478 27.7783C115.421 28.1976 115.396 28.6207 115.404 29.0438C115.397 29.4705 115.422 29.897 115.478 30.32C115.505 30.6064 115.588 30.8846 115.722 31.1389C115.831 31.3344 115.998 31.4907 116.2 31.5856C116.441 31.6766 116.697 31.72 116.954 31.7132H116.965Z" fill="#231F20"/>
+<path d="M126.694 27.523C126.71 27.9865 126.611 28.4465 126.408 28.863C126.205 29.2356 125.872 29.5198 125.473 29.6607L127.151 32.8511H125.452L123.975 29.8627H122.849V32.8724H121.373V25.2578H123.997C124.433 25.2499 124.869 25.2999 125.292 25.4067C125.599 25.478 125.884 25.6241 126.121 25.8321C126.327 26.0285 126.48 26.2735 126.567 26.5446C126.657 26.8629 126.699 27.1924 126.694 27.523ZM125.186 27.523C125.207 27.3719 125.192 27.218 125.142 27.0739C125.092 26.9297 125.009 26.7994 124.899 26.6935C124.595 26.5256 124.247 26.4516 123.901 26.4808H122.839V28.6078H123.901C124.113 28.6273 124.326 28.6273 124.538 28.6078C124.682 28.5749 124.817 28.5094 124.931 28.4164C125.028 28.3236 125.098 28.2059 125.133 28.0761C125.169 27.9083 125.187 27.7372 125.186 27.5656V27.523Z" fill="#231F20"/>
+<path d="M130.858 26.5446V32.9256H129.382V26.5446H127.395V25.2578H132.844V26.5446H130.858Z" fill="#231F20"/>
+</g>
+<defs>
+<clipPath id="clip0_356_2856">
+<rect width="203" height="33" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/social/fb_orange.svg b/public/img/social/fb_orange.svg
new file mode 100644
index 000000000..1d45257e6
--- /dev/null
+++ b/public/img/social/fb_orange.svg
@@ -0,0 +1,11 @@
+<svg width="40" height="41" viewBox="0 0 40 41" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_356_3151)">
+<path d="M20 40.0911C31.0457 40.0911 40 31.1368 40 20.0911C40 9.04537 31.0457 0.0910645 20 0.0910645C8.95431 0.0910645 0 9.04537 0 20.0911C0 31.1368 8.95431 40.0911 20 40.0911Z" fill="#F07D3E"/>
+<path d="M12.897 10.7653C12.3089 10.7671 11.7454 11.0016 11.3295 11.4174C10.9136 11.8333 10.6792 12.3969 10.6774 12.985V27.191C10.6792 27.7791 10.9136 28.3427 11.3295 28.7585C11.7454 29.1744 12.3089 29.4089 12.897 29.4107H20.3694C20.4174 29.4186 20.4663 29.4186 20.5142 29.4107H23.033C23.081 29.4186 23.1299 29.4186 23.1778 29.4107H27.1031C27.6912 29.4089 28.2547 29.1744 28.6706 28.7585C29.0865 28.3427 29.3209 27.7791 29.3227 27.191V12.985C29.3209 12.3969 29.0865 11.8333 28.6706 11.4174C28.2547 11.0016 27.6912 10.7671 27.1031 10.7653H12.897ZM12.897 11.6532H27.1031C27.2782 11.6523 27.4518 11.6862 27.6137 11.7528C27.7757 11.8194 27.9229 11.9175 28.0467 12.0413C28.1706 12.1652 28.2686 12.3123 28.3352 12.4743C28.4019 12.6363 28.4357 12.8099 28.4349 12.985V27.191C28.4357 27.3661 28.4019 27.5397 28.3352 27.7017C28.2686 27.8636 28.1706 28.0108 28.0467 28.1346C27.9229 28.2585 27.7757 28.3566 27.6137 28.4232C27.4518 28.4898 27.2782 28.5237 27.1031 28.5228H23.5515V22.3077H25.2475L25.8692 19.2001H23.5515V18.3123C23.5515 18.0648 23.5751 18.0454 23.6582 17.9915C23.9056 17.8907 24.173 17.8486 24.4394 17.8683H25.7713V15.3686L25.5181 15.2481C24.7558 14.9243 23.9358 14.7586 23.1077 14.7608C22.6623 14.7461 22.2195 14.8334 21.8132 15.0162C21.4068 15.1989 21.0476 15.4722 20.7631 15.8151C20.2329 16.5368 19.9638 17.4174 20 18.3123V19.2001H18.6682V22.3077H20V28.5228H12.897C12.7219 28.5237 12.5483 28.4898 12.3864 28.4232C12.2244 28.3566 12.0772 28.2585 11.9534 28.1347C11.8295 28.0108 11.7315 27.8636 11.6648 27.7017C11.5982 27.5397 11.5644 27.3661 11.5652 27.191V12.985C11.5644 12.8099 11.5982 12.6363 11.6648 12.4743C11.7315 12.3123 11.8295 12.1652 11.9534 12.0413C12.0772 11.9175 12.2244 11.8194 12.3864 11.7528C12.5483 11.6862 12.7219 11.6523 12.897 11.6532ZM23.1076 15.6486C23.7141 15.6361 24.3173 15.7418 24.8834 15.9599V16.9804H24.4394C24.0007 16.9427 23.5607 17.0353 23.1744 17.2466C23.0083 17.3686 22.8748 17.5297 22.7857 17.7155C22.6966 17.9014 22.6547 18.1063 22.6637 18.3122V20.088H24.7854L24.5192 21.4198H22.6637V28.5228H20.8879V21.4198H19.5561V20.088H20.8879V18.3123C20.8548 17.6194 21.0551 16.9355 21.4567 16.37C21.6541 16.1265 21.907 15.9338 22.1943 15.8083C22.4816 15.6827 22.7948 15.628 23.1076 15.6486Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_356_3151">
+<rect width="40" height="40" fill="white" transform="translate(0 0.0910645)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/social/twitter_orange.svg b/public/img/social/twitter_orange.svg
new file mode 100644
index 000000000..d564c5d75
--- /dev/null
+++ b/public/img/social/twitter_orange.svg
@@ -0,0 +1,11 @@
+<svg width="40" height="41" viewBox="0 0 40 41" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_356_3154)">
+<path d="M20 40.0911C31.0457 40.0911 40 31.1368 40 20.0911C40 9.04537 31.0457 0.0910645 20 0.0910645C8.95431 0.0910645 0 9.04537 0 20.0911C0 31.1368 8.95431 40.0911 20 40.0911Z" fill="#F07D3E"/>
+<path d="M24.9941 11.553C23.6855 11.5543 22.4308 12.0748 21.5055 13.0001C20.5801 13.9254 20.0597 15.1801 20.0584 16.4888C20.0692 16.6508 20.0882 16.8122 20.1153 16.9724C18.4974 16.827 16.9246 16.361 15.4886 15.6015C14.0527 14.842 12.7823 13.8043 11.7516 12.5487C11.7052 12.49 11.6451 12.4436 11.5766 12.4136C11.5081 12.3835 11.4333 12.3707 11.3587 12.3762C11.2843 12.3818 11.2124 12.4056 11.1494 12.4457C11.0865 12.4857 11.0344 12.5406 10.9977 12.6056C10.5095 13.4347 10.2797 14.3906 10.338 15.351C10.3963 16.3114 10.7399 17.2326 11.3249 17.9965C11.2075 17.9449 11.0795 17.9165 10.9693 17.8542C10.9002 17.8175 10.8228 17.7992 10.7446 17.8011C10.6664 17.803 10.59 17.825 10.5228 17.865C10.4556 17.9051 10.3999 17.9618 10.361 18.0296C10.3221 18.0975 10.3013 18.1743 10.3008 18.2525V18.3094C10.3063 19.1041 10.5047 19.8856 10.8788 20.5867C11.2529 21.2878 11.7916 21.8877 12.4486 22.3348C12.4344 22.3357 12.4201 22.3357 12.4059 22.3348C12.3291 22.3214 12.2502 22.3279 12.1767 22.3538C12.1031 22.3797 12.0375 22.424 11.9861 22.4826C11.9346 22.5412 11.8991 22.612 11.883 22.6882C11.8668 22.7645 11.8706 22.8436 11.8938 22.918C12.1505 23.6971 12.5969 24.4001 13.1928 24.9637C13.7887 25.5273 14.5155 25.9339 15.3076 26.1468C13.6904 27.1106 11.801 27.5155 9.93093 27.2989C9.82755 27.2852 9.7226 27.3074 9.63361 27.3618C9.54462 27.4162 9.47699 27.4994 9.44202 27.5977C9.40705 27.6959 9.40686 27.8032 9.44148 27.9016C9.4761 28 9.54343 28.0835 9.63223 28.1381C11.7528 29.5039 14.2219 30.2299 16.7442 30.2291C18.5946 30.2639 20.4305 29.8966 22.125 29.1525C23.8196 28.4084 25.3323 27.3052 26.5588 25.9192C28.7213 23.4538 29.9275 20.2943 29.9583 17.015C29.9583 16.8852 29.9476 16.759 29.944 16.631C30.7844 16.0013 31.5149 15.2372 32.1061 14.3694C32.1621 14.2869 32.1895 14.1884 32.184 14.0889C32.1786 13.9894 32.1407 13.8944 32.0761 13.8185C32.0115 13.7426 31.9238 13.69 31.8265 13.6687C31.7291 13.6475 31.6275 13.6588 31.5371 13.7008C31.3024 13.8057 31.0286 13.8164 30.7833 13.9C31.1174 13.4724 31.377 12.9915 31.5514 12.4776C31.5791 12.3895 31.5793 12.295 31.5521 12.2068C31.5248 12.1186 31.4714 12.0407 31.3988 11.9836C31.3263 11.9265 31.238 11.8928 31.1459 11.887C31.0537 11.8812 30.962 11.9037 30.8828 11.9513C30.0923 12.413 29.2326 12.7443 28.3367 12.9327C27.4392 12.0635 26.2435 11.5699 24.9941 11.553ZM24.9941 12.4634C25.5464 12.4636 26.0928 12.5773 26.5993 12.7975C27.1058 13.0178 27.5616 13.3398 27.9385 13.7435C27.9928 13.7994 28.0606 13.8405 28.1352 13.8629C28.2099 13.8853 28.2891 13.8883 28.3652 13.8715C28.9491 13.7555 29.5207 13.584 30.0721 13.3595C29.7571 13.7882 29.3607 14.1507 28.9057 14.4263C28.8056 14.4753 28.7269 14.5593 28.6846 14.6623C28.6423 14.7654 28.6393 14.8805 28.6761 14.9856C28.7129 15.0908 28.787 15.1788 28.8843 15.233C28.9817 15.2872 29.0956 15.3038 29.2044 15.2797C29.6437 15.1922 30.0763 15.0733 30.4988 14.9241C30.1108 15.3449 29.6819 15.726 29.2186 16.062C29.1566 16.1073 29.1071 16.1676 29.0747 16.2373C29.0424 16.307 29.0283 16.3837 29.0337 16.4603C29.0408 16.6452 29.0479 16.8283 29.0479 17.015C29.0134 20.069 27.8884 23.0101 25.876 25.3076C24.7379 26.601 23.331 27.6302 21.7537 28.323C20.1763 29.0159 18.4666 29.3557 16.7442 29.3188C14.9914 29.3189 13.2593 28.9404 11.6663 28.2093C13.5285 28.0813 15.3107 27.4031 16.7869 26.2606C16.8596 26.2024 16.9128 26.1233 16.9392 26.034C16.9656 25.9447 16.9639 25.8494 16.9345 25.761C16.905 25.6726 16.8491 25.5954 16.7744 25.5398C16.6997 25.4841 16.6097 25.4528 16.5166 25.4499C15.807 25.4316 15.1152 25.2242 14.5125 24.8491C13.9099 24.474 13.4183 23.9449 13.0886 23.3163H13.1597C13.6016 23.3178 14.0417 23.2604 14.4683 23.1456C14.5656 23.1176 14.6508 23.0579 14.7104 22.976C14.77 22.8942 14.8005 22.7948 14.7973 22.6936C14.794 22.5924 14.7571 22.4952 14.6924 22.4173C14.6276 22.3394 14.5388 22.2854 14.4399 22.2637C13.6493 22.0952 12.9284 21.691 12.3723 21.1044C11.8161 20.5178 11.4509 19.7764 11.3249 18.978C11.7857 19.1501 12.2702 19.2508 12.7615 19.2767C12.8623 19.2827 12.9622 19.2551 13.0456 19.1981C13.129 19.1411 13.191 19.058 13.222 18.9618C13.2529 18.8657 13.2511 18.762 13.2166 18.6671C13.1822 18.5722 13.1171 18.4914 13.0317 18.4375C12.4796 18.0688 12.0272 17.5695 11.7145 16.9839C11.4019 16.3983 11.2387 15.7445 11.2395 15.0806C11.2514 14.5816 11.3575 14.0893 11.5525 13.6298C13.8788 16.219 17.1375 17.7793 20.6131 17.9681C20.6835 17.9717 20.7537 17.9592 20.8184 17.9315C20.8831 17.9037 20.9406 17.8615 20.9865 17.8081C21.032 17.7542 21.0644 17.6905 21.081 17.622C21.0977 17.5535 21.0982 17.4821 21.0825 17.4134C21.0093 17.1106 20.9711 16.8003 20.9687 16.4888C20.9676 15.9599 21.071 15.4359 21.2729 14.9471C21.4748 14.4582 21.7713 14.014 22.1453 13.64C22.5193 13.266 22.9635 12.9695 23.4524 12.7676C23.9412 12.5657 24.4652 12.4623 24.9941 12.4634Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_356_3154">
+<rect width="40" height="40" fill="white" transform="translate(0 0.0910645)"/>
+</clipPath>
+</defs>
+</svg>

From 9fd7b2819ccb35c8eaf59b444f405964d2f47bef Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Fri, 27 May 2022 14:38:13 +0200
Subject: [PATCH 06/17] Restavriran lang file po commitu do Nejca (ker je
 povozil dosedanje popravke)

---
 lang/1.php | 1260 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 791 insertions(+), 469 deletions(-)

diff --git a/lang/1.php b/lang/1.php
index ca477a02f..838549b37 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -98,6 +98,7 @@ $lang = array (
 	"logout_text" 			=>		"&#269;e on-line novic ne elite prejemati ve&#269;, se lahko odjavite tu.<br>Ko boste odjavljeni,
 						Vam ne bomo po&#353;iljali <b>nobene</b> pote. &#269;e imate shranjen pikotek, bo odstranjen.",
 	"email" 			=>		"E-mail",
+	"altemail" 			=>		"Alternativni e-mail",
 	"password" 			=>		"Geslo",
 	"google_2fa" 			=>	"Dvo nivojsko preverjanje pristnosti",
 	"google_2fa_user_code" =>	"Vpišite 6 mestno kodo",
@@ -116,6 +117,8 @@ $lang = array (
 	"app_aai_installation_text" =>		"<b>Z orodjem 1KA lahko na enostaven način izdelate spletni vprašalnik, izvedete spletno anketo, urejate in analizirate podatke, s kar najmanjšim številom klikov.</b><br /><br />Za uporabo orodja 1KA se lahko registrirate oziroma prijavite z vašim Arnes AAI-računom.<br /><br />Kliknite na spodnji gumb in sledite navodilom za prijavo v AAI.",
     "sent" 			        =>		"Poslano",
     "not_sent" 			    =>		"Ni poslano",
+    "unsubscribed"          =>		"Odjavljen",
+    "not_unsubscribed"      =>		"Ni odjavljen",
     "check_and" 			=>		"Preverite in",
     "submit" 			    =>		"potrdite spremembe",
 	"dontwant"			    =>	"Ne elim ve&#269; prejemati on-line novic",
@@ -222,7 +225,7 @@ $lang = array (
 	"show"				=>		"Prikazan povsod",
 	"only_show_index"		=>		"Samo na prvi strani",
 	"not_show"			=>		"Ni prikazan",
-	"ask_delete_link" 		=>		"Ali ste prepri&#269;ani, da zelite izbrisati podstran",
+	"ask_delete_link" 		=>		"Ali ste prepri&#269;ani, da želite izbrisati podstran",
 	"ask2_delete_link"		=>	"Unicili boste tudi vse podnavigacije! Ce hocete uniciti zgolj to navigacijo, ne pa tudi tistih pod njo, jo najprej spremenite v nizji nivo. Res zelite uniciti tudi vse podnavigacije in njihove vsebine?",
 	"ask_delete_news"		=>	"Ali ste prepri&#269;ani, da zelite izbrisati novico?",
 	"archive_restored"		=>		"Arhiv nalozen.",
@@ -337,6 +340,7 @@ $lang = array (
 	"add_category"			=>		"Dodajanje kategorije",
 	"add_category1"			=>		"Dodaj kategorijo",
 	"sent_by"			=>		"Vpisal",
+	"sent_by2"			=>		"Poslal",
 	"edit_by"			=>		"Popravil",
 	"send_mail"			=>		"Poslati maile",
 	"no_one"			=>		"Nikomur",
@@ -349,8 +353,10 @@ $lang = array (
 	"or_current"			=>		"<font color=\"red\"><br><b>ALI</b></font> obstoje&#269;e",
 	"edit4"				=>	"Spremeni",
 	"edit1337"				=>	"Shrani spremembe",
+	"edit1338"				=>	"Prekliči",
+	"edit1339"				=>	"Nadaljuj",
     "reset_translation"				    =>	"Ponastavi prevod",
-	"delete_account"				    =>	"Izbriši račun 1KA",
+	"delete_account"				    =>	"Izbriši 1KA račun",
 	"delete_account_conformation"       => "Ste prepričani, da želite trajno izbrisati vaš račun? Po potrditvi se ne boste več mogli prijaviti s tem računom!",
 	"change_account_pass_conformation"  => "Po spremembi gesla vas bo odjavilo iz aplikacije! Za aktiviranje spremembe gesla se ponovno prijavite z novim geslom.",
 	"pass_text1"			            =>	"Z geslom boste tretji osebi prepre&#269;ili spreminjanje vaih nastavitev on-line novic in profila.",
@@ -617,6 +623,7 @@ $lang = array (
 	"threads"			=>	"Tem",
 	"new_thread"			=>	"Nova tema",
 	"reply"				=>	"Odgovori",
+	"for"				=>	"Za",
 	"guest"				=>	"Gost",
 	"askdelforum"			=>	"Ali ste prepri&#269;ani, da zelite izbrisati forum? Izbrisali boste tudi vse teme v tem forumu!",
 	"newforum"			=>	"Nov forum",
@@ -676,6 +683,7 @@ $lang = array (
   "login_alternative_emails_success"	=>	"Na izbran elektronski naslov (#email#) je bilo poslano elektronsko sporočilo s povezavo za potrditev.",
 	"login_email_subscription"	=>	"Privzeti email",
 	"login_password"		=>	"Geslo",
+	"password_confirm"		=>	"Potrditev gesla",
 	"login_again"			=>	"Ponovno",
 	"login_alert"			=>	"Obve&#353;&#269;anje",
 	"login_frequency"		=>	"Pogostost",
@@ -762,9 +770,11 @@ $lang = array (
 	"date_dec"				=>	"Dec",
 	"s_search"				=>	"I&#353;&#269;i",
 	"s_search2"				=>	"Išči",
-	"s_search_mySurvey"		=>	"Išči po mojih anketah",
 	"s_search_Library"		=>	"Išči po knjižnici",
+	"s_search_Library_public"	=>	"Išči po javni knjižnici",
+	"s_search_Library_my"	    =>	"Išči po moji knjižnici",
 	"s_search_metaadmin"	=>	"Išči samo po avtorju",
+	"s_search_mySurvey"		=>	"Išči po mojih anketah",
 	"s_search_mySurvey_title"	=>	"Rezultati iskanja po mojih anketah",
 	"s_search_mySurvey_nothing"	=>	"Za poizvedbo ni bilo mogoče najti nobene ankete",
 	"s_search_mySurvey_back"	=>	"Nazaj na Moje ankete",
@@ -780,11 +790,11 @@ $lang = array (
 	"s_any"					=>	"Katerakoli beseda",
 	"s_thru"				=>	"I&#353;&#269;i po",
 	"s_lookinto"			=>	"Preglej",
-	"s_title"				=>	"Naslovu",
+	"s_title"				=>	"Naslov",
 	"s_content"				=>	"Vsebini",
-	"s_author"				=>	"Avtorju",
+	"s_author"				=>	"Avtor",
 	"s_word"				=>	"Ključnih besedah",
-	"s_text"				=>	"Besedilu",
+	"s_text"				=>	"Besedilo",
 	"s_webcontent"			=>	"Vsebino strani",
 	"s_articles"			=>	"&#269;lanke, novice, obvestila",
 	"s_database"			=>	"Baze",
@@ -1045,6 +1055,8 @@ $lang = array (
 	"send_email2admins"		=>	"Po&#353;lji e-mail administratorjem",
 	"sendmailnotice"		=>	"Pozor: vnesite va&#353; pravi e-mail naslov, da vam bo naslovnik lahko odgovoril!",
 	"subject"			=>	"Zadeva",
+	"message"		=>	"Sporočilo",
+	"message_content"			=>	"Vsebina sporočila",
 	"email_show"			=>	"Prika&#382;i e-mail",
 //	"email_send"			=>	"Mo&#382;no poslati e-mail",
 	"email_send"			=>	"Omogo&#269;i po&#154;iljanje, a skrij naslov",
@@ -1142,6 +1154,7 @@ $lang = array (
 	"group_members"			=>	"&#268;lanov",
 	"group_new"			=>	"Nova skupina",
 	"group_name"			=>	"Ime skupine",
+	"group_URL"				=>	"URL Povezava",
 	"admin_edit_groups"		=>	"Urejanje skupin za",
 	"admin_edit_groups_no"		=>	"Ni skupin. Dodajte jih.",
 	"mass_select_group"		=>	"Izberite skupino(e) uporabnikov",
@@ -1251,10 +1264,10 @@ $lang = array (
 	"deactive_column"		=>	"Deaktiviraj rubriko",
 	"breakedPage_title" 		=>	"Naslov prelomljene strani",
 	"access2"			=>	"To sporo&#269;ilo vidi <strong>avtor</strong> in",
-	"forum_admin"			=>	"administratorji",
-	"forum_manager"			=>	"managerji",
-	"forum_clan"			=>	"&#269;lani",
-	"forum_registered"		=>	"registrirani uporabniki",
+	"forum_admin"			=>	"Administratorji",
+	"forum_manager"			=>	"Managerji",
+	"forum_clan"			=>	"Člani",
+	"forum_registered"		=>	"Registrirani uporabniki",
 	"ForumAvatar"			=>	"Avatar v forumu",
 	"avatar_notin3"			=>	 	"ne v 3-kolonskem prikazu",
 	"upload_ur_avatar"		=>	"Nalo&#382;i svojega",
@@ -1561,23 +1574,46 @@ $lang = array (
 	"export_all_excel"		=>	"Izvozi vsa polja v Excel",
 	"export_s_excel"		=>	"Izvozi v Excel",
 	"srv_lnk_excel"			=>	"CSV",
-	"srv_lnk_excel_xls"		=>	"Excel (xls)",
+	"srv_lnk_excel_xls"		=>	"EXCEL XLS",
 	"srv_lnk_spss"			=>	"SPSS SYNTAX",
 	"srv_lnk_sav"   		=>	"SPSS SAV",
 	"srv_lnk_PDF/RTF"		=>	"Zaporedni izpis vseh respodentov",
 	"srv_lnk_txt"			=>	"Tekstovna datoteka",					
 	"srv_lnk_data_view"		=>	"Pregled",					
-	"srv_lnk_data_edit"		=>	"Urejanje",	
-	"srv_izvoz_Excel_xls_note"		=>	"<p>Podatke v Excel (xls) izvozite s klikom na ukaz <a href=\"#\" onclick=\"doExcelXlsExport(); return false;\" ><span class=\"bold\">\"Izvoz v Excel\"</span></a>.</p><p>V Excel verzije 2003 ali starej&#353;e je mo&#382;en izvoz najve&#269; 256-ih stolpcev (spremenljivk). Morebitni nadaljnji stolpci se ne bodo izvozili. Ta omejitev je odpravljena v verziji 2007.</p>",
-	"srv_izvoz_Excel_xls_note_2"	=>	"<p>Opozorilo! Pri izvozu v Excel (Microsoft Excel verzija 2007 in novejše) se odprti odgovori ne izpišejo v celoti. Rešitev takšne težave in vseh težav z Excelom si lahko pogledate v pomoči <a href=\"https://www.1ka.si/db/19/430/Pogosta%20vprasanja/Tezave_pri_izvozu_v_Excel/\" target=\"_blank\"><span class=\"bold\">Težave pri izvozu v Excel</span></a>.</p>",	
-	"srv_izvoz_Excel_note"			=>	"<p>Podatke v CSV (comma separated values) izvozite s klikom na ukaz <a href=\"#\" onclick=\"doExcelExport(); return false;\" ><span class=\"bold\">\"Izvoz v CSV\"</span></a>.</p><p>V Excel verzije 2003 ali starej&#353;e je mo&#382;en izvoz najve&#269; 256-ih stolpcev (spremenljivk). Morebitni nadaljnji stolpci se ne bodo izvozili. Ta omejitev je odpravljena v verziji 2007.</p>",
-	"srv_izvoz_Excel_note_2"		=>	"<p>Opozorilo! Pri izvozu v Excel (Microsoft Excel verzija 2007 in novejše) se odprti odgovori ne izpišejo v celoti. Rešitev takšne težave in vseh težav z Excelom si lahko pogledate v pomoči <a href=\" https://www.1ka.si/db/19/430/Pogosta%20vprasanja/Tezave_pri_izvozu_v_Excel/\" target=\"_blank\"><span class=\"bold\">Težave pri izvozu v Excel</span></a>.</p>",
+	"srv_lnk_data_edit"		=>	"Urejanje",
+	"srv_izvoz_step1"		=>	"1. korak:",
+	"srv_izvoz_step2"		=>	"2. korak:",
+	"srv_izvoz_step3"		=>	"3. korak:",
+	"srv_izvoz_step4"		=>	"4. korak:",
+	"srv_izvoz_step5"		=>	"5. korak:",
+	"srv_izvoz_Excel_xls_note1"		=>	"Podatke v Excel izvozite s klikom na spodnji ukaz:",
+	"srv_izvoz_Excel_xls_file"		=>	"Izvoz v Excel",
+	"srv_izvoz_Excel_xls_prirocnik"		=>	"<a href='https://www.1ka.si/d/sl/pomoc/prirocniki/izvoz-excel'>Za več informacij smo pripravili tudi priročnik za izvoz v Excel.</a>",
+	"srv_izvoz_Excel_note_a"			=>	"Podatke v CSV (angl. <span class=\"italic\">comma separated values</span>) izvozite s klikom na spodnji ukaz:",
+	"srv_izvoz_Excel_file"			=>	"Izvoz v CSV",
+	"srv_izvoz_Excel_note_b"			=>	"V Excel verzije 2003 ali starejše je možen izvoz največ 256-ih stolpcev (spremenljivk). Morebitni nadaljnji stolpci se ne bodo izvozili. Ta omejitev je odpravljena v verziji 2007.",
+	"srv_izvoz_Excel_note_2"		=>	"<span class=\"red\">Opozorilo!</span> Pri izvozu v Excel (Microsoft Excel verzija 2007 in novejše) se odprti odgovori ne izpišejo v celoti. Rešitev takšne težave in vseh ostalih težav z Excelom si lahko ogledate v pomoči <a href=\" https://www.1ka.si/db/19/430/Pogosta%20vprasanja/Tezave_pri_izvozu_v_Excel/\" target=\"_blank\">Težave pri izvozu v Excel</a>.",
 	"srv_izvoz_Excel_settings"		=>	"Nastavitve",
-	"srv_izvoz_SPSS_note"			=>	"<p>Podatke va&#353;e ankete izvozite v SPSS/PASW v petih kratkih korakih:</p><p><dl class=\"dl_spss\"><dt>1. korak:</dt><dd>Naprej s klikom spodaj shranimo datoteko v izbrano mapo:</dd><dd><span class=\"bold\"><a href=\"#\" onclick=\"doSpssExport('yes'); return false;\" target=\"_blank\">Datoteka s podatki (.txt)</a></span></dd><br/><dt>2. korak:</dt><dd>Nato v isto mapo shranimo &#353;e datoteko s sintakso:</dd><dd><span class=\"bold\"><a href=\"#\" onclick=\"doSpssExport('no'); return false;\" target=\"_blank\">Datoteka s sintakso (.sps)</a></span></dd><dd>Z dvojnim klikom na datoteko sedaj odpremo sintakso v programu SPSS/PASW.</dd><br/><dt>3. korak:</dt><dd>V odprti datoteki s sintakso poi&#353;&#269;emo DATA LIST vrstico <i>(»primer: DATA LIST FILE=\"C:\anketa_podatki.txt\"«)</i>.</dd><dd>Da bi povezali sintakso in podatke, namesto »C:« vpi&#353;emo lokacijo na&#353;e datoteke s podatki <i>(zgled: &#269;e smo podatke shranili npr. v mapo Prenosi znotraj My Documents: DATA LIST FILE=\"C:\My Documents\Prenosi\anketa_podatki.txt\")</i>.</dd><dd>&nbsp;</dd><dd><i>Natan&#269;no lokacijo datoteke s podatki lahko poi&#353;&#269;emo na naslednji na&#269;in: uporabimo desni klik na datoteko s podatki in v meniju izberemo Lastnosti (Properties)- Mesto (Location) in to lokacijo vpi&#353;emo namesto »C:«.</i></dd><br/><dt>4. korak:</dt><dd>Datoteko s sintakso nato po&#382;enemo z ukazom RUN ALL (najdemo ga v spustnem meniju RUN) in tako kreiramo novo datoteko – bazo podatkov (.sav), ki jo lahko shranimo.</dd><br/><dt>5. korak:</dt><dd>Po izvozu v SPSS/PASW lahko dolo&#269;imo tudi manjkajo&#269;e vrednosti. Postavimo se v zavihek <i>Variable View</i> in v stolpcu Missing ozna&#269;imo <i>Range plus one optional discrete missing value; Low: -99; High: -1;</i> v 1KA so namre&#269; manjkajo&#269;e vse negativne vrednosti s slede&#269;imi pomeni:</dd><dd>&nbsp;&nbsp;<i>(-1) Ni odgovoril</i></dd><dd>&nbsp;&nbsp;<i>(-2) Preskok (if)</i></dd><dd>&nbsp;&nbsp;<i>(-3) Prekinjeno</i></dd><dd>&nbsp;&nbsp;<i>(-4) Naknadno vpra&#353;anje</i></dd><dd>&nbsp;&nbsp;<i>(-97) Neustrezno</i></dd><dd>&nbsp;&nbsp;<i>(-98) Zavrnil</i></dd><dd>&nbsp;&nbsp;<i>(-99) Ne vem.</i></dd></dl></p>",		
-	"srv_izvoz_txt_note"			=>	"<p>Podatke lahko izvozite tudi v <a href=\"#\" onclick=\"doTxtExport(); return false;\" target=\"_blank\"><span class=\"bold\">tekstovno</span></a> ASCII datoteko</p>",	
-	"srv_izvoz_SPSS_complex_note"	=>	"<p>Pri izvozu zelo kompleksne ankete z zankami vam v primeru kakršnih koli težav priporočamo najprej izvoz v Excel, in nato uvoz v SPSS.</p>",		
-	"srv_izvoz_SPSS_faq"			=>	"<p>V primeru kakršnihkoli zapletov (npr. pri kompleksnih anketah z zankami, stare verzije SPSS) priporočamo izvoz v Excel, in nato uvoz v SPSS. Posebej priporočamo pri kombiniranih tabelah. Več o izvozih v SPSS si lahko preberete v <span class=\"bold\"><a href='https://www.1ka.si/d/sl/pomoc/prirocniki/izvoz-spss' target=\"_blank\">FAQ</a></span>. V primeru težav kontaktirajte <a href=\"https://www.1ka.si/a/72864?Q1=5729900\" target=\"_blank\"><span class=\"bold\">Pomoč uporabnikom</span></a>.</p>",		
-	"srv_izvoz_SAV_note"			=>	"<p>Podatke v SPSS (SAV) izvozite s klikom na ukaz <a href=\"#\" onclick=\"doSAVExport(); return false;\" ><span class=\"bold\">\"Izvoz v SPSS (SAV)\"</span></a>.</p><p>Pozor: Izvoz ne omogoča izvoza label vrednosti odgovorov. </p><p class=\"semibold\">Funkcionalnost je še v razvoju, zato so možne težave pri izvozu.<br />Priporočamo uporabo (starega) izvoza v SPSS, ki generira dve lo&#269;eni datoteki - datoteko s sintakso (.SPS) in datoteko s podatki (.TXT).</p>",
+	"srv_izvoz_SPSS_note"			=>	"Podatke vaše ankete izvozite v SPSS/PASW v petih kratkih korakih:",		
+	"srv_izvoz_step1_SPSS"			=>	"Naprej s klikom spodaj shranimo datoteko s podatki (format .txt) v izbrano mapo:",
+	"srv_izvoz_step1_SPSS_file"			=>	"Datoteka s podatki TXT",
+	"srv_izvoz_step2a_SPSS"		=>	"Nato v isto mapo shranimo še datoteko s sintakso (format .sps):",
+	"srv_izvoz_step2b_SPSS"		=>	"Nato z dvojnim klikom na datoteko odpremo sintakso v programu SPSS/PASW.",
+	"srv_izvoz_step2_SPSS_file"		=>	"Datoteka s sintakso SPS",
+	"srv_izvoz_step3a_SPSS"		=>	"V datoteki s sintakso poiščemo /FILE vrstico (primer: »/FILE =\C:\anketa_podatki.txt\"«).",
+	"srv_izvoz_step3b_SPSS"		=>	"Za povezavo sintakse in podatkov namesto »C:« vpišemo natančno lokacijo naše datoteke s podatki (primer: Če smo podatke shranili v mapo 'Prenosi', ki se nahaja v mapi 'My Documents', vpišemo naslednje:<br>DATA LIST FILE=\"C:\My Documents\Prenosi\anketa_podatki.txt\").",
+	"srv_izvoz_step3c_SPSS"		=>	"Natančno lokacijo datoteke s podatki lahko poiščemo na naslednji način: Uporabimo desni klik na datoteko s podatki in v meniju izberemo Lastnosti (Properties) - Mesto (Location) in to lokacijo vpišemo namesto »C:«.",
+	"srv_izvoz_step4_SPSS"			=>	"Datoteko s sintakso nato poženemo z ukazom RUN ALL (najdemo ga v spustnem meniju RUN) in tako kreiramo novo datoteko - bazo podatkov (.sav), ki jo lahko shranimo.",
+	"srv_izvoz_step5_SPSS"			=>	"Po izvozu v SPSS/PASW lahko določimo tudi manjkajoče vrednosti. Postavimo se v zavihek Variable View in v stolpcu Missing označimo 'Range plus one optional discrete missing value; Low: -99; High: -1;' v 1KA so namreč manjkajoče vse negativne vrednosti s sledečimi pomeni:<br>(-1) Ni odgovoril<br>(-2) Preskok (if)<br>(-3) Prekinjeno<br>(-4) Naknadno vprašanje<br>(-97) Neustrezno<br>(-98) Zavrnil<br>(-99) Ne vem.",
+	"srv_izvoz_txt_note"			=>	"Podatke lahko izvozite v tekstovno ASCII datoteko s klikom na spodnji ukaz:",	
+	"srv_izvoz_txt_file"			=>	"Izvoz v tekstovno datoteko",	
+	"srv_izvoz_SPSS_complex_note"	=>	"Pri izvozu zelo kompleksne ankete z zankami vam v primeru kakršnih koli težav priporočamo najprej izvoz v Excel, in nato uvoz v SPSS.",		
+	"srv_izvoz_SPSS_faq"			=>	"V primeru kakršnihkoli zapletov (npr. pri kompleksnih anketah z zankami, stare verzije SPSS) priporočamo izvoz v Excel, in nato uvoz v SPSS. To priporočamo še posebej pri kombiniranih tabelah. Več o izvozih v SPSS si lahko preberete v priročniku <a href='https://www.1ka.si/d/sl/pomoc/prirocniki/izvoz-spss' target=\"_blank\">Izvoz v SPSS</a>. V primeru težav kontaktirajte <a href=\"https://www.1ka.si/a/72864?Q1=5729900\" target=\"_blank\">Pomoč uporabnikom</a>.",		
+	"srv_izvoz_SAV_note1"			=>	"Podatke izvozite v SPSS SAV s klikom na spodnji ukaz:",
+	"srv_izvoz_SAV_file"			=>	"Izvoz v SPSS SAV",
+	"srv_izvoz_SAV_note2a"			=>	"<span class=\"red\">Opozorilo!</span> Izvoz ne omogoča izvoza label vrednosti odgovorov. Funkcionalnost je še v razvoju, zato so možne težave pri izvozu. Priporočamo uporabo ",
+	"srv_izvoz_SAV_note2b"			=>	"izvoza SPSS SYNTAX",
+	"srv_izvoz_SAV_note2c"			=>	", ki generira dve ločeni datoteki - datoteko s sintakso (.SPS) in datoteko s podatki (.TXT).",
 	"s_sortby_A"			=>	"Sortiraj po ",
 	"s_sortby_B"			=>	"&#269;asu",
 	"s_sortby_C"			=>	" / ",
@@ -1804,9 +1840,9 @@ $lang = array (
 	"srv_note"				=>	"Opomba",
 	"srv_note2"				=>	"Opomba na vprašanje",
 	"srv_novaanketa"		=>	"Nova anketa: ",
-	"srv_new_survey_success1"		=>	"Anketo lahko za&#269;nete s predlogo iz <a href=\"#\" onclick=\"show_library(2); return false;\">knji&#382;nice</a> ali z vpra&#353;anji iz spodnjega menija.",
-	"srv_new_survey_success2"		=>	"Vprašanja dodate iz levega menija.",
-	"srv_new_survey_success3"		=>	"Uporabite lahko predloge <a href=\"index.php?a=knjiznica\">anket</a> ali <a href=\"%s\" onclick=\"change_mode('toolbox', '3'); return false;\"> vprašanj</a>.",
+	"srv_new_survey_success"		=>	"V anketi ni še nobenega vprašanja. Vprašanja lahko dodate tudi iz levega menija.",
+	"srv_new_survey_success_button_create"		=>	"Dodaj vprašanje",
+	"srv_new_survey_success_button_template"	=>	"Dodaj vprašanje iz knjižnice",
 	"srv_new_question_icon" =>	"S klikom dodajte na konec ali umestite s \"povleci in spusti\"",
 	"srv_new_question"      =>	"Kliknite na izbrano vprašanje ali uporabite \"povleci in spusti\"",
 	"srv_new_question_text" =>	"Z miško izberite želeni tip vprašanja",
@@ -1864,14 +1900,24 @@ $lang = array (
 	"srv_anketa_active"				=>	"Anketa je aktivna. V aktivno anketo se odgovori na vpra&#353;anja shranjujejo.",
 	"srv_anketa_delete"				=>	"Izbri&#353;i anketo.",
 	"srv_anketa_noactive2"			=>	"Anketa ni aktivna",
+	"srv_anketa_noactive2_text"     =>	"Anketa še ni aktivna. Zbirate lahko samo testne podatke. Če želite za anketo zbirati realne podatke, jo lahko aktivirate v zavihku 'Objava' ali s klikom na stikalo 'OFF'.",
 	"srv_anketa_active2"			=>	"Anketa je aktivna",
+	"srv_anketa_active2_text"       =>	"Anketa je aktivna. Zbirate lahko realne podatke. V zavihku 'Objava' izberite način posredovanja ankete respondentom.",
 	"srv_anketa_is_active"			=>	"AKTIVNA",
 	"srv_anketa_is_not_active"		=>	"NEAKTIVNA",
 	"srv_anketa_is_finished"		=>	"ZAKLJUČENA",
 	"srv_anketa_href"				=>	"HTML koda povezave",
-	"srv_anketa_href_text"			=>	"Običajna HTML koda za povezavo",
-	"srv_anketa_href_count"			=>	"HTML koda povezave s &#353;tevcem ogledov",
-	"srv_anketa_href_count_text"	=>	"HTML koda skupaj s števcem, ki šteje število ogledov <u>povezave</u> na anketo",
+	"srv_anketa_href_text"			=>	"Delite povezavo do ankete na vaši spletni strani.",
+	"srv_anketa_href_count"			=>	"HTML koda s števcem ogledov",
+	"srv_anketa_href_count_text"	=>	"Delite povezavo do ankete na vaši spletni strani in beležite število ogledov povezave na anketo. ",
+	"srv_anketa_href_friends"		=>	"QR koda",
+	"srv_anketa_href_friends_text"	=>	"Delite povezavo do ankete s QR kodo.",
+	"srv_anketa_href_ijs"			=>	"iFrame - JavaScript verzija",
+	"srv_anketa_href_ijs_text"		=>	"Vdelajte anketo na vašo spletno stran, da lahko respondenti anketo rešujejo na vaši strani.",
+	"srv_anketa_href_ijs_text2"		=>	"Tu lahko skopirate kodo vaše ankete (Javascript verzija) in jo vdelate v vašo spletno stran.",
+	"srv_anketa_href_inojs"			=>	"iFrame - brez JavaScripta",
+	"srv_anketa_href_inojs_text"	=>	"Vdelajte anketo na vašo spletno stran, da lahko respondenti anketo rešujejo na vaši strani.",
+	"srv_anketa_href_inojs_text2"	=>	"Tu lahko skopirate kodo vaše ankete (verzija brez Javascript-a) in jo vdelate v vašo spletno stran.",
 	"srv_anketa_noactive_email"		=>	"Ozna&#269;i anketo kot 'Email vabila''.",
 	"srv_anketa_setActive_email"	=>	"aktiviraj 'Email vabila'",
 	"srv_anketa_active_email"		=>	"Anketa je ozna&#269;ena kot 'Email vabila'.",
@@ -2043,19 +2089,18 @@ $lang = array (
     "srv_alert_foto_remove"	        =>	"Odstrani sliko",
 	"srv_dostop"			=>	"Anketo lahko ureja avtor in vsi",
 	"srv_izpolnjujejo"		=>	"Anketo lahko izpolnjujejo",	
-	"srv_dostop_users"		=>	"Uporabniki, ki lahko urejajo anketo",
 	"srv_dostop_userspassive"	=>	"Pasivni uporabniki, ki lahko pregledujejo anketo",
 	"srv_passive_multilang"		=>	"Jeziki, ki jih lahko ureja",
 	"srv_passive_multilang_1"	=>	"Pasivni uporabniki, ki prevajajo",
 	"srv_dostop_addusers"			=>	"Dodajanje uporabnikov za urejanje ankete",
-	"srv_dostop_adduserstxt_admin"	=>	"Dostop za urejanje ankete lahko dodelite tudi ostalim uporabnikom, ki so že ali pa še ne, registrirani na ",
+	"srv_dostop_adduserstxt_admin"	=>	"Dostop za urejanje ankete lahko dodelite tudi ostalim uporabnikom, ki so že ali pa še ne registrirani na ",
 	"srv_dostop_adduserstxt"		=>	"Dostop za urejanje ankete lahko dodelite samo uporabnikom, ki so že registrirani na ",
 	"srv_dostop_adduserstxt_aai_more"	=>	"<a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/dodajanje-uredniskega-dostopa-na-1kaarnessi\" target=\"_blank\">Več >></a>",
     "srv_dostop_adduserstxt_email"	=>	"V vsako vrstico vpi&#353;ite le en email naslov. Poleg emaila lahko dodate tudi ime in priimek, vse spremenljivke lo&#269;ite z vejico (janez.novak@example.com,Janez,Novak):",
-    "srv_dostop_adduserstxt_note"	=>	"Sporočilo za uporabnike, ki jim dodeljujete dostop (opcijsko). Sporočilo lahko poljubno spremenite.",
+    "srv_dostop_adduserstxt_note"	=>	"V avtomatsko obvestilo o dostopu dodaj svoje sporočilo (neobvezno).",
     "srv_dostop_adduserstxt_note_text"	=>	"Pozdravljeni,\r\n\r\ndodelil/a sem vam dostop do ankete, ki jo trenutno urejam.\r\n\r\nLep pozdrav",
-	"srv_dostop_adduserstxt_end"	=>	"Uporabniki bodo o novem dostopu avtomatsko obve&#353;&#269;eni na e-mail.",
-    "srv_dostop_addusers_button"	=>	"Dodaj dostope in pošlji obvestila",
+	"srv_dostop_adduserstxt_end"	=>	"Uporabniki bodo o dostopu avtomatsko obveščeni na e-mail.",
+    "srv_dostop_addusers_button"	=>	"Dodaj dostope",
     "srv_dostop_addusers_error1"	=>	"Vnešeni email naslov ni veljaven!",
     "srv_dostop_addusers_error2"	=>	"Uporabnik s tem e-poštnim naslovom še ni registriran!",
     "srv_dostop_addusers_error3"	=>	"Prišlo je do napake pri pošiljanju obvestila!",
@@ -2110,8 +2155,10 @@ $lang = array (
 	"srv_alert_active_1"	=>	"Spremembi aktivnosti",
 	"srv_alert_delete_1"	=>	"Izbrisu ankete",
 	"srv_alert_completed_2"	=>	"Obveščanje o izpolnjeni anketi",
+	"srv_alert_completed_prejemniki"	=>	"Obvestilo o izpolnjeni anketi prejmejo naslednji prejemniki:",
 	"srv_alert_expired_2"	=>	"Obveščanje o izteku ankete",
 	"srv_alert_active_2"	=>	"Obveščanje o spremembi aktivnosti",
+	"srv_alert_active_prejemniki"	=>	"Obvestilo o spremembi aktivnosti prejmejo naslednji prejemniki:",
 	"srv_alert_delete_2"	=>	"Obveščanje o izbrisu ankete",
 	"srv_alert_setting"		=>	"Nastavitve",
 	"srv_alert_turnOn_text"	=>	"Zaradi množičnega izpolnjevanja anket je lahko količina poslanih e-mailov preko 1KA sistema zelo velika. Da bi se izognili temu, da so e-poštna obveščanja o izpolnjenih anketah uvrščena v spam oziroma vsiljeno pošto, je uporaba storitve plačljiva in se obračuna po veljavnem <a href=\"https://www.1ka.si/d/sl/storitve/cenik-metodoloskih-storitev?from1ka=1\" target=\"_blank\"><span class=\"bold\">1KA ceniku</span></a>. Za uporabo storitve je potrebno najprej izpolniti <a href=\"https://www.1ka.si/objava\" target=\"_blank\"><span class=\"bold\">obrazec</span></a>.",
@@ -2144,11 +2191,14 @@ $lang = array (
     "srv_podif_edit"        =>	 "Uredi pogoj za prikaz kategorije",
     "srv_block_new"         =>	 "Dodaj blok",
     "srv_if_rem"            =>	 "Odstrani pogoj",
-    "srv_if_rem_all"        =>	 "Izbri&#353;i pogoj in celotno vsebino",
+    "srv_if_rem_only"       =>	 "Odstrani pogoj (obdrži vsebino)",
+    "srv_if_rem_all"        =>	 "Odstrani pogoj in celotno vsebino",
     "srv_block_rem"			=>	 "Odstrani blok",
+    "srv_block_rem_only"    =>	 "Odstrani blok (obdrži vsebino)",
+    "srv_block_rem_all"		=>	 "Odstrani blok in celotno vsebino",
     "srv_loop_rem"			=>	 "Odstrani zanko",
-    "srv_block_rem_all"		=>	 "Izbri&#353;i blok in celotno vsebino",
-    "srv_loop_rem_all"		=>	 "Izbri&#353;i zanko in celotno vsebino",
+    "srv_loop_rem_only"     =>	 "Odstrani zanko (obdrži vsebino)",
+    "srv_loop_rem_all"		=>	 "Odstrani zanko in celotno vsebino",
     "srv_if_edit"           =>	 "Uredi pogoj",
     "srv_block_edit"		=>	 "Uredi blok",
     "srv_loop_edit"			=>	 "Uredi zanko",
@@ -2193,7 +2243,7 @@ $lang = array (
     "srv_notext"            =>	 "Brez tekstovnih",
     "srv_anketa"            =>	 "Anketa",
     "srv_vnos"            	=>	 "Vnos",
-    "srv_vnos_navodila"    	=>	 "Opcija 'Vnos' se uporablja za vna&#353;anje ve&#269;ih vpra&#353;alnikov v bazo (npr. 1000), kar opravi nekaj vna&#353;alcev (npr. 10). Vsak od vna&#353;alcev mora biti registriran kot Sisplet uporabnik, kar anketa prepozna ter ime vna&#353;alca shrani poleg vnesenega vpra&#353;alnika.",
+    "srv_vnos_navodila"    	=>	 "Opcija 'Vnos' se uporablja za vnašanje večih vprašalnikov v bazo (npr. 1000), kar opravi nekaj vnašalcev (npr. 10). Vsak od vnašalcev mora biti registriran kot Sisplet uporabnik, kar anketa prepozna ter ime vnašalca shrani poleg vnesenega vprašalnika.",
     "srv_test"            	=>	 "Test",
     "srv_forma"             =>	 "Forma",
 	"srv_forma_naslov"		=>	 "Nabor vpra&#154;anj",
@@ -2213,8 +2263,8 @@ $lang = array (
     "srv_moduli"        	=>	 "Napredni moduli",
     "srv_moduli_setings"    =>	 "Nastavitve",
     "srv_uporabnost"        =>	 "Evalvacija strani",
-    "srv_uporabnost_link"   =>	 "URL strani, ki jo evaluirate (ekran se bo razpolovil)",
-    "srv_uporabnost_warning" =>	 "Vključite lahko samo spletno stran, ki ima dovoljeno vključevanje iz drugih domen (angl. cross-origin framing). Nekatere spletne strani takega vključevanja (npr. google.si ipd.) takega vključevanja ne dovolijo, prav tako lahko pride do težav, če spletna stran nima dodatnega varnostnega protokola (v primeru, da gre za spletno stran http). V teh primerih v anketi spletne strani ne bo prikazalo, zato pred aktivacijo ankete dobro pretestirajte, ali imate vključene spletne strani, ki to dovolijo.",
+    "srv_uporabnost_link"   =>	 "Povezava spletnega mesta za ocenjevanje (zaslon se razdeli):",
+    "srv_uporabnost_warning" =>	 "<span class='red'>Opozorilo!</span> Vključite lahko samo spletno stran, ki ima dovoljeno vključevanje iz drugih domen (angl. <span class='italic'>cross-origin farming</span>). Nekatere spletne strani takega vključevanja ne dovolijo, prav tako pa lahko pride do težav, če spletna stran nima dodatnega varnostnega protokola. V teh primerih v anketi spletne strani ne bo prikazalo, zato pred aktivacijo ankete dobro pretestirajte, ali ima spletna stran za ocenjevanje dovoljeno vključevanje iz drugih domen.",
     "srv_uporabnost_razdeli"=>	 "Stran razdeli",
     "srv_vodoravno"			=>	 "vodoravno",
     "srv_navpicno"			=>	 "navpi&#269;no",
@@ -2234,20 +2284,22 @@ $lang = array (
 	"srv_alert_title"		=>	"Obve&#353;&#269;anje o vsaki izpolnjeni anketi:",
 	"srv_alert_expired_title"	=>	"Obve&#353;&#269;anje pred iztekom ankete:",
 	"srv_alert_expired_time_title"	=>	"Datum - interval obve&#353;&#269;anja:",
-	"srv_alert_no_sys_var"	=>	"V anketi ni sistemskih spremenljivk.",
+	"srv_alert_no_sys_var"	=>	"V sporočilu lahko uporabite tudi sistemske spremenljivke, ki jih trenutno ni v anketi.",
 	"srv_alert_respondent"  =>	  "Respondent",
-	"srv_alert_respondent_note_ok_email_ime"	=>	"&nbsp;<span class=\"gray\">(Dodani sta sistemski spremenljivki \"email\" in \"ime\")</span>",
-	"srv_alert_respondent_note_ime"		=>	  "&nbsp;<span class=\"red\">&#381;elite dodati tudi sistemsko spremenljivko \"ime\"</span>",
-	"srv_alert_respondent_note_ok_email"	=>	  "&nbsp;<span class=\"gray\">(Dodana je sistemska spremenljivka \"email\")</span>",
-	"srv_alert_respondent_note_notok_email"	=>	  "&nbsp;<span class=\"red\">(Sistemske spremenljivke \"email\" ne morem dodati!)</span>",
-	"srv_alert_respondent_note_link"	=>	"Dodaj potrebne sistemske spremenljivke!",
+	"srv_alert_respondent_note_ok_email_ime"	=>	"(Dodani sta sistemski spremenljivki \"email\" in \"ime\")",
+	"srv_alert_respondent_note_ime"		=>	  "Želite dodati tudi sistemsko spremenljivko \"ime\"?",
+	"srv_alert_respondent_note_ok_email"	=>	  "(Dodana je sistemska spremenljivka \"email\")",
+	"srv_alert_respondent_note_notok_email"	=>	  "(Sistemske spremenljivke \"email\" ni bilo mogoče dodati!)",
+	"srv_alert_respondent_note_link"	=>	"Dodaj potrebne sistemske spremenljivke",
     "srv_alert_respondent_cms" 		=>	  "Respondent, registriran v CMS",
-    "srv_alert_respondent_cms_note"	=>	  "&nbsp;<span class=\"red\">(V nastavitah mora biti ozna&#269;eno, da prepozna uporabnika iz CMS!)</span>",
-	"srv_alert_respondent_cms_note_ok"	=>	  "&nbsp;<span class=\"gray\">(Uporabnik bo prepoznan iz sisplet CMS)</span>",
+    "srv_alert_respondent_cms_note"	=>	  "(V nastavitah mora biti označeno, da prepozna uporabnika iz CMS!)",
+	"srv_alert_respondent_cms_note_ok"	=>	  "(Uporabnik bo prepoznan iz sisplet CMS)",
 	"srv_alert_respondent_cms_note_link"	=>	"Dodaj nastavitev!",
-    "srv_alert_author"		=>	"Avtor ankete oziroma druge osebe, katerim je omogo&#269;en dostop:",
+    "srv_alert_author"		=>	"Avtor ankete oziroma souredniki",
     "srv_alert_msg"         =>	 "je izpolnil formo/anketo",
     "srv_alert_prejemnik"	=>	 "Obvestilo dobijo naslednji prejemniki:",
+    "srv_alert_surveydelete"	=>	 "Obveščanje o izbrisu ankete",
+    "srv_alert_surveydelete_text"	=>	 "Obvestilo o izbrisu ankete prejmejo naslednji prejemniki:",
     "srv_alert_oblika"		=>	 "Oblika e-mail sporočila:",
     "srv_alert_oblika_deactivate_note"	=>	 "Sporo&#269;ilo ob deaktivaciji ankete",
     "srv_alert_oblika_activate_note"	=>	 "Sporo&#269;ilo ob aktivaciji ankete",
@@ -2273,7 +2325,7 @@ $lang = array (
     "srv_user_base_individual_invitaition"		=>	 "Individualizirana vabila:",
     "srv_user_base_individual_invitaition_note"	=>	 "Individualizirana vabila omogočajo sledenje respondentom.",
     "srv_user_base_individual_invitaition_note2"	=>	 "Z izbiro \"Ne\" je modul individualiziranih vabil izklopljen. Anketira se lahko vsak, ki vidi ali pozna URL naslov. Respondentov v takem primeru ne moremo slediti; ne vemo kdo je odgovoril in kdo ne. Sistem 1KA lahko kljub temu pošlje (email) oziroma dokumentira (pošta, SMS, drugo) pošiljanje splošnega ne-individualiziranega vabila, kjer vsi respondenti prejmejo enotni URL. To pomeni, da se zabeležilo, komu, kdaj in kako je bilo vabilo poslano, ne bo pa označeno, kdo je odgovoril in kdo ne.",
-    "srv_user_base_access_check"				=>	 "Omogoči dostop do ankete tudi brez individualiziranega vabila (kode):",
+    "srv_user_base_access_check"				=>	 "Omogoči dostop do ankete tudi brez individualiziranega vabila (kode)",
     "srv_user_base_access"						=>	 "Dostop brez kode:",
     "srv_user_base_access_alert_0"				=>	 "Pri privzeti nastavitvi »NE«, respondenti brez kode oziroma vabila ne bodo mogli dostopati do ankete!",
     "srv_user_base_access_alert_1"				=>	 "Pri nastavitvi »DA« bodo v anekto lahko vstopali vsi respondenti!",
@@ -2282,7 +2334,7 @@ $lang = array (
     "srv_email_server_settings_warning"			=>	 "Opozorilo! Iste nastavitve poštnega strežnika se upoštevajo pri obveščanju in pri pošiljanju email vabil!",
     "srv_massinsert"        =>	 "Masovni vnos",
     "srv_massdelete"        =>	 "Pobri&#154;i vse vnose",
-    "srv_masstxt"           =>	 "Respondente dodajajte po enega v vrstico. Stolpce lo&#269;ite z vejico, v enakem vrstnem redu kot so prikazani spodaj v odebeljenem tisku.<br /><br />Primeri:<br />janez.novak@example.com,Janez Novak<br />janez.novak@example.com<br />Janez Novak,M,Ljubljana",
+    "srv_masstxt"           =>	 "Respondente dodajajte po enega v vrstico. Stolpce ločite z vejico, v enakem vrstnem redu kot so prikazani spodaj v odebeljenem tisku.<br /><br />Primeri:<br />janez.novak@example.com,Janez Novak<br />janez.novak@example.com<br />Janez Novak,M,Ljubljana",
     "srv_basecode"          =>	 "Vnesite svojo kodo",
     "srv_usermails"         =>	 "Po&#154;iljanje e-po&#154;te",
     "srv_usermailing_setting"    =>	 "Nastavitve e-po&#154;te",
@@ -2290,12 +2342,14 @@ $lang = array (
     "srv_arhivi_printouts"  =>	 "Arhivi in izpisi",
     "srv_arhivi"			=>	 "Arhivi",
     "srv_progressbar"       =>	 "Prika&#382;i vrstico napredka (progress bar)",
-    "srv_ask_delete"        =>	 "Ali ste prepricani, da želite trajno izbrisati?",
-    "srv_ask_delete_inv"    =>	 "Ali ste prepricani, da želite trajno izbrisati?\n\nPobrisali boste tudi odgovore, ki so vezani na vabila! To lahko povzroči napake pri obravnavanju odgovorov poslanih preko vabil.",
+    "srv_ask_delete"        =>	 "Ali ste prepričani, da želite trajno izbrisati?",
+    "srv_ask_delete_multiple_data"   =>	 "Ali ste prepričani, da želite trajno izbrisati izbrane enote?",
+    "srv_ask_delete_data"   =>	 "Ali ste prepričani, da želite trajno izbrisati enoto?",
+    "srv_ask_delete_inv"    =>	 "Ali ste prepričani, da želite trajno izbrisati?\n\nPobrisali boste tudi odgovore, ki so vezani na vabila! To lahko povzroči napake pri obravnavanju odgovorov poslanih preko vabil.",
     "srv_crosstabs"         =>	 "Tabele",
 	"srv_multicrosstabs"    =>	 "Multitabele",
     "srv_means"				=>	 "Povprečja",
-    "srv_average" 	        =>	 "Povpre&#269;ja",
+    "srv_average" 	        =>	 "Povprečja",
     "srv_statistics" 		=>	 "Osnovni pregled",
 	"srv_statistics_edit" 	=>	 "Uvodni tekst h rezultatom",
     "srv_zapri"             =>	 "Zapri",
@@ -2304,11 +2358,11 @@ $lang = array (
     "srv_create_new"        =>	 "Kreiraj",
 	"srv_create_survey"     =>	 "Ustvari Anketo",
     "srv_zapri_novo"        =>	 "Zapri in dodaj novo vpra&#154;anje",
-    "srv_timer_on"          =>	 "Timer je vklju&#269;en",
+    "srv_timer_on"          =>	 "Timer je vključen",
     "srv_timer_on_time"		=>	 "Timer: ",
-    "srv_timer_off"         =>	 "Timer je izklju&#269;en",
-	"srv_timer_on2"			=>	 "Vklju&#269;en",
-    "srv_timer_off2"		=>	 "Izklju&#269;en",
+    "srv_timer_off"         =>	 "Timer je izključen",
+	"srv_timer_on2"			=>	 "Vključen",
+    "srv_timer_off2"		=>	 "Izključen",
     "srv_seconds"           =>	 "sec",
     "srv_minutes"           =>	 "min",
 	"srv_sistemska"         =>	 "Sistemska spremenljivka",
@@ -2318,8 +2372,9 @@ $lang = array (
     "srv_newfolder"         =>	 "Nova mapa",
     "srv_deletefolder"      =>	 "Izbri&#154;i mapo",
     "srv_backup"         	=>	 "Kreiraj arhivsko anketo",
-    "srv_backup_label"      =>	 "Izdelava arhivske verzije vpra&#353;alnika:",
-    "srv_backup_data_label" =>	 "Izdelava arhivske kopije podatkov:",
+    "srv_backup_label"      =>	 "Izdelava arhivske verzije vprašalnika:",
+    "srv_backup_data_text" =>	 "Pred spreminjanjem vprašalnika ali urejanjem podatkov lahko obstoječo verzijo podatkov shranite tako, da izdelate arhivsko verzijo. S klikom na 'Izdelaj arhivsko verzijo podatkov' se v spodnjem seznamu generira arhivska verzija vprašalnika in podatkov. Vsako arhivsko verzijo vprašalnika lahko aktivirate. Z aktivacijo se arhivska verzija avtomatsko ustvari kot nova anketa.",
+    "srv_backup_data_label" =>	 "Izdelaj arhivsko verzijo podatkov",
     "srv_backup_button"     =>	 "Izdelaj arhivsko verzijo vprašalnika",
     "srv_backup_data_button"=>	 "Izdelaj arhivsko kopijo podatkov",
     "srv_concl_link"        =>	 "Ob koncu ankete",
@@ -2333,9 +2388,41 @@ $lang = array (
 	"srv_concl_link_recnum"	=>	 "Recnum responedenta",
 	"srv_concl_link_datapiping"	=>	 "V url lahko vključite tudi vrednosti odgovorov s sintakso <b>#IME_VPRAŠANJA#</b><br />(npr. https://www.1ka.si?q1=#Q1#)",
     "srv_library"           =>	 "Knji&#382;nica",
+    "srv_library_survey_title"  =>	 "Knjižnica vprašanj",
+    "srv_library_survey_tab_questions"  =>	 "Samostojna vprašanja",
+    "srv_library_survey_tab_surveys"    =>	 "Vprašanja v anketah",
+    "srv_library_survey_add"    =>	 "Dodaj v anketo",
+    "srv_library_item_counter"  =>	 "Št. izbranih vprašanj",
+    "srv_library_folder_add"    =>	 "Dodaj podmapo",
+    "srv_library_folder_delete" =>	 "Odstrani podmapo",
+    "srv_library_folder_rename" =>	 "Preimenuj podmapo",
+    "srv_library_folder_name"   =>	 "Ime podmape",
+    "srv_library_delete_q"      =>	 "Odstrani vprašanje",
+    "srv_library_delete_if"     =>	 "Odstrani pogoj",
+    "srv_library_delete_block"  =>	 "Odstrani blok",
+    "srv_library_delete_loop"   =>	 "Odstrani zanko",
+    "srv_library_rename_q"      =>	 "Preimenuj vprašanje",
+    "srv_library_rename_if"     =>	 "Preimenuj pogoj",
+    "srv_library_rename_block"  =>	 "Preimenuj blok",
+    "srv_library_rename_loop"   =>	 "Preimenuj zanko",
+    "srv_library_add_to_lib_title_q"        =>	 "Dodaj vprašanje v knjižnico",
+    "srv_library_add_to_lib_title_if"       =>	 "Dodaj pogoj v knjižnico",
+    "srv_library_add_to_lib_title_block"    =>	 "Dodaj blok v knjižnico",
+    "srv_library_add_to_lib_title_loop"     =>	 "Dodaj zanko v knjižnico",
+    "srv_library_add_to_lib"                =>	 "Dodaj v knjižnico",
+    "srv_library_add_to_lib_name_q"         =>	 "Ime vprašanja",
+    "srv_library_add_to_lib_name_if"        =>	 "Ime pogoja",
+    "srv_library_add_to_lib_name_block"     =>	 "Ime bloka",
+    "srv_library_add_to_lib_name_loop"      =>	 "Ime zanke",
+    "srv_library_add_to_lib_folder"         =>	 "Dodaj v mapo",
+    "srv_library_add_to_lib_success_q"      =>	 "Vprašanje je bilo uspešno dodano v knjižnico.",
+    "srv_library_add_to_lib_success_if"     =>	 "Pogoj je bil uspešno dodan v knjižnico.",
+    "srv_library_add_to_lib_success_block"  =>	 "Blok je bil uspešno dodan v knjižnico.",
+    "srv_library_add_to_lib_success_loop"   =>	 "Zanka je bila uspešno dodana v knjižnico.",
+    "srv_library_add_to_lib_success_err"    =>	 "Prišlo je do napake pri dodajanju v knjižnico!",
     "srv_nadzor"            =>	 "Nadzor",
     "srv_knjiznica_add"     =>	 "&#268;e &#382;elite dodati spremenljivko v knji&#382;nico, jo povlecite v to polje",
-    "srv_knjiznica_copy"    =>	 "&#268;e &#382;elite kopirati vpra&#154;anje, ga ozna&#269;ite z ikono COPY",
+    "srv_knjiznica_copy"    =>	 "&#268;e &#382;elite kopirati vpra&#154;anje, ga označite z ikono COPY",
     "srv_deleteall"         =>	 "Izbri&#154;i vse vnose",
     "srv_expand"            =>	 "Odpri vse",
     "srv_collapse"          =>	 "Zapri vse",
@@ -2358,11 +2445,11 @@ $lang = array (
     "srv_moja_vprasanja"    =>	 "Moja vprasanja",
     "srv_ankete"            =>	 "Ankete",
     "srv_moje_ankete"       =>	 "Moje ankete",
-    "srv_prestevilci"       =>	 "Pre&#154;tevil&#269;i",
+    "srv_prestevilci"       =>	 "Pre&#154;tevilči",
     "srv_ank_lib_on"        =>	 "Dodaj anketo v javno knjižnico",
-    "srv_ank_lib_off"        =>	 "Odstrani anketo iz javne knji&#382;nice",
+    "srv_ank_lib_off"        =>	 "Odstrani anketo iz javne knjižnice",
     "srv_ank_mylib_on"        =>	 "Dodaj anketo v mojo knjižnico",
-    "srv_ank_mylib_off"        =>	 "Odstrani anketo iz moje knjiznice",
+    "srv_ank_mylib_off"        =>	 "Odstrani anketo iz moje knjižnice",
     "srv_ank_phone_off"        =>	 "Ni telefonska anketa.",
     "srv_ank_phone_on"        =>	 "Je telefonska anketa.",
     "srv_anketa_copy"       	=>	"Kopiranje bo zbrisalo vsa obstojeca vprasanja. Nadaljujem?",
@@ -2370,15 +2457,19 @@ $lang = array (
     "srv_library_help_prva"		=>	"&#268;e &#382;elite novo anketo ustvariti iz knji&#382;nice, vpi&#154;ite ime ankete na vrhu in kliknite na ikono kopiraj %s na desni.",
     "srv_library_help_druga"	=>	"&#268;e &#382;elite novo anketo ustvariti iz knji&#382;nice, vpi&#154;ite ime ankete na vrhu in kliknite na ikono kopiraj %s na levi.",
     "srv_library_anketa_help"   =>	"Anketo shranite v knjiznico na prvi strani s klikom na ikono vozicka. Za kopiranje kliknite na ikono kopiraj na desni.",
+    "srv_library_title_my"              =>	"Vse ankete v moji knjižnici",
+    "srv_library_title_public"          =>	"Vse ankete v javni knjižnici",
+    "srv_library_title_search_my"       =>	"Rezultati iskanja po anketah v moji knjižnici",
+    "srv_library_title_search_public"   =>	"Rezultati iskanja po anketah v javni knjižnici",
     "srv_vstavi"          		=>	"Vstavi",
     "srv_1cs"          			=>	"1KA",
     "srv_no_library"        =>	 "brez predloge",
     "srv_cookie_return"        =>	 "Ko se uporabnik vrne",
-    "srv_cookie_return_start"       =>	 "Za&#269;ne od za&#269;etka",
+    "srv_cookie_return_start"       =>	 "Začne od začetka",
     "srv_cookie_return_middle"      =>	 "Nadaljuje na strani, kjer je ostal",
-    "srv_return_finished"        	=>	 "Uporabnik, ki je zaklju&#269;il anketo",
+    "srv_return_finished"        	=>	 "Uporabnik, ki je zaključil anketo",
     "srv_return_finished_yes"       =>	 "Lahko kasneje ureja svoje odgovore",
-    "srv_return_finished_no"        =>	 "Ne more ve&#269; urejati svojih odgovorov",
+    "srv_return_finished_no"        =>	 "Ne more več urejati svojih odgovorov",
     "srv_subsequent_answers"        =>	 "Uporabnik med izpolnjevanjem",
     "srv_subsequent_answers_no"     =>	 "Ne more naknadno urejati svojih odgovorov",
     "srv_subsequent_answers_yes"    =>	 "Lahko naknadno ureja svoje odgovore",
@@ -2388,35 +2479,36 @@ $lang = array (
     "srv_cookie_continue_alert"     =>	 "Če želite izpolniti anketo, se morate strinjati z uporabo piškotka.",
     "srv_block_ip"        			=>	 "Blokiraj ponovni IP naslov",
     "srv_block_ip_warning"       	=>	 "Pozor! Vklop oziroma omejevanje IP naslova ima lahko negativne posledice. <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/uporaba-ip-naslovov-piskotkov-za-nadzor-nad-podvojenimi-vnosi?&from1ka=1\" target=\"_blank\">Več >></a>",
-    "srv_from_library"     		=>	 "predloga",
-    "srv_last_insrt"        =>	 "Zadnji vnos",
+    "srv_from_library"                 =>     "predloga",
+    "srv_last_insrt"                =>     "Zadnji vnos",
+    "srv_created"                   =>     "Ustvarjeno",
     "srv_anketarestore"        =>	 "Aktiviraj arhivsko verzijo vprašalnika",
     "srv_anketarestoredata"        =>	 "Aktiviraj arhiv podatkov",
-    "srv_show_inserts"      =>	 "Enote",
-    "srv_show_questions"      =>	"Vprašanja",
+    "srv_show_inserts"      =>	 "Enote na stran:",
+    "srv_show_questions"      =>	"Vprašanja na stran:",
     "srv_allpages"          =>	 "Vse strani",
     "srv_move"              =>	 "Premakni",
-    "srv_call_start"        =>	 "Za&#269;ni s klicanjem telefonskih &#154;tevilk",
+    "srv_call_start"        =>	 "Začni s klicanjem",
     "srv_call_next"        =>	 "Naslednja telefonska &#154;tevilka",
-    "srv_call_nonumber"        =>	 "Trenutno ni ve&#269; prostih telefonskih &#154;tevilk.",
-    "srv_call_call"        	=>	 "Kli&#269;i",
-    "srv_call_open"        	=>	 "Odpri anketo",
+    "srv_call_nonumber"        =>	 "Trenutno ni več prostih telefonskih &#154;tevilk.",
+    "srv_call_call"        	=>	 "Kliči",
+    "srv_call_open"        	=>	 "Odpri anketo in začni",
     "srv_call_open_startCall"	=>	 "»A« Začnimo z anketiranjem - ",
     "srv_call_history"      =>	 "Zgodovina klicev",
-    "srv_call_calling"      =>	 "Kli&#269;em",
+    "srv_call_calling"      =>	 "Kličem",
     "srv_call_unsuccessful"	=>	 "Neuspeli izidi",
-    "srv_call_successful"	=>	 "»U« - Uspe&#154;no kon&#269;ano",
-    "srv_call_successful2"	=>	 "»U« - Uspe&#154;no zaklju&#269;ena anketa, pojdi na naslednji klic",
+    "srv_call_successful"	=>	 "»U« - Uspe&#154;no končano",
+    "srv_call_successful2"	=>	 "»U« - Uspe&#154;no zaključena anketa, pojdi na naslednji klic",
     "srv_call_zaseden"		=>	 "»Z« - Zaseden",
     "srv_call_ga_ni"		=>	 "»N« - Nedosegljiv",
     "srv_call_zavrnil"		=>	 "»R« - Zavrnil",
     "srv_call_zmenjen"		=>	 "»T« - Zmenjen",
     "srv_call_prekinjen"	=>	 "»P« - Prekinjen",
     "srv_call_prelozen"		=>	 "»D« - Preložen",
-    "srv_call_cancel"		=>	 "Prekli&#269;i klic",
-    "srv_call_settings_z" 	=>	 "&#268;e je status \"Z\" (Zaseden) kli&#269;i &#269;ez",
-    "srv_call_settings_n"	=>	 "&#268;e je status \"N\" (Nedosegljiv) kli&#269;i &#269;ez",
-    "srv_call_settings_d"	=>	 "&#268;e je status \"D\" (Preložen) kli&#269;i &#269;ez",
+    "srv_call_cancel"		=>	 "Prekliči klic",
+    "srv_call_settings_z" 	=>	 "Če je status \"Z\" (Zaseden) kliči čez",
+    "srv_call_settings_n"	=>	 "Če je status \"N\" (Nedosegljiv) kliči čez",
+    "srv_call_settings_d"	=>	 "Če je status \"D\" (Preložen) kliči čez",
     "srv_call_settings_min"	=>	 "minut",
     "srv_call_settings_max"	=>	 " Maksimalno",
     "srv_call_settings_calls"	=>	 "klicev",
@@ -2426,35 +2518,37 @@ $lang = array (
 	"srv_call_settings_call_order_2"	=>	 "A-Z",
 	"srv_call_settings_call_order_3"	=>	 "Z-A",
     "srv_call_nextcall"						=>	 "Naslednji klic",
-    "srv_call_nonumbers"					=>	 "Ni ve&#269; &#154;tevilk v bazi!",
+    "srv_call_nonumbers"					=>	 "Ni več &#154;tevilk v bazi!",
     "srv_call_nonumbers_time"				=>	 "Naslednji klic mogoč ob:",
     "srv_call"								=>	 "Klic",
     "srv_survey_repsonse_limit"   			=>	 "Anketa ima preseženo število odgvorov.",
-    "srv_survey_non_active"        			=>	 "Anketa je zaklju&#269;ena.",
+    "srv_survey_non_active"        			=>	 "Anketa je zaključena.",
     "srv_survey_non_active1"        			=>	 "Anketa je zaključena.",
     "srv_survey_deleted"        			=>	 "Anketa je izbrisana.",
     "srv_survey_non_active_notActivated"	=>	 "Anketa &#353;e ni bila aktivirana.",
 	"srv_survey_non_active_notActivated1"	=>	 "Anketa še ni bila aktivirana.",
-    "srv_survey_non_active_notStarted"		=>	 "Anketa &#353;e ni aktivna. Za&#269;ne se dne: ",
+    "srv_survey_non_active_notStarted"		=>	 "Anketa &#353;e ni aktivna. Začne se dne: ",
     "srv_survey_non_active_notStarted1"		=>	 "Anketa še ni aktivna. Začne se dne: ",
-    "srv_survey_non_active_expired"			=>	 "Anketa ve&#269; ni aktivna. Kon&#269;ala se je dne: ",
+    "srv_survey_non_active_expired"			=>	 "Anketa več ni aktivna. Končala se je dne: ",
     "srv_survey_non_active_expired1"			=>	 "Anketa več ni aktivna. Končala se je dne: ",
-	"srv_starts"        					=>	 "Datum za&#269;etka ankete",
+	"srv_starts"        					=>	 "Datum začetka ankete",
+	"srv_starts2"        					=>	 "Začetek ankete",
 	"srv_expire"        					=>	 "Datum zaključka ankete",
+	"srv_expire2"        					=>	 "Zaključek ankete",
 	"srv_vote_limit"						=>	 "Omejitev &#154;tevila odgovorov",
 	"srv_vote_quotas"						=>	 "Kvote (omejitev &#154;tevila odgovorov)",
 	"srv_vote_quotas_2"						=>	 "Kvote",
-	"srv_vote_count"						=>	 "Najve&#269;je &#154;tevilo odgovorov",
-	"srv_survey_non_active_voteLimit"  		=>	 "Anketa ni ve&#269; aktivna, ker jo je izpolnilo dolo&#269;eno &#353;tevilo respondentov.",
+	"srv_vote_count"						=>	 "Največje &#154;tevilo odgovorov",
+	"srv_survey_non_active_voteLimit"  		=>	 "Anketa ni več aktivna, ker jo je izpolnilo določeno &#353;tevilo respondentov.",
 	"srv_survey_voteLimit_warning"  		=>	 "V primeru dosežene omejitve števila odgovorov se respondentu izpiše obvestilo",
     "srv_mailing"        		=>	 "E-po&#154;to po&#154;lji",
     "srv_mailing_all"        	=>	 "Vsem",
     "srv_mailing_nonrsp"        =>	 "Tistim, ki &#154;e niso odgovorili na anketo",
     "srv_mailing_rsp"        	=>	 "Tistim, ki so &#382;e odgovorili na anketo",
     "srv_mailing_all_with_status"	=>	"Vsem ki imajo status",
-    "srv_mailing_add_help"      =>	 "<p><ul><li>V razdelku \"Spremenljivke\" izberite &#382;eljene spremenljivke. Izbrane spremenljivke bodo dodane na konec ankete kot sistemske spremenljivke.</li><li>V razdelku \"Respondenti\" dodajajte respondente po enega v vrstico.<br/>Stolpce lo&#269;ite z vejico, v enakem vrstnem redu kot so navedeni zgoraj (Spremenljivke).<br /><br />Primer:<div style=\"padding-left:30px;\">Spremenljivke: <i>email,ime</i></div><div style=\"padding-left:30px;\">Respondenti: <i>janez.novak@example.com,Janez Novak</i></div></li><br/><li>Lahko pa respondente prenesete iz tekstovne datoteke. S pomo&#269;jo spodnjega okna za prenos.</li></ul></p>",
-    #"srv_mailing_set_help"      =>	 "<p>Za po&#154;iljanje e-po&#154;te mora biti dodana sistemska spremenljivka <strong>email</strong>!</p><br /><ul><li>Za vstavljanje povezave na url ankete vpi&#154;ite <strong>#URL#</strong> v besedilo.</li><li>Za izpis kode anketiranca vpi&#154;ite <strong>#CODE#</strong> v besedilo.</li><li>Za povezavo na odjavo iz mailing liste, dodajte <strong>#UNSUBSCRIBE#</strong></li><li>Za izpis anketiran&#269;eve vrednosti na drugi spremenljivki ali sistemski spremenljivki iz ankete, vnesite ime spremenljivke med znaka <strong>#</strong>. <br/><div style=\"margin-left:20px;\"><i>Primer: za izpis anketiran&#269;evega e-po&#353;tnega naslova vpi&#154;ite v besedilo <strong>#EMAIL#</strong>. </i></div></li></ul><strong>Sistemske spremenljivke, ki so na voljo:<br/></strong></p>",
-    "srv_mailing_upload_list"   =>	 "Nalo&#382;i seznam respondentov iz datoteke",
+    "srv_mailing_add_help"      =>	 "<p><ul><li>V razdelku \"Spremenljivke\" izberite &#382;eljene spremenljivke. Izbrane spremenljivke bodo dodane na konec ankete kot sistemske spremenljivke.</li><li>V razdelku \"Respondenti\" dodajajte respondente po enega v vrstico.<br/>Stolpce ločite z vejico, v enakem vrstnem redu kot so navedeni zgoraj (Spremenljivke).<br /><br />Primer:<div style=\"padding-left:30px;\">Spremenljivke: <i>email,ime</i></div><div style=\"padding-left:30px;\">Respondenti: <i>janez.novak@example.com,Janez Novak</i></div></li><br/><li>Lahko pa respondente prenesete iz tekstovne datoteke. S pomočjo spodnjega okna za prenos.</li></ul></p>",
+    #"srv_mailing_set_help"      =>	 "<p>Za po&#154;iljanje e-po&#154;te mora biti dodana sistemska spremenljivka <strong>email</strong>!</p><br /><ul><li>Za vstavljanje povezave na url ankete vpi&#154;ite <strong>#URL#</strong> v besedilo.</li><li>Za izpis kode anketiranca vpi&#154;ite <strong>#CODE#</strong> v besedilo.</li><li>Za povezavo na odjavo iz mailing liste, dodajte <strong>#UNSUBSCRIBE#</strong></li><li>Za izpis anketirančeve vrednosti na drugi spremenljivki ali sistemski spremenljivki iz ankete, vnesite ime spremenljivke med znaka <strong>#</strong>. <br/><div style=\"margin-left:20px;\"><i>Primer: za izpis anketirančevega e-po&#353;tnega naslova vpi&#154;ite v besedilo <strong>#EMAIL#</strong>. </i></div></li></ul><strong>Sistemske spremenljivke, ki so na voljo:<br/></strong></p>",
+    "srv_mailing_upload_list"   =>	 "Naloži seznam respondentov iz datoteke",
     "srv_ub_added"        		=>	 "Dodan v bazo",
     "srv_ub_addedby"        	=>	 "Dodal v bazo",
     "srv_ub_mailed"        		=>	 "Poslana e-po&#154;ta",
@@ -2480,21 +2574,22 @@ $lang = array (
     "srv_userstatus_total"		=> "Vsi statusi",
     "srv_userstatus_appropriate"=> "Ustrezni",
     "srv_userstatus_inappropriate"=> "Neustrezni",
-    "srv_edithelp"           	=>	 "Urejanje oken s pomo&#269;jo",
+    "srv_edithelp"           	=>	 "Urejanje oken s pomočjo",
     "srv_tracking"           	=>	 "Prika&#382;i spremembe ankete",
     "srv_diagnostics"           =>	 "Aktivnost",
     "srv_sar"           		=>	 "Strežnik",
     "srv_addfilter"           	=>	 "Dodaj filtriranje",
     "srv_editcalculation"       =>	 "Uredi kalkulacijo",
     "srv_editcalculation_missing"	=>	 "Neodgovor upoštevaj kot vrednost 0",
+    "srv_editcalculation_new"	=>	 "Ime nove spremenljivke",
     "srv_edit_quota"       		=>	 "Uredi kvoto",
     "cats_for_r_db_ttl"			=>	"Prikazani filtri v r-bazi",
-	"FinancialSite"				=>	"Finan&#269;no spletno mesto",
+	"FinancialSite"				=>	"Finančno spletno mesto",
 	"whatsthis"					=>	"Kaj je to?",
-	"aboutOneClick"			=>	"OneClick Upload vam omogo&#269;a, da z enostavno operacijo povleci-spusti ali kopiraj-prilepi va&#154;emu sporo&#269;ilu dodate poljubno &#154;tevilo prilog iz va&#154;ega trdega diska ali USB klju&#269;ka.<br />Deluje v vseh operacijskih sistemih, v Microsoftovih oknih pa je potrebno za njegovo delovanje nalo&#382;iti mali dodatek, ki ga lahko <a href=\"http://www.sisplet.org/uploadi/editor/1162159255OneClick.zip\">dobite tukaj</a>.<br /><br /> Ve&#154; o OneClick uploadu si lahko <a href=\"http://www.sisplet.org/index.php?fl=1&nt=3&sid=7\">preberete tukaj.</a>",
-	"create_thread"			=>	"Iz tega sporo&#269;ila kreiraj novo temo",
-	"create_thread_q"		=>	"Ali ste prepri&#269;ani, da &#382;elite iz tega sporo&#269;ila ustvariti novo temo?",
-	"delete_project"		=>	"Ali ste prepri&#269;ani, da &#382;elite trajno izbrisati ta projekt?",
+	"aboutOneClick"			=>	"OneClick Upload vam omogoča, da z enostavno operacijo povleci-spusti ali kopiraj-prilepi va&#154;emu sporočilu dodate poljubno &#154;tevilo prilog iz va&#154;ega trdega diska ali USB ključka.<br />Deluje v vseh operacijskih sistemih, v Microsoftovih oknih pa je potrebno za njegovo delovanje nalo&#382;iti mali dodatek, ki ga lahko <a href=\"http://www.sisplet.org/uploadi/editor/1162159255OneClick.zip\">dobite tukaj</a>.<br /><br /> Ve&#154; o OneClick uploadu si lahko <a href=\"http://www.sisplet.org/index.php?fl=1&nt=3&sid=7\">preberete tukaj.</a>",
+	"create_thread"			=>	"Iz tega sporočila kreiraj novo temo",
+	"create_thread_q"		=>	"Ali ste prepričani, da &#382;elite iz tega sporočila ustvariti novo temo?",
+	"delete_project"		=>	"Ali ste prepričani, da &#382;elite trajno izbrisati ta projekt?",
     "SurveyDostop"            =>    "Ankete lahko urejajo",
 	"SurveyForum"			=>	"Forum za komentiranje anket",
     "SurveyCookie"            =>	   "Privzeto shranjevanje pi&#154;kotka",
@@ -2588,6 +2683,7 @@ $lang = array (
 	"e-mail_name_surname"	=>	"e-maile, imena in priimke",
 	"email_prejemniki"		=>	"Dodatni prejemniki ",
 	"email_one_per_line"	=>	"<span class=\"red\" >(Vsak e-po&#154;tni naslov vnesite v svojo vrstico.)</span>",
+	"email_prejemniki_one_per_line"	=>	"E-mail naslovi dodatnih prejemnikov (vsak e-poštni naslov vnesite v svojo vrstico)",
 //	"email_one_per_line"		=>	"Vnesite e-po&#353;tne naslove, po enega v vrstico.",
 	"tab_delimited_one_per_line"	=>	"Vnesite e-po&#154;tne naslove, imena, in priimke, lo&#269;ene s tabulatorji (tab-delimited); po eno osebo v vrstico.",
 	"you_are_on_page"		=>	"Nahaja&#154; se na strani",
@@ -2606,8 +2702,8 @@ $lang = array (
 	"bruto"				=>	"Bruto",
 	"cost_label"			=>	"Oznaka stro&#154;ka",
 	"fin_import_3_of_3"		=>	"Korak 3 od 3: Opravljeno",
-	"fin_import_ok"			=>	"Podatki so bili uspe&#154;no uvo&#382;eni",
-	"fin_import_ok_text"	=>	"Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na več straneh, izberite zadnjo stran)",
+	"fin_import_ok"			=>	"Podatki so bili uspešno uvoženi",
+	"fin_import_ok_text"	=>	"Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na več straneh, izberite zadnjo stran).",
 	"fin_show_substm"		=>	"Prika&#382;i tudi  podstro&#154;kovna mesta",
 	"texts"				=>	"Teksti",
 	"logotype"			=>	"Logotip",
@@ -2662,6 +2758,8 @@ $lang = array (
 	"show_menu_forum"		=>	"Prika&#382;i menu v forumu",
 	"using_mail_template"	=>	"Pri obve&#154;&#269;anju se uporablja predloga ki je definirana v skinu",
 	"SurveyMetaOnly"		=>	"Prika&#382;i survey samo meta adminom",
+    "other"                    =>    "Ostalo",
+    "more2"                    =>    "Več",
 	"srv_analiza_info"		=>	"Podatki",
 	"srv_analiza_stVprasanj"	=>	"Vpra&#353;anj",
 	"srv_analiza_stVariable"	=>	"Spremenljivk",
@@ -2735,7 +2833,7 @@ $lang = array (
 	"srv_analiza_opisne_povprecje1"			=>	"Povprečje", // "Povprečna<br/>vrednost",
 	"srv_analiza_opisne_povprecje_odstotek"	=>	"Povpre&#269;je<br/>/&nbsp;odstotek", // "Povpre&#269;na<br/>vrednost",
 	"srv_analiza_opisne_povprecje_odstotek1"	=>	"Povprečje<br/>/&nbsp;odstotek", // "Povpre&#269;na<br/>vrednost",
-	"srv_analiza_opisne_odklon"				=>	"Std. Odklon",// "Standardni<br/>odklon",
+	"srv_analiza_opisne_odklon"				=>	"Std. odklon",// "Standardni<br/>odklon",
 	"srv_analiza_opisne_min"				=>	"Minimum", //"Najmanj&#353;a<br/>vrednost",
 	"srv_analiza_opisne_max"				=>	"Maksimum", //"Najve&#269;ja<br/>vrednost",
 	"srv_analiza_opisne_valid"				=>	"Veljavni", 
@@ -2764,6 +2862,8 @@ $lang = array (
 	"srv_analiza_crosstab_average" 			=>	"Povprečje",
 	"srv_analiza_crosstab_navedbe" 			=>	"Po navedbah",
 	"srv_analiza_crosstab_enote" 			=>	"Po enotah",
+	"srv_analiza_crosstab_table_settings" 	=>	"V tabeli prikaži",
+	"srv_analiza_crosstab_answer_settings"	=>	"Odgovore prikaži",
 	"srv_standardna_porocila"				=>	"Standardna poro&#269;ila",
 	"srv_rep_text"							=>	"Tekstovno poro&#269;ilo",
 	"srv_rep_graph"							=>	"Grafi&#269;no poro&#269;ilo",
@@ -2901,6 +3001,7 @@ $lang = array (
 	"srv_orientacija_horizontalna_3"  =>	"Vodoravno",
 	"srv_orientacija_expand"          =>	"Z razpiranjem",
 	"srv_dynamic_multigrid"  		=>	"Postopno reševanje",
+	"srv_more_info"					=>	"Več informacij",
 	"srv_more"						=>	"ve&#269",
 	"srv_less"						=>	"manj",
 	"user_tracker"					=>	"Nadzor uporabnika",
@@ -2957,9 +3058,11 @@ $lang = array (
 	"glasovanja_embed_on"			=>	"Vklju&#269;ena v drugo spletno mesto",
 	"glasovanja_embed_off"			=>	"Samostojna anketa",
 	"glasovanja_theme"				=>	"Izberi temo za anketo",
+	"glasovanja_theme2"				=>	"Tema za anketo",
 	"glasovanja_stat_theme"			=>	"Izberi temo za statistiko",
-	"oblikovanje_if" 				=>	"Urejanje pogojev",
-	"oblikovanje_blok" 				=>	"Urejanje bloka",
+	"glasovanja_stat_theme2"        =>	"Tema za statistiko",
+	"oblikovanje_if" 				=>	"Nastavitve pogoja",
+	"oblikovanje_blok" 				=>	"Nastavitve bloka",
 	"sintaksa_if" 					=>	"Predogled pogojev",
     "urejanje_podif_alert" 			=>	"Urejate pogoj za prikaz izbrane vrstice (kategorije, podvpra&#353;anja) in ne celega vpra&#353;anja!",
     "urejanje_pogoj_popup"          =>	"Uredi pogoj",
@@ -2969,7 +3072,7 @@ $lang = array (
 	"srv_url" 						=>	"URL",
 	"srv_embed_link" 				=>	"Embed",
 	"srv_pop-up" 					=>	"Pop-up",
-	"srv_email-vabila" 				=>	"E-po&#353;tna Vabila",
+	"srv_email-vabila" 				=>	"E-poštna vabila",
 	"srv_email-vabila_form"			=>	"Hitre nastavitve email vabil",
 	"srv_url_intro_active" 			=>	"Anketa je aktivirana.",
 	"srv_url_intro1" 				=>	"Anketa je aktivirana. URL:",
@@ -3013,7 +3116,7 @@ $lang = array (
 	"srv_h_sl_spreminjal"			=>	"Spremenil",
 	"srv_h_sl_trajanjeod"			=>	"Od",
 	"srv_h_sl_trajanjedo"			=>	"Do",
-	"srv_h_sl_stvprasanj"			=>	"Št. vprašanj",
+	"srv_h_sl_stvprasanj"			=>	"št. vprašanj",
 	"srv_h_sl_phone"				=>	"Telefonska anketa",
 	"srv_sl_error_msg"				=>	"Vidnost posameznih stolpcev lahko vklju&#269;ite s pomo&#269;jo potrditvenih polj.<br>Vrstni red pa nastavite s preme&#353;&#269;anjem posameznih elementov.",
 	"srv_sl_setting_show"			=>	"Prikaži ",					
@@ -3063,7 +3166,7 @@ $lang = array (
 	"srv_vrsta_survey_note_0_4"		=>	"Glasovanje",
 					
 	"srv_vrsta_survey_note_0_1"		=>	"Vklju&#269;iti &#382;elite: <strong>Glasovanja</strong><br/><br/>",
-	"srv_vrsta_survey_note_0_2"		=>	"Glasovanje je anketa z enim vpra&#353;anjem, mo&#382;nost vklju&#269;itve v poljubno stran, mo&#382;nost sprotne analize rezultov za respondente, mo&#382;nost registriranega glasovanja, volitev, peticij...<br/>",
+	"srv_vrsta_survey_note_0_2"		=>	"Glasovanje je anketa z enim vpra&#353;anjem, mo&#382;nost vklju&#269;itve v poljubno stran, mo&#382;nost sprotne analize rezultatov za respondente, mo&#382;nost registriranega glasovanja, volitev, peticij...<br/>",
 	
 	"srv_vrsta_survey_note_1_1"		=>	"Vklju&#269;iti &#382;elite: <strong>Formo</strong><br/><br/>",
 	"srv_vrsta_survey_note_1_2"		=>	"Forma je enostavna anketa na eni strani in brez pogojev.<br/>",
@@ -3075,28 +3178,33 @@ $lang = array (
 	"srv_vrsta_survey_note_3_2"		=>	"Vklju&#269;ili boste napreden vmesnik za uporabo pogojev (vejitev, preskokov).",
 	"srv_vrsta_survey_note_3_3"		=>	"<strong>Anketa s pogoji</strong> - kompleksna anketa, pogojni stavki (IF), vejitve, preskoki, bloki.",
 	"srv_vrsta_survey_note_4_1"		=>	"Vklju&#269;iti &#382;elite: <strong>Evalvacija strani</strong><br/>",
-	"srv_vrsta_survey_note_4_2"		=>	"<br/>Razdeljen ekran, kjer z 1KA ocenjujemo poljubno spletno mesto ",
-	"srv_vrsta_survey_note_4_3"		=>	"Razdeljen ekran, kjer z 1KA ocenjujemo poljubno spletno mesto ",
+	"srv_vrsta_survey_note_4_3"		=>	"Modul 'Evalvacija strani' je namenjen ocenjevanju spletnih mest. Uporabniki lahko na eni polovici zaslona gledajo in uporabljajo spletno mesto, ki ga ocenjujejo preko ankete na drugi polovici zaslona.",
+	"srv_vrsta_survey_note_4_3a"	=>	"Vklopi modul 'Evalvacija strani'",
+	"srv_vrsta_survey_note_4_3b"	=>	"Modul 'Evalvacija strani' omogoča tudi, da se hkrati ocenjuje več spletnih strani, vsako na svoji strani ankete. Tako lahko povezavo spletne strani za ocenjevanje določimo za vsako stran ankete posebej.",
 	"srv_vrsta_survey_note_5_1"		=>	"Vklju&#269;iti &#382;elite: <strong>Vnos vpra&#353;alnikov</strong><br/>",
 	"srv_vrsta_survey_note_5_2"		=>	"<br/>Možnost hitrega vnosa <b>pisemskih</b> vprašalnikov. <br/> Opcija pride v upoštev pri vnašanju že pridobljenih podatkov preko pisemskih vprašalnikov. Z vklopom tega modula se vam v vprašalniku pojavijo prazna polja za vnos vrednosti odgovorov, zato ta modul <b>ni primeren za spletno anketiranje </b>.",
 	"srv_vrsta_survey_note_5_3"		=>	"Možnost hitrega vnosa <b>pisemskih</b> vprašalnikov. <br/>Opcija pride v upoštev pri vnašanju že pridobljenih podatkov preko pisemskih vprašalnikov. Z vklopom tega modula se vam v vprašalniku pojavijo prazna polja za vnos vrednosti odgovorov, zato ta modul <b>ni primeren za spletno anketiranje </b>.",
-	"srv_vrsta_survey_note_6_1"		=>	"Vklju&#269;iti &#382;elite: <strong>Kviz</strong><br/>",
-	"srv_vrsta_survey_note_6_2"		=>	"<br/>Mo&#382;nost preverjanja rezultatov se&#353;tevanja to&#269;k in obve&#353;&#269;anja o dose&#382;enih rezultatih",
-	"srv_vrsta_survey_note_6_3"		=>	"Mo&#382;nost preverjanja rezultatov se&#353;tevanja to&#269;k in obve&#353;&#269;anja o dose&#382;enih rezultatih",
-	"srv_vrsta_survey_note_6_4"		=>	"Mo&#382;nost preverjanja pravilnih odgovorov pri vprašanjih",
+	"srv_vrsta_survey_note_6_4"		=>	"Modul kviz je namenjen preverjanju pravilnih odgovorov na vprašanja. Avtomatsko preverjanje pravilnih odgovorov je mogoče samo pri vprašanjih tipa 'Kategorije - En odgovor', 'Kategorije - En odgovor - Roleta' in 'Kategorije - Več odgovorov'.",
+	"srv_vrsta_survey_note_6_4a"		=>	"Vklopi modul 'Kviz'",
+	"srv_vrsta_survey_note_6_4b"		=>	"V zaključku kviza se respondentu prikažejo rezultati:",
 	"srv_vrsta_survey_note_7_1"		=>	"Vklju&#269;iti &#382;elite: <strong>Telefonska anketa</strong><br/>",
 	"srv_vrsta_survey_note_7_2"		=>	"<br/>Podpora izvedbi, nadzoru in opravljanju telefonskega anketiranja",
 	"srv_vrsta_survey_note_7_3"		=>	"Podpora izvedbi, nadzoru in opravljanju telefonskega anketiranja",
 	"srv_vrsta_survey_note_8_1"		=>	"Vklju&#269;iti &#382;elite: <strong>Socialna omre&#382;ja</strong><br/>",
-	"srv_vrsta_survey_note_8_2"		=>	"<br/>Podpora zajemov egocentri&#269;nih socialnih omre&#382;ij (ego-alter) vklju&#269;no z Antonuccijevimi krogi",
-	"srv_vrsta_survey_note_8_3"		=>	"Podpora zajemov egocentri&#269;nih socialnih omre&#382;ij (ego-alter) vklju&#269;no z Antonuccijevimi krogi",
+	"srv_vrsta_survey_note_8_3"		=>	"Modul socialna omrežja je namenjen podpori zajemu egocentričnih socialnih omrežij (ego-alter) vključno z Antonuccijevimi krogi.",
+	"srv_vrsta_survey_note_8_3a"	=>	"Vklopi modul 'Socialna omrežja'",
 	"srv_vrsta_survey_note_9_1"		=>	"Vklju&#269;iti &#382;elite: <strong>Prezentacijo</strong><br/>",
 	"srv_vrsta_survey_note_9_2"		=>	"<br/>Prezentacija (slideshow) je namenjena prikazovanju posameznih strani kot predstavitev. Strani se prikazujejo oz. zamenjujejo avtomatično, zaradi tega tudi ni gumbov \"Naprej\", \"Prejšnja stran\", \"Naslednja stran\"... Odgovori respondentov se ne beležijo.",
 	"srv_vrsta_survey_note_9_3"		=>	"Prezentacija (slideshow) je namenjena prikazovanju posameznih strani kot predstavitev. Strani se prikazujejo oz. zamenjujejo avtomatično, zaradi tega tudi ni gumbov \"Naprej\", \"Prejšnja stran\", \"Naslednja stran\"... Odgovori respondentov se ne beležijo.",
 	"srv_vrsta_survey_note_11_1"	=>	"<br/>Modul 360 stopinj omogoča posebno analizo ankete.",
 	"srv_vrsta_survey_note_12_1"	=>	"<br/>Modul omogoča izpis poročila z analizo 360°, kjer se ocenjuje posameznika znotraj organizacije. Zaposleni (nadrejeni, podrejeni, sodelavci in samoocenjevalec) izpolnijo vprašalnik na osnovi katerega se avtomatsko generira poročilo.<br /><br />Za prilagajanje izpisa poročila ali spremembe vprašalnika kontaktirajte Center za pomoč uporabnikom 1KA na tel. št. 030/702-788.",
-	"srv_vrsta_survey_note_14_1"	=>	"<br/>Modul omogoča pogovarjanje med respondenti in urednikom ankete preko storitve TAWK. <br /><br />Najprej je potrebno ustvariti uporabniški račun na <a href= \"http:\\www.tawk.to\" target=\"_blank\">www.tawk.to</a>. Po prijavi morate najprej vpisati informacije za ime spletnega mesta: 1KA, nato pa še URL www.1ka.si. Povabite lahko vse anketarje, ki bodo odgovarjali na klepet, nato pa v zadnjem koraku prejmete kodo <b>Widget Code</b>, ki jo morate kopirati in prilepiti na 1KA v spodnje okno <b>TAWK koda</b>.<br /><br />S spodnjimi nastavitvami izberete na kakšen način se prikaže okno za klepet.<br /><br />",
-    "srv_vrsta_survey_note_15_1"	=>	"<br/>Modul omogoča povezovanje ankete s spletnim panelom (npr. Valicon, GFK...). <a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/napredni-moduli/panel\" target=\"_blank\">Več >></a>",
+	"srv_vrsta_survey_note_14_1"	=>	"Modul omogoča pogovarjanje med respondenti in urednikom ankete preko storitve TAWK.",
+    "srv_vrsta_survey_note_14_1b"	=>	"Vklopi modul 'Klepet'",
+	"srv_vrsta_survey_note_14_1a"	=>	"Najprej je potrebno ustvariti uporabniški račun na <a href= \"http:\\www.tawk.to\" target=\"_blank\">www.tawk.to</a>. Po prijavi morate najprej vpisati informacije za ime spletnega mesta: 1KA, nato pa še URL: www.1ka.si. Povabite lahko vse anketarje, ki bodo odgovarjali na klepet, nato pa v zadnjem koraku prejmete kodo <span class='bold'>Widget Code</span>, ki jo morate kopirati in prilepiti na 1KA v spodnje okno <span class='bold'>Widget koda</span>.",
+	"srv_vrsta_survey_note_14_1c"	=>	"S spodnjimi nastavitvami izberete, na kakšen način se prikaže okno za klepet v anketi.",
+    "srv_vrsta_survey_note_15_1"	=>	"Modul omogoča povezovanje ankete s spletnim panelom (npr. Valicon, GFK, ipd.).",
+    "srv_vrsta_survey_note_15_1a"	=>	"<a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/napredni-moduli/panel\" target=\"_blank\">Več informacij o modulu 'Panel'</a>",
+    "srv_vrsta_survey_note_15_1b"	=>	"Vklopi modul 'Panel'",
     "srv_vrsta_survey_note_16_1"	=>	"<br/>Prikaz grafa (excelleration matrix) po koncu reševanja ankete.",
 	"srv_vrsta_survey_create"		=>	"Naprej",
 	"srv_vrsta_survey_with_pages_error"	=>	"Ankete vsebuje pogoje, zato je ne morete spremeniti v preprosto anketo!<br><span class=\"red\">Najprej odstranite vse pogoje.</span>",
@@ -3153,20 +3261,20 @@ $lang = array (
 	"srv_slideshow_sett_pause_button_lbl"	=>	"Prikaz gumba 'Pavza'",
 	"srv_slideshow_sett_button_opt_0"	=>	"Ne prikaži gumba",
 	"srv_slideshow_sett_button_opt_1"	=>	"Prikaži gumb",
-	"srv_chat_code"					=>	"TAWK koda",
-	"srv_chat_type"					=>	"Prikaz klepet okna",
+	"srv_chat_code"					=>	"Widget koda",
+	"srv_chat_type"					=>	"Prikaz okna za klepet",
 	"srv_chat_type_0"				=>	"Vedno na dnu",
 	"srv_chat_type_1"				=>	"Aktivacija znotraj besedila vprašanja",
-	"srv_chat_type_2"				=>	"Aktivacija vedno na vrhu",
+	"srv_chat_type_2"				=>	"Aktivacija na vrhu, v glavi ankete",
 	"srv_chat_turn_on"				=>	"Vklopi klepet",
 	"srv_chat_question_text"		=>	"Aktivirajte klepet s klikom na gumb",
-	"srv_quiz_results"				=>	"Prikaz rezultov kviza v zaključku",
-	"srv_quiz_results_chart"		=>	"Prikaz grafa rezultov kviza v zaključku",
+	"srv_quiz_results"				=>	"Prikaz rezultatov kviza v zaključku",
+	"srv_quiz_results_chart"		=>	"Prikaz grafa rezultatov kviza v zaključku",
 	"srv_quiz_results_chart_correct"	=>	"Pravilni odgovori",
 	"srv_quiz_results_chart_incorrect"	=>	"Napačni odgovori",
-	"srv_panel_user_id_name"		=>	"Ime parametra za id respondenta",
+	"srv_panel_user_id_name"		=>	"Ime parametra za ID respondenta",
 	"srv_panel_status_name"			=>	"Ime parametra za status",
-	"srv_panel_status_default"		=>	"Privzeta vrednost status parametra",
+	"srv_panel_status_default"		=>	"Privzeta vrednost za parameter status",
 	"srv_panel_url"					=>	"URL po koncu ankete",
 	"srv_panel_url1_example"		=>	"Primer URL-ja za prihod na anketo",
 	"srv_panel_url2_example"		=>	"Primer URL-ja za preusmeritev po koncu ankete",
@@ -3179,14 +3287,14 @@ $lang = array (
     "srv_fieldwork_device_surveyID" =>  "ID te ankete na napravi",
     "srv_fieldwork_sync_data"       =>  "Sinhroniziraj podatke",
     "srv_hint"							=>	"Namig",
-	"srv_hint_datapiping"				=>	"Pri urejanju zaklju&#269;ka ali vsebini e-po&#353;te, ki ga prejme respondent uporabite za prikaz &#353;tevila to&#269;k <b>Prenos vrednosti</b>.</p><p>Vpi&#353;ite labelo spremenljivke z izra&#269;unano vrednostjo, obdano z lojtro, npr.: <B>#rezultat#</B>",
-	"srv_missing_profile_title1"		=>	"Ozna&#269;eni odgovori se <font class=\"red bold\">ne</font> upo&#353;tevajo pri analizah, in se obravnavajo kot manjkajo&#269;e vrednosti!",
-	"srv_missing_profile_title2"		=>	"Manjkajo&#269;e vrednosti – neopredeljeni odgovori",
-	"srv_missing_profile_title3"		=>	"Manjkajo&#269;e vrednosti – nedogovor spremenljivke",
-	"srv_missing_profile_title4"		=>	"Ustrezne enote – enote, ki se upo&#353;tevajo v analizah",
+	"srv_hint_datapiping"				=>	"Pri urejanju zaključka ali vsebini e-pošte, ki ga prejme respondent uporabite za prikaz &#353;tevila to&#269;k <b>Prenos vrednosti</b>.</p><p>Vpi&#353;ite labelo spremenljivke z izra&#269;unano vrednostjo, obdano z lojtro, npr.: <B>#rezultat#</B>",
+	"srv_missing_profile_title1"		=>	"Označeni odgovori se <font class=\"red bold\">ne</font> upoštevajo pri analizah, in se obravnavajo kot manjkajo&#269;e vrednosti!",
+	"srv_missing_profile_title2"		=>	"Manjkajoče vrednosti – neopredeljeni odgovori",
+	"srv_missing_profile_title3"		=>	"Manjkajoče vrednosti – nedogovor spremenljivke",
+	"srv_missing_profile_title4"		=>	"Ustrezne enote – enote, ki se upoštevajo v analizah",
 	"srv_missing_profile_title5"		=>	"Ostale nastavitve",
 	"srv_invalid_units"					=>	"Neustrezne enote",
-	"srv_missing_profile_means"			=>	"Povpre&#269;je",
+	"srv_missing_profile_means"			=>	"Povprečje",
 	"srv_missing_profile_sums"			=>	"Sumarnik",
 	"srv_missing_profile_crosstab"		=>	"Tabulacije",
 	"srv_missing_profile_freqency"		=>	"Frekvence",
@@ -3344,11 +3452,12 @@ $lang = array (
     "add_alternative_email_subject"   		=> "Potrditev dodatnega elektronskega naslova na spletnem mestu #PAGENAME#",
 	"add_alternative_email"					=>	"Spo&#353;tovani, #NAME#!<br /><br />Na spletnem mestu <strong>#PAGENAME#</strong> ste dodali poleg primarnega elektronskega naslova #PRIMARNIEMAIL#,  dodali še dodatni elektronski naslov <strong>#ALTERNATIVNIEMAIL#</strong>. Geslo za prijavo je enako kot za primarni elektronski naslov.<br/><br/>
  															 Omenjeni elektronski naslov aktivirate s klikom na to #CODESTART# povezavo#CODEEND#.<br /><br />Lep pozdrav,",
-    "add_alternative_primary_email_subject"   => "Dodan nov elektronski dostop do vašega računa na spletnem mestu #PAGENAME#",
-    "add_alternative_primary_email"			=>	"Spo&#353;tovani, #NAME#!<br /><br />Na spletnem mestu <strong>#PAGENAME#</strong> ste dodali nov elektronsk naslov <strong>#ALTERNATIVNIEMAIL#</strong>.<br/>
+    "add_alternative_primary_email_subject" => "Dodan nov elektronski dostop do vašega računa na spletnem mestu #PAGENAME#",
+    "add_alternative_primary_email"         =>	"Spo&#353;tovani, #NAME#!<br /><br />Na spletnem mestu <strong>#PAGENAME#</strong> ste dodali nov elektronsk naslov <strong>#ALTERNATIVNIEMAIL#</strong>.<br/>
  															 				V kolikor tega niste storili, nas o tem obvestite ali izbrišite elektronski naslov iz vašega profila.<br /><br />Lep pozdrav,",
-    "alternative_email_confirm_error"			=>	"Pri aktivaciji dodatnega elektronskega naslova je pri&#353;lo do napake.<br />Prosimo, kontaktirajte urednika spletnega mesta za pomo&#269;",
+    "alternative_email_confirm_error"       =>	"Pri aktivaciji dodatnega elektronskega naslova je pri&#353;lo do napake.<br />Prosimo, kontaktirajte urednika spletnega mesta za pomo&#269;",
     "alternative_email_confirm_success"		=>	"Poslali smo vam elektronsko sporočilo s kodo za aktivacijo omenjenega elektronskega naslova.",
+    "alternative_email_delete"		        =>	"Ste prepričani, da želite odstraniti alternativni email",
 	"confirm_user_in_db"      				=> "Potrdi",
 	"delete_user_in_db"      				=> "Izbriši",
 	"user_confirm_h"						=>	"Potrditev veljavnosti e-naslova",
@@ -3366,7 +3475,7 @@ $lang = array (
 	"user_confirm_p_admin_success"	=>	"Uporabnik je bil uspešno aktiviran.",
 	"reg_confirm_error"				=>	"Pri aktivaciji je pri&#353;lo do napake.<br />Prosimo, kontaktirajte urednika spletnega mesta za pomo&#269;",
 	"srv_vprasalnik_finnished"		=>	"Ali je vpra&#353;alnik zaključen?",
-	"srv_vprasalnik_autosave"		=>	"Avtomatično shranjevanje.",
+	"srv_vprasalnik_autosave"		=>	"Avtomatično shranjevanje",
 	"upload_exe"					=>	"Nalaganje datoteke prepre&#269;eno- prosimo, ne nalagajte izvr&#352;ilnih in skriptnih datotek (exe, php,..).<br />Uporabite ZIP / ARJ in jih nalo&#382;ite stisnjene.",
 	"upload_done"					=>	"Datoteka je bila uspe&#353;no nalo&#382;ena.<br />Njen URL je zapisan zgoraj v URL polju.",
 	"upload_not_ok"					=>	"Datoteke ni bilo mo&#269; nalo&#382;iti.<br />Prosimo, kontaktirajte administratorja stre&#382;nika.",
@@ -3384,14 +3493,14 @@ $lang = array (
 	"srv_list_library_no_access"	=>	"Potrebujete administratorski dostop!",
 	"srv_default"					=>	"Privzeto",
 	"srv_vsota_text"				=>	"Skupaj",
-	"srv_vsota_exact"				=>	"Zahtevana vsota: ",
-	"srv_vsota_both"				=>	"Dodatna omejitev vsote: ",
-	"srv_vsota_limit"				=>	"Zgornja: ",
-	"srv_vsota_min"					=>	"Spodnja: ",
-	"srv_vsota_show"				=>	"Prikaži omejitev vsota pri izpolnjevanju: ",
-	"srv_num_limit"					=>	"Max: ",
-	"srv_num_min"					=>	"Min: ",
-	"srv_num_limit_show"			=>	"Prikaži meje pri izpolnjevanju: ",
+	"srv_vsota_exact"				=>	"Zahtevana vsota",
+	"srv_vsota_both"				=>	"Dodatna omejitev vsote",
+	"srv_vsota_limit"				=>	"Zgornja",
+	"srv_vsota_min"					=>	"Spodnja",
+	"srv_vsota_show"				=>	"Prikaži omejitev vsota pri izpolnjevanju",
+	"srv_num_limit"					=>	"Max",
+	"srv_num_min"					=>	"Min",
+	"srv_num_limit_show"			=>	"Prikaži meje pri izpolnjevanju",
 	"srv_num_limit_reminder"		=>	"Opozorilo za preseg meje",
 	"srv_vsota_reminder"			=>	"Opozorilo za preseg vsote",
 	"srv_num_reminder"				=>	"Minimum in maksimum",
@@ -3426,6 +3535,7 @@ $lang = array (
 	"srv_info_variables"			=>	"Spremenljivk",
 	"srv_info_pages"				=>	"Strani", 
 	"srv_info_answers"				=>	"Odgovorov",
+    "srv_info_answers_no"            =>    "Št. odgovorov",
 	"srv_info_answers_valid"		=>	"Ustreznih",
 	"srv_info_type"					=>	"Tip ankete",
 	"srv_info_author"				=>	"Avtor",
@@ -3471,6 +3581,7 @@ $lang = array (
 	"srv_forum_back"				=>	"Nazaj na urejanje ankete",
 	"srv_admin_comment"				=>	"Komentarji urednikov",
 	"srv_repondent_comment"			=>	"Komentarji respondentov",
+	"srv_add_comment_toggle"				=>	"Dodaj nov komentar",
 	"srv_add_comment"				=>	"Dodaj komentar",
 	"srv_view_comment"				=>	"Poglej komentarje",
 	"srv_delete_respondent"			=>	"Izbri&#353;i respondenta in njegove vnose.",
@@ -3496,12 +3607,17 @@ $lang = array (
 	"srv_admin_q_comments"			=>	"Komentarji na vpra&#353;anja",
 	"srv_admin_q_comments_txt"		=>	" – obla&#269;ek za komentarje urednikov na vsako vpra&#353;anje posebej (spodaj pod vsakim vpra&#353;anjem)",
 	"srv_admin_s_comments"			=>	"Komentarji na anketo",
+	"srv_admin_s_comments_editor"	=>	"Uredniki",
+	"srv_admin_s_comments_resp"		=>	"Respondenti",
+	"srv_admin_s_comments_links"	=>	"Povezave",
+	"srv_admin_s_comments_view"		=>	"Pregled vseh komentarjev",
+	"srv_admin_s_comments_set"		=>	"Pokaži napredne nastavitve",
 	"srv_admin_s_comments2"			=>	"Komentarji na anketo",
 	"srv_admin_s_comments_txt"		=>	" – obla&#269;ek za komentarje urednikov na anketo (zgoraj desno pri vpra&#353;alniku)",
-	"srv_resp_s_comments_txt"		=>	" – obla&#269;ek za komentarje respondentov na anketo (zgoraj desno pri vpra&#353;alniku)",
+	"srv_resp_s_comments_txt"		=>	"<span class=\"semi-bold\">Oblaček za komentarje respondentov na anketo</span> (zgoraj desno pri vprašalniku)",
 	"srv_comments_only_admin"			=>	"Vpisane komentarje vidijo samo administratorji",
 	"srv_comments_respondents"			=>	"Komentarji respondentov",
-	"srv_comments_respondents_txt"		=>	" – dodatno okno, ki se za vsako vpra&#353;anje prika&#382;e respondentom, ki ob odgovarjanju lahko podajo &#353;e svoj vtis oziroma komentar. Uredniki ankete vidijo te komentarje spodaj desno pod vsebino vpra&#353;anja",
+	"srv_comments_respondents_txt"		=>	"<span class=\"semi-bold\">Dodatno okno</span>, ki se za vsako vpra&#353;anje prika&#382;e respondentom, ki ob odgovarjanju lahko podajo &#353;e svoj vtis oziroma komentar. Uredniki ankete vidijo te komentarje spodaj desno pod vsebino vpra&#353;anja",
 	"srv_comments_show_open"			=>	"Okno za komentar naj bo na začetku",
 	"srv_comment_history"			=>	"Prikaz zgodovine splošnih komentarjev",
 	"srv_comment_history_0"			=>	"Brez",
@@ -3517,41 +3633,49 @@ $lang = array (
     "srv_survey_comment_show"           =>	"Okno s komentarji je vedno odprto",
     "srv_c_to_mail"						=>	"Pošlji ta komentar urednikom na e-mail",
     "srv_c_alert"						=>	"Prikaži ta komentar vsem urednikom, ko urejajo anketo",
+	"srv_diagnostics_basis"				=>	"Osnova:",
 	"srv_diagnostics_user_surveys"		=>	"&#352;tevilo anket v",
 	"srv_diagnostics_total"				=>	"Skupno &#353;tevilo",
 	"srv_diagnostics_in"				=>	"v",
-	"srv_diagnostics_orfrom"			=>	", ali od",
-	"srv_diagnostics_to"				=>	"do",
-	"srv_diagnostics_respondentov"		=>	"Ustreznih", // respondentov
+	"srv_diagnostics_orfrom"			=>	"Od:",
+	"srv_diagnostics_to"				=>	"Do:",
+	"srv_diagnostics_respondentov"		=>	"Ustrezne enote", // respondentov
 	"srv_diagnostics_strani"			=>	"Strani",
-	"srv_diagnostics_analiza"			=>	"Analiz",
-	"srv_diagnostics_editing"			=>	"Urejanj",
-	"srv_diagnostics_graph"				=>	"Grafov",
-	"srv_diagnostics_1 minute"			=>	"1 minuti",
-	"srv_diagnostics_5 minute"			=>	"5 minutah",
-	"srv_diagnostics_10 minute"			=>	"10 minutah",
-	"srv_diagnostics_30 minute"			=>	"30 minutah",
-	"srv_diagnostics_1 hour"			=>	"1 uri",
-	"srv_diagnostics_6 hour"			=>	"6 urah",
-	"srv_diagnostics_12 hour"			=>	"12 urah",
-	"srv_diagnostics_1 day"				=>	"1 dnevu",
-	"srv_diagnostics_2 day"				=>	"2 dneh",
-	"srv_diagnostics_5 day"				=>	"5 dneh",
-	"srv_diagnostics_7 day"				=>	"zadnji teden",
-	"srv_diagnostics_14 day"			=>	"14 dneh",
-	"srv_diagnostics_1 month"			=>	"zadnji mesec",
-	"srv_diagnostics_3 month"			=>	"3 mesecih",
-	"srv_diagnostics_6 month"			=>	"6 mesecih",
-	"srv_diagnostics_choose_date"		=>	"Izberi datum",
+	"srv_diagnostics_analiza"			=>	"Analize",
+	"srv_diagnostics_editing"			=>	"Urejanja",
+	"srv_diagnostics_graph"				=>	"Grafi",
+	"srv_diagnostics_emails"			=>	"E-mail vabila",
+	"srv_diagnostics_upostevane"		=>	"Upoštevane enote",
+	"srv_diagnostics_upostevaj"			=>	"Upoštevaj enote:",
+	"srv_diagnostics_jezik"				=>	"Jezik:",
+	"srv_diagnostics_filter"			=>	"Filtriraj",
+	"srv_diagnostics_date"				=>	"Določi obdobje",
+	"srv_diagnostics_date2"				=>	"Izberi obdobje:",
+	"srv_diagnostics_1 minute"			=>	"1 minuta",
+	"srv_diagnostics_5 minute"			=>	"5 minut",
+	"srv_diagnostics_10 minute"			=>	"10 minut",
+	"srv_diagnostics_30 minute"			=>	"30 minut",
+	"srv_diagnostics_1 hour"			=>	"1 ura",
+	"srv_diagnostics_6 hour"			=>	"6 ur",
+	"srv_diagnostics_12 hour"			=>	"12 ur",
+	"srv_diagnostics_1 day"				=>	"1 dan",
+	"srv_diagnostics_2 day"				=>	"2 dneva",
+	"srv_diagnostics_5 day"				=>	"5 dni",
+	"srv_diagnostics_7 day"				=>	"Zadnji teden",
+	"srv_diagnostics_14 day"			=>	"14 dni",
+	"srv_diagnostics_1 month"			=>	"Zadnji mesec",
+	"srv_diagnostics_3 month"			=>	"3 mesecev",
+	"srv_diagnostics_6 month"			=>	"6 mesecev",
+	"srv_diagnostics_choose_date"		=>	"Po meri",
 	"srv_diagnostics_sum_total"			=>	"n = ",
 	"srv_diagnostics_sum_total_survey"	=>  "Število anket: ",	
-	"srv_diagnostics_filter_test"		=>  "Testni",	
-	"srv_diagnostics_filter_autotest"	=>  "Avtomatski testni",	
-	"srv_diagnostics_filter_import"		=>  "Uvoženi",	
-	"srv_diagnostics_filter_6"			=>  "Status 6",	
-	"srv_diagnostics_filter_5"			=>  "Status 5",	
-	"srv_diagnostics_filter_34"			=>  "Neustrezni (status 3,4)",	
-	"srv_diagnostics_filter_012"		=>  "E-pošta brez odgovora (status 0,1,2)",	
+	"srv_diagnostics_filter_test"		=>  "Testne",	
+	"srv_diagnostics_filter_autotest"	=>  "Avtomatske testne",	
+	"srv_diagnostics_filter_import"		=>  "Uvožene",	
+	"srv_diagnostics_filter_6"			=>  "Enote s statusom 6",	
+	"srv_diagnostics_filter_5"			=>  "Enote s statusom 5",	
+	"srv_diagnostics_filter_34"			=>  "Neustrezne enote (status 3 in 4)",	
+	"srv_diagnostics_filter_012"		=>  "E-pošta brez odgovora (status 1 in 2)",	
 	"srv_diagnostics_filter_lang_all"	=>  "Vsi",	
 	"srv_diagnostics_filter_lang_slo"	=>  "Slovenščina",	
 	"srv_diagnostics_filter_lang_ang"	=>  "Angleščina",	
@@ -3575,6 +3699,10 @@ $lang = array (
 	"srv_language_admin_0"			=>	"Jezik",
 	"srv_language_admin_1"			=>	"Osnovni jezik",
 	"srv_language_admin_survey"		=>	"Jezik administrativnega vmesnika",
+	"srv_language_admin_surveyA"		=>	"Trenutni ",
+	"srv_language_admin_surveyB"		=>	" je Slovenščina.",
+	"srv_language_std_bes1"		=>	"Standardne besede lahko urejate v ",
+	"srv_language_std_bes2"		=>	"nastavitvah vprašalnika",
 	"srv_language_admin_survey2"	=>	"Jezik administrativnega vmesnika lahko urejate <a href=\"%s\"><span class=\"bold\">tukaj</span></a>",
 	"srv_language_respons"			=>	"Osnovni jezik vpra&#353;alnika za respondente",
 	"srv_language_respons_1"		=>	"Osnovni jezik za respondente",
@@ -3597,26 +3725,29 @@ $lang = array (
 	"srv_alert_active_text0"		=>	"Pozdravljeni,<br/><br/>obveščamo vas, da je bila anketa \"[SURVEY]\" deaktivirana!<br/><br/>Povezava: [URL]",
 	"srv_alert_active_text1"		=>	"Pozdravljeni,<br/><br/>obveščamo vas, da je bila anketa \"[SURVEY]\" aktivirana!<br/><br/>Povezava: [URL]",
 	"srv_alert_delete_text"			=>	"Spoštovani,<br/><br/>obveščamo vas, da je bila anketa \"[SURVEY]\" izbrisana!",
-	"srv_alert_expire_days1"		=>	"Avtomatsko pošlji obvestilo ",
-	"srv_alert_expire_days2"		=>	" dni pred potekom ankete. Vrednost 0 pomeni, da bo obvestilo bo poslano isti dan.<br/>",
+	"srv_alert_expire_days"		=>	"Število dni pred potekom ankete, ko je obvestilo o izteku ankete avtomatsko poslano",
 	"srv_alert_expire_expire_at"		=>	" Anketa poteče: ",
 	"srv_alert_expire_note_at"		=>	" Obvestilo bo poslano: ",
-	"srv_alert_instruction1"					=>	"<span class=\"red bold\">Navodila oblikovanja sporo&#269;il za obve&#353;&#269;anje!</span><br/><p class=\"bold\">Uporabite lahko naslednje spremenljivke iz baze:</p>",
-	"srv_alert_instruction2"					=>	" [NAME] => ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime<br/> ",
-	"srv_alert_instruction_name"				=>	" [NAME] => ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime",
-	"srv_alert_instruction_survey"				=>	"[SURVEY] => ime ankete",
-	"srv_alert_instruction_date"				=>	"[DATE] => datum",
-	"srv_alert_instruction_site"				=>	"[SITE] => URL do ankete",
-	"srv_alert_instruction_url"					=>	"[URL] => URL do urejanja ankete",
-	"srv_alert_instruction_pdf"					=>	"[PDF] => povezava do PDF datoteke z odgovori respondenta ",
-	"srv_alert_instruction_rtf"					=>	"[RTF] => povezava do RTF datoteke z odgovori respondenta",
-	"srv_alert_instruction_meta_referer_url"	=>	"[META_REFERER_URL] => Referer URL",
-	"srv_alert_instruction_system"				=>	"<p class=\"bold\">Dodatne sistemske spremenljivke iz ankete navedite med dva znaka #. </p>",
-	"srv_alert_instruction_sample"				=>	"<p>Primer:</p><p> &#269;e &#382;elimo izpisati odgovor, ki ga je uporabnik vnesel pri sistemskem vpra&#353;anju email, bomo uporabili #email#</p>",
-	"srv_alert_instruction_available"	=>	"<p class=\"bold\">Sistemske spremenljivke, ki so v anketi &#382;e na voljo:</p>",
-	"srv_alert_instruction3"			=>	"[SURVEY] => ime ankete<br/> [DATE] => datum<br/> [SITE] => URL do ankete<br/> [URL] => URL do urejanja ankete<br/><br/></p><p class=\"bold\">Dodatne sistemske spremenljivke iz ankete navedite med dva znaka #. </p><p>Primer:</p><p> &#269;e &#382;elimo izpisati odgovor, ki ga je uporabnik vnesel pri sistemskem vpra&#353;anju email, bomo uporabili #email#<br/></p><p class=\"bold\">Sistemske spremenljivke, ki so v anketi &#382;e na voljo:</p><p>",
-	"srv_alert_instruction4"			=>	"<p> [SURVEY] => ime ankete<br/> [DATE] => datum<br/> [SITE] => URL do ankete<br/> [URL] => URL do urejanja ankete<br/> [DAYS] => &#353;tevilo dni nastavljeno v intervalu<br/><br/></p>",
-	"srv_alert_instruction5"			=>	"<p> [SURVEY] => ime ankete<br/> [DATE] => datum<br/> [SITE] => URL do ankete<br/> [URL] => URL do urejanja ankete<br/><br/></p>",
+    "srv_alert_expire_prejemniki"	=>	 "Obvestilo o izteku ankete prejmejo naslednji prejemniki:",
+	"srv_alert_instruction1"					=>	"Navodila za oblikovanje sporočil",
+	"srv_alert_instruction1a"					=>	"Legenda spremenljivk iz baze",
+	"srv_alert_instruction1b"					=>	"V sporočilu lahko uporabite tudi sistemske spremenljivke, ki jih trenutno ni v anketi",
+	"srv_alert_instruction2"					=>	" [NAME] - ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime<br/> ",
+	"srv_alert_instruction_name"				=>	" [NAME] - ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime",
+	"srv_alert_instruction_survey"				=>	"[SURVEY] - ime ankete",
+	"srv_alert_instruction_date"				=>	"[DATE] - datum",
+	"srv_alert_instruction_site"				=>	"[SITE] - povezava do ankete",
+	"srv_alert_instruction_url"					=>	"[URL] - povezava do urejanja ankete",
+	"srv_alert_instruction_pdf"					=>	"[PDF] - povezava do PDF datoteke z odgovori respondenta ",
+	"srv_alert_instruction_rtf"					=>	"[RTF] - povezava do RTF datoteke z odgovori respondenta",
+	"srv_alert_instruction_meta_referer_url"	=>	"[META_REFERER_URL] - Referer URL",
+	"srv_alert_instruction_system"				=>	"Sistemske spremenljivke navedite med dva znaka #.",
+	"srv_alert_instruction_sample"				=>	"Primer: Če želimo izpisati odgovor, ki ga je uporabnik vnesel pri sistemskem vprašanju email, bomo uporabili #email#",
+	"srv_alert_instruction_available"	=>	"Sistemske spremenljivke v anketi:",
+	"srv_alert_instruction3"			=>	"[SURVEY] - ime ankete<br/> [DATE] - datum<br/> [SITE] - povezava do ankete<br/> [URL] -> povezava do urejanja ankete<br/><br/></p><p class=\"bold\">Dodatne sistemske spremenljivke iz ankete navedite med dva znaka #. </p><p>Primer:</p><p> &#269;e &#382;elimo izpisati odgovor, ki ga je uporabnik vnesel pri sistemskem vpra&#353;anju email, bomo uporabili #email#<br/></p><p class=\"bold\">Sistemske spremenljivke, ki so v anketi &#382;e na voljo:</p><p>",
+	"srv_alert_instruction4"			=>	"<p> [SURVEY] - ime ankete<br/> [SITE] - povezava do ankete<br/> [URL] - povezava do urejanja ankete<br/> [DAYS] - število dni pred potekom ankete <br/> [DURATION] - čas aktivnosti ankete</p>",
+	"srv_alert_instruction5"			=>	"[SURVEY] - ime ankete<br/> [DATE] - datum<br/> [SITE] - povezava do ankete<br/> [URL] - povezava do urejanja ankete",
+	"srv_alert_instruction5a"			=>	"[SURVEY] - ime ankete<br/> [DATE] - datum",
 	"versions"						=>	"Verzije",
 	"ip_browser_login"				=>	"Prijava glede na IP in brskalnik:",
 	"select_user"					=>	"Izberite Uporabnika",
@@ -3639,7 +3770,7 @@ $lang = array (
 	"srv_statistic_period_day_month"	=>	"Dnevi v mesecu",
 	"srv_statistic_period_day_week"		=>	"Dnevi v tednu",
 	"srv_statistic_period_hour_day"		=>	"Ure v dnevu",
-	"srv_statistic_hide_null"		=>	"Skrij 0: ",
+	"srv_statistic_hide_null"		=>	"Skrij vrednosti 0",
 	"srv_statistic_show_referals"	=>	"Referali:",
 	"srv_statistic_show_no_referals"=>	"V bazi ni zapisov o referalih.",
 	"srv_statistic_detail"			=>	"(podrobnost)",
@@ -3665,6 +3796,7 @@ $lang = array (
 	"srv_statistic_redirection_sum_view"		=>	"Skupaj ogledov povezave",
 	"srv_statistic_redirection_sum_invitation"	=>	"Skupaj emaili-neodgovori",
 	"srv_statistic_redirection_test"			=>	"od tega testnih",
+	"srv_statistic_metric"					=>	"Metrika",
 	"srv_statistic_lang_title"					=>	"Jezikovna različica vprašalnika",
 	"srv_statistic_lang"						=>	"Jezik",
 	"srv_statistic_sum"							=>	"Skupaj enot",
@@ -3834,12 +3966,12 @@ $lang = array (
 	"srv_respondents_admin"				=>	"Admin",
 	"srv_respondents_error_create"		=>	"Napaka pri kreiranju novega profila",
 	"srv_respondents_error_data"		=>	"Manjkajo podatki!",
-	"srv_success_save"					=>	"Nastavitve so bile shranjene...",
 	"PastEventsInt"						=>	"; kot pretekli se &#154;tejejo dogodki, starej&#154;i od ",
 	"srv_statistic_choose_interval"		=>	"Izberite interval",
 	"srv_statistic_choose_dates"		=>	"Izberite datume",
 	"srv_extra_translations"			=>	"Standardne besede",
 	"srv_extra_translations2"			=>	"- v ostale jezike pa lahko prevajate v zavihku <a href=\"%s\">Jezik</a>",
+	"srv_check_pogoji_ok2"				=>	"Preverjanje pogojev",
 	"srv_check_pogoji_ok"				=>	"Vsi pogoji v anketi so ustrezno nastavljeni",
 	"srv_check_pogoji_not_ok"			=>	"Anketa vsebuje napake!",
 	"srv_check_pogoji_spremenljivka"	=>	"Napaka v pogoju na vrednosti spremenljivke",
@@ -3854,10 +3986,12 @@ $lang = array (
 	"srv_resp_change_lang_type_0"		=>	"Radio gumbi",
 	"srv_resp_change_lang_type_1"		=>	"Roleta",
 	"srv_multilang"						=>	"Dodatni jeziki za respondente",
+	"srv_multilang_link"				=>	"Povezava do ankete",
+	"srv_multilang_users"				=>	"Dostop do ankete",
 	"srv_add_lang"						=>	"Omogo&#269;i ve&#269;jezi&#269;no podporo v anketi",
 	"srv_prevajanje"					=>	"Prevajanje",
 	"srv_mobile_settings"				=>	"Mobilne nastavitve",
-	"srv_mobile_settings_title"			=>	"Nastavitve prikaza pri mobinih napravah",
+	"srv_mobile_settings_title"			=>	"Nastavitve prikaza pri mobilnih napravah",
 	"srv_mobile_survey"					=>	"Anketa ustvarjena v mobilni aplikaciji",
 	"srv_mobile_add_question"			=>	"Dodaj vprašanje",
 	"srv_standardne_besede"				=>	"Standardne besede",
@@ -3867,7 +4001,9 @@ $lang = array (
 	"srv_trans_lang"					=>	"Prevod",
 	"srv_trans_langs"					=>	"Prikaži dodatni jezik",
 	"srv_default_lang"					=>	"Osnovni jezik",
-	"srv_lang_rem"						=>	"Odstrani ta prevod",
+	"srv_lang_rem"						=>	"Izbris prevoda",
+	"srv_lang_pdf"						=>	"Izvoz v PDF",
+	"srv_lang_rtf"						=>	"Izvoz v Word (RTF)",
 	"srv_lang_rem_confirm"				=>	"Ali ste prepri&#269;ani, da &#382;elite odstraniti ta prevod?",
 	"srv_testiranje"					=>	"Testiranje",			
 	"srv_testiranje_oblivanje"			=>	"Testni podatki",			
@@ -3894,24 +4030,25 @@ $lang = array (
 	"srv_active_editing"				=>	"Pozor, urejate anketo ki je aktivna!",
 	"srv_no_comments"				=>	"Anketa nima nobenih komentarjev.",
 	"srv_no_comments_solved"				=>	"Komentarji so vklopljeni, vendar anketa nima nerešenih komentarjev.",
-	"srv_timing_page"					=>	"&#268;as za 1 stran",
-	"srv_timing_vprasanje"				=>	"&#268;as za vpra&#353;anje (na 100 znakov besedila)",
-	"srv_timing_kategorija"				=>	"&#268;as za kategorijo (na 100 znakov besedila)",
-	"srv_timing_kategorija_max"			=>	"Najdaljši čas za izbiro kategorij",	
+	"srv_timing_page"					=>	"Predviden čas, ki ga respondent porabi za eno stran:",
+	"srv_timing_vprasanje"				=>	"Čas za vprašanje (na 100 znakov)",
+	"srv_timing_kategorija"				=>	"Čas za odgovor (na 100 znakov)",
+	"srv_timing_kategorija_max"			=>	"Najdaljši čas za izbiro odgovora",	
 	"srv_pagebreak_all"					=>	"Dodaj prelom strani med vsa vpra&#353;anja",
 	"srv_bruto_cas"						=>	"Bruto &#269;as",
 	"srv_neto_cas"						=>	"Neto &#269;as",
 	"srv_bruto_v_cas"					=>	"Brez pogojev",
+	"srv_bruto_v_cas_long"				=>	"Trajanje brez pogojev",
 	"srv_neto_v_cas"					=>	"Dejansko trajanje",
-	"srv_bruto_t_cas"					=>	"Trajanje z upo&#353;tevanjem vseh vpra&#353;anj (brez pogojev)",
+	"srv_bruto_t_cas"					=>	"Trajanje z upoštevanjem vseh vprašanj (brez pogojev)",
 	"srv_neto_t_cas"					=>	"Dejansko trajanje",
 	"srv_verjetnost_pojavitve"			=>	"Verjetnost pojavitve",
 	"srv_vnosi_no_entry"				=>	"Anketa trenutno &#353;e nima vnosov!<br/>",
 	"srv_vnosi_no_entry_filter"			=>	"Nobena enota ne ustreza izbranim filtrom!<br/>",
-	"srv_stevilo_vnosov"				=>	"Dodaj testne vnose",
+	"srv_stevilo_vnosov"				=>	"Število testnih vnosov",
 	"srv_testni_samo_veljavni"			=>	"Samo veljavni odgovori",
 	"srv_dodaj_vnose"					=>	"Generiraj testne vnose",
-	"srv_delete_testdata"				=>	"Pobri&#353;i testne vnose",
+	"srv_delete_testdata"				=>	"Izbriši vse testne vnose",
 	"srv_delete_autogen_testdata"		=>	"Pobri&#353;i avtomatsko generirane vnose",
 	"srv_autogen_testni_podatki_alert"	=>	"Med njimi so tudi avtomatsko generirani testni vnosi.",		
 	"srv_sklop_osnovna"					=>	"Osnovna vpra&#154;anja - kategorije",
@@ -3936,21 +4073,26 @@ $lang = array (
 	"srv_tip_standard_993"				=>	"Upload datoteke",
 	"srv_tip_standard_994"				=>	"Ime priimek",
 	"srv_tip_standard_996"				=>	"Podpis",
-	"srv_vkljuci_predvidene"			=>	"Prika&#382;i tudi predvidene &#269;ase",
-	"srv_vkljuci_preskocene"			=>	"Prika&#382;i tudi &#269;ase za presko&#269;ene strani",
+	"srv_vkljuci_predvidene"			=>	"V tabeli prikaži tudi predvidene čase",
+	"srv_vkljuci_preskocene"			=>	"Prikaži tudi čase za preskočene strani",
 	"srv_total_trajanje"				=>	"Celoten čas trajanja ankete",
 	"srv_dejansko_trajanje"				=>	"Predvideno dejansko trajanje ankete",
-	"srv_casi_po_straneh"				=>	"&#268;asi po straneh",
-	"srv_casi_po_blokih"				=>	"&#268;asi po blokih",
-	"srv_casi_po_vprasanjih_strani"		=>	"&#268;asi po vpra&#353;anjih (Strani)",
-	"srv_casi_po_vprasanjih_bloki"		=>	"&#268;asi po vpra&#353;anjih (Bloki)",
+	"srv_dejansko_trajanje_real"		=>	"Dejansko trajanje ankete",
+	"srv_casi_po_straneh"				=>	"Časi po straneh",
+	"srv_casi_po_straneh_stran"			=>	"Stran",
+	"srv_casi_po_blokih"				=>	"Časi po blokih",
+	"srv_casi_po_blokih_blok"			=>	"Blok",
+	"srv_casi_po_vprasanjih_vprasanje"	=>	"Vprašanje",
+	"srv_casi_po_vprasanjih_skupaj"		=>	"Skupaj",
+	"srv_casi_po_vprasanjih_strani"		=>	"Časi po vprašanjih (Strani)",
+	"srv_casi_po_vprasanjih_bloki"		=>	"Časi po vprašanjih (Bloki)",
 	"srv_frekvencna_porazdelitev"		=>	"Frekven&#269;na porazdelitev trajanja",
 	"srv_dejanski_casi"					=>	"Dejanski &#269;asi trajanja (brez morebitnih testnih enot)",
-	"srv_testni_nagovor"					=>	"Predvideno &#353;tevilo odgovorov po vpra&#353;anjih. V primeru ve&#269; kategorij se odgovori porazdeljujejo enakomerno. <br /><br />Za &#353;tevilske spremenljivke se generira slu&#269;ajna 4 mestna &#353;tevilka, v primeru besedila pa slu&#269;ajno 10 mestno besedilo.",
-	"srv_testni_nakonec"					=>	"Statisti&#269;no analizo testnih podatkov v analizah naredite tako, da v Statusih izberete Vse statuse oziroma status null.",
+	"srv_testni_nagovor"					=>	"Vnesite število avtomatskih vnosov, ki jih želite generirati. Za številske spremenljivke se generira slučajna 4-mestna številka, v primeru besedila pa slučajno 10-mestno besedilo. V primeru več kategorij se odgovori porazdeljujejo enakomerno.",
+	"srv_testni_nakonec"					=>	"Statistično analizo testnih podatkov v zavihku 'ANALIZE' naredite tako, da v Statusih izberete Vse statuse oziroma status null.",
 	"srv_analiza_arhiv"     				=>	"Arhiv",
 	"srv_analiza_arhiviraj"					=>	"Arhiviraj",
-	"srv_analiza_arhiviraj_ttl"				=>	"Ustvari arhiv analize",
+	"srv_analiza_arhiviraj_ttl"				=>	"Izdelaj arhiv analize",
 	"srv_analiza_arhiviraj_email"			=>	"Po&#353;lji",
 	"srv_analiza_arhiviraj_email_ttl"		=>	"Po&#353;lji arhiv analize prijatelju",
 	"srv_analiza_arhiviraj_ime"				=>	"Ime arhiva",
@@ -3966,14 +4108,14 @@ $lang = array (
 	"srv_analiza_archive_access_wrong_pass"	=>	"Napa&#269;no geslo",
 	"srv_analiza_archive_duration"			=>	"Trajanje",
 	"srv_analiza_archive_duration_default"	=>	"Privzeto 3 mesece (do: %s)",
-	"srv_analiza_archive_duration_custom"	=>	"Poljubno. Izberi datum:",
-	"srv_analiza_arhiviraj_create"			=>	"Ustvari arhivski naslov",
+	"srv_analiza_archive_duration_custom"	=>	"Poljubno:",
+	"srv_analiza_arhiviraj_create"			=>	"Ustvari arhiv",
 	"srv_analiza_arhiviraj_save"			=>	"Shrani",
 	"srv_analiza_arhiviraj_delete"			=>	"Izbri&#353;i",
 	"srv_analiza_arhiviraj_cancle"			=>	"Prekli&#269;i",
 	"srv_analiza_arhiviraj_close"			=>	"Zapri",
-	"srv_analiza_arhiviraj_success"			=>	"Arhiv analize z imenom: <b><i>%s</i></b> je bil uspe&#353;no ustvarjen!",
-	"srv_analiza_arhiviraj_success_note"	=>	"Dostopen je na naslovu:",
+	"srv_analiza_arhiviraj_success"			=>	"Arhiv analize z imenom: <span class=\"semi-bold\">%s</span> je bil uspešno ustvarjen!",
+	"srv_analiza_arhiviraj_success_note"	=>	"Dostopen je na naslovu",
 	"srv_analiza_arhiviraj_error_note"		=>	"Pri ustvarjanju arhiva analize je pri&#353;lo do napake!",
 	"srv_analiza_arhiviraj_access_0"		=>	"Vsi",
 	"srv_analiza_arhiviraj_access_1"		=>	"Administratorji ankete",
@@ -4010,7 +4152,7 @@ $lang = array (
 	"srv_analiza_archive_lbl_access"		=>	"Dostop",
 	"srv_analiza_archive_lbl_type"			=>	"Tip",
 	"srv_analiza_archive_lbl_date"			=>	"Datum",
-	"srv_analiza_archive_lbl_duration"		=>	"Trajanje",
+	"srv_analiza_archive_lbl_duration"		=>	"Traja do",
 	"srv_analiza_archive_lbl_author"		=>	"Avtor",
 	"srv_analiza_archive_lbl_editor"		=>	"Spremenil",
 	"srv_analiza_archive_title"				=>	"Analiza - ",
@@ -4042,8 +4184,9 @@ $lang = array (
 	"srv_lurkers_subnote"				=>	"(Uporabniki, kateri so samo preklikali čez anketo - lurkerji)",	
 	"srv_testni_vnos"					=>	"Prikaži testne enote:",	
 	"srv_show_pages"					=>	"Prika&#382;i frekven&#269;no porazdelitev za vsako stran posebej",	
-	"srv_stevilo_enot"					=>	"&#352;tevilo enot",	
+	"srv_stevilo_enot"					=>	"Število enot",	
 	"srv_skupaj_predvideni"				=>	"Skupaj predvideni",	
+	"srv_testni_podatki_alert_title"	=>	"Vaša anketa vsebuje testne podatke",	
 	"srv_testni_podatki_alert"			=>	"Pozor, v bazi so tudi testni podatki!",	
 	"srv_anketacopy"					=>	"Kopiraj anketo",	
 	"s_survey"							=>	"Anketa",
@@ -4068,23 +4211,37 @@ $lang = array (
 	"srv_printouts_q"					=>	"Izpisi vpra&#353;alnika",
 	"srv_printouts_q"					=>	"Izpisi vpra&#353;alnika",
 	"srv_archival_version_q"			=>	"Arhivske verzije vpra&#353;alnika",
-	"srv_questionnaire_archives"		=>	"Arhivi vpra&#353;alnika",
-	"srv_survey_archives"				=>	"Izvoz",
+	"srv_questionnaire_archives"		=>	"Arhivi vprašalnika",
+	"srv_questionnaire_archives_text"		=>	"Pred spreminjanjem vprašalnika lahko obstoječo verzijo vprašalnika shranite tako, da izdelate arhivsko verzijo. Arhiv se izdela brez podatkov respondentov. S klikom na 'Izdelaj arhivsko verzijo vprašalnika' se v spodnjem seznamu generira arhivska verzija vprašalnika. Vsako arhivsko verzijo vprašalnika lahko aktivirate. Z aktivacijo se arhivska verzija avtomatsko ustvari kot nova anketa.",
+	"srv_questionnaire_archives_note"		=>	"Opomba k arhivski verziji",
+	"srv_questionnaire_archives_date"		=>	"Datum arhiviranja",
+	"srv_questionnaire_archives_by"		=>	"Arhiviral/-a",
+	"srv_questionnaire_archives_note2"		=>	"Opomba",
+	"srv_questionnaire_archives_activate"		=>	"Aktivacija",
+	"srv_survey_archives"				=>	"Izvozi",
 	"srv_survey_archives_ie"			=>	"Vprašalnik",
 	"srv_survey_archives_ie_title"		=>	"Izvoz vprašalnika",
 	"srv_survey_archives_ie_data"		=>	"Vprašalnik in podatki",
 	"srv_survey_archives_ie_data_title"		=>	"Izvoz vprašalnika in podatkov",
 	"srv_survey_archives_tracking"		=>	"Spremembe",
 	"srv_survey_archives_tracking_survey"	=>	"Spremembe vprašalnika",
+	"srv_survey_archives_tracking_survey_text1"	=>	"V spodnji tabeli je navedenih zadnjih 25 sprememb",
+	"srv_survey_archives_tracking_survey_text_appendmerge"	=>	"povezanih z dodajanjem ali združevanjem podatkov",
+	"srv_survey_archives_tracking_survey_text1a"	=>	"v vprašalniku",
+	"srv_survey_archives_tracking_survey_text1b"	=>	"v zavihku",
+	"srv_survey_archives_tracking_survey_text1c"	=>	"za vprašalnik",
+	"srv_survey_archives_tracking_survey_text1d"	=>	"še ni bilo sprememb",
+	"srv_survey_archives_tracking_survey_text2"	=>	"Za vpogled v vse spremembe prenesite",
+	"srv_survey_archives_tracking_survey_text3"	=>	"Excel datoteko",
 	"srv_survey_archives_tracking_data"		=>	"Spremembe podatkov",
 	"srv_survey_archives_tracking_append"	=>	"Append/Merge (uvozi)",
     "srv_survey_archives_tracking_hierarchy"            =>	"Spremembe samoevalvacije v šolah",
     "srv_survey_archives_tracking_hierarchy_structure"  =>	"Spremembe hierarhije",
     "srv_survey_archives_tracking_hierarchy_users"      =>	"Spremembe uporabnikov",
-    "srv_survey_archives_tracking_last_changes"         =>	"Zadnjih 25 sprememb (za vpogled v vse spremembe prenesite <a href=\"ajax.php?a=user_tracking&d=download\" class=\"bold\">Excel datoteko</a>)",
+    "srv_survey_archives_tracking_last_changes"         =>	"Zadnjih 25 sprememb (za vpogled v vse spremembe prenesite <a href=\"ajax.php?a=user_tracking&d=download\">Excel datoteko</a>)",
 	"srv_survey_archives_note"			=>	"Shrani arhivsko datoteko vprašalnika in podatkov na svoj računalnik.",
-	"srv_survey_archives_note_survey"		=>	"Shranjevanje in prenos arhivske datoteke za vprašalnik.",
-	"srv_survey_archives_note_survey_data"	=>	"Shranjevanje in prenos arhivske datoteke za vprašalnik in podatke.",
+	"srv_survey_archives_note_survey"		=>	"S klikom na gumb 'Izvoz' prenesete in shranite arhivsko datoteko za vprašalnik. Datoteka s končnico .1ka se bo shranila na vaš računalnik v privzeto mapo za prenose.",
+	"srv_survey_archives_note_survey_data"	=>	"S klikom na gumb 'Izvoz' prenesete in shranite arhivsko datoteko za vprašalnik in podatke. Datoteka s končnico .1ka se bo shranila na vaš računalnik v privzeto mapo za prenose.",
 	"srv_survey_archives_import"		=>	"Uvoz",
 	"srv_survey_archives_import_text"	=>	"Restavriranje vprašalnika iz arhivske datoteke",
 	"srv_survey_archives_import_import"	=>	"Restavriraj",
@@ -4094,6 +4251,7 @@ $lang = array (
 	"srv_survey_archives_survey"		=>	"<b>Shrani arhivsko datoteko vprašalnika</b>",
 	"srv_survey_archives_data"			=>	"<b>Shrani arhivsko datoteko vprašalnika s podatki</b>",
 	"srv_survey_archives_delete_survey"	=>	"Izbriši arhivsko verzijo vprašalnika",
+	"srv_survey_archives_other"			=>	"Ostalo",
 	"srv_tracking_label"				=>	"Sledenje spremembam (tracking)",
 	"link_parent_content"				=>	"Odpri meni, a ohrani vsebino star&#154;a",
 	"link_prev_content"				=>	"Odpri meni, a ohrani vsebino prej odprte strani",
@@ -4148,7 +4306,7 @@ $lang = array (
 	"srv_dashboard_no_file"					=>	"Datoteka s podatki še ne obstaja!",
 	"srv_dashboard_new_units"				=>	" Število nedodanih enot: ",
 	"srv_dashboard_up_to_date"				=>	"Datoteka s podatki je ažurna.",
-	"srv_dashboard_paradata_date_warning"	=>	"Opozorilo! Shranjevanje datumov odgovarjanja na vprašanja (parapodatki) je izklopljeno. Zato nekateri statusi ne bodo prikazani.",
+	"srv_dashboard_paradata_date_warning"	=>	"Shranjevanje datumov odgovarjanja na vprašanja (parapodatki) je izklopljeno. Zato nekateri statusi ne bodo prikazani.",
 	"srv_data_no_data"						=>	"V bazi ni podatkov o izpolnjenih anketah!",
 	"srv_data_no_data_filtred"				=>	"Ni podatkov.",
 	"srv_diferencial2"      			=>	"Tabela diferencial",
@@ -4180,7 +4338,19 @@ $lang = array (
 #	"srv_collect_full_meta"				=> "Para podatke (lastnosti ra&#269;unalika, podrobni podatki o e-po&#353;tnih vabilih in telefonskih klicih).",
 	"srv_publication_base"				=> "Pregled",#"Nastavitve",#"Objava URL",					
 	"srv_publication_base_title"		=> "Osnovne URL povezave",
-	"srv_publication_survey_warnings"	=> "Anketa ima napake, opozorila, priporočila, nerešene komentarje.",
+	"srv_publication_survey_warnings"	=> "Anketa ima napake, opozorila, priporočila ali nerešene komentarje, ki jih lahko pregledate v zavihku ",
+	"srv_publication_survey_noactive"	=> "Vaša anketa še ni aktivirana",
+	"srv_publication_survey_links"		=> "Delite povezavo do ankete",
+	"srv_publication_survey_links_note"		=> "Spodaj je povezava do vprašalnika, kjer se podatki normalno shranjujejo v bazo. To povezavo sporočite dejanskim respondentom, denimo z objavo na družbenih omrežjih, forumih, prek e-maila, ipd.",
+	"srv_publication_survey_noactive_note"	=> "Če želite zbirati realne podatke, je anketo treba aktivirati.",
+	"srv_publication_survey_noactive_note2"	=> "Z aktiviranjem potrjujete <a href=\"#\" onclick=\"publishPopupOpen('settings')\">privzete nastavitve</a>.",
+	"srv_publication_survey_settings"	=> "Privzete nastavitve ankete",
+	"srv_publication_survey_settings_more"	=> "Več nastavitev",
+	"srv_publication_survey_settings_less"	=> "Manj nastavitev",
+	"srv_publication_survey_grouplang"	=> "Povezave za skupine in jezike",
+	"srv_publication_survey_niceurl"	=> "Lepe URL povezave",
+	"srv_publication_survey_more"		=> "Več načinov deljenja ankete",
+	"srv_publication_survey_copylink"	=> "Kopiraj povezavo",
 	"srv_publication_advanced_url"		=> "Napredne URL povezave",
 	"srv_publication_advanced_url_text"	=> "HTML koda, QR koda, vdelava, pop-up, Twitter, Facebook...",
 	"srv_publication_invitations"		=> "Vabila v anketo",
@@ -4205,10 +4375,10 @@ $lang = array (
 	"no_stats_for_this_file"			=>	"Za to povezavo ni statistik",
 	"back_to_statistics"				=>	"Nazaj na statistike",
 	"srv_loop"							=>	"Zanka",
-	"srv_loop_urejanje"					=>	"Urejanje zanke",
+	"srv_loop_urejanje"					=>	"Nastavitve zanke",
 	"srv_loop_no_nesting"				=>	"Gnezdenje zank (zanka v zanki) ni dovoljeno!",
 	"srv_loop_desc"						=>	"Izberite spremenljivko in vrednosti, ki jih &#382;elite uporabiti v zanki. Za vsako ozna&#269;eno vrednost bo respondent (seveda, le če bo odgovarjajočo možnost tudi označil) dobil vsa vpra&#353;anja v zanki. Podrobnosti o uporabi zanke so <a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/vprasalnik/zanka\" target=\"_blank\">tukaj</a>.<br /><br />Za prikaz vrednosti vprašanja, o katerem sprašujete v zanki uporabite prenos vrednosti, npr. #Q1#",
-	"srv_spss_export_base_instructions"	=>	"********************\n* UVOZ PODATKOV V SPSS\n********************\n* Koraki za uvoz:\n*   1) v vrstici 18 dolo&#269;ite pot do datoteke;\n*   2) po&#382;enite sintakso, tako da v meniju tega okna izberete Run, nato All;\n*   3) baza podatkov se bo samodejno ustvarila.\n* Podrobnej&#353;a navodila so na voljo na www.1ka.si.\n********************",
+	"srv_spss_export_base_instructions"	=>	"********************\n* UVOZ PODATKOV V SPSS\n********************\n* Koraki za uvoz:\n*   1) v vrstici 19 dolo&#269;ite pot do datoteke;\n*   2) po&#382;enite sintakso, tako da v meniju tega okna izberete Run, nato All;\n*   3) baza podatkov se bo samodejno ustvarila.\n* Podrobnej&#353;a navodila so na voljo na www.1ka.si.\n********************",
 	"srv_spss_export_file_instructions"	=>	"/* NAVODILO: Med enojna narekovaja vpi&#353;ite pot do datoteke. Narekovajev ne izbri&#353;ite. */ ",
 	"srv_sppss_checkbox_value_0"		=>	"ni izbran",
 	"srv_sppss_checkbox_value_1"		=>	"izbran",
@@ -4228,7 +4398,7 @@ $lang = array (
 	"srv_loop_always"					=>	"Vedno",
 	"srv_loop_never"					=>	"Nikoli",
 	"srv_loop_max"						=>	"Število ponovitev je lahko manjše od števila odgovorov. Izberete lahko samo prvih nekaj odgovorov",
-	"srv_missing_values"				=>	"Manjkajo&#269;e vrednosti",
+	"srv_missing_values"				=>	"Manjkajoče vrednosti",
 	"srv_missing_values_questions"		=>	"Rekodiranje",
 	"srv_missing_confirm_use_system"	=>	"Obstoječe nastavitve manjkajočih vrednosti bodo izbrisane. Nadomestile jih bodo sistemske nastavitve. Ali ste prepričani da želite nadaljevati?",
 	"srv_missing_confirm_delete"		=>	"Ali ste prepričani da želite izbrisati profil: ",
@@ -4274,7 +4444,7 @@ $lang = array (
 	"srv_invitation_nonActivated_title"			=>	"Pošiljanje vabil v anketo",
 	"srv_invitation_nonActivated_text1"			=>	"V spletnih anketah običajno zadoščata dve splošni emaili vabili vsem enotam (drugo vabilo je hkrati zahvala respondentom). V primeru manjšega števila enot (npr. nekaj sto) uporabimo kar privzeti email sistem (npr. Gmail, Outlook...), če je enot več, pa orodja za masovno pošiljanje (npr. SqualoMail, MailChimp...).",
 	"srv_invitation_nonActivated_text2"			=>	"Večje število vabil in sledenje respondentom je večinoma nepotrebno, hkrati pa tudi zahtevno (glej <a class=\"bold\" href=\"%s\">priporočila za pošiljanje vabil</a>).",
-	"srv_invitation_nonActivated_text3"			=>	"Email vabila lahko pošiljamo tudi preko sistema 1KA, in to tako splošna kot individualizirana vabila s kodo in sledenjem. Sistem 1KA poleg tega podpira (dokumentira) tudi pošiljanje vabil na preko pošta, SMS, ipd.",
+	"srv_invitation_nonActivated_text3"			=>	"Email vabila lahko pošiljamo tudi preko sistema 1KA, in to tako splošna kot individualizirana vabila s kodo in sledenjem. Sistem 1KA poleg tega podpira (dokumentira) tudi pošiljanje vabil preko pošte, SMS, ipd.",
 	"srv_invitation_nonActivated_button_details"	=>	"Podrobnosti o 1KA sistemu vabil",
 	"srv_invitation_nonActivated_button_activate"	=>	"Omogoči 1KA sistem vabil",
 	"srv_invitation_nonActivated_more"			=>	"Več >>",
@@ -4289,11 +4459,16 @@ $lang = array (
 	"srv_invitation_recipients"					=>	"Prejemniki",
 	"srv_invitation_preview"					=>	"Predogled",
 	"srv_invitation_send"						=>	"Pošlji e-maile",
-	"srv_displaydata_relevance"					=>	"Ustreznost",
+	"srv_displaydata_columns"					=>	"Prikaz stolpcev",
+	"srv_displaydata_fullscreen_0"				=>	"Osnovni",
+	"srv_displaydata_fullscreen_1"				=>	"Cel zaslon",
+	"srv_displaydata_columns"					=>	"Prikaz stolpcev",
+	"srv_displaydata_relevance"					=>	"Ustreznost enote (DA/NE)",
 	"srv_displaydata_invitation"				=>	"Vabilo",
-	"srv_displaydata_data"						=>	"Podatke",
+	"srv_displaydata_data"						=>	"Odgovori respondentov",
 	"srv_displaydata_status"					=>	"Status",
 	"srv_displaydata_meta"						=>	"Para podatki",
+	"srv_displaydata_meta2"						=>	"Parapodatki respondentov",
 	"srv_displaydata_system_data"				=>	"Identifikatorji",
 	"srv_displaydata_pdf_type"					=>	"Dolg izpis odgovorov v PDF",
 	"srv_displaydata_type"						=>	"Izpis PDF/RTF",
@@ -4323,9 +4498,9 @@ $lang = array (
 	"srv_activate_duration_auto_to"				=>	" do: ",
 	"srv_activate_duration_manual"				=>	" Ročno od: ",
 	"srv_activate_duration_manual_1"			=>	" Ročno ",
-	"srv_activate_duration_manual_from"			=>	" od: ",
-	"srv_activate_duration_manual_to"			=>	" do: ",
-	"srv_activate_duration_autostart"			=>	"Avtomatska aktivacija čez ",
+	"srv_activate_duration_manual_from"			=>	"Od:",
+	"srv_activate_duration_manual_to"			=>	"Do:",
+	"srv_activate_duration_autostart"			=>	"Avtomatska aktivacija čez",
 	"srv_activate_duration_button"				=>	"Aktiviraj",
 	"srv_processing"							=>	"Obdelava",
 	"srv_status_profile_system_1"				=>	"Vsi",
@@ -4367,6 +4542,12 @@ $lang = array (
 	"srv_comments_anketa_ured"					=>	"Splošni komentarji urednikov",
 	"srv_comments_anketa_resp"					=>	"Splošni komentarji respondentov",
 	"srv_comments_link"							=>	"Pregled komentarjev",
+	"srv_comments_user"							=>	"Uporabnik ",
+	"srv_comments_user2"						=>	" je komentiral:",
+	"srv_comments_archive"						=>	"Arhiviraj komentar",
+	"srv_comments_unarchive"						=>	"Označi kot nerešeno",
+	"srv_comments_archived"						=>	"Komentar je arhiviran",
+	"srv_comments_new"							=>	"Komentiraj",
 	"srv_zanka_profile_all"						=>	"Brez",
 	"srv_zanka_profile_session"						=>	"Za&#269;asno",
 	"srv_zanka_note"							=>	"Skupina za: ",
@@ -4375,14 +4556,12 @@ $lang = array (
 	"srv_compute_list"							=>	"Anketa vsebuje naslednje izračunane vrednosti",
 	"srv_compute_start"							=>	"Poženi novo računanje izračunanih vrednosti",
 	"srv_loop_multiplication_error"				=>	"Pri množenju lahko uporabite naveč dve spremenljivki.",
-	"srv_social_settings_text1"					=>	"Omrežja so sestavljena vprašanja.",
-	"srv_social_settings_text2"					=>	"Začnejo se z generatorjem imen (name generator). S tem respondent <b>(ego)</b> navede objekte, prijatelje <b>(alterje)</b>, za katere v nadaljevanju (zanki) postavljamo podvprašanja.",
-	"srv_social_settings_text3"					=>	"Druga kompnenta je zanka, v kateri za vse alterje določenega ega postavimo enaka vprašanja.",
-	"srv_social_settings_text4"					=>	"Tretja komponenta so podvprašanja za alterje.",
-	"srv_social_settings_text5"					=>	"Primer egocentričnih socialnih omrežij je tukaj:",
-	"srv_social_settings_text6"					=>	"vprašalnik pa najdemo v knjižnjici med tipskimi vprašalniki:",
-	"srv_social_settings_text7"					=>	"in ga lahko skopiramo kot podlago za naš morebitni vprašalnik.",
-	"srv_social_settings_text8"					=>	", nova vprašanja s podporo socialnim omrežjem dodajamo v naboru novih vprašanj (popup)",
+	"srv_social_settings_text1"					=>	"Omrežja so sestavljena vprašanja. Začnejo se z generatorjem imen (name generator). S tem respondent (ego) navede objekte, prijatelje (alterje), za katere v nadaljevanju (zanki) postavljamo podvprašanja. Druga komponenta je zanka, v kateri za vse alterje določenega ega postavimo enaka vprašanja. Tretja komponenta so podvprašanja za alterje.",
+	"srv_social_settings_text2"					=>	"Primer vprašalnika egocentričnih socialnih omrežij je <a href='http://www.1ka.si/a/3510'>tukaj</a>, nahaja pa se tudi v ",
+	"srv_social_settings_text3"					=>	"<a href='http://www.1ka.si/admin/survey/index.php?a=knjiznica'>knjižnici</a>",
+	"srv_social_settings_text4"					=>	" med tipskimi vprašalniki in ga lahko kopirate kot predlogo za vprašalnik.",
+	"srv_social_settings_text5"					=>	"Nova vprašanja s podporo socialnim omrežjem dodajamo v zavihku ",
+	"srv_social_settings_text6"					=>	"'UREJANJE' - 'Vprašalnik'",
 	"srv_export_questionnare"					=>	"Izpis vseh odgovorov",
 	"srv_export_questionnare_0"					=>	"Navodila za izpis odgovorov respondentov",
 	"srv_export_questionnare_1"					=>	"Izpisati je mogoče vse odgovore respondentov, kar je smiselno predvsem pri FORMAH/OBRAZCIH (npr. izpis spiska prijavljencev) ali pri TESTIH (kjer nato ocenjujemo odgovore respondentov).",
@@ -4407,10 +4586,12 @@ $lang = array (
 	"srv_email_vabila_simple_popup_title"       =>	"Enostavna vabila - brez sledenja",
 	"srv_here"									=>	"tukaj",
 	"srv_email_simple_button"              		=>	"Oblikuj email sporočilo",
-	"srv_survey_missing_title"					=>	"Manjkajoče vrednosti uporabljene v anketi", 
+	"srv_survey_missing_title"					=>	"Manjkajoče vrednosti", 
+	"srv_survey_missing_text"					=>	"Po meri spremenite vrednosti in labele, ki so označene kot manjkajoče vrednosti.",
 	"srv_survey_missing_system"					=>	"Sistemske manjkajoče vrednosti", 
 	"srv_survey_missing_special"				=>	"Posebne manjkajoče vrednosti (na nivoju ankete)", 
-	"srv_survey_missing_default"				=>	"Uporabi privzeto (sistemske manjkajoče vrednosti)",
+	"srv_survey_missing_default"				=>	"Ponastavi na privzeto",
+	"srv_survey_missing_add"					=>	"Dodaj manjkajočo vrednost",
 	"srv_survey_missing_error1"					=>	"Napaka! Ta manjkajoča vrednost že obstaja!", 
 	"srv_survey_missing_error2"					=>	"Anketa še nima nastavljenih manjkajočih vrednosti.",
 	"srv_stolpci"								=>	"Prikaži kategorije v večih stolpcih",
@@ -4422,18 +4603,21 @@ $lang = array (
     "admin_please_enable_this_b"				=>	"Prosimo, vklopite B za to navigacijo v urejanju navigacij",
     "admin_too_many_b"                          =>	"&#381;tevilo prikazanih kategorij je zaradi hitrosti omejeno na 2000.",
 	"srv_nice_url"								=>  "Lep URL",
-	"srv_nice_url_add"							=>  "Dodaj nov lep URL",
+	"srv_nice_url_add"							=>  "Ustvari lepo URL povezavo",
 	"srv_nice_url_remove"						=>  "Odstrani lep URL",
 	"srv_nice_url_taken"						=>  "je že zaseden!",
 	"srv_nice_url_short"						=>  "je prekratek! Minimalna dolžina so 3 znaki.",
 	"srv_nice_url_long"							=>  "je predolg! Maksimalna dolžina je 20 znakov.",
 	"srv_nice_url_title"						=>  "Anketa ima naslednji URL naslov:",
+	"srv_nice_url_note"							=>	"V spodnji tabeli je seznam vseh lepih URL povezav na tej namestitvi in povezave do anket, za katere so bile ustvarjene.",
+	"srv_nice_url_surveyname"					=>  "Ime ankete",
+	"srv_nice_url_extension"					=>  "Končnica lepe URL povezave",
 	"activate_this_cat_in_edit_db"				=>	"Filter je potrebno aktivirati v urejanju baze, saj trenutno ni obkljukan.",
 	"srv_undecided"								=>	"Nedoločen",
 	"srv_todo"									=>	"Za narediti",
 	"srv_done"									=>	"Končano",
 	"srv_not_relevant"							=>	"Nerelevantno",
-	"srv_comment_comment"						=>	"Replika",
+	"srv_comment_comment"						=>	"Odgovori",
 	"srv_edit_data_title"						=>	"Uredi podatke vprašanja",
 	"srv_edit_data_row"							=>	"Uredi celotno anketo respondenta",
 	"srv_edit_data_row_quick"					=>	"Hitro urejanje celotne ankete respondenta",
@@ -4450,7 +4634,8 @@ $lang = array (
 	"srv_quick_view_off"						=>	"Onemogoči spreminjanje vnosov",
 	"without_changes"							=>	"Brez sprememb",
 	"srv_time_profile_default"					=>	"Vsi",
-	"srv_time_profile_from"						=>	"za obdobje od",
+	"srv_time_profile_time"						=>	"Za obdobje:",
+	"srv_time_profile_from"						=>	"od",
 	"srv_time_profile_to"						=>	"do",
 	"srv_time_profile_choose_interval"			=>	"Izberite interval",
 	"srv_time_profile_link"						=>	"Obdobje", # časovni interval					
@@ -4494,6 +4679,10 @@ $lang = array (
 	"srv_change_default_profile"				=> 	"Privzetega profila ne morete spreminjati. Lahko pa kreirate nov profil.",
 	"srv_anketa_locked_1"						=> 	"Anketa je zaklenjena. Zaklenjene ankete se ne da urejati.",
 	"srv_anketa_locked_0"						=> 	"Anketa je odklenjena. Odklenjeno anketo se lahko normalno ureja.",
+	"srv_anketa_locked"	    					=> 	"Anketa je zaklenjena",
+	"srv_anketa_locked_text"	    			=> 	"Zaklenjene ankete se ne da urejati.",
+	"srv_anketa_unlocked"    					=> 	"Anketa je odklenjena",
+	"srv_anketa_unlocked_text"    			    => 	"Odklenjeno anketo se lahko normalno ureja.",
 	"srv_captcha_edit"							=> 	"Vpis CAPTCHA kode",
 	"srv_captcha_edit_note"						=> 	"Ne pozabite izbrati trdega opozorila za vprašanje!",
 	"srv_signature_edit"						=> 	"Elektronski podpis",
@@ -4512,8 +4701,8 @@ $lang = array (
 	"srv_dsp_link"								=>	"Nastavitve",
 	"srv_position"								=>	"Mesto",
 	"srv_add_condition_question"				=>	"Dodajte pogoj za prikaz",
-	"srv_edit_condition_question"				=>	"Vprašanja v pogoju se bodo prikazala, če je pogoj izpolnjen. <a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/vprasalnik/pogoji?from1ka=1\" target=\"_blank\">Več >></a>",
-	"srv_edit_condition_question1"				=>	"Vprašanje %s se bo prikazalo, če je izpolnjen spodnji pogoj. <a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/vprasalnik/pogoji?from1ka=1\" target=\"_blank\">Več >></a>",
+	"srv_edit_condition_question"				=>	"Vprašanja v pogoju se bodo prikazala, če je pogoj izpolnjen. <a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/vprasalnik/pogoji?from1ka=1\" target=\"_blank\">Preberi več</a>.",
+	"srv_edit_condition_question1"				=>	"Vprašanje %s se bo prikazalo, če je izpolnjen spodnji pogoj. <a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/vprasalnik/pogoji?from1ka=1\" target=\"_blank\">Preberi več</a>.",
 	"srv_edit_condition_conjunction"			=>	"Klikni za spremembo operatorja",
 	"srv_random_groups"							=>	"Naključne skupine",
 	"srv_device"								=>	"Naprava",
@@ -4652,7 +4841,7 @@ $lang = array (
 	"srv_chart_table_type_1"					=>	"Navadna",
 	"srv_chart_table_align"						=>	"Sredinska poravnava",
 	"srv_chart_table_freq"						=>	"Prikaži frekvence",	
-	"srv_chart_edit_warning"					=>	"Vstopate v vmesnik kjer lahko urejate in dodajate labele grafov. Ali ste prepricani da želite nadaljevati?",
+	"srv_chart_edit_warning"					=>	"Vstopate v vmesnik kjer lahko urejate in dodajate labele grafov. Ali ste prepričani da želite nadaljevati?",
 	"srv_chart_numerusText"						=>	"Položaj numerusa",
 	"srv_chart_numerusText_0"					=>	"Ob naslovu",
 	"srv_chart_numerusText_1"					=>	"Na grafu",
@@ -4675,7 +4864,7 @@ $lang = array (
 	"srv_chart_advancedLink_colors"				=>	"Spreminjanje barv",
 	"srv_chart_advancedLink_recoding"			=>	"Rekodiranje",
 	"srv_chart_advancedLink_limits"				=>	"Meje",
-	"srv_chart_advanced_default_color"			=>	"Nastavi privzeto",
+	"srv_chart_advanced_default_color"			=>	"Ponastavi na privzeto",
 	"srv_chart_advanced_skin"					=>	"Izberi skin",
 	"srv_chart_ttest_title"						=>	"Povprečna vrednost za",
 	"srv_chart_settings_fullScale"				=>	"Polna skala",
@@ -4743,14 +4932,16 @@ $lang = array (
 	'srv_inv_settings_code_0'					=> "koda je v URL",
 	'srv_inv_settings_code_1'					=> "ročni vnos kode",
 	'srv_inv_settings_code_2'					=> "brez kode",
-	'srv_inv_add_recipients_heading'			=> "Dodajanje prejemnikov",
-	'srv_inv_recipiens_field_note' 				=> "Izberite polja, ki jih boste vnesli. Dodatne spremenljivke lahko dodate v urejanju. S premikanjem lahko določite vrstni red:",
-	'srv_inv_recipiens_email_note' 				=> "Vpišite ali kopirajte seznam prejemnikov, vsakega prejemnika dodajte v svojo vrstico. Če uvažate tudi dodatna polja, jih ločite s spodaj izbranim ločnikom in jih dodajte v enakem vrstnem redu kot ste označili polja zgoraj. Podvojeni zapisi bodo odstranjeni.",
+	'srv_inv_add_recipients_heading'			=> "Dodaj respondente",
+	'srv_inv_recipiens_field_note' 				=> "<span class=\"semi-bold\">Izberite polja, ki jih boste vnesli.</span> Dodatne spremenljivke lahko dodate v zavihku 'Urejanje'. S premikanjem lahko določite vrstni red spremenljivk:",
+	'srv_inv_recipiens_email_note' 				=> "<span class=\"semi-bold\">Vpišite ali kopirajte seznam prejemnikov, vsakega prejemnika dodajte v svojo vrstico.</span> Če uvažate tudi dodatna polja, jih ločite z vejico in jih dodajte v enakem vrstnem redu, kot ste označili polja zgoraj. Podvojeni zapisi bodo odstranjeni.",
 	'srv_inv_recipiens_email_note_append' 		=> "Vpišite ali kopirajte podatke v tekstovni obliki, vsak zapis dodajte v svojo vrstico. Če dodajate več polj, jih ločite s spodaj izbranim ločilnikom in jih dodajte v enakem vrstnem redu kot ste označili polja zgoraj.",
 	'srv_inv_recipiens_pass_warning'			=> "Opozorilo! Maksimalna dolžina znakov za polje <i>PASSWORD</i> je 20 znakov.",
-	'srv_inv_recipiens_fields' 					=> "Polja:",
+	'srv_inv_recipiens_fields' 					=> "Vnesite podatke respondentov po sledečem vrstnem redu:",
 	'srv_inv_recipiens_sample' 					=> "Primer:",
 	'srv_inv_recipiens_sample1' 				=> "janez.novak@example.com,Janez,Novak,g.<br/>janja.novak@example.com,,,ga.",
+	"srv_inv_recipiens_sample2" 				=>	"<span class=\"bold\">Primer</span> - vnos podatkov za primer, ko želimo za dva respondenta vnesti podatke za njuno telefonsko številko, ime in priimek:",
+	"srv_inv_recipiens_insert" 				    =>	"Vnesite prejemnike",
 	'srv_inv_edit_recipients_heading' 			=> "Vpogled in urejanje prejemnikov",
 	'srv_inv_recipients_email' 					=> "EMAIL", #"Email",
 	'srv_inv_recipients_password' 				=> "PASSWORD", #"Geslo",
@@ -4799,13 +4990,14 @@ $lang = array (
 	'srv_inv_recipiens_add_invalid_note' 		=> "Preverite naslove in njihov položaj v spodnjem oknu!",
 	'srv_inv_recipiens_add_invalid_note2' 		=> "Enote z neveljavnim emailom ali geslom se ne dodajo v seznam",
 	'srv_inv_recipiens_add_invalid_upload_note' => "Preverite naslove v datoteki!",
-	'srv_inv_recipiens_upload_error' 			=> "Uporabnikov ne morem dodati, prosim odpravite spodnje napake!",
+	'srv_inv_recipiens_upload_error' 			=> "Uporabnikov ni mogoče dodati, prosim odpravite spodnje napake!",
 	'srv_inv_recipiens_upload_error_no_fields' 	=> "Nobeno polje ni izbrano!",
 	'srv_inv_recipiens_onlyThisSurvey' 			=> "Samo ta anketa",
+	'srv_inv_recipiens_from' 				    => "Vnos prejemnikov",
 	'srv_inv_recipiens_from_list' 				=> "Ročni vnos",
 	'srv_inv_recipiens_from_file' 				=> "Datoteke (csv)",
 	'srv_inv_recipiens_from_system' 				=> "Iz obstoječe spremenljivke",
-	'srv_inv_recipiens_temporary_list' 			=> "Začasni seznam",
+	'srv_inv_recipiens_temporary_list' 			=> "Začasen seznam",
 	'srv_inv_recipiens_list_created_by' 	=> "Kreiral: ",
 	'srv_inv_recipiens_list_created_day' 		=> "Kreiral dne: ",
 	'srv_inv_recipiens_list_comment' 			=> "komentar: ",
@@ -4821,6 +5013,9 @@ $lang = array (
 	'srv_inv_recipient_list_comment' 			=> "Komentar: ",
 	'srv_inv_recipient_list_recipients' 		=> "Prejemniki: ",
 	'srv_inv_recipient_list_new' 				=> "Seznam respondentov",
+	'srv_inv_recipient_delete' 			=> "Izbris respondenta",
+	'srv_inv_recipient_edit' 			=> "Urejanje respondenta",
+	'srv_inv_recipient_delete_text' 			=> "Ali ste prepričani da želite izbrisati respondenta?",
 	'srv_inv_recipient_delete_error' 			=> "Ne morem izbrisati respondenta!",
 	'srv_inv_recipient_show_only_duplicates' 	=> "Prikaži samo podvojene",
 	'srv_inv_list_profiles_edit' 				=> "Uredi",
@@ -4862,11 +5057,13 @@ $lang = array (
 	'srv_inv_message_delete_profile' 			=> "Izbriši sporočilo",
 	'srv_inv_message_rename_profile' 			=> "Preimenuj sporočilo",
 	'srv_inv_message_rename_new_name' 			=> "Ime sporočila:",
-	"srv_inv_message_help"      				=> "<ul><li>Za vstavljanje povezave na url ankete vpi&#154;ite <strong>#URL#</strong> v besedilo.</li>
-                                                        <li>Za vstavljanje povezave na URL ankete na besedilo ali sliko, označite besedo ali sliko in kliknite na ikono za vstavljanje povezave. Pod \"protokol\" izberite \"drugo\", pod URL vpišite <strong>#URLLINK#</strong>.</li>
-                                                        <li>Za izpis kode anketiranca vpi&#154;ite <strong>#CODE#</strong> v besedilo.</li>
-                                                        <li>Za povezavo na odjavo iz mailing liste, dodajte <strong>#UNSUBSCRIBE#</strong></li>
-                                                        <li>Za izpis anketiran&#269;eve vrednosti na drugi spremenljivki ali sistemski spremenljivki iz ankete, vnesite ime spremenljivke med znaka <strong>#</strong>. <br/><div style=\"margin-left:20px;\"><i>Primer: za izpis anketiran&#269;evega e-po&#353;tnega naslova vpi&#154;ite v besedilo <strong>#EMAIL#</strong>. </i></div></li></ul>",		
+	'srv_inv_message_help_title'    			=> "Navodila za oblikovanje sporočil",
+	"srv_inv_message_help"      				=> "<p>Za vstavljanje povezave na url ankete vpi&#154;ite <strong>#URL#</strong> v besedilo.</p>
+                                                    <p>Za vstavljanje povezave na URL ankete na besedilo ali sliko, označite besedo ali sliko in kliknite na ikono za vstavljanje povezave. Pod \"protokol\" izberite \"drugo\", pod URL vpišite <strong>#URLLINK#</strong>.</p>
+                                                    <p>Za izpis kode anketiranca vpi&#154;ite <strong>#CODE#</strong> v besedilo.</p>
+                                                    <p>Za povezavo na odjavo iz mailing liste, dodajte <strong>#UNSUBSCRIBE#</strong></p>
+                                                    <p>Za izpis anketiran&#269;eve vrednosti na drugi spremenljivki ali sistemski spremenljivki iz ankete, vnesite ime spremenljivke med znaka <strong>#</strong>.</p>
+                                                    <p>Primer: za izpis anketiran&#269;evega e-po&#353;tnega naslova vpi&#154;ite v besedilo <strong>#EMAIL#</strong>.</p>",		
 	"srv_inv_message_help_identifikators"		=> "<strong>Identifikatorji, ki so na voljo:</strong>",		
 	"srv_inv_message_help_systemvars"			=> "<strong>Sistemske spremenljivke, ki so na voljo:</strong>",		
 	"srv_inv_message_help_system_email"      	=> " - email respondenta",		
@@ -4902,18 +5099,18 @@ $lang = array (
 	'srv_inv_potencial_respondents' 			=> "Sporočilo bo poslano na spodnje naslove:",
 	'srv_inv_potencial_respondents_limit' 		=> "Vabilo želite poslati več kot 5000 respondentom. Prosimo, če nas pred pošiljanjem o tem obvestite na <a href=\"mailto:info@1ka.si\">info@1ka.si</a>!",
 	'srv_inv_btn_add_recipients_add' 			=> "Dodaj",
-	'srv_inv_recipiens_file_note_1' 			=> "Izberite datoteko z e-poštnimi naslovi prejemnikov. Vsak prejemnik mora biti v svoji vrstici. Če uvažate tudi dodatna personalizacijska polja, jih ločite z vejicami. Polja v datoteki morajo biti v enakem vrstnem redu kot ste označili zgoraj. Podvojeni zapisi se ne bodo dodajali.",
+	'srv_inv_recipiens_file_note_1' 			=> "<span class=\"semi-bold\">Izberite datoteko z e-poštnimi naslovi prejemnikov. Vsak prejemnik mora biti v svoji vrstici.</span> Če uvažate tudi dodatna personalizacijska polja, jih ločite z vejicami. Polja v datoteki morajo biti v enakem vrstnem redu, kot ste označili zgoraj. Podvojeni zapisi se ne bodo dodajali.",
 	'srv_inv_archive_heading' 					=> "Arhivi pošiljanja",									
 	'srv_inv_archive_date_send' 				=> "Datum pošiljanja",									
 	'srv_inv_archive_hour_send' 				=> "Ura pošiljanja",									
-	'srv_inv_archive_subject_text' 				=> "Naslov sporočila",									
-	'srv_inv_archive_naslov' 					=> "Email sporočilo",									
+	'srv_inv_archive_subject_text' 				=> "Zadeva sporočila",									
+	'srv_inv_archive_naslov' 					=> "Ime sporočila",									
 	'srv_inv_archive_subject' 					=> "Naslov sporočila",									
 	'srv_inv_archive_body_text' 				=> "Vsebina sporočila",									
 	'srv_inv_archive_cnt_succsess' 				=> "Uspešno poslanih",									
 	'srv_inv_archive_cnt_error' 				=> "Napak",									
 	'srv_inv_archive_comment' 					=> "Komentar",									
-	'srv_inv_archive_sender' 					=> "Poslal",
+	'srv_inv_archive_sender' 					=> "Poslal/-a",
 	'srv_inv_archive_email_address' 			=> "Email prejemnika",
 	'srv_inv_archive_status' 					=> "Status",
 	'srv_inv_archive_edit' 						=> "Uredi",
@@ -4963,26 +5160,26 @@ $lang = array (
 	'srv_inv_dashboard_view_list' 				=> "Preglej sezname ankete >>",
 	'srv_inv_dashboard_view_other_list'			=> "Preglej ostale sezname >>",
 	'srv_inv_dashboard_add_link' 				=> "Dodaj",
-	'srv_inv_dashboard_tbl_all' 				=> "Vseh enot:",
-	'srv_inv_dashboard_tbl_send' 				=> "Skupno poslano enotam:",
-	'srv_inv_dashboard_tbl_clicked' 			=> "&nbsp;&nbsp;&nbsp;neustrezno - neveljavni odgovori:",
-	'srv_inv_dashboard_tbl_finished' 			=> "&nbsp;&nbsp;&nbsp;ustrezne enote:",
-	'srv_inv_dashboard_tbl_unanswered' 			=> "&nbsp;&nbsp;&nbsp;neustrezno - neodgovori:",
-	'srv_inv_dashboard_tbl_unknown' 			=> "Neznani status:",
-	'srv_inv_dashboard_tbl_error' 				=> "Napake (neuspelo pošiljanje):",
+	'srv_inv_dashboard_tbl_all' 				=> "Vseh enot",
+	'srv_inv_dashboard_tbl_send' 				=> "Skupno poslano enotam",
+	'srv_inv_dashboard_tbl_clicked' 			=> "neustrezno - neveljavni odgovori",
+	'srv_inv_dashboard_tbl_finished' 			=> "ustrezne enote",
+	'srv_inv_dashboard_tbl_unanswered' 			=> "neustrezno - neodgovori",
+	'srv_inv_dashboard_tbl_unknown' 			=> "Neznani status",
+	'srv_inv_dashboard_tbl_error' 				=> "Napake (neuspelo pošiljanje)",
 	'srv_inv_dashboard_lists' 					=> "Seznami",
 	'srv_inv_dashboard_lists_cnt_this_survey'	=> "Število seznamov respondentov te ankete:",
 	'srv_inv_dashboard_lists_cnt_all'			=> "Število seznamov respondentov v drugih anketah:",
-	'srv_inv_dashboard_list_cnt_title'			=> ". pošiljanje. Poslal:&nbsp;",
+	'srv_inv_dashboard_list_cnt_title'			=> ". pošiljanje.",
 	'srv_activation_header'						=> "Anketo ste aktivirali! Aktivna bo 3 mesece",
 	'srv_activation_expire'						=> "Anketa poteče dne: ",
-	'srv_activation_setting'					=> "Nastavitve aktivnosti lahko spremenite <a href=\"index.php?anketa=%1s&a=trajanje\"><span class=\"bold\">tukaj</span></a>.",
+	'srv_activation_setting'					=> "Nastavitve aktivnosti lahko spremenite <a href=\"index.php?anketa=%1s&a=trajanje\">tukaj</a>.",
 	'srv_activation_header_gdpr'				=> "Anketo ste aktivirali! Aktivna bo 3 mesece",
 	'srv_activation_text_gdpr'					=> "Anketa vsebuje vprašanja oz. nastavitve, ki kažejo na zbiranje osebnih podatkov. Če v anketi zbirate osebne podatke, gre za GDPR anketo in morate izpolniti dodatne nastavitve. GDPR nastavitve ankete lahko urejate <a href=\"index.php?anketa=%1s&a=gdpr_settings\"><span class=\"bold\">tukaj</span></a>.",
-	'srv_activation_text_nongdpr'				=> "Če v anketi zbirate osebne podatke, gre za GDPR anketo in morate izpolniti dodatne nastavitve. GDPR nastavitve ankete lahko urejate <a href=\"index.php?anketa=%1s&a=gdpr_settings\"><span class=\"bold\">tukaj</span></a>.",
-	'srv_activation_text_nongdpr2'				=> "V skladu z GDPR uredbo upoštevajte naslednje:<ul><li>Obdelujte le tiste osebne podatke, ki so nujno potrebni za izvedbo ankete. </li><li>Podatke lahko obdelujte le za namen, za katerega so bili podatki pridobljeni.</li></ul><a href=\"https://www.1ka.si/d/sl/gdpr\"><b>Več >></b></a>",
+	'srv_activation_text_nongdpr'				=> "Če v anketi zbirate osebne podatke, gre za GDPR anketo in morate izpolniti dodatne nastavitve. GDPR nastavitve ankete lahko urejate <a href=\"index.php?anketa=%1s&a=gdpr_settings\">tukaj</a>.",
+	'srv_activation_text_nongdpr2'				=> "V skladu z GDPR uredbo upoštevajte naslednje:<ul><li>Obdelujte le tiste osebne podatke, ki so nujno potrebni za izvedbo ankete. </li><li>Podatke lahko obdelujte le za namen, za katerega so bili podatki pridobljeni.</li><li><a href=\"https://www.1ka.si/d/sl/gdpr\">Več >></a></li></ul>",
 	'srv_activation_expire_gdpr'				=> "Anketa poteče dne: ",
-	'srv_activation_setting_gdpr'				=> "Nastavitve aktivnosti lahko spremenite <a href=\"index.php?anketa=%1s&a=trajanje\"><span class=\"bold\">tukaj</span></a>.",	
+	'srv_activation_setting_gdpr'				=> "Nastavitve aktivnosti lahko spremenite <a href=\"index.php?anketa=%1s&a=trajanje\">tukaj</a>.",	
 	'srv_mass_input' 							=>	"Masovno (hitro) izpolnjevanje ankete",
 	'srv_mass_input_0' 							=>	"Izključeno",
 	'srv_mass_input_1' 							=>	"Vključeno",
@@ -5027,16 +5224,17 @@ $lang = array (
 	'srv_svetovanje_uporaba'				    =>	"Uporaba 1KA",
 	'srv_svetovanje_statistika'				    =>	"Statistika",
 	'srv_svetovanje_metodologija'				    =>	"Metodologija",
-    'srv_footer_links'							=>	"<a href=\"https://www.1ka.si/d/sl/o-1ka/splosen-opis\" target=\"_blank\">O 1KA</a>
-                                                        | <a href=\"https://www.1ka.si/d/sl/pomoc\" target=\"_blank\">Pomoč</a>
-                                                        | <a href=\"https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-1ka\" target=\"_blank\">Pogoji uporabe</a>
-                                                        | <a href=\"https://www.1ka.si/d/sl/cenik/zasebni-paketi\" target=\"_blank\">Cenik</a>",
+    'srv_footer_links'							=>	"<span class=\"footer_item\"><a href=\"https://www.1ka.si/d/sl/o-1ka/splosen-opis\" target=\"_blank\">O 1KA</a></span>
+                                                     <span class=\"footer_item\"><a href=\"https://www.1ka.si/d/sl/pomoc\" target=\"_blank\">Pomoč</a></span>
+                                                     <span class=\"footer_item\"><a href=\"https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-1ka\" target=\"_blank\">Pogoji uporabe</a></span>
+                                                     <span class=\"footer_item\"><a href=\"https://www.1ka.si/d/sl/cenik/zasebni-paketi\" target=\"_blank\">Cenik</a></span>",
 	'srv_footer_1ka_version'					=>	"1KA verzija",
 	'srv_footer_drupal_version'					=>	"Drupal",
 	'srv_footer_copyright'					    =>	"UL FDV, CDI",
 	'srv_password'								=>	"Geslo za dostop do izpolnjevanja ankete",
-	'srv_password_add_mass'						=>	"Masoven vnos gesel",
-    'srv_password_add_mass_instructions'		=>	"Vnesite seznam gesel kjer je vsako geslo v svoji vrstici:",
+	'srv_password_remove'						=>	"Odstrani",
+	'srv_password_add_mass'						=>	"Masovni vnos gesel",
+    'srv_password_add_mass_instructions'		=>	"Vnesite seznam gesel, kjer je vsako geslo v svoji vrstici:",
     'srv_password_add_mass_sample'		        =>  "(npr. Geslo1,Geslo2,Geslo3...)",
 	'srv_password_add_mass_execute'				=>	"Dodaj gesla",
 	'srv_interno_ime'							=>	"(Interno ime se uporablja pri urejanju ankete.)",
@@ -5113,8 +5311,13 @@ $lang = array (
 	"srv_sledenje_identifikatorji"				=>	"Poveži identifikatorje (email, ime iz zavihka OBJAVA) s podatki respondenta",	
 	"offer_plain_login"							=>  'Napacna prijava.\r\nAli se zelite prijaviti preko klasicne prijavne forme na naslovni strani?',
 	'srv_change_q_tip'							=>	"Spremeni tip vprašanja",
-	'srv_mass_coding'							=>	"Izvedi avtomatsko kodiranje na besedilni spremenljivki",
-	'srv_mass_coding_txt'						=>	"Avtomatsko lahko kodirate le eno spremenljivko naenkrat. Za dve, tri… spremenljivke, je treba postopek dvakrat, trikrat,… ponoviti.<br>Avtomatsko kodiranje je primerno za kratke odgovore, kjer se besede (oz. koreni besed) pogosto ponavljajo. Avtomatsko kodiranje to zazna ter jih združi v skupno vrednost (npr. Jabolko, Jabolka ipd.).<br>Uporabe avtomatskega kodiranja ne priporočamo na vprašanjih z dolgimi odprtimi odgovori.<br><br>Pri kodiranju večih vrednosti na odgovor se za deliminator (ločitveni znak) uporablja vejica.<br><br>Avtomatsko kodirano spremenljivko lahko kasneje še dodatno popravljate v zavihku Ročno kodiranje.",
+	'srv_mass_coding'							=>	"Avtomatsko kodiraj besedilno spremenljivko:",
+	'srv_mass_coding_count'						=>	"Število kodiranih vrednosti na odgovor:",
+	'srv_mass_coding_run'						=>	"Kodiraj",
+	'srv_mass_coding_txt1'						=>	"Avtomatsko lahko kodirate le eno spremenljivko naenkrat. Za dve, tri … spremenljivke je treba postopek dvakrat, trikrat, … ponoviti.",
+	'srv_mass_coding_txt2'						=>	"Avtomatsko kodiranje je primerno za kratke odgovore, kjer se besede (oz. koreni besed) pogosto ponavljajo. Avtomatsko kodiranje to zazna ter jih združi v skupno vrednost (npr. Jabolko, Jabolka, ipd.). Uporabe avtomatskega kodiranja ne priporočamo na vprašanjih z dolgimi odprtimi odgovori.",
+	'srv_mass_coding_txt3'						=>	"Pri kodiranju večih vrednosti na odgovor se za deliminator (ločitveni znak) uporablja vejica.",
+	'srv_mass_coding_txt4'						=>	"Avtomatsko kodirano spremenljivko lahko kasneje še dodatno popravljate v zavihku Ročno kodiranje.",
 	'srv_auto_coding'							=>	"Avtomatsko kodiranje",
 	'srv_hand_coding'							=>	"Ročno kodiranje",
 	'srv_coding_merge'							=>	"Združi v",
@@ -5126,6 +5329,7 @@ $lang = array (
 	"reg_before_posting"						=>	"Prosimo, prijavite se pred pisanjem.",
 	"srv_testiranje_review"						=>	"Pregled",
 	"srv_testiranje_diagnostika"				=>	"Diagnostika",
+	"srv_testiranje_diagnostika_lastnosti"		=>	"Lastnosti ankete",
 	"srv_testiranje_diagnostika_base"			=>	"Osnovna diagnostika",
 	"srv_testiranje_komentarji"					=>	"Komentarji",
 	"srv_testiranje_komentarji_anketa"			=>	"Komentarji na anketo",
@@ -5155,10 +5359,13 @@ $lang = array (
 	"srv_survey_settings"						=>	"Nastavitve ankete",
 	"srv_interface_settings"					=>	"Nastavitve vmesnika",
 	"srv_testing_time"							=>	"Časi",
-	"srv_analiza_archive_generate_quick"		=>	'Arhiv trenutne analize lahko zgenerirate tudi<span class="as_link" onclick="doArchiveAnaliza();"> tukaj</span>',
-	"srv_analiza_archive_note_no_archive"		=>	"Anketa nima arhivov analiz.<br/><br/>Arhiv lahko generirate s klikom na ikonco <span class=\"faicon arhiv\"></span> pri posameznih analizah.",
+	"srv_analiza_archive_generate_quick"		=>	'Arhiv posamezne analize lahko ustvarite tudi s klikom na gumb \'Izdelaj arhivsko verzijo analize\'.',
+	"srv_analiza_archive_generate_quick_button"		=>	'Izdelaj arhivsko verzijo analize',
+	"srv_analiza_archive_note_no_archive"		=>	"Anketa nima arhivov analiz.",
+	"srv_analiza_archive_note1"					=>	"Arhiv lahko generirate s klikom na ikono <span class=\"faicon arhiv blue\"></span> pri posameznih analizah.",
+	"srv_analiza_archive_list"					=>	"Seznam arhivov analiz",
 	"srv_wait_a_moment"							=>	"Prosimo počakajte trenutek.",
-	"srv_saving"								=>	"Obdelujem...",
+	"srv_saving"								=>	"Nalaganje",
 	"srv_grid_defaults_1_1"						=>	"Sploh ne velja",
 	"srv_grid_defaults_1_2"						=>	"Ne velja",
 	"srv_grid_defaults_1_3"						=>	"Niti niti",
@@ -5201,9 +5408,8 @@ $lang = array (
 	"srv_diagnostic_5_element_2" 				=> 'Preverjanje podvojenosti imen variabel',
 	"srv_diagnostic_5_element_3" 				=> 'Preverjanje validacij na spremenljivkah',
 	"srv_diagnostic_ustreza" 					=> 'OK',
-	"srv_diagnostic_neustreza1" 				=> 'Odpravite napako',
-	"srv_diagnostic_neustreza2" 				=> 'Priporočamo popravek',
-	"srv_diagnostic_neustreza" 					=> 'Priporočamo razmislek',
+	"srv_diagnostic_neustreza" 					=> 'Napaka',
+	"srv_diagnostic_rec" 						=> 'Priporočilo',
 	"srv_diagnostic_time_1" 					=> 'Zelo kratka anketa',
 	"srv_diagnostic_time_2" 					=> 'Kratka anketa',
 	"srv_diagnostic_time_3" 					=> 'Srednje dolga anketa',
@@ -5270,7 +5476,7 @@ $lang = array (
 	"srv_replace"								=> 'Zamenjaj',
 	"srv_inspect_setting"						=> 'Zoom',
 	"srv_inspect_setting_enabled"				=> '"Zoom" je omogočen:',
-	"srv_inspect_setting_link"					=> 'Preberite več o funkcionalnosti "Zoom" <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/zoom?from1ka=1" target="_blank"><span class="bold">tukaj</span></a>',
+	"srv_inspect_setting_link"					=> 'Preberite več o funkcionalnosti "Zoom" <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/zoom?from1ka=1" target="_blank">tukaj.</a>',
 	"srv_inspect_setting_show_variables"		=> 'Pri pregledovanju prikaži dodatne spremenljivke:',
 	"srv_inspect_goto_note"						=> '"Zoom" kaže na:',
 	"srv_inspect_goto_0"						=> 'Obstoječe analize',
@@ -5341,26 +5547,28 @@ $lang = array (
 	"reg_donthave_uname"						=> 'Nimate uporabni&#154;kega imena',
 	"reg_can_social"							=> 'Prijavite ali registrirate se lahko tudi z uporabni&#154;kim imenom va&#154;ega socialnega omre&#382;ja.',
 	"login_or_register"							=> 'Prijava ali registracija',
-	"srv_not_default_setting"					=> '»Izbrane imate lastne nastavitve, ki se razlikujejo od privzetih (default) 1KA nastavitev«',
-	"srv_dataIcons_write"						=> 'Izpisi',
+	"srv_not_default_setting"					=> 'Izbrane imate lastne nastavitve, ki se razlikujejo od privzetih (default) 1KA nastavitev.',
+	"srv_dataIcons_write"						=> 'Izvoz posamezne ankete',
 	"srv_dataIcons_labels"						=> 'Labele',
 	"srv_dataIcons_note"						=> 'Ikone:',
-	"srv_dataIcons_quick_view"						=> 'Vpogled',
-	"srv_dataIcons_edit"						=> 'Urejanje',
+	"srv_dataIcons_quick_view"					=> 'Vpogled v posamezno anketo',
+	"srv_dataIcons_edit"						=> 'Urejanje posamezne ankete',
+	"srv_dataTable_settings_show"				=> 'V tabeli naj bodo prikazani:',
+	"srv_dataTable_settings_shortcuts"			=> 'Bljižnice za:',
 	"login_for_existing"						=>	'Prijava za obstoje&#269;e uporabnike',
 	"login_for_existing2"						=>	'Obstoje&#269;i uporabniki',
 	"simplified_social_login"					=> 'Poenostavljena prijava preko socialnih omre&#382;ij',
 	"social_login"								=> 'Prijava preko socialnih omre&#382;ij',
 	"srv_max_answers"							=> 'max število odgovorov',
 	"srv_analysis_links_allAnswers"				=> 'Izpis odgovorov vseh ustreznih respondentov',
-	"srv_analysis_links_allAnswers_note"		=> '(pozor – ne gre za podatke, ampak za dobeseden izpis vprašalnikov in odgovorov za vsakega respondenta, kar je lahko izjemno obsežno; privzeta omejitev je zato 300 enot)',
+	"srv_analysis_links_allAnswers_note"		=> '<span class="red">Opozorilo!</span> Pri tej možnosti ne gre za izpis podatkov, ampak za dobeseden izpis vprašanj in odgovorov za vsakega respondenta. Izpis je časovno zamuden, zato je možno izpisati odgovore za največ 300 enot.',
 	"srv_analysis_links_vpogled"				=> 'Vpogled v individualne ankete',
 	"srv_means_izberi_prvo" 					=>	"Izberite prvo vpra&#353;anje",
 	"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",
@@ -5391,22 +5599,31 @@ $lang = array (
 	"srv_skin_tablet"							=>	'Stran za tablice',
 	"srv_loop_for_variable"						=>	'Zanka po spremenljivki:',
 	"srv_loop_antonucci_circle"					=>	'Krog Antonuccija:',
-	"srv_current_theme"							=>	'Trenutno izbrana tema',
+	"srv_current_theme"							=>	'Aktivna tema',
+	"srv_current_theme_general"					=>	'Splošna tema',
+	"srv_current_theme_mobile"					=>	'Mobilna tema',
 	"srv_show_all_settings"						=>	"Prikaži napredne nastavitve",
-	"srv_skin_disclamer"						=>	"Vaše naložene in urejene teme bodo vidne izključno vam. Ostali uporabniki ne morejo uporabljati vaših tem.",
+	"srv_skin_disclamer"						=>	"Vaše naložene in urejene teme bodo vidne izključno vam in morebitnim urednikom ankete. Ostali uporabniki ne morejo uporabljati vaših tem.",
+	"srv_skin_warning"							=>	"<span class=\"red\">Opozorilo!</span> Ustvarjanje teme na lastno odgovornost. Ob poseganju v CSS lahko pride do napake in s tem potencialno do napačnega ali nedelujočega prikaza ankete na strani respondenta.",
+	"srv_skin_warning_edit"						=>	"<span class=\"red\">Opozorilo!</span> Posegov v kodo ne priporočamo brez poznavanja jezika CSS. Urejanje teme je na lastno odgovornost.",
 	"srv_SN_nagovor_title"						=>	'Odgovarjate za osebo ',
 	"srv_system_themes"							=>	'Splošne teme',
 	"srv_mobile_themes"							=>	'Mobilne teme',
-	"srv_mobile_theme"							=>	'mobilna',
+	"srv_mobile_theme"							=>	'Mobilna tema',
 	"srv_safe_themes"							=>	'Safe teme',
 	"srv_user_themes"							=>	'Lastne prilagoditve in CSS teme',
 	"srv_user_themes_css"						=>	'Lastne CSS teme',
     "srv_user_custom_checkbox"                  =>  'Izbira velikosti checkbox/radio gumbov',
 	"srv_online_edit"							=>	'Online urejanje teme',
 	"srv_offline_edit"							=>	'Offline urejanje teme',
+	"srv_diagnostika_testiranje"				=>	'Testiranje',
+	"srv_diagnostika_testiranje_notea"			=>	'Spodaj je povezava do ročnega testnega vnosa, kjer se podatki shranijo kot testni. V zavihku ',
+	"srv_diagnostika_testiranje_noteb"			=>	'\'TESTIRANJE\' - \'Avtomatski vnosi\'',
+	"srv_diagnostika_testiranje_notec"			=>	' lahko testne podatke vnesete tudi avtomatsko.',
+	"srv_diagnostika_testiranje_copy"			=>	'Kopiraj',
 	"srv_diagnostika_table_title"				=>	'Status',
-	"srv_diagnostika_table_title1"				=>	'Napake',
-	"srv_diagnostika_table_title2"				=>	'Opozorila',
+	"srv_diagnostika_table_title1"				=>	'Kriterij',
+	"srv_diagnostika_table_title2"				=>	'Podrobnosti',
 	"srv_diagnostika_table_title3"				=>	'Priporočila',
 	"srv_diagnostika_table_title4"				=>	'Lastnost',
 	"srv_ttest"									=>	'T-test',
@@ -5426,16 +5643,17 @@ $lang = array (
 	"srv_data_lurker"							=>  "Prazna",
 	"srv_data_test"								=>  "Testni",
 	"srv_data_date"								=>  "Datum",
+	"srv_data_date2"							=>  "Datum izpolnjevanja ankete",
 	"srv_library_edit"							=>	"Urejanje knjižnice",
 	"srv_library_edit_add"						=>	"Dodaj to anketo v mojo knjižnico",
 	"srv_library_q_txt"							=>	"Za prenos vprašanj (ali blokov) uporabite povleci in spusti",
 	"srv_library_show"							=>	"Prikaži knjižnico",
 	"srv_library_hide"							=>	"Skrij knjižnico",
 	"srv_list_author"							=>	"Avtor ankete",
-	"srv_list_my_surveys"						=>	"Prikaži samo moje ankete",
-	"srv_list_all_surveys"						=>	"Prikaži vse ankete",
-	"srv_list_gdpr_no_gdpr"						=>	"Prikaži samo ankete brez GDPR",
-	"srv_list_gdpr_gdpr"						=>	"Prikaži samo GDPR ankete",
+	"srv_list_my_surveys"						=>	"Moje ankete",
+	"srv_list_all_surveys"						=>	"Vse ankete",
+	"srv_list_gdpr_no_gdpr"						=>	"Ankete brez GDPR",
+	"srv_list_gdpr_gdpr"						=>	"GDPR ankete",
 	"srv_list_userFilter_surveys"				=>	"Seznam je filtriran po uporabniku",
 	"srv_default_setting"						=>	"Privzete nastavitve za objavo",
 	"srv_default_setting_unactive"				=>	"Z aktiviranjem potrjujete privzete nastavitve",
@@ -5454,6 +5672,7 @@ $lang = array (
 	"srv_invitation_recipients_add_type4"		=>	'Dodaj v anketo',
 	"srv_invitation_recipients_add_type5"		=>	'Shrani kot nov seznam',
 	"srv_invitation_recipients_filter"			=>	'Filtriraj:',
+	"srv_invitation_recipients_filter_button"			=>	'Filtriraj',
 	"srv_invitation_recipients_filter_advanced" =>	'Napredno filtriranje',
 	"srv_invitation_recipients_filter_sent"		=>	'Poslano:',
 	"srv_invitation_recipients_filter_answered" =>	'Odgovorjeno:',
@@ -5478,7 +5697,7 @@ $lang = array (
 	"srv_invitation_choosen"					=>	'(izbran)',
 	"srv_invitation_note1"						=>	'Polje s prejemniki je prazno!',
 	"srv_invitation_note2"						=>	'Izbrano ni nobeno polje!',
-	"srv_invitation_note3"						=>	'Ni ustrezih respondentov!',
+	"srv_invitation_note3"						=>	'Ni ustreznih respondentov!',
 	"srv_invitation_note4"						=>	'Nič sporočil še ni bilo poslanih!',
 	"srv_invitation_note5"						=>	'Sporočilo je bilo uspešno poslano na vse naslove!',
 	"srv_invitation_note5_noEmailing"			=>	'Obvestilo o vabilu je bilo dokumentirano in shranjeno v sistem 1KA. Podrobnosti so v <a href="%s" class="bold">arhivih</a>.',
@@ -5555,17 +5774,18 @@ $lang = array (
 	"srv_data_delete_not_selected"				=>	"Niste izbrali nobenega respondenta!",
 	"srv_if_error"								=>	"Dopolnite ali odstranite pogoj!",
 	"srv_export_spss"							=>	"Izvozi v spss",
-	"srv_export_excel"							=>	"Izvozi v excel",
+	"srv_export_excel"							=>	"Izvozi v Excel",
 	"srv_export_txt"							=>	"Izvozi v tekstovno datoteko",
 	"srv_expaned_text"							=>	"Priporočamo vam tudi uporabo skrčenega pogleda",
 	"srv_library_q_added"						=>	"Vprašanje uspešno dodano v knjižnico!",
 	"srv_library_b_added"						=>	"Pogoj oz. blok je uspešno dodan v knjižnico!",
-	"srv_expor_excel_cell_delimiter"			=>	"Ločitveni znak med polji naj bo:",
+	"srv_expor_excel_cell_delimiter"			=>	"Ločitveni znak med polji naj bo",
 	"srv_expor_excel_cell_delimiter1"			=>	"Podpičje (;)",
 	"srv_expor_excel_cell_delimiter2"			=>	"Vejica (,)",		
 	"srv_statistic_menu"						=>	"Izberite:&nbsp;",		
 	"srv_back_to_email"							=>	"Nazaj na objavo",		
 	"srv_data_valid_units_settings"				=>	"Nastavitve prikazov v analizah in podatkih",	
+	"srv_data_valid_label"						=>	"Prikaži enote",		
 	"srv_data_only_valid"						=>	"Samo ustrezni",		
 	"srv_data_valid_units"						=>	"Ustrezne",		
 	"srv_data_finished_units"					=>	"Končani",		
@@ -5646,32 +5866,34 @@ $lang = array (
 	"XSTARleta"									=>	'Starost: vnos starosti (min: 10 let, max: 90 let)',
 	"XLETNICA"									=>	'Starost: izbira letnice rojstva v roleti z letnicami od 1910 do 2010.',
 	"XDATUMROJ"									=>	'Starost: Izbira datuma rojstva na koledarju',
-	"srv_find_text"								=>	'Zgolj za iskanje uporabite Ctrl + F',
+	"srv_find_text"								=>	'Samo za iskanje besed v vprašalniku uporabite bližnjico Ctrl+F.',
 	"srv_find_replace_count"					=>	'Najdenih besed',
 	"srv_demografija_text"						=>	'Na konec ankete lahko dodate že pripravljena demografska vprašanja',
 	"srv_demografska_vprasanja"					=>	'Demografska vprašanja',
 	"srv_head_demografska_vprasanja"			=>	'Priporočamo standardna socio-demografska vprašanja (<a href="https://www.1ka.si/d/sl/pomoc/prirocniki/standardna-demografija" target="_blank"><span class="bold">Podrobnosti</span></a>)',
-	"srv_manager_add_user"						=>	'Dodajte novega uporabnika nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo o podrobnostih dostopa obveščen na e-mail</span>',
-	"srv_manager_add_user2"						=>	'Dodajte si obstoječega uporabnika nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail</span>',
-	"srv_manager_add_user3"						=>	'Dodajte si obstoječega uporabnika nad katerim boste imeli pregled (dodajate lahko samo uporabnike registrirane z emaili %s)',
+	"srv_manager_add_user_label"				=>	'Izberite uporabnika',
+	"srv_manager_add_user"						=>	'Dodajte novega uporabnika, nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo o podrobnostih dostopa obveščen na e-mail.</span>',
+	"srv_manager_add_user2"						=>	'Dodajte si obstoječega uporabnika, nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail.</span>',
+	"srv_manager_add_user3"						=>	'Dodajte si obstoječega uporabnika, nad katerim boste imeli pregled (dodajate lahko samo uporabnike registrirane z emaili %s)',
 	"srv_manager_add_user4"						=>	'<span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail</span>',
 	"srv_manager_rem_user2"						=>	'Odstranite uporabnika iz svojega pregleda',
 	"srv_manager_manager"						=>	'Uporabniki, ki imajo managerski pregled nad vašimi anketami',
 	"srv_manager_count"			    			=>	'Dodeljeni uporabniki',
 	"srv_manager_remove_alert"	    			=>	'Ste prepričani, da želite odstraniti uporabnika iz pregleda?',
 	"srv_manager_add_admin"	    			    =>	'Dodaj uporabnika v pregled',
-	"srv_manager_add_user_popup"				=>	'Dodajte obstoječega uporabnika nad katerim bo uporabnik pregled',
+	"srv_manager_add_user_popup"				=>	'Dodajte obstoječega uporabnika, nad katerim bo uporabnik imel pregled',
 	"srv_manager_count_manager"				    =>	'Managerji',
 	"create"		            				=>	'Ustvari',
 	"create_add"		            		    =>	'Ustvari in dodaj',
     "srv_library_left"							=>	'Standardna vprašanja lahko dodajate v anketo',
 	"srv_library_left_right"					=>	'Moja vprašanja, ki jih lahko dodajate v knjižnico in iz knjižnice v anketo',
 	"srv_language_settings"						=>	'Jezikovne nastavitve',
-	"srv_add_new_language"						=>	'Dodaj nov jezik',
+	"srv_add_new_language"						=>	'Dodaj nov prevod',
 	"srv_std_first"								=>	'Osnovni jezik',
 	"srv_std_second"							=>	'Privzeti prevod',
 	"srv_std_translation"						=>	'Popravek privzetega prevoda',
 	"srv_select_type"							=>	'Izberite tip vprašanja',
+	"srv_common_settings"   					=>	'Pogoste nastavitve',
 	"srv_question_type"							=>	'Tip vprašanja',
 	"srv_dropdown_select"						=>	'Izberite',
 	"srv_added_false"							=>	'Uporabnik s tem e-mail naslovom je že registriran.',
@@ -5688,15 +5910,15 @@ $lang = array (
 	"srv_edit_in_edit"							=>	'Urejanje je možno v zavihku',
 	"srv_analize_preview_sample_choose"			=>	'Kliknite na izbrano možnost v roleti.',
 	"srv_analize_preview_sample"				=>	'Primer izpisa: ',
-	"srv_analize_preview_1"						=>	'<b>Sumarnik</b> - Analize prilagojene tipu spremenljivke.',
-	"srv_analize_preview_2"						=>	'<b>Opisne statistike</b> - povprečja, standardni odklon, minimum, maximum.',
-	"srv_analize_preview_3"						=>	'<b>Frekvence</b> - Izpis frekvenčnih porazdelitev.',
-	"srv_analize_preview_4"						=>	'<b>Tabele</b> - Dvodimenzionalna tabela kategorialnih spremenljivk.',
-	"srv_analize_preview_5"						=>	'<b>Povprečja</b> - Tabele povprečij glede na kontrolno kategorialno spremenljivko.',
-	"srv_analize_preview_6"						=>	'<b>T-test</b> - Preverjanje domnev o statistično značilnih razlikah.',
-	"srv_analize_preview_7"						=>	'<b>Razbitje</b> - Analiza vseh spremenljivk glede na kategorije kontrolnih spremenljivk.',
-	"srv_analize_preview_8"						=>	'<b>Multitabele</b> - Večdimenzionalna tabela kategorialnih spremenljivk.',	
-	"srv_analize_preview_9"						=>	'<b>Neodgovori spremenljivk</b>',	
+	"srv_analize_preview_1"						=>	'<span class="first">Primer izpisa: Sumarnik</span> - Analize prilagojene tipu spremenljivke.',
+	"srv_analize_preview_2"						=>	'<span class="first">Primer izpisa: Opisne statistike</span> - povprečja, standardni odklon, minimum, maximum.',
+	"srv_analize_preview_3"						=>	'<span class="first">Primer izpisa: Frekvence</span> - Izpis frekvenčnih porazdelitev.',
+	"srv_analize_preview_4"						=>	'<span class="first">Primer izpisa: Tabele</span> - Dvodimenzionalna tabela kategorialnih spremenljivk.',
+	"srv_analize_preview_5"						=>	'<span class="first">Primer izpisa: Povprečja</span> - Tabele povprečij glede na kontrolno kategorialno spremenljivko.',
+	"srv_analize_preview_6"						=>	'<span class="first">Primer izpisa: T-test</span> - Preverjanje domnev o statistično značilnih razlikah.',
+	"srv_analize_preview_7"						=>	'<span class="first" class="first">Primer izpisa: Razbitje</span> - Analiza vseh spremenljivk glede na kategorije kontrolnih spremenljivk.',
+	"srv_analize_preview_8"						=>	'<span class="first">Primer izpisa: Multitabele</span> - Večdimenzionalna tabela kategorialnih spremenljivk.',	
+	"srv_analize_preview_9"						=>	'<span class="first">Primer izpisa: Neodgovori spremenljivk</span>',	
 	"srv_analize_preview_watermark"				=>	'VZOREC',
 	"srv_dostop_maili"							=>	'Lahko pošilja e-maile',
 	"srv_dostop_mail_server"					=>	'Lahko pošilja e-maile preko 1KA strežnika',
@@ -5711,14 +5933,22 @@ $lang = array (
 	"srv_dostop_dashboard"						=>	'Vidi zavihek status',
 	"srv_dostop_phone"							=>	'Je anketar ankete (lahko izvaja le telefonsko anketo)',
 	"srv_anketa_deleted"						=>	'Izbrisane ankete',
+	"srv_anketa_deleted_note"					=>	'V spodnji tabeli je seznam vseh izbrisanih anket in možnost obnovitve teh anket.',
+	"srv_anketa_deleted_restore"				=>	'Obnovi anketo',
+	"srv_anketa_deleted_restore_confirm"		=>	'Ste prepričani, da želite obnoviti anketo?',
 	"srv_data_deleted"							=>	'Izbrisani podatki',
+	"srv_data_deleted_surveyname"				=>	'Ime ankete',
+	"srv_data_deleted_user"						=>	'E-mail uporabnika',
+	"srv_data_deleted_restore"					=>	'Obnovi podatke',
+	"srv_data_deleted_restore_confirm"          =>	'Ste prepričani, da želite obnoviti podatke?',
+	"srv_data_deleted_note"						=>	'V spodnji tabeli je seznam vseh anket, kjer so bili izbrisani podatki, in možnost obnovitve izbrisanih podatkov.',
 	"srv_restore"								=>	'Obnovi',
 	"srv_all_types"								=>	'Vsi tipi',
 	"srv_demografija_all"						=>	'V editiranju vprašanja so na voljo tudi dodatni tipi vprašanj',
 	"srv_delete_infotext"						=>	'Namesto izbrisa svetujemo izbiro ustreznih enot',
 	"srv_unlock"								=>	"Odkleni",
 	"srv_unlock_alert"							=>	"Pri urejanju ankete z že zbranimi podatki je potrebno biti posebej pazljiv! Ob brisanju vprašanj ali kategorij se bodo izbrisali tudi pripadajoči podatki respondentov. Želite nadaljevati?",
-	"srv_unlock_popup"							=>	"Vaša anketa se je z aktivacijo zaklenila, urejanje ankete je možno, če jo odklenete s klikom na <img src=\"img_0/lock.png\">",
+	"srv_unlock_popup"							=>	"Vaša anketa se je z aktivacijo zaklenila.<br>Urejanje ankete je možno, če jo odklenete s klikom na <span class=\"faicon lock_close blue\"></span>.",
 	"srv_unlock_popup2"							=>	"Pri urejanju ankete z že zbranimi podatki je potrebno biti posebej pazljiv! Ob brisanju vprašanj ali kategorij se bodo izbrisali tudi pripadajoči podatki respondentov. Urejanje ankete je zopet možno, če jo odklenete s klikom na odkleni.",
 	"srv_unlock_popup3"							=>	"Anketa je zaklenjena. Nimate dovoljenja za odklepanje ankete.",
 	"srv_unlock_mobile"							=>	"Anketa je ustvarjena z mobilno aplikacijo. Če anketo odklenete, bo postala navadna anketa in je ne bo več mogoče urejati z mobilno aplikacijo.",
@@ -5740,6 +5970,8 @@ $lang = array (
 	"srv_deleteSurveyDataFile_success_note"		=>	"Datoteka s podatki je bila uspešno izbrisana!",
 	"srv_archive_survey"						=>	"Arhivi vprašalnika",
 	"srv_archive_invitation"					=>	"Arhivi vabil",
+	"srv_archive_invitation_text"				=>	"Vsako poslano email vabilo se avtomatsko shrani v spodnji seznam, kjer je navedena tudi statistika pošiljanja.",
+	"srv_archive_invitation_text2"				=>	"Seznam poslanih email vabil",
 	"srv_archive_analysis"						=>	"Arhivi analiz",
 	"srv_toolbox_if"							=>	"Določite pogoje za prikaz vprašanja",
 	"srv_toolbox_block"							=>	"Bloki za strukturiranje daljših vprašalnikov",
@@ -5748,12 +5980,15 @@ $lang = array (
 	"srv_data_emailstatus_1"					=>	"Da",
 	"srv_data_emailstatus_2"					=>	"Napaka",
 	"srv_bottom_data_legend_note"				=>	'Legenda manjkajočih (negativnih) vrednosti',
-	"srv_bottom_data_legend_note_li0"			=>	'<a href="https://www.1ka.si/d/sl/pomoc/prirocniki/statusi-enot-ustreznost-veljavnost-manjkajoce-vrednosti?from1ka=1" target="_blank">Več>></a>',
+	"srv_bottom_data_legend_note_li0"			=>	'<a href="https://www.1ka.si/d/sl/pomoc/prirocniki/statusi-enot-ustreznost-veljavnost-manjkajoce-vrednosti?from1ka=1" target="_blank" class="read-more">Preberi več<span class="faicon arrow2_r"></span></a>',
 	"srv_bottom_data_legend_note_li1"			=>	"'-1' neodgovorjeno vprašanje,",
 	"srv_bottom_data_legend_note_li2"			=>	"'-2' preskok zaradi pogoja (IF),",
 	"srv_bottom_data_legend_note_li3"			=>	"'-3' prekinitev izpolnjevanja,",
 	"srv_bottom_data_legend_note_li4"			=>	"'-4' naknadno vprašanje,",
-	"srv_bottom_data_legend_note_li5"			=>	"'-5' prazna anketa (NEUSTREZNA enota).",
+	"srv_bottom_data_legend_note_li5"			=>	"'-5' prazna anketa (NEUSTREZNA enota),",
+	"srv_bottom_data_legend_note_li99"			=>	"'-99' ne vem,",
+	"srv_bottom_data_legend_note_li98"			=>	"'-98' zavrnil,",
+	"srv_bottom_data_legend_note_li97"			=>	"'-97' neustrezno.",
 	"srv_bottom_data_legend_note_li1a"			=>	"neodgovorjeno vprašanje",
 	"srv_bottom_data_legend_note_li2a"			=>	"preskok zaradi pogoja",
 	"srv_bottom_data_legend_note_li3a"			=>	"prekinitev izpolnjevanja",
@@ -5780,13 +6015,13 @@ $lang = array (
 	"srv_user_notbanned"						=>	"Uporabnik je aktiven",
 	"srv_displayifs"							=>	"Prikaži pogoje in bloke pred vprašanjem",
 	"srv_user_settings"							=>	"Nastavitve uporabnika",
-	"srv_lock_survey_when_activate"				=>	"Zakleni anketo ob aktivaciji:",
+	"srv_lock_survey_when_activate"				=>	"Zakleni urejanje ankete",
 	"srv_validation"							=>	"Validacija",
 	"srv_validation_no"							=>	"Vprašanje nima nastavljenih validacijskih omejitev",
 	"srv_validation_new"						=>	"Dodaj validacijo",
 	"srv_validation_remove"						=>	"Odstrani validacijo",
 	"srv_data_recoded_note"						=>	"Nekateri podatki so rekodirani.",
-	"srv_analysys_perview_sample"				=>	'<span class="sampleView">Vzorec</span>',
+	"srv_analysys_perview_sample"				=>	'Vzorec',
 	"srv_preview_text"							=>	'Podatki se ne shranjujejo',
 	"srv_testdata_text"							=>	'Podatki se shranijo kot testni',
 	"srv_testdata_text_long"					=>	"Podatki se shranijo kot testni s čimer se lahko pretestira analize in jih kasneje z 1 klikom tudi izbriše",
@@ -5795,7 +6030,8 @@ $lang = array (
 	"srv_no_reminder_all"						=>	"Odstrani opozorila iz vseh vprašanj",
 	"srv_reminder_popup_warning"				=>	"Ta funkcionalnost se zelo dolgo izvaja. Želite nadaljevati?",
 	"srv_jump_to"								=>	"Skoči na",
-	"srv_recode_h_variable"						=>	"Variable",
+	"srv_recode_h_variable"						=>	"Spremenljivka",
+	"srv_recode_h_scale"						=>	"Merska lestvica",
 	"srv_recode_h_actions"						=>	"Funkcije rekodiranja",
 	"srv_recode_add"							=>	"Dodaj",
 	"srv_recode_remove"							=>	"Odstrani",
@@ -5818,13 +6054,14 @@ $lang = array (
 	"srv_continue_later_subject"				=>	'Shranjena anketa',
 	"srv_continue_later_content"				=>	'Pozdravljeni, <br><br>Na spletni strani 1ka.si ste si shranili spodnjo anketo za kasnejše izpolnjevanje.<br><br> Z izpolnjevanjem lahko nadaljujete s klikom na povezavo',
 	"srv_continue_later_content_rs-rs"  		=>	'Pozdravljeni, <br><br>Na spletni strani vprasalniki.rs-rs.si ste si shranili spodnjo anketo za kasnejše izpolnjevanje.<br><br> Z izpolnjevanjem lahko nadaljujete s klikom na povezavo',
-	"srv_upload_pic"							=>	'Uporabite svoj logo ali sliko',
+	"srv_upload_pic"							=>	'Naložite svoj logotip',
 	"srv_upload_pic2"							=>	'Naložite svojo sliko',
 	"srv_upload_logo"							=>	'Naložite svoj logotip',
 	"srv_upload_pic_disclaimer"					=>	'Za uporabo slike v temi, skopirajte njen URL (iz seznama spodaj) in ga vključite v CSS datoteko, ki jo lahko urejate zgoraj',
 	"srv_data_subnavigation_append"				=>	'Dodaj podatke',
 	"srv_data_subnavigation_merge"				=>	'Združi podatke',
 	"srv_custom_report"							=>	"Poro&#269;ilo po meri",
+	"srv_custom_report_begin"					=>	"Dodajte prvi element ali besedilo, ki ga želite vključiti v analizo raziskave.",
 	"srv_custom_report_title"					=>	"Izdelava poro&#269;ila po meri",
 	"srv_custom_report_preview"					=>	"Predogled poročila po meri",
 	"srv_custom_report_preview_short"			=>	"Predogled",
@@ -5852,6 +6089,7 @@ $lang = array (
 	"srv_custom_report_time_edited"				=>	"Poročilo spreminjano",
 	"srv_custom_report_default"					=>	"Poročilo 1",
 	"srv_custom_report_create"					=>	"Ustvari novo poročilo",
+	"srv_custom_report_create2"					=>	"Novo poročilo",
 	"srv_custom_report_edit"					=>	"Preglej vsa poročila",
 	"srv_custom_report_name"					=>	"Ime poročila",
 	"srv_custom_report_delete_confirm" 			=>	"Ali &#382;elite izbrisati poročilo",
@@ -5870,34 +6108,50 @@ $lang = array (
 	"srv_custom_report_share_long"				=>	"Deli poročilo z drugimi uredniki ankete",
 	"srv_color"									=>	"Barva",
 	"src_coding_refresh"						=>	"Poženi novo računanje rekodiranih vrednosti", #Osveži podatke
-	"src_coding_alert"							=>	"Priporočamo, da <a href=\"index.php?anketa=%1s&a=arhivi&m=data\">arhiv podatkov</a> ustvarite, preden pričnete z urejanjem.",
+	"src_coding_alert"							=>	"Opozorilo: Priporočamo, da ustvarite <a href=\"index.php?anketa=%1s&a=arhivi&m=data\">arhiv podatkov</a>, preden začnete z urejanjem.",
 	"srv_coding_spr"							=>	"Prikaži izbrano spremenljivko",
 	"srv_coding_spr_1"							=>	"Prikaži vse spremenljivke",
 	"srv_coding_spr2"							=>	"Za več opcij pojdite v Napredne možnosti ter nato Spremenljivke",
 	"srv_coding_filter"							=>	"Filtriraj",
 	
-	"srv_append_note" 							=>	"<b>Dodajanje pomeni nove zapise (records)</b><br><br>Izberite polja, ki jih boste vnesli. S premikanjem lahko določite vrstni red.<br><br>Dodajate lahko spremenljivke tekstovnih in numeričnih tipov ter vprašanja z enim in več odgovori - vse trenutno obstoječe spremenljivke so spodaj tudi že prikazane. Ostalih tipov zaenkrat ni mogoče vnašati. Dodatne spremenljivke lahko dodate v urejanju.",
-	"srv_append_note" 							=>	"<p>Uvoz odgovorov pomeni dodajanje novih zapisov (records).</p>",
-	"srv_append_step1" 							=>	"<p><b>1. korak: Definirajte polja (spremenljivke), ki jih boste vnesli.</b></p>",
-	"srv_append_step1_note" 					=>	"<p>S premikanjem lahko določite vrstni red.</p><p>Če v vprašalniku še nimate vprašanj, jih je potrebno predhodno vnesti.</p><p>Dodajate lahko spremenljivke tekstovnih in numeričnih tipov ter vprašanja z enim in več odgovori - vse trenutno obstoječe spremenljivke so spodaj tudi že prikazane.<br />Ostalih tipov zaenkrat ni mogoče vnašati. Dodatne spremenljivke lahko dodate v urejanju.</p>",
-	"srv_append_step2" 							=>	"<p><b>2. korak: Izberite vir podatkov, ki jih želite vnesti:</b></p>",
-	"srv_append_step3" 							=>	"<p><b>3. korak: Vpišite ali kopirajte podatke.</b></p>",
-	"srv_append_step3_note" 					=>	"<p>Podatke vnesite v tekstovni obliki, vsak zapis dodajte v svojo vrstico.<br />Če dodajate več polj, jih ločite z vejico in jih dodajajte v enakem vrstnem redu, kot ste jih označili zgoraj.</p>",
-	"srv_append_step3_xls" 						=>	"<p><b>3. korak: Naložite podatke iz datoteke.</b></p>",
-	"srv_append_xls_note" 						=>	"<p>Pri dodajanju podatkov iz Excelove datoteke, bodo uvoženi podatki za naslednje spremenljivke <i>(ki ste jih izbrali v prejšnjem koraku)</i></p>",
-	"srv_append_xls_step1" 						=>	"<p><b>1. korak: izberite pripadajoča polja (stolpce)</b> iz Excelove datoteke h zgornjim spremenljivkam:</p>",
-	"srv_append_xls_step2" 						=>	"<p><b>2. korak: </b>vpišite številko začetne in zadnje vrstice podatkov respondentov v Excelovi datoteki</p>",
+	"srv_append_note" 							=>	"Dodajanje podatkov pomeni dodajanje odgovorov  za nove respondente, ki jih še ni v bazi podatkov vaše ankete. Dodani odgovori se shranijo v obstoječo bazo podatkov.",
+	"srv_append_step1" 							=>	"1. korak: Označite spremenljivke, ki jih boste vnesli:",
+	"srv_append_step1_notea" 					=>	"Spodaj so navedena imena obstoječih spremenljivk vašega vprašalnika.",
+	"srv_append_step1_noteb" 					=>	"Dodajanje podatkov je možno le za spremenljivke tekstovnih in numeričnih tipov ter vprašanja z enim in več odgovori.",
+	"srv_append_step1_notec" 					=>	"Če v vprašalniku še nimate vprašanj, jih je najprej treba dodati.",
+	"srv_append_step1_noted" 					=>	"S premikanjem spremenljivk lahko spremenite vrstni red (od leve proti desni), v katerem boste vnesli podatke.",
+	"srv_append_step2" 							=>	"2. korak: Izberite vir podatkov, ki jih želite vnesti:",
+	"srv_append_step3" 							=>	"3. korak: Vpišite ali kopirajte podatke:",
+	"srv_append_step3_note1" 					=>	"Za vsakega respondenta vnesite podatke v svojo vrstico.",
+	"srv_append_step3_note2" 					=>	"Podatke vnesite le za tiste spremenljivke, ki ste jih označili v 1. koraku.",
+	"srv_append_step3_note3" 					=>	"Za vprašanja z enim ali več možnimi odgovori je treba vnesti vrednosti odgovorov - npr. 1, 2, 3 (in ne besedila). Do vrednosti posameznega odgovora lahko dostopate s klikom na opcijo 'Uredi vrednosti odgovorov', ki se nahaja v naprednem urejevalniku vprašanja v zavihku 'UREJANJE'- Vprašalnik.",
+	"srv_append_step3_note4" 					=>	"Če dodajate podatke za več spremenljivk, morate za vsako izmed njih:",
+	"srv_append_step3_note5" 					=>	"Podatke ločiti z vejico (,).",
+	"srv_append_step3_note6" 					=>	"Podatke vnesti v enakem vrstnem redu (od leve proti desni), kot so spremenljivke prikazane v 1. koraku.",
+	"srv_append_step3_note7" 					=>	"Primer - vnos podatkov za primer, ko želimo za dva respondenta vnesti podatke za njun elektronski naslov in ime:",
+	"srv_append_step3_note8" 					=>	"janez.novak@example.com,Janez",
+	"srv_append_step3_note9" 					=>	"janja.novak@example.com,Janja",
+	"srv_append_step3_note10" 					=>	"Podatke vnesite v tem vrstnem redu:",
+	"srv_append_add" 							=>	"Dodaj podatke",
+	"srv_append_step3_xls" 						=>	"3. korak: Naložite podatke iz datoteke:",
+	"srv_append_xls_note" 						=>	"Pri dodajanju podatkov iz Excelove datoteke bodo uvoženi podatki za naslednje spremenljivke (izbrali ste jih v prejšnjem koraku):",
+	"srv_append_xls_step1" 						=>	"<span class=\"bold\">1. korak: izberite stolpce iz Excelove datoteke</span>, v katerih se nahajajo podatki za izbrane spremenljivke:",
+	"srv_append_xls_step2" 						=>	"<span class=\"bold\">2. korak: izberite vrstice iz Excelove datoteke</span>, v katerih se nahajajo podatki:",
 	"srv_append_xls_step2_begin" 				=>	"Številka začetne vrstice",
 	"srv_append_xls_step2_end" 					=>	"Številka zadnje vrstice",
     
-    "srv_merge_note" 							=>	"<p>Združevanje podatkov (join merge) ne povečuje števila zapisov (records) ampak dodaja podatke spremenljivkam</p>",
-	"srv_merge_step1" 							=>	"<p><b>1. korak: Definirajte polja (spremenljivke), ki jih boste vnesli.</b></p>",
-	"srv_merge_step1_note" 						=>	"<p>S premikanjem lahko določite vrstni red.</p><p>Če v vprašalniku še nimate vprašanj, jih je potrebno predhodno vnesti.</p><p>Dodajate lahko spremenljivke tekstovnih in numeričnih tipov ter vprašanja z enim in več odgovori - vse trenutno obstoječe spremenljivke so spodaj tudi že prikazane.<br />Ostalih tipov zaenkrat ni mogoče vnašati. Dodatne spremenljivke lahko dodate v urejanju.</p>",
-	"srv_merge_step2" 							=>	"<p><b>2. korak: Izberite vir podatkov, ki jih želite vnesti:</b></p>",
-	"srv_merge_step3" 							=>	"<p><b>3. korak: Izberite polje, po katerem želite izvesti združevanje (identifikator)</b></p>",
-	"srv_merge_step4" 							=>	"<p><b>4. korak: Vpišite ali kopirajte podatke.</b></p>",
-	"srv_merge_step4_note" 						=>	"<p>Podatke vnesite v tekstovni obliki, vsak zapis dodajte v svojo vrstico.<br />Če dodajate več polj, jih ločite z vejico in jih dodajajte v enakem vrstnem redu, kot ste jih označili zgoraj.</p>",
-	"srv_merge_step4_xls" 						=>	"<p><b>4. korak: Naložite podatke iz datoteke.</b></p>",
+    "srv_merge_note" 							=>	"Združevanje podatkov omogoča dodajanje odgovorov za obstoječe respondente, ki so že v bazi podatkov vaše ankete. Dodani odgovori se shranijo v bazo podatkov skupaj z ostalimi odgovori. ",
+	"srv_merge_step1" 							=>	"1. korak: Označite spremenljivke, ki jih boste vnesli, vključno s spremenljivko, po kateri bo izvedeno združevanje (ključ):",
+	"srv_merge_step1_notea" 					=>	"Spodaj so navedena imena obstoječih spremenljivk vašega vprašalnika.",
+	"srv_merge_step1_noteb" 					=>	"Dodajanje podatkov je možno le za spremenljivke tekstovnih in numeričnih tipov ter vprašanja z enim in več odgovori.",
+	"srv_merge_step1_notec" 					=>	"Če želite dodati podatke za nove spremenljivke, jih je prvotno treba ustvariti v zavihku 'UREJANJE' - 'Vprašalnik'.",
+	"srv_merge_step1_noted" 					=>	"S premikanjem spremenljivk lahko spremenite vrstni red (od leve proti desni), v katerem boste vnesli podatke.",
+	"srv_merge_step2" 							=>	"2. korak: Izberite vir podatkov, ki jih želite vnesti:",
+	"srv_merge_step3" 							=>	"3. korak: Izberite polje, po katerem želite izvesti združevanje (ključ):",
+	"srv_merge_step4" 							=>	"4. korak: Vpišite ali kopirajte podatke:",
+	"srv_merge_step4_note" 						=>	"Podatke vnesite v tekstovni obliki, vsak zapis dodajte v svojo vrstico.<br />Če dodajate več polj, jih ločite z vejico in jih dodajajte v enakem vrstnem redu, kot ste jih označili zgoraj.",
+	"srv_merge_step4_xls" 						=>	"4. korak: Naložite podatke iz datoteke:",
+	"srv_merge_add" 							=>	"Združi podatke",
     
     "srv_append-merge_error_file" 				=>	"Napaka! Datoteka ne obstaja!",
     "srv_append-merge_added_1" 					=>	"Dodanih",
@@ -5911,8 +6165,8 @@ $lang = array (
     "srv_append-merge_process_2"			    =>	"vrstic podatkov",
     "srv_append-merge_process_o_1"			    =>	"V postopku bo združenih",
     "srv_append-merge_process_o_2"			    =>	"vrstic podatkov. Obstoječe vrednosti se bodo prepisale!",
-    "srv_append-merge_error_value"			    =>	"Pri združevanju po identifikatorju se nobena od vrednosti ne ujema.",
-    "srv_append-merge_fin"			            =>	"Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na večih straneh, izberite zadnjo stran)",
+    "srv_append-merge_error_value"			    =>	"Pri združevanju po ključu se nobena od vrednosti ne ujema.",
+    "srv_append-merge_fin"			            =>	"Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na večih straneh, izberite zadnjo stran).",
 
     "srv_question_respondent_comment"			=>	"Vaš komentar k vprašanju",
 	"1cul_select_file"							=>	"Izberite datoteko iz svojega ra&#269;unalnika",
@@ -5958,11 +6212,12 @@ $lang = array (
 	'srv_inv_pagination_shown'					=>	'Prikazanih ',
 	'srv_inv_pagination_shown_records'			=>	' zapisov na stran.',
 	'srv_inv_list_edit_header'					=>	'Urejanje seznamov',
+	'srv_inv_list_edit_list'		            =>	'Prikaži sezname',
 	'srv_inv_list_edit_from_this_survey'		=>	'Samo ta anketa',
 	'srv_inv_list_edit_from_all_surveys'		=>	'Vse moje ankete',
 	'srv_inv_list_edit_from_archive'			=>	'Arhivi pošiljanja',
 	'srv_inv_list_table_name'					=>	'Ime seznama',
-	'srv_inv_list_table_cnt_receive'			=>	'Št.prej.',
+	'srv_inv_list_table_cnt_receive'			=>	'Št. prej.',
 	'srv_inv_list_table_comment'				=>	'Komentar',
 	'srv_inv_list_table_date_create'			=>	'Datum kreiranja',
 	'srv_inv_list_table_author'					=>	'Avtor',
@@ -5986,7 +6241,7 @@ $lang = array (
 	'srv_recode_to_label'						=>	'labela',
 	'srv_recode_to_value'						=>	'vrednost',
 	'srv_recode_naknadnoVprasanje'				=>	'Naknadno vprašanje [-4]',
-	'srv_recode_note'							=>	'Rekodiranje je primerno za spremembo ali združevanje vrednosti numeričnih in kategorialnih spremenljvk, kot tudi za uvrstitev določene vrednosti med manjkajoče. Za večje posege priporočamo rekodiranje v novo spremenljivko. <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/rekodiranje?from1ka=1" target="_blank">Več >></a>',
+	'srv_recode_note'							=>	'Rekodiranje je primerno za spremembo ali združevanje vrednosti numeričnih in kategorialnih spremenljvk, kot tudi za uvrstitev določene vrednosti med manjkajoče. Za večje posege priporočamo rekodiranje v novo spremenljivko. <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/rekodiranje?from1ka=1" target="_blank">Več informacij.</a>',
 	'srv_recode_note_text'						=>	'Za tekstovne spremenljivke izberite kodiranje.',
 	'srv_recode_confirm_delete'					=>	'Ali ste prepričani da želite izbrisati rekodirane vrednosti?',
 	'srv_recode_confirm_delete_sub'				=>	'Ali želite pobrisati tudi rekodirano spremenljivko:',
@@ -6007,44 +6262,46 @@ $lang = array (
 	'srv_recoded_advancetNote_recoded2'			=>	' je že rekodirana v drugo spremenljivko: ',
 	'srv_recoded_advancetNote_recoded3'			=>	'Spremenljivka: ',
 	'srv_recoded_advancetNote_recoded4'			=>	' je že rekodirana iz druge spremenljivke, zato nadalnje rekodiranje ni mogoče.',
+	'srv_auto_coding_end_title'					=>	'Uspešno kodiranje',
 	'srv_auto_coding_end'						=>	'Uspešno ste kodirali <b>%s</b> vrednosti.<br><br>Za ogled rezultatov in  nadaljnje popravke kliknite na %s',
-	'srv_hand_coding_text'						=>	'Kliknite za izbrano vrednost v tabeli in jo spremenite (kodirajte) v oknu, ki se odpre <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kaksna-razlika-med-kodiranjem-rekodiranjem?from1ka=1" target="_blank">Več >></a>',
+	'srv_hand_coding_text'						=>	'Kliknite za izbrano vrednost v tabeli in jo spremenite (kodirajte) v oknu, ki se odpre. <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kaksna-razlika-med-kodiranjem-rekodiranjem?from1ka=1" target="_blank">Več informacij.</a>',
 	'srv_popup_title'							=>	'Vključitev ankete v pop-up oknu (znotraj istega okna brskalnika)',
 	'srv_grid_add'								=>	'Dodaj možni odgovor',
 	'srv_grid_remove'							=>	'Odstrani odgovor',
 	'srv_te_progressbar'						=>	'Vrstica/indikator napredka',
 	'srv_te_progressbar_show'					=>	'Prikaži vrstico/indikator napredka',
 	'srv_te_survey_text'						=>	'Besedilo ankete',
-	'srv_te_survey_h_text'						=>	'Besedilo naslova ankete',
+	'srv_te_survey_h_text'						=>	'Naslov ankete',
 	'srv_te_outer_frame'						=>	'Zunanji okvir',
 	'srv_te_question_text'						=>	'Besedilo vprašanja',
-	'srv_te_question_border'					=>	'Okvir vprasanja',
+	'srv_te_question'							=>	'Vprašanja',
+	'srv_te_question_border'					=>	'Obroba',
 	'srv_te_question_border_0'					=>	'Brez',
 	'srv_te_question_border_1'					=>	'Črta',
 	'srv_te_question_border_2'					=>	'Okvir',
-	'srv_te_answers_text'						=>	'Besedilo odgovorov',
+	'srv_te_answers_text'						=>	'Odgovori',
 	'srv_te_remove_setting'						=>	'Odstrani lastno nastavitev',
 	'srv_te_font_family'						=>	'Pisava',
 	'srv_te_font_size'							=>	'Velikost pisave',
 	'srv_te_font_color'							=>	'Barva pisave',
 	'srv_te_background_color'					=>	'Barva ozadja',
 	'srv_te_default'							=>	'Privzeta',
-    'srv_te_custom_checkbox_radio'				=>	'Ikone za osebni računalnik',
+    'srv_te_custom_checkbox_radio'				=>	'IZBIRNI GUMBI IN POTRDITVENA POLJA',
     'srv_te_custom_mobile_checkbox_radio'		=>	'Ikone za mobilni telefon',
-    'srv_te_custom_icon_pc'                     =>  'Velikost ikon checkbox/radio',
-    'srv_te_custom_icon_pc_color' 				=> 	'Barva ikon checkbox/radio',
-    'srv_te_custom_icon_mobile'                 =>  'Velikost ikon checkbox/radio',
-    'srv_te_custom_icon_mobile_color'           =>  'Barva ikon checkbox/radio',
+    'srv_te_custom_icon_pc'                     =>  'Velikost',
+    'srv_te_custom_icon_pc_color' 				=> 	'Barva',
+    'srv_te_custom_icon_mobile'                 =>  'Velikost',
+    'srv_te_custom_icon_mobile_color'           =>  'Barva',
     'srv_te_custom_icon_accessibility'          =>  'Accessibility ikone',
 	'srv_te_custom_glossary_popup'				=> 	'Oblaček pri slovarju',
 	'srv_te_custom_glossary_keywords'			=> 	'Ključna beseda pri slovarju',
-	'srv_te_custom_border_size'              	=>  'Velikost obrobe oblačka',
-	'srv_te_custom_border_style'              	=>  'Oblika obrobe oblačka',
-	'srv_te_custom_border_color'              	=>  'Barva obrobe oblačka',
-	'srv_te_custom_border_radius'              	=>  'Ostrina roba oblačka',
-	'srv_te_custom_background_keywords'			=> 	'Barva ozadja ključne besede',
-	'srv_te_custom_font_style_keywords'			=>  'Stil ključne besede',
-	'srv_te_custom_font_style_keywords_bold'	=>  'Odobeljeno',
+	'srv_te_custom_border_size'              	=>  'Velikost obrobe',
+	'srv_te_custom_border_style'              	=>  'Oblika obrobe',
+	'srv_te_custom_border_color'              	=>  'Barva obrobe',
+	'srv_te_custom_border_radius'              	=>  'Ostrina roba',
+	'srv_te_custom_background_keywords'			=> 	'Barva ozadja',
+	'srv_te_custom_font_style_keywords'			=>  'Stil',
+	'srv_te_custom_font_style_keywords_bold'	=>  'Odebeljeno',
 	'srv_te_custom_font_style_keywords_italic'	=> 	'Poševno',
 	'srv_te_custom_font_style_keywords_underline'=> 'Podčrtano',
 	'srv_mv_Neustrezno'							=>	'Neustrezno',
@@ -6062,15 +6319,19 @@ $lang = array (
 	'srv_te_base_theme'							=>	'Tema za osnovo',
 	'srv_te_profile_name'						=>	'Izbrana prilagoditev teme',
 	'srv_te_theme_edit'							=>	'Prilagodi',
-	'srv_te_no_profiles'						=>	'Nimate še lastnih tem. Za prilagoditev teme, kliknite na "Prilagodi" poleg imena trenutne teme. Uporabite lahko tudi naprednješe CSS urejanje teme.',
-	'srv_variableView_h_name'					=>	'Ime',
+	'srv_te_theme_activate'						=>	'Aktiviraj',
+	'srv_te_theme_activate2'					=>	'Aktiviraj temo',
+	'srv_te_theme_delete2'						=>	'Izbriši temo',
+	'srv_te_no_profiles'						=>	'Nimate še lastnih tem. Za prilagoditev teme kliknite na "Prilagodi" poleg imena trenutne teme. Uporabite lahko tudi naprednješe CSS urejanje teme.',
+	'srv_variableView_h_name'					=>	'Spremenljivka',
 	'srv_variableView_h_type'					=>	'Tip',
 	'srv_variableView_h_width'					=>	'Št. celih mest',
 	'srv_variableView_h_decimals'				=>	'Št. decimalk',
-	'srv_variableView_h_label'					=>	'Labela',
-	'srv_variableView_h_measure'				=>	'Merjenje',
+	'srv_variableView_h_label'					=>	'Vprašanje',
+	'srv_variableView_h_measure'				=>	'Merska lestvica',
 	'srv_save_set_theme'						=>	'Izberi to temo za temo ankete',
 	'srv_lnk_back_to_data'						=>	'Nazaj',
+	'srv_lnk_data'							    =>	'Pregled podatkov',
 	'srv_lnk_vpogled'							=>	'Vpogled',
 	'srv_lnk_pregled_variabel'					=>	'Spremenljivke',
 	'srv_lnk_ego'								=>	'Ego',
@@ -6085,6 +6346,7 @@ $lang = array (
 	'srv_show_continue_later'					=>	'Opcija za nadaljevanje kasneje',
 	'srv_themes_select'							=>	'Izbira teme',
 	'srv_themes_mod'							=>	'Prilagoditev teme',
+	'srv_themes_mod2'							=>	'Trenutno urejate temo',
 	'srv_themes_edit'							=>	'CSS urejanje teme',
 	'srv_themes_edit_warning'					=>	'Opozorilo! Urejanje teme na lastno odgovornost!',
 	'srv_themes_upload_css'						=>	'Naložite lasten CSS',
@@ -6112,7 +6374,7 @@ $lang = array (
 	'srv_editing_mode_new_anketa'				=>	'Način urejanja ankete',
 	'srv_editing_mode_new_anketa_0'				=>	'Osnovni način',
 	'srv_editing_mode_new_anketa_1'				=>	'Napredni način',
-	'srv_email_example_txt'						=>	'Če želite ta e-mail uporabljati za pošiljanje je treba v naprednih nastavitvah označiti, da je sistemski.',
+	'srv_email_example_txt'						=>	'Če želite ta e-mail uporabljati za pošiljanje, je treba v naprednih nastavitvah nastaviti, da je spremenljivka sistemska.',
 	'srv_prikaz_default_valid'					=>	'Privzeta izbira ustreznih enot:',
 	'srv_prikaz_showItime'						=>	'Prikaži datum respondenta:',
 	'srv_prikaz_showLineNumber'					=>	'Prikaži številko vrstice respondenta:',
@@ -6143,7 +6405,7 @@ $lang = array (
 	'srv_telephone_save_new'					=>	'Shrani kot nov profil',
 	'srv_telephone_save'						=>	'Shrani profil',
 	'srv_telephone_add'							=>	'Dodaj',
-	'srv_telephone_navi_dashboard'				=>	'Pregled',
+	'srv_telephone_navi_dashboard'				=>	'Analiza',
 	'srv_telephone_navi_add'					=>	'Dodaj',
 	'srv_telephone_navi_view'					=>	'Preglej',
 	'srv_telephone_navi_start_call'				=>	'Začni',
@@ -6158,7 +6420,7 @@ $lang = array (
 	'srv_telephone_respondents_unsubscribed'	=>	'Odjavljeno',
 	'srv_telephone_respondents_pass'			=>	'Geslo',
 	'srv_telephone_respondents_password'		=>	'PASSWORD',
-	'srv_telephone_respondents_status'			=>	'Status',
+	'srv_telephone_respondents_status'			=>	'Status klica',
 	'srv_telephone_respondents_ime'				=>	'Ime',
 	'srv_telephone_respondents_firstname'		=>	'FIRSTNAME',
 	'srv_telephone_respondents_lastname'		=>	'LASTNAME',
@@ -6166,7 +6428,7 @@ $lang = array (
 	'srv_telephone_respondents_custom'			=>	'CUSTOM',
 	'srv_telephone_respondents_priimek'			=>	'Priimek',
 	'srv_telephone_respondents_telefon'			=>	'Telefon',
-	'srv_telephone_respondents_phone'			=>	'PHONE',
+	'srv_telephone_respondents_phone'			=>	'Telefonska številka',
 	'srv_telephone_respondents_email'			=>	'EMAIL',
 	'srv_telephone_respondents_schedule_call_time'	=>	'Naslednji klic',
 	'srv_telephone_respondents_comment'			=>	'Komentar',
@@ -6181,16 +6443,26 @@ $lang = array (
 	'srv_telephone_table_call_status'			=>	'Status klica',
 	'srv_telephone_status_'						=>	'Uporabnik še ni bil kontaktiran',
 	'srv_telephone_status_A'					=>	'»A« - Respondent je začel z anketiranjem',
+	'srv_telephone_status_A2'					=>	'Začel',
 	'srv_telephone_status_U'					=>	'»U« - Uspešno zaključena anketa',
+	'srv_telephone_status_U2'					=>	'Zaključen',
 	'srv_telephone_status_T'					=>	'»T« - Dogovorjen za drug termin',
+	'srv_telephone_status_T2'					=>	'Prestavljen',
 	'srv_telephone_status_P'					=>	'»P« - Anketa je bila prekinjena',
+	'srv_telephone_status_P2'					=>	'Prekinjen',
 	'srv_telephone_status_R'					=>	'»R« - Zavrnil',
+	'srv_telephone_status_R2'					=>	'Zavrnil',
 	'srv_telephone_status_Z'					=>	'»Z« - Zaseden',
+	'srv_telephone_status_Z2'					=>	'Zaseden',
 	'srv_telephone_status_N'					=>	'»N« - Nedosegljiv',
+	'srv_telephone_status_N2'					=>	'Nedosegljiv',
 	'srv_telephone_status_D'					=>	'»D« - Preložen',
-	'srv_telephone_add_sample' 					=> "040 987 654,Janez,Novak,g.<br/>040 987 654,,,ga.",
+	'srv_telephone_status_D2'					=>	'Preložen',
+	'srv_telephone_add_sample' 					=> "000 111 222,Janez,Novak,<br/>000 333 444,,Novak",
+	'srv_telephone_call_start'				=>	'Začni s klicanjem',
 	'srv_telephone_call_available'				=>	'Prostih telefonskih številk na voljo:',
 	'srv_telephone_calling_number'				=>	'Kličete številko:',
+	'srv_telephone_calling_number_info'				=>	'Podatki',
 	'srv_telephone_calling_number_end'			=>	'Zaključujete številko:',
 	'srv_telephone_calling_next_step'			=>	'Izberite naslednji korak izmed naslednjih možnosti:',
 	'srv_telephone_calling_step_action'			=>	'<span class="strong red">Izberite kaj se je zgodilo:</span>',
@@ -6203,19 +6475,21 @@ $lang = array (
 	'srv_telephone_call_action_cant_edit_R'		=>	'Uporabnik je zavrnil sodelovanje v telefonski anketi!',
 	'srv_telephone_call_action_cancel_preview'	=>	'Prekliči',
 	'srv_telephone_call_action_undo_status'		=>	'Pobriši zadnji status respondenta',
-	'srv_telephone_call_introduction'			=>	'Uvod:',
-	'srv_telephone_call_comment'				=>	'Morebitni komentar anketarja na to številko:',
-	'srv_telephone_settings_access_list'		=>	'Seznam anketarjev in urednikov z dostopom:',
-	'srv_telephone_settings_access_list_link'	=>	' (podrobno lahko urednike urejate <a href="%s">tukaj</a>)',
-	'srv_telephone_no_respondents'				=>	'V bazi nimate respondentov z telefonskimi številkami.',
+	'srv_telephone_call_introduction'			=>	'Uvod',
+	'srv_telephone_call_comment'				=>	'Komentar anketarja na klic:',
+	'srv_telephone_call_anketar'				=>	'Anketar',
+	'srv_telephone_settings_access_list'		=>	'Seznam anketarjev in urednikov z dostopom',
+	'srv_telephone_settings_access_list_link'	=>	' (podrobno lahko urednike urejate <a href="%s">tukaj</a>):',
+	'srv_telephone_no_respondents'				=>	'V bazi nimate respondentov s telefonskimi številkami.',
 	'srv_telephone_dashboard_legend'			=>	'Sumarni pregled telefonske ankete:',
 	'srv_telephone_dashboard_legend_finished'	=>	'Sumarni pregled zaključenih anket:',
-	'srv_telephone_dashboard_legend_anketar'	=>	'Pregled stanja klicev po anketarjih:',
+	'srv_telephone_dashboard_legend_datum'	=>	'Počisti datum',
+	'srv_telephone_dashboard_legend_anketar'	=>	'Pregled stanja klicev po anketarjih',
 	'srv_telephone_dashboard_all_respondents'	=>	'Vseh enot s telefonsko številko:',
 	'srv_telephone_dashboard_all_contacted'		=>	'Vseh klicanih enot:',
 	'srv_telephone_dashboard_all_started'		=>	'Enot, ki so začele izpolnjevati:',
-	'srv_telephone_call_mark_T_note'			=>	'Številka je dogovorjena čez 60min,<br/>oziroma določite nov datum in ure.',
-	'srv_telephone_call_mark_P_note'			=>	'Številka je prekinjena za 60min,<br/>oziroma določite nov datum in ure.',
+	'srv_telephone_call_mark_T_note'			=>	'Številka je dogovorjena čez 60min, oziroma določite nov datum in uro.',
+	'srv_telephone_call_mark_P_note'			=>	'Številka je prekinjena za 60min, oziroma določite nov datum in uro.',
 	'srv_coding_one'							=>	'Kodiraj eno vrednost na odgovor',
 	'srv_coding_multi'							=>	'Kodiraj več vrednosti na odgovor',
 	'srv_profileManager_link'					=>	'Profili',	
@@ -6246,10 +6520,26 @@ $lang = array (
 	'srv_enote_navedbe_2'						=>	'Navedbe: vsaka enota se lahko upošteva večkrat; število navedb je lahko večje kot število enot.',
 	'srv_line_number'							=>	'Zap. št.',
 	'srv_dostop_users'							=>	'Dostop do ankete imajo',
+	'srv_dostop_users_list'						=>	'Seznam uporabnikov z dostopom do urejanja ankete',
+	'srv_dostop_users_username'					=>	'Uporabniško ime',
+	'srv_dostop_users_email'					=>	'Email naslov',
+	'srv_dostop_users_removeselected'			=>	'Odstrani označene',
 	'srv_dataIcons_multiple'					=>	'Kombinirana tabela',
 	'srv_incremental_lock_message'				=>	'Poteka priprava podatkov za pregled in analize. Prosimo počakajte trenutek!',
-	'srv_archive_test_data_count'				=>	'Število testnih podatkov: ',
-	'srv_archive_test_data_auto'				=>	'. Avtomatsko dodanih: ',
+	'srv_archive_test_data_text1'				=> 	'Vsak testni vnos podatkov (',
+	'srv_archive_test_data_text1a'				=> 	'\'TESTIRANJE\' - \'Avtomatski vnosi\'',
+	'srv_archive_test_data_text2'				=> 	' ali ',
+	'srv_archive_test_data_text2a'				=> 	'ročni testni vnos',
+	'srv_archive_test_data_text3'				=>	') se avtomatsko shrani v spodnjo časovnico.',
+	'srv_archive_test_data_count'				=>	'Število testnih vnosov',
+	'srv_archive_test_data_date'				=>	'Datum testnih vnosov',
+	'srv_archive_test_data_timeline_manual'		=>	'Časovnica ročnih testnih vnosov za vprašalnik ',
+	'srv_archive_test_data_timeline_auto'		=>	'Časovnica avtomatskih testnih vnosov za vprašalnik ',
+	'srv_archive_test_data_none1'				=>	'V vprašalniku ',
+	'srv_archive_test_data_none2'				=>	' še ni ',
+	'srv_archive_test_data_none_manual'		=>	'ročnih ',
+	'srv_archive_test_data_none_automatic'			=>	'avtomatskih ',
+	'srv_archive_test_data_none3'				=>	'testnih vnosov',
 	'srv_inv_condition_filter'					=>	'Pogoji: ',
 	'srv_inv_condition_no_filter'				=>	'Brez ',
 	'srv_inv_condition_new_filter'				=>	'Nov filter',
@@ -6278,6 +6568,7 @@ $lang = array (
 	'srv_test_sett_txt'							=>	'Uredniške nastavitve testiranja in komentarjev',
 	'srv_users_viewing'							=>	'aktivnih urednikov',
 	'srv_users_viewing2'						=>	'Trenutno aktivni uredniki',
+	'srv_users_viewing3'						=>	'Število aktivnih urednikov',
 	'srv_users_add_new'							=>  'Nov uporabnik',
 	"srv_users_add_new_title"					=>	'Ustvarite novega uporabnika v sistemu <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span>',
 	'srv_users_add_assigned'					=>  'Dodajte pregled nad uporabniki',
@@ -6285,9 +6576,9 @@ $lang = array (
 	'srv_users_add_assigned_max_reached'		=>  'Dosegli ste maksimalno število uporabnikov v pregledu.',
 	'srv_users_add_assigned_max_1'				=>  'Dostop do vaše domene lahko dodelite največ',
 	'srv_users_add_assigned_max_2'			    =>  'uporabnikom.',
-	"srv_users_add_assigned_title"				=>	'Ustvarite novega uporabnika nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span></span>',
+	"srv_users_add_assigned_title"				=>	'Ustvarite novega uporabnika, nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span></span>',
 	"srv_users_assigned_title"				    =>	'Uporabniki nad katerimi imate pregled',
-	'srv_uredniske_nastavitve'					=>	'Uredniške nastavitve',
+	'srv_uredniske_nastavitve'					=>	'Uredniške nastavitve testiranja',
 	'srv_q_inicialke'							=>	'Respondenti naj vnesejo tudi svoje inicialke',
 	'srv_q_inicialke_alert'						=>	'Opozorilo za inicialke',
 	'srv_enter_inicialke'						=>	'Prosimo, vnesite še vaše inicialke (zgoraj desno)',
@@ -6368,7 +6659,8 @@ $lang = array (
 	'srv_data_column_naslov_map'				=>	'Naslov',
 	'srv_data_column_vrednost_map'				=>	'Vrednost',
 	'srv_data_column_koordinate_map'			=>	'Koordinate',
-	'srv_comments_on_alert'						=>	'Komentarji so sedaj vklopljeni.',
+	'srv_comments_on_alert'						=>	'Komentarji so sedaj vklopljeni',
+	'srv_comments_on_alert1'					=>	'Če vklop komentarjev ni bil storjen namerno, lahko komentarje izklopite',
 	'srv_comments_on_alert2'					=>	'Dodatne nastavitve lahko uredite spodaj.',
 	'srv_off'									=>	'Izklopi',
 	'srv_para_neodgovori'						=>	'Neodgovor spremenljivke',
@@ -6423,7 +6715,7 @@ $lang = array (
 	'srv_edits_analysis_num_sessions'			=>	'Število seans',
 	'srv_edits_analysis_editing_details'		=>	'Podrobnosti urejanja',
 	'srv_edits_analysis_graph'					=>	'Graf urejanja',
-	'srv_cookie_alert_title'					=>	'<b>Pozor!</b>',
+	'srv_cookie_alert_title'					=>	'Uporaba piškotkov',
 	'srv_cookie_alert_1'						=>	'Vklopili ste piškotke oziroma kukije (cookies).',
 	'srv_cookie_alert_2'						=>	'Preverite, če jih res potrebujete, posebej pa preverite potencialen konflikt z drugimi identifikatorji! <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/nastavitve-za-dostop-respondentov-piskotki-ip-naslovi-gesla-sistemsko-prepoznavanja?from1ka=1" target="_blank">Več >></a>',
 	'srv_cookie_alert'							=>	'Respondent bo ob prihodu na stran dobil obvestilo, da stran uporablja piškotke! <a href="https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/politika-zasebnosti?from1ka=1" target="_blank">Več >></a>',
@@ -6438,12 +6730,14 @@ $lang = array (
 	'srv_privacy_text_1'						=>	'S klikom na Naslednja stran se strinjate z našo <a href="https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/politika-zasebnosti?from1ka=1" target="_blank">Politiko zasebnosti</a>.',
 	'srv_privacy_text_2'						=>	'Strinjam se s <a href="https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/politika-zasebnosti?from1ka=1" target="_blank">Politiko zasebnosti</a>.',
 	'srv_comment_splosen'						=>	'Splošen komentar',
-	'srv_iz_seznama'							=>	'Iz seznama (ločeno z vejico)',
-	'srv_iz_excela'								=>	'Iz Excelove datoteke (v formatu .xls)',
+	'srv_appendmerge_source'					=>	'Vir podatkov - podatke bom:',
+	'srv_iz_seznama'							=>	'Vnesel iz seznama (ločeno z vejico)',
+	'srv_iz_excela'								=>	'Uvozil iz Excelove datoteke (v formatu .xls)',
 	'srv_iz_excela_xls_error'					=>	'Napačen format datoteke! Datoteka mora biti v formatu .xls.',
-	'srv_izberite_identifikator'				=>	'Izberite polje po katerem želite izvesti združevanje (identifikator):',
+	'srv_izberite_identifikator'				=>	'Izberite polje, po katerem želite izvesti združevanje (ključ):',
 	'srv_show'									=>	'Prikaži',
 	'srv_recnum'								=>	'Zap. št.',
+	'srv_recnum_long'							=>	'Zaporedna številka respondenta',
 	'srv_recnum2'								=>	'Recnum',
 	'srv_aapor'									=>	'AAPOR kalkulacije',
 	'srv_languages_statistics'					=>	'Statistika jezikov',
@@ -6469,12 +6763,12 @@ $lang = array (
 	'srv_email_setting_encryption_none'			=>  'Brez',
 	'srv_email_setting_encryption_ssl'			=>  'SSL',
 	'srv_email_setting_encryption_tls'			=>  'TLS',
-	'srv_email_setting_port'					=>  'Vrata: ',
-	'srv_email_setting_port_note'				=>  '(V večini primerov, standardna vrata: 25, 465 ali 587)',
+	'srv_email_setting_port'					=>  'Vrata ',
+	'srv_email_setting_port_note'				=>  '(v večini standardna: 25, 465, 587)',
 	'srv_email_setting_host'					=>  'Strežnik: ',
 	'srv_email_setting_btn_test'				=>  'Preveri nastavitve',
 	'srv_email_setting_btn_save'				=>  'Shrani',
-	'srv_email_setting_smtp_delay'				=>  'Časovni zamik pri posameznem pošiljanju',
+	'srv_email_setting_smtp_delay'				=>  'Čas. zamik pri posam. pošiljanju',
 	'srv_parapodatki'							=>	'Napredni parapodatki',
 	'pasteFromWordAlert'						=>	'<b>Kopiranje besedila močno odsvetujemo!</b> <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/zakaj-priporocljivo-kopiranje-besedila?from1ka=1" target="_blank">Več >></a>',
 	'srv_interaktivni_elementi'					=>	'Interaktivni elementi',
@@ -6486,7 +6780,7 @@ $lang = array (
 	'srv_para_show_rows_other'					=>	'Prikaži polja "drugo"',
 	'srv_para_show_rows_text'					=>	'Prikaži polja tipa "besedilo"',
 	'srv_para_variable'							=>	'Spremenljivka',
-	'srv_para_question'							=>	'Vprašanje',
+	'srv_para_question'							=>	'Labela',
 	'srv_para_valid'							=>	'Veljavni',
 	'srv_para_approp'							=>	'Ustrezni',
 	'srv_para_nonconceptual'					=>	'Prikazano',
@@ -6495,6 +6789,7 @@ $lang = array (
 	'srv_para_unaswered'						=>	'Neodgovor spremenljivk',
 	'srv_para_unaswered_short'					=>	'NS',
 	'srv_para_unaswered_graph_title'			=>	'Neodgovor spremenljivke (NS) - grafični prikaz', #'Grafični prikaz stopnje neodgovora spremenljivke (%)',
+	'srv_para_unaswered_graph_title_br'			=>	'Neodgovor spremenljivke<br>(NS) - grafični prikaz',
 	'srv_para_breaks'							=>	'Prekinitve',
 	'srv_para_breaks_delta'						=>	'Porast prekinitve',
 	'srv_para_breaks_value'						=>	'Stopnja prekinitev',
@@ -6506,12 +6801,12 @@ $lang = array (
 	'srv_para_breaks_value_bruto_short'			=>	'BSP<br/>[%]',
 	'srv_para_breaks_value_neto_short'			=>	'NSP<br/>[%]',
 	'srv_para_breaks_graph_title'				=>	'Stopnja prekinitve (SP) - grafični prikaz', #'Grafični prikaz stopnje neodgovora spremenljivke (%)',
-	'srv_para_show_question_advanced'			=>	'Prikaži besedilo vprašanja',
-	'srv_para_show_show_graph_advanced'			=>	'Prikaži grafe',
-	'srv_para_show_question_basic'				=>	'Prikaži besedilo vprašanja',
-	'srv_para_show_show_graph_basic'			=>	'Prikaži graf',
-	'srv_para_show_question_breaks'				=>	'Prikaži besedilo vprašanja',
-	'srv_para_show_show_graph_breaks'			=>	'Prikaži graf',
+	'srv_para_show_question_advanced'			=>	'Labela',
+	'srv_para_show_show_graph_advanced'			=>	'Graf',
+	'srv_para_show_question_basic'				=>	'Labela',
+	'srv_para_show_show_graph_basic'			=>	'Graf',
+	'srv_para_show_question_breaks'				=>	'Labela',
+	'srv_para_show_show_graph_breaks'			=>	'Graf',
 	'srv_para_close_settings'					=>	'Zapri nastavitve',
 	'srv_para_graph_type'						=>	'V grafu prikaži',
 	'srv_para_graph_type0'						=>	'Stopnjo prekinitve',
@@ -6550,7 +6845,8 @@ $lang = array (
 	'srv_para_graph_ustrezni'					=>	'Ustrezni',
 	'srv_para_graph_text'						=>	'Parapodatki beležijo tehnične lastnosti respondentove naprave, preko katere odgovarja na anketo. <a href="https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/status/parapodatki" target="_blank">Več >></a>',
 	'srv_other_size'							=>	'Polje drugo',
-	'srv_predvidenicasi_help'					=>	'<p>Vsem uporabnikom lastne inštalacije 1KA odsvetujemo spreminjanje časovnih nastavitev, saj se bo z vsako posodobitvijo verzije vsebina prepisala. Za spremembo obvestite <a href="https://www.1ka.si/d/sl/o-1ka/kontakt" target="_blank">Center za pomoč</a>.</p>',
+	'srv_predvidenicasi_help'					=>	'Vsem uporabnikom lastne inštalacije 1KA odsvetujemo spreminjanje časovnih nastavitev, saj se bo z vsako posodobitvijo verzije vsebina prepisala. Za spremembo obvestite <a href="https://www.1ka.si/d/sl/o-1ka/kontakt" target="_blank">Center za pomoč</a>.',
+	'srv_predvidenicasi_note'					=>	'V spodnji tabeli je za vsak tip vprašanja predviden čas, ki ga respondent porabi za vprašanje in odgovore. Izračuni so narejeni glede na število znakov, ki jih vsebuje vprašanje.',
 	'srv_replay_to'								=> 	'Odgovor za',
 	'srv_noSurvey_settings'						=> 	'Vpiši osnovne značilnosti ankete',
 	'srv_noSurvey_skin'							=> 	'Izberi vizualno predlogo ankete',
@@ -6599,13 +6895,14 @@ $lang = array (
 	'srv_zanka_settings'						=>	'Nastavitve skupin',
 	'srv_missing_settings'						=>	'Nastavitve manjkajočih vrednosti',
 	'srv_preview'								=>	'Predogled',
-	'srv_preview_mobile'						=>	'Mobilnik',
+	'srv_preview_computer'						=>	'Računalnik',
+	'srv_preview_mobile'						=>	'Mobitel',
 	'srv_preview_tablet'						=>	'Tablica',
 	'srv_all_vars'								=>	'Vse variable',
 	'srv_default_without'						=>	'Privzeto - brez',
 	'srv_survey_info'							=>	'Podatki o anketi',
-	'srv_monitor_toolbox_title'					=>	'Predogled in testni vnosi',
-	'srv_monitor_toolbox_preview'				=>	'brez komentarjev in shranjevanja vnosov',
+	'srv_monitor_toolbox_title'					=>	'Predogled ankete',
+	'srv_monitor_toolbox_preview'				=>	'Predogled brez komentiranja in shranjevanja vnosov.',
 	'srv_monitor_toolbox_test'					=>	'možnost komentiranja, shranjevanje testnih vnosov',
 	'sort_by_title'								=>	'Naslov ankete',
 	'sort_by_qcount'							=>	'Število vprašanj',
@@ -6655,13 +6952,16 @@ $lang = array (
 	'more'										=>	'še',
 	'more2'										=>	'Več',
 	'srv_settings_activity'						=>	'Aktivnost / kvote',
-	'srv_settings_autoActiveSurvey'				=>	'Anketa je ob kreaciji aktivna',
-	'srv_settings_activeComments'				=>	'Komentarji so ob kreaciji vklopljeni',
+	'srv_settings_oncreation'					=>	'Ob kreaciji ankete',
+	'srv_settings_onactivation'					=>	'Ob aktivaciji ankete',
+	'srv_settings_autoActiveSurvey'				=>	'Anketa je aktivna',
+	'srv_settings_activeComments'				=>	'Komentarji so vklopljeni',
 	'srv_settings_advancedMySurveys'			=>	'Napredni vmesnik za "Moje ankete"',
-	'srv_settings_oneClickCreate'				=>	'Možnost enklik kreiranja ankete',
-	'srv_settings_language_shortcut' 			=> 	'Prikaži ikono za izbiro jezika v statusni vrstici ankete',
-	'srv_settings_showSAicon'					=> 	'Prikaži ikono za hitro aktiviranje SA modula',
-	'srv_language_mySurveys'					=>	'Jezik za "Moje ankete" lahko urejate v <a href="index.php?a=nastavitve&m=global_user_settings"><b>nastavitvah uporabnika</b></a>',
+	'srv_settings_interfaceshow'				=>	'V vmesniku prikaži',
+	'srv_settings_oneClickCreate'				=>	'Možnost kreiranja ankete z enim klikom (ENKLIK kreiranje)',
+	'srv_settings_language_shortcut' 			=> 	'Ikono za izbiro jezika v statusni vrstici ankete',
+	'srv_settings_showSAicon'					=> 	'Ikono za hitro aktiviranje SA modula',
+	'srv_language_mySurveys'					=>	'Jezik za "Moje ankete" lahko urejate v <a href="index.php?a=nastavitve&m=global_user_settings">nastavitvah uporabnika</a>',
 	'srv_public_link_title'						=>	'Javne povezave do podatkov',
 	'srv_public_link_noLink'					=>	'Anketa še nima povezav!',
 	'srv_public_link_addLink'					=>	'Dodaj novo povezavo',
@@ -6770,9 +7070,9 @@ $lang = array (
 	'edit_hide'			                		=>  "Skrij",
 	'edit_show'			                		=>  "Prikaži",
 	'srv_show_title'			               	=>  "Naslov ankete za uporabnike",
-	'srv_create_show_intro'			            =>  "Uvod je ob kreaciji prikazan",
-	'srv_create_show_concl'			            =>  "Zaključek je ob kreaciji prikazan",
-	'srv_create_show_title'			            =>  "Naslov ankete je ob kreaciji prikazan za respondente",
+	'srv_create_show_intro'			            =>  "Uvod je viden respondentom",
+	'srv_create_show_concl'			            =>  "Zaključek je viden respondentom",
+	'srv_create_show_title'			            =>  "Naslov ankete je viden respondentom",
 	'srv_displayData_search'		            =>  "Podatki so filtrirani",
 	'srv_signature_clear'		            	=>  "Počisti podpis",
 	'srv_signature_name'		            	=>  "Podpis osebe:",
@@ -6978,17 +7278,23 @@ $lang = array (
 	'srv_notifications'							=>	"Sporočila",
 	'srv_notifications_recieved'				=>	"Prejeta sporočila",
 	'srv_notifications_sent'					=>	"Poslana sporočila",
-	'srv_notifications_sent_resolve'			=>	"Razreši neprebrane",
+	'srv_notifications_sent_none'				=>	"Ni poslanih sporočil",
+	'srv_notifications_sent_success'			=>	"Sporočilo je bilo uspešno poslano uporabniku",
+	'srv_notifications_sent_nouser1'			=>	"Vnešeni e-mail (",
+	'srv_notifications_sent_nouser2'			=>	") ne pripada nobenemu uporabniku!",
+	'srv_notifications_sent_resolve'			=>	"Ne prikazuj več uporabnikom",
 	'srv_notifications_unread'					=>	"Neprebrana sporočila",
 	'srv_notifications_alert'					=>	"Imate novo neprebrano sporočilo!",
 	'srv_notifications_admin_alert'				=>	"Pošiljanje je omogočeno samo administratorjem!",
-	'srv_notifications_send_reciever'			=>	"Prejemnik (e-pošta)",
+	'srv_notifications_send_reciever2'			=>	"Prejemnik (e-pošta)",
+	'srv_notifications_send_reciever2'			=>	"Prejemniki",
 	'srv_notifications_send_title'				=>	"Naslov",
-	'srv_notifications_send_text'				=>	"Besedilo",
+	'srv_notifications_send_text'				=>	"Sporočilo",
 	'srv_notifications_send'					=>	"Pošlji",
 	'srv_notifications_save_send'				=>	"Shrani in pošlji",
-	'srv_notifications_send_all_slo'			=>	"Pošlji vsem slovenskim uporabnikom",
-	'srv_notifications_send_all_ang'			=>	"Pošlji vsem angleškim uporabnikom",
+	'srv_notifications_send_all_slo'			=>	"Vsi slovenski uporabniki",
+	'srv_notifications_send_all_ang'			=>	"Vsi angleški uporabniki",
+	'srv_notifications_send_custom'				=>	"E-poštni naslov po meri:",
 	'srv_notifications_force_show'				=>	"Prikaži obvestilo avtomatsko po prijavi",
 	'slider_min_label_note'						=>	"Labela za Min",
 	'slider_max_label_note'						=>	"Labela za Max",
@@ -7018,11 +7324,12 @@ $lang = array (
 	'srv_newSurvey_survey_new'	      	 	=> "Nova anketa",
 	'srv_newSurvey_survey_new2'	      	 	=> "Ustvari novo anketo",
 	'srv_newSurvey_survey_new_folder' 	 	=> "Shrani anketo v mapo",
-	'srv_newSurvey_survey_new_folder_def' 	=> "Izberi mapo",
+	'srv_newSurvey_survey_new_folder_def' 	=> "-- Izberi mapo --",
 	'srv_newSurvey_survey_template'	       	=> "1KA predloge",
 	'srv_newSurvey_survey_template2'	    => "Ustvari anketo iz predloge",
 	'srv_newSurvey_survey_template_type'	=> "Tip ankete",
 	'srv_newSurvey_survey_template_preview'	=> "Predogled",
+	'srv_newSurvey_survey_template_choose'	=> "Izberi predlogo",
 	'srv_newSurvey_survey_template_cat0'	=> "Vse predloge",
 	'srv_newSurvey_survey_template_cat1'	=> "Evalvacija spletne strani",
 	'srv_newSurvey_survey_template_cat2'	=> "Izobraževanje",
@@ -7037,17 +7344,22 @@ $lang = array (
 	'srv_newSurvey_survey_template_error'	=> "Prosimo izberite predlogo",
 	'srv_newSurvey_survey_copy'	    		=> "Moje 1KA ankete",
 	'srv_newSurvey_survey_copy_title'	    => "Kopiraj svojo obstoječo anketo",
+	'srv_newSurvey_survey_copy_paragraph'	    => "Iz seznama izberi anketo in klikni gumb \"Naprej\". Ustvarila se bo kopija izbrane ankete.",
+	'srv_newSurvey_survey_copy_dropdown'	    => "-- Izberi anketo --",
 	'srv_newSurvey_survey_copy_text'	    => "Naslov obstoječe ankete",
-	'srv_newSurvey_survey_archive'	       	=> "Uvoz \".1ka\" format",
+	'srv_newSurvey_survey_archive'	       	=> "Uvoz .1ka datoteke",
+	'srv_newSurvey_survey_archive_choosefile'	       	=> "Izberi datoteko",
 	'srv_newSurvey_survey_archive2'	       	=> "Uvozi 1ka anketo iz arhiva",
-	'srv_newSurvey_survey_archive_title'   	=> "Uvozi 1ka anketo (restavriraj anketo iz arhivske datoteke)",
+	'srv_newSurvey_survey_archive_title'   	=> "Restavriraj anketo iz arhivske .1ka datoteke",
 	'srv_newSurvey_survey_archive_text'   	=> "Iz arhivske datoteke se bo ustvarila kopija arhivirane ankete",
-	'srv_newSurvey_survey_archive_text2'   	=> "Uvozite lahko anketo, ki ste jo iz arhiva predhodno shranili kot datoteko v formatu .1ka.",
+	'srv_newSurvey_survey_archive_text2'   	=> "Uvozi se lahko anketa, ki je bila v arhivu predhodno shranjena kot datoteka s končnico .1ka.",
 	'srv_newSurvey_survey_archive_error1'  	=> "Pri uvozu ankete je prišlo do napake. Preverite, če ste izbrali ustrezno datoteko s končnico .1ka.",
 	'srv_newSurvey_survey_archive_error2'  	=> "Pri uvozu ankete je prišlo do napake. Zbrane datoteke ni mogoče uvoziti.",
 	'srv_newSurvey_survey_from_text'	    => "Uvoz besedila",
 	'srv_newSurvey_survey_from_text_title'	=> "Prilepi besedilo",
-	'srv_newSurvey_survey_from_text_text'	=> "Med vprašanji mora biti prazna vrstica.<br><br>Za vsako vprašanje morajo biti kategorije odgovorov v svoji vrstici. V primeru tabele je v svoji vrstici vsako vprašanje.<br><br>Ostale vidike se uredi v urejanju (npr. sprememba vprašanja v tabelo podvprašanj, sprememba radio gumbov v checbox).",
+	'srv_newSurvey_survey_from_text_text1'	=> "Za vsako vprašanje morajo biti kategorije odgovorov v svoji vrstici. V primeru tabele je v svoji vrstici vsako vprašanje.",
+	'srv_newSurvey_survey_from_text_text2'	=> "Med vprašanji mora biti prazna vrstica.",
+	'srv_newSurvey_survey_from_text_text3'	=> "Ostale podrobnosti se lahko uredi po uvozu ankete (npr. sprememba vprašanja v tabelo podvprašanj, sprememba radio gumbov v checkbox).",
 	'srv_newSurvey_survey_from_text_example'	=> "Naslov vprašanja 1\r\nVrednost 1\r\nVrednost 2\r\nVrednost 3\r\n\r\nNaslov vprašanja 2\r\nVrednost 1\r\nVrednost 2\r\nVrednost 3",
 	
 	
@@ -7374,8 +7686,9 @@ $lang = array (
 	'srv_diferencial_trak_starting_num'			=>	"Trak začni s številom",
 	'srv_api'				=> 	"API",
 	'srv_api_auth'			=> 	"Pridobitev ključa za API",
-	'srv_api_auth2'			=> 	"Generiraj",
+	'srv_api_auth2'			=> 	"Generiranje ključa",
 	'srv_api_auth_title'	=> 	"Podatki za API dostop",
+	'srv_api_auth_private'	=> 	"Zasebni ključ",
 	'srv_login_tracking_title'	=> 	"Zgodovina prijav",
 	'srv_login_tracking_noData'	=> 	"Ni podatkov o prijavah",
 	'srv_login_tracking_time'	=> 	"Ura prijave",
@@ -7383,6 +7696,8 @@ $lang = array (
 	'srv_last_login'			=> 	"Zadnja prijava",
 	'ob'			=> 	"ob",
     'srv_profil_aai_warning'    => '1KA profil je vezan na vaš AAI račun. Vse spremembe urejate v vašem AAI profilu.',
+    'srv_profil_settings_text'    => 'Uporabniške podatke, ki ste jih nastavili ob prijavi, lahko spreminjate tukaj. Za vsako spremembo je obvezen vpis in potrditev gesla.',
+    'srv_profil_settings_addemail'    => 'Dodaj e-mail',
 	'srv_drag_and_drop_new_look_option'      				=>	"Prikaži odgovore v obliki",
 	'srv_drag_and_drop_new_look_option1'      				=>	"okvirjev",
 	'srv_drag_and_drop_new_look_option2'      				=>	"škatel",
@@ -7438,7 +7753,7 @@ $lang = array (
 	'srv_export_no_chart' => "Ni ustreznega grafa za prikazovanje",
 	'srv_export_2_xls_button' => "Izvozi v Excel",
 	'srv_pc_unavailable' => "Prikaz slike ni mogoč",
-    "additional_info_api"       =>      "<a href=\"https://www.1ka.si/d/sl/o-1ka/1ka-api\" target=\"_blank\"><span class=\"bold\">Dodatne informacije</span></a>",
+    "additional_info_api"       =>      "<a href=\"https://www.1ka.si/d/sl/o-1ka/1ka-api\" target=\"_blank\"><p>Dodatne informacije</p></a>",
 
     
 
@@ -7450,7 +7765,7 @@ $lang = array (
     'as_modules'    => "Nastavitve dodatnih modulov",
 
     'as_debug'              => "Debug mode",
-    'as_installation_type'  => "Tip namestitve (0-lastna, 1-www, 2-aai, 3-virtualka)",
+    'as_installation_type'  => "Tip namestitve",
 
     'as_app_settings-app_name'              => "Ime aplikacije",
     'as_app_settings-admin_email'           => "Email administratorja",
@@ -7551,8 +7866,14 @@ $lang = array (
     'srv_narocilo_paket'                => "Paket",
     'srv_narocilo_trajanje'             => "Trajanje",
     'srv_narocilo_trajanje_mesecev'     => "mesecev",
+	'srv_narocilo_trajanje_1'     => "mesec",
+    'srv_narocilo_trajanje_2'     => "meseca",
+    'srv_narocilo_trajanje_3_4'     => "meseci",
+    'srv_narocilo_trajanje_5'     => "mesecev",
+    'srv_narocilo_veljavnodo'     => "Paket veljaven do:",
     'srv_narocilo_cena_brez_popusta'    => "Cena brez popusta",
     'srv_narocilo_cena'                 => "Končna cena",
+    'srv_narocilo_samo_cena'                 => "Cena",
     'srv_narocilo_popust'               => "Popust",
     'srv_narocilo_nacin_placila'        => "Način plačila",
     'srv_narocilo_nacin_placila_1'      => "Bančno nakazilo",
@@ -7649,8 +7970,9 @@ $lang = array (
     // DOSTOP GLEDE NA PAKET
     'srv_access_no_access_not_author' => "Avtor ankete nima zakupljenega ustreznega paketa, ki vključuje to funkcionalnost.",
     'srv_access_no_access'          => "Funkcionalnost je na voljo samo v plačljivi verziji orodja 1KA v paketu",
-	'paket_opis_2ka'				=> "Napredni (2KA)",
-	'paket_opis_3ka'				=> "Profesionalni (3KA)",
+	'paket_opis_1ka'				=> "Osnovni 1KA",
+	'paket_opis_2ka'				=> "Napredni 2KA",
+	'paket_opis_3ka'				=> "Profesionalni 3KA",
     'srv_access_package'            => "Aktivni paket",
     'srv_access_package_free'       => "brezplačno",
     'srv_access_package_valid'      => "velja do",
@@ -7690,7 +8012,6 @@ $lang = array (
     'simple_footer_about_cookies'   => "<a href=\"https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/politika-piskotkov\" target=\"_blank\">Politika piškotkov</a>",
     'simple_footer_about_antispam'  => "<a href=\"https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/antispam-politika\" target=\"_blank\">Antispam politika</a>",
     'simple_footer_about_follow'    => "Spremljajte nas",
-	'simple_footer_namestitev'    => "Namestitev omogočajo",
 
     'simple_footer_company'         => "Organizacija",
     'simple_footer_company_contact' => "Kontakt",
@@ -7699,8 +8020,7 @@ $lang = array (
     'simple_cookie_1'     => "Spletno mesto uporablja piškotke zaradi boljše uporabniške izkušnje.",
     'simple_cookie_2'     => "Z uporabo naše spletne strani potrjujete, da se z njihovo uporabo strinjate. <a href=\"https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-1ka/politika-piskotkov\">Več o uporabi piškotkov >></a>",
     'simple_cookie_button'=> "Da, strinjam se",
-	
-	
+
 	
 	// GDPR //
 	'srv_gdpr' => "GDPR",
@@ -7708,11 +8028,11 @@ $lang = array (
 	'srv_gdpr_general_settings' => "Splošne GDPR nastavitve",
 	'srv_gdpr_general_settings_warning' => "Prosimo izpolnite osebne podatke GDPR profila!",
 	'srv_gdpr_user_settings' 		=> "Splošne nastavitve",
-	'srv_gdpr_user_settings_title' 	=> "GDPR nastavitve profila",
-	'srv_gdpr_user_settings_desc1' 	=> "S 25. majem 2018 je v veljavi nova Splošna uredba o varstvu podatkov (<a href=\"http://www.eugdpr.org/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>), ki opredeljuje tudi način zbiranja podatkov in respondentom zagotavlja možnost izbrisa, vpogleda, prenosa, omejitve obdelave ali spremembe zbranih osebnih in/ali anketnih podatkov.",
+	'srv_gdpr_user_settings_title' 	=> "Splošne GDPR nastavitve",
+	'srv_gdpr_user_settings_desc1' 	=> "S 25. majem 2018 je v veljavi nova Splošna uredba o varstvu podatkov (<a href=\"https://gdpr.eu/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>), ki opredeljuje tudi način zbiranja podatkov in respondentom zagotavlja možnost izbrisa, vpogleda, prenosa, omejitve obdelave ali spremembe zbranih osebnih in/ali anketnih podatkov.",
 	'srv_gdpr_user_settings_desc2' 	=> "V skladu s tem je na vaši strani, kot izvajalcu ankete in s tem upravljalcu osebnih podatkov, <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/pravice-respondentov-odgovornosti-urednikov-anket-okviru-gdpr\" target=\"_blank\"><span class=\"bold\">odgovornost</span></a>, da izvršite omenjene zahteve, ki jih na vaših anketah podajo respondenti (zahteva za izbris, vpogled ali spremembo osebnih in/ali anketnih podatkov).",
 	'srv_gdpr_user_settings_desc3' 	=> "Prosimo vas, da izpolnite spodnji obrazec s svojimi podatki. Podatke potrebujemo za pripravo informacij, ki morajo biti v skladu z GDPR na voljo posamezniku (respondentu). Če gre za organizacijo, vnesite tudi podatke o pooblaščeni osebi za varstvo osebnih podatkov (<a href=\"https://www.uradni-list.si/e-bilten/novica/pooblascena-oseba-za-varstvo-podatkov\" target=\"_blank\"><span class=\"bold\">DPO</span></a>). Vnesene podatke bomo uporabili zgolj za namene procesiranja zahtevkov.",
-	'srv_gdpr_user_settings_err' 	=> "Polja \"Ime\", \"Priimek\" in \"E-pošta\" so obvezna!",
+	'srv_gdpr_user_settings_err' 	=> "Polja označena z * so obvezna.",
 	'srv_gdpr_user_settings_err2' 	=> "Polji \"Ime organizacije\" in \"Matična številka\" sta obvezni!",
 	'srv_gdpr_user_settings_type' 	=> "Organizacija ali zasebnik",
 	'srv_gdpr_user_settings_type_0'	=> "Zasebnik",
@@ -7735,52 +8055,55 @@ $lang = array (
 	'srv_gdpr_user_settings_country_select' => "Izberi državo",
 	'srv_gdpr_user_settings_authority' => "Informacijski pooblaščenec",
 	'srv_gdpr_survey_list' 			=> "Seznam anket",
-	'srv_gdpr_survey_list_text' 	=> "Spodaj je seznam vseh vaših anket. Z rožnato barvo in vrednostjo 1 (v stolpcu Potencialno GDPR) so označene vse ankete, pri katerih je orodje 1KA zaznalo prisotnost vprašanj, ki bi lahko vsebovala GDPR občutljive podatke.",
+	'srv_gdpr_survey_list_text' 	=> "Spodaj je seznam vseh vaših anket. Z ozadjem svetlo rdeče barve in vrednostjo “Da” (v stolpcu Potencialno GDPR) so označene vse ankete, pri katerih je orodje 1KA zaznalo prisotnost vprašanj, ki bi lahko vsebovala GDPR občutljive podatke.",
 	'srv_gdpr_survey_list_text2' 	=> "Za GDPR se preverja:",
 	'srv_gdpr_survey_list_li_1' 	=> "email vabila",
 	'srv_gdpr_survey_list_li_2' 	=> "vklopljen modul telefonska anketa",
 	'srv_gdpr_survey_list_li_3' 	=> "spremenljivke 'ime', 'priimek', 'email', 'firstname', 'lastname'",
 	'srv_gdpr_survey_list_li_4' 	=> "vprašanje tipa lokacija",
-	'srv_gdpr_survey_list_text3' 	=> "V primeru, da gre za h GDPR zavezujočo anketo, označite to v zadnjem stolpcu. V tem primeru imate pri anketi na voljo dodatne možnosti urejanja v skladu z GDPR zahtevanega soglasja respondentov.",
+	'srv_gdpr_survey_list_text3' 	=> "V primeru, da gre za anketo, ki zahteva zavezanost h GDPR, slednje označite v prvem stolpcu. V tem primeru imate pri vsaki anketi (v zavihku ‘Urejanje’ - ‘Nastavitve’ - ‘GDPR’) na voljo dodatne možnosti urejanja soglasja respondentov, ki ga zahteva GDPR.",
 	'srv_gdpr_survey_list_survey' 	=> "Anketa",
 	'srv_gdpr_survey_list_activity' => "Aktivnost",
 	'srv_gdpr_survey_list_pot_gdpr' => "Potencialno GDPR",
 	'srv_gdpr_survey_list_gdpr' 	=> "GDPR",
 	'srv_gdpr_dpa' 	                => "DPA",
-	'srv_gdpr_dpa_text'             => "S strinjanjem s splošnimi pogoji uporabe orodja 1KA (s katerimi ste se strinjali ob registraciji na spletno stran <a href=\"https://www.1ka.si\">www.1ka.si</a>), se strinjate tudi s pogoji in določbami v pogodbi o obdelavi podatkov (angl. Data processing agreement) med uporabnikom 1KA in storitvijo 1KA.<br /><br />Pisna različica nepodpisane pogodbe je na voljo na spodnjih povezavah:",
+	'srv_gdpr_dpa_text'             => "S strinjanjem s <a href=\"https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-1ka/splosni-pogoji\" target=\"_blank\">splošnimi pogoji uporabe orodja 1KA</a> (s katerimi ste se strinjali ob registraciji na spletno stran <a href=\"https://www.1ka.si\" target=\"_blank\">www.1ka.si</a>), se strinjate tudi s <a href=\"https://www.1ka.si/uploadi/dokumenti/DPA_SLO.pdf\" target=\"_blank\">pogoji in določbami v pogodbi o obdelavi podatkov</a> (angl. <span class=\"italic\">Data processing agreement</span>) med uporabnikom 1KA in storitvijo 1KA.<br /><br />Pisna različica nepodpisane pogodbe je na voljo na spodnjih povezavah:",
 	'srv_gdpr_dpa_slo'              => "v slovenščini",
 	'srv_gdpr_dpa_eng'              => "v angleščini",
 	'srv_gdpr_dpa_info' 	        => "Za podpisano pogodbo DPA kontaktirajte <a href=\"mailto:help@1ka.si\">help@1ka.si</a> in DPA bomo ustrezno prilagodili.",
 	'srv_gdpr_requests' 			=> "Procesiranje zahtevkov",
+	'srv_gdpr_requests_list' 		=> "Seznam zahtevkov",
+	'srv_gdpr_requests_list_resolved' 		=> "Izvršeni zahtevki",
+	'srv_gdpr_requests_list_unresolved' 		=> "Neizvršeni zahtevki",
 	'srv_gdpr_requests_all' 		=> "Vsi zahtevki (admin)",
 	'srv_gdpr_requests_desc' 		=> "Spodaj je seznam zahtevkov, ki so jih oddali respondenti v vaših anketah.<br />Prosimo, da v roku enega meseca izvršite zahtevo in o tem obvestite respondenta na spodaj navedeni elektronski naslov respondenta (<a href=\"http://eur-lex.europa.eu/legal-content/SL/TXT/?uri=uriserv:OJ.L_.2016.119.01.0001.01.SLV&toc=OJ:L:2016:119:FULL\" target=\"_blank\">Člen 19 uredbe GDPR</a>).<br />Če v roku 30 dni zahtevek ni izveden in respondent o tem ni obveščen, si pridržujemo pravico, da vašo anketo izbrišemo oziroma respondentu neposredno zagotovimo vpogled oziroma popravek.",
 	'srv_gdpr_requests_none' 		=> "Ni zahtevkov",
-	'srv_gdpr_requests_survey' 		=> "Anketa",
+	'srv_gdpr_requests_survey' 		=> "Ime ankete",
 	'srv_gdpr_requests_recnum' 		=> "Recnum",
 	'srv_gdpr_requests_ip' 			=> "IP",
 	'srv_gdpr_requests_url' 		=> "URL",
 	'srv_gdpr_requests_email' 		=> "Email respondenta",
 	'srv_gdpr_requests_date' 		=> "Čas odgovora",
 	'srv_gdpr_requests_text' 		=> "Sporočilo respondenta",
-	'srv_gdpr_requests_done' 		=> "Opravljeno",
+	'srv_gdpr_requests_resolved' 		=> "Izvršeno",
 	'srv_gdpr_requests_comment' 	=> "Komentar avtorja",
 	'srv_gdpr_requests_status' 		=> "Status",
 	'srv_gdpr_requests_status_0' 	=> "V obdelavi",
 	'srv_gdpr_requests_status_1' 	=> "Opravljeno",
-	'srv_gdpr_requests_type' 		=> "Vrsta zahtevka",
+	'srv_gdpr_requests_type' 		=> "Zahtevek",
 	'srv_gdpr_requests_type_1' 		=> "Izbris",
 	'srv_gdpr_requests_type_2' 		=> "Vpogled",
 	'srv_gdpr_requests_type_3' 		=> "Popravek",
 	'srv_gdpr_requests_type_4' 		=> "Prenos",
 	'srv_gdpr_requests_type_5' 		=> "Omejitev obdelave",
 	'srv_gdpr_requests_type_6' 		=> "Preklic privolitve v obdelavo",
-	'srv_gdpr_requests_date_sent'	=> "Datum zahtevka",
+	'srv_gdpr_requests_date_sent'	=> "Datum",
 	'srv_gdpr_requests_author' 		=> "Avtor",
 	'srv_gdpr_requests_responsible' => "GDDPR podatki avtorja ankete",
 	'srv_gdpr_requests_organization' => "GDDPR podatki organizacije",
 	'srv_gdpr_requests_done' 		=> "Opravljeni zahtevki",
 	'srv_gdpr_survey_settings' 		=> "GDPR nastavitve ankete",
-	'srv_gdpr_survey_settings_desc1' => "S 25. majem 2018 je v veljavi nova uredba o varovanju osebnih podatkov (<a href=\"http://www.eugdpr.org/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>). Za zbiranje kakršnihkoli osebnih podatkov v anketah mora avtor ankete pridobiti ustrezno soglasje respondenta. Respondent se mora z zbiranjem osebnih podatkov izrecno strinjati, sicer ne more izpolnjevati vprašalnika.",
+	'srv_gdpr_survey_settings_desc1' => "S 25. majem 2018 je v veljavi nova uredba o varovanju osebnih podatkov (<a href=\"https://gdpr.eu/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>). Za zbiranje kakršnihkoli osebnih podatkov v anketah mora avtor ankete pridobiti ustrezno soglasje respondenta. Respondent se mora z zbiranjem osebnih podatkov izrecno strinjati, sicer ne more izpolnjevati vprašalnika.",
 	'srv_gdpr_survey_settings_desc2' => "Če v vaši anketi zbirate osebne podatke, prosimo ustrezno označite. Uporabite lahko pred pripravljeno soglasje za zbiranje podatkov ali ga uredite sami. Pred zbiranjem osebnih podatkov poskrbite tudi, da je ustrezno izpolnjen obrazec z vašimi podatki, ki je dostopen",
 	'srv_gdpr_survey_settings_desc3' => "<a href=\"https://www.1ka.si/d/sl/gdpr\" target=\"_blank\"><span class=\"bold\">Več o GDPR >></span></a>",
     
@@ -7919,7 +8242,7 @@ $lang = array (
 	'srv_gdpr_drupal_intro2' 		=> 'Če želite oddati zahtevo za izbris, dostop, popravek, prenos, omejitev ali preklic, prosimo izpolnite spodnji obrazec. V primeru težav kontaktirajte Center za pomoč uporabnikom 1KA (<a href="mailto:help@1ka.si?subject=GDPR">help@1ka.si</a>). ',
 	'srv_gdpr_drupal_field_email' 	=> 'Elektronski naslov',
 	'srv_gdpr_drupal_field_srv-name' => 'Ime ankete',
-	'srv_gdpr_drupal_field_srv-url' => 'Povezava do ankete',
+	'srv_gdpr_drupal_field_srv-url' => 'URL ankete',
 	'srv_gdpr_drupal_error_srv-url' => 'Nepravilen URL ankete. Vpišite pravilen URL 1KA ankete. V primeru težav kontaktirajte Center za pomoč uporabnikom 1KA (<a href="mailto:help@1ka.si?subject=GDPR">help@1ka.si</a>).',
 	'srv_gdpr_drupal_field_gdpr-action' => 'GDPR zahteva',
 	'srv_gdpr_drupal_q1_title' 		=> 'Želim podati zahtevo za:',
@@ -7931,7 +8254,7 @@ $lang = array (
 	'srv_gdpr_drupal_q1_answer6' 	=> '<b>Preklic privolitve v obdelavo</b> osebnih podatkov v določeni anketi',
 	'srv_gdpr_drupal_q2_note' 		=> 'Prosimo, čim bolj natančno opišite, na osnovi katerih podatkov lahko identificiramo vaš vnos v anketi (npr. email, ime, komentar, specifične kombinacije odgovorov) in za kateri podatek oziroma podatke želite oddati zahtevek za izbris, spremembo ali vpogled. ',
 	'srv_gdpr_drupal_check' 		=> 'Želim, da me avtor obvesti o izvedeni zahtevi na zgoraj navedeni elektronski naslov.',
-	'srv_gdpr_drupal_end' 			=> 'S klikom na POTRDI bo vaša zahteva poslana avtorju raziskave.',
+	'srv_gdpr_drupal_end' 			=> 'S klikom na Potrdi bo vaša zahteva poslana avtorju raziskave.',
 	'users_gdpr_title' 		=> 'GDPR soglasje',
 	'users_gdpr1'			=> 'Da',
 	'users_gdpr0'			=> 'Ne',
@@ -8261,30 +8584,29 @@ $lang = array (
 	'alert_too_many_arguments'	=>	"Preveč argumentov! Plugin: dataHolder",
 	'alert_missing_arguments'	=>	"Manjkajoči argumenti! Plugin: dataHolder",
 
-	// HEADER
-	'lang_flag' 				=>  '<img src="public/img/flags/english_flag.svg" alt="english flag"> <span>ENG</span>',
-	'AAI_prijava'				=>  'AAI prijava',
 
-	// HERO
-	'hero_heading' => '1KA ARNES',
-	'hero_text'=> 'Brezplačna in neomejena uporaba orodja 1KA. Na voljo za vse AAI uporabnike.',
-	'hero_button'=> '<a href="#"> AAI-prijava </a>',
+    // Besedila popupa levo spodaj (obvestilo o akciji)
+    "action_note_lib_add_to_lib_type1"      =>  "Vprašanje je bilo dodano v knjižnico",
+    "action_note_lib_add_to_lib_type2_0"    =>  "Pogoj je bil dodan v knjižnico",
+    "action_note_lib_add_to_lib_type2_1"    =>  "Blok je bil dodan v knjižnico",
+    "action_note_lib_add_to_lib_type2_2"    =>  "Zanka je bila dodana v knjižnico",
 
-	// Pomembne povezave
+    "action_note_lib_add_to_survey_m"       =>  "Elementi so bili dodani",
+    "action_note_lib_add_to_survey_1"       =>  "Vprašanje je bilo dodano",
+    "action_note_lib_add_to_survey_1m"      =>  "Vprašanja so bila dodana",
+    "action_note_lib_add_to_survey_2_0"     =>  "Pogoj je bil dodan",
+    "action_note_lib_add_to_survey_2_0m"    =>  "Pogoji so bili dodani",
+    "action_note_lib_add_to_survey_2_1"     =>  "Blok je bil dodan",
+    "action_note_lib_add_to_survey_2_1m"    =>  "Bloki so bili dodani",
+    "action_note_lib_add_to_survey_2_2"     =>  "Zanka je bil dodana",
+    "action_note_lib_add_to_survey_2_2m"    =>  "Zanke so bile dodane",
 
-	'povezave_pomembne_povezave' => 'Pomembne povezave',
+	"action_note_link_copied"			    =>	'Povezava je bila kopirana',
+	"action_note_text_copied"			    =>	'Besedilo je bilo kopirano',
+	"action_note_success_save"			    =>	"Nastavitve so bile shranjene",
 
-	'povezave__kako_deluje_h2' => 'KAKO DELUJE?',
-	'povezave__kako_deluje_text' => 'Vsem uporabnikom so na voljo priročniki, video vodiči in odgovori na pogosta vprašanja.',
-	'povezave_o_1ka_h2' => 'O 1KA',
-	'povezave_o_1ka_text' => '1KA je aplikacija, ki omogoča enostavno in dostopno spletno anketiranje.',
-	'povezave_1ka_podpora_h2' => '1KA PODPORA',
-	'povezave_1ka_podpora_text' => 'Ste ob izdelavi ankete naleteli na težavo? Kontaktirajte našo podporo uporabnikov.',
-	'povezave_arnes_podpora_h2' => 'ARNES PODPORA',
-	'povezave_arnes_podpora_text' => 'Če imate težave z AAI identiteto ali prijavo, kontaktirajte Arnesovo podporo uporabnikov.',
-
-	'povezave_preberi_vec' => 'Preberi več',
 
+	
 );
 
 

From 743a71e131a576f4177570fa9d94e576fb287c9e Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 30 May 2022 11:03:03 +0200
Subject: [PATCH 07/17] Redesign - popravki napak - hitri seznam v podatkih

---
 .../surveyData/class.SurveyDataDisplay.php    | 71 +++++++++++--------
 public/css/admin_new.css                      | 10 +++
 .../pages/survey_data/quick_list_data.scss    | 11 +++
 .../pages/survey_data/survey_data.scss        |  1 +
 4 files changed, 62 insertions(+), 31 deletions(-)
 create mode 100644 resources/sass/admin_new/pages/survey_data/quick_list_data.scss

diff --git a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
index 5a907c87b..95ac7c36f 100644
--- a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
+++ b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
@@ -3305,20 +3305,26 @@ class SurveyDataDisplay{
 			$lang_admin = $row['value'];
 		}
 
+        $sqlVersion = sisplet_query("SELECT value FROM misc WHERE what = 'version'");
+        $rowVersion = mysqli_fetch_assoc($sqlVersion);
+
 		#izpišemo HTML
 		echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
 		echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">';
-		echo '<head>';
-		echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
+		
+
+        echo '<head>';
+		
+        echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
 		echo '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8" />';
-		echo '<script type="text/javascript" src="'.$site_url.'admin/survey/script/js-lang.php?lang='.($lang_admin==1?'si':'en').'"></script>';
+		
+        echo '<script type="text/javascript" src="'.$site_url.'admin/survey/script/js-lang.php?lang='.($lang_admin==1?'si':'en').'"></script>';
 		echo '<script type="text/javascript" src="'.$site_url.'admin/survey/minify/g=jsnew"></script>';
-		echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=css" media="screen" rel="stylesheet" />';
-		echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=cssPrint" media="print" rel="stylesheet" />';
-		echo '<style>';
-		echo '.container {margin-bottom:45px;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
-		echo '</style>';
-		echo '<!--[if lt IE 7]>';
+		
+        echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=css?v='.$rowVersion['value'].'" media="screen" rel="stylesheet" />';
+		echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=cssPrint?v='.$rowVersion['value'].'" media="print" rel="stylesheet" />';
+
+        echo '<!--[if lt IE 7]>';
 		echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie6hacks.css" type="text/css" />';
 		echo '<![endif]-->';
 		echo '<!--[if IE 7]>';
@@ -3327,9 +3333,7 @@ class SurveyDataDisplay{
 		echo '<!--[if IE 8]>';
 		echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie8hacks.css" type="text/css" />';
 		echo '<![endif]-->';
-		echo '<style>';
-		echo '.container {margin-bottom:45px;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
-		echo '</style>';
+
 		echo '<script>';
 		echo 'function chkstate(){';
 		echo '	if(document.readyState=="complete"){';
@@ -3347,12 +3351,17 @@ class SurveyDataDisplay{
 		echo '	window.close();';
 		echo '}';
 		echo '</script>';
+
 		echo '</head>';
 
-		echo '<body style="margin:5px; padding:5px;" onBlur="window.close();">'; 
-		echo '<input type="hidden" name="anketa_id" id="srv_meta_anketa_id" value="' . $_REQUEST['anketa'] . '" />';
-		#echo '<div id="div_analiza_single_var" class="container">';
+
+		echo '<body class="quick_list_data" onBlur="window.close();">'; 
+		
+        echo '<input type="hidden" name="anketa_id" id="srv_meta_anketa_id" value="' . $_REQUEST['anketa'] . '" />';
+		
+
 		echo '<div id="analiza_data">';
+
 		//Izvoz v PDF / RTF / XLS
 		$_url1 = $site_url.'admin/survey/izvoz.php?dc='.base64_encode(
 				serialize(
@@ -3369,14 +3378,18 @@ class SurveyDataDisplay{
 						array(	'b'=>'export',
 								'a'=>'list_xls',
 								'anketa'=>$anketa)));
-		echo '<div class=" printHide" style="margin-top:6px;">';
-		echo '<a href="'.$_url1.'" target="_blank"><span class="faicon pdf icon-as_link"></span></a>&nbsp;&nbsp;';
+
+
+		echo '<div class="printHide">';
+
+		/*echo '<a href="'.$_url1.'" target="_blank"><span class="faicon pdf icon-as_link"></span></a>&nbsp;&nbsp;';
 		echo '<a href="'.$_url2.'" target="_blank"><span class="faicon rtf icon-as_link"></span></a>&nbsp;&nbsp;';
-		echo '<a href="'.$_url3.'" target="_blank"><span class="faicon xls icon-as_link"></span></a>';
+		echo '<a href="'.$_url3.'" target="_blank"><span class="faicon xls icon-as_link"></span></a>';*/
 		
-		echo '<br class="clr"/>';
 		echo $lang['srv_data_print_preview'];
+
 		echo '</div>';
+
 		
 		self::$printPreview = true;
 		self::$_VARS[VAR_DATA] = 1;
@@ -3391,27 +3404,23 @@ class SurveyDataDisplay{
 			unset(self::$_SVP_PV['invitation']);
 		}
 		
-	
-			# ponastavimo nastavitve- filter
+
+	    # ponastavimo nastavitve- filter
 		self::setUpFilter();
 		self::DisplayDataTable();
+
 		echo '</div>';
 			
-		echo '<div id="navigationBottom" class="printHide">';
 
-		echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="close_win(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>';
-		echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="window.print();return false;"><span class="faicon print_small icon-grey_dark_link"></span> '.$lang['hour_print2'].'</a></div></span>';
-		
-		echo '<span  class="spaceRight floatRight printHide" style="margin-top:6px;">';
-		echo '<a href="'.$_url1.'" target="_blank"><span class="faicon pdf icon-as_link"></span></a>&nbsp;&nbsp;';
-		echo '<a href="'.$_url2.'" target="_blank"><span class="faicon rtf icon-as_link"></span></a>&nbsp;&nbsp;';
-		echo '<a href="'.$_url3.'" target="_blank"><span class="faicon xls icon-as_link"></span></a>';
+		echo '<div class="button_holder below float-right">';
+		echo '  <button class="medium white-blue" onclick="window.print(); return false;">'.$lang['hour_print2'].'</button>';
+		echo '  <button class="medium blue" onclick="close_win(); return false;">'.$lang['srv_zapri'].'</button>';
 		echo '</span>';
-		
-		echo '<br class="clr" />';
+
 		echo '</div>';
 		
 		echo '</body>';
+
 		echo '</html>';
 	}
 
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index c0eb1e71a..79aeb032d 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -25560,6 +25560,16 @@ ul#merge li {
   opacity: 0.5;
 }
 
+.quick_list_data {
+  padding: 16px;
+}
+.quick_list_data #dataTableScroller {
+  display: none;
+}
+.quick_list_data #dataTable {
+  margin-top: 16px;
+}
+
 /*
 To change this license header, choose License Headers in Project Properties.
 To change this template file, choose Tools | Templates
diff --git a/resources/sass/admin_new/pages/survey_data/quick_list_data.scss b/resources/sass/admin_new/pages/survey_data/quick_list_data.scss
new file mode 100644
index 000000000..468be764f
--- /dev/null
+++ b/resources/sass/admin_new/pages/survey_data/quick_list_data.scss
@@ -0,0 +1,11 @@
+.quick_list_data{
+    padding: 16px;
+    
+    #dataTableScroller{
+        display: none;
+    }
+
+    #dataTable{
+        margin-top: 16px;
+    }
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/survey_data/survey_data.scss b/resources/sass/admin_new/pages/survey_data/survey_data.scss
index 456fd5b4d..643002d25 100644
--- a/resources/sass/admin_new/pages/survey_data/survey_data.scss
+++ b/resources/sass/admin_new/pages/survey_data/survey_data.scss
@@ -7,5 +7,6 @@
 @import "calculations";
 @import "append_merge";
 @import "quick_edit";
+@import "quick_list_data";
 
 @import "popups/popups";

From 9cf2d9359f895508e71c24bd3f82985badc8810e Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 30 May 2022 11:18:34 +0200
Subject: [PATCH 08/17] Redesign - popravki napak - popravek zapiranja popupa s
 kalkulacijo

---
 admin/survey/Branching.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 081b24952..42e17af12 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -8831,22 +8831,22 @@ class Branching {
 
 		echo '</div>';
 
+
         echo '<div id="condition_editing_close" class="podatki">';
 
-		echo '<div class="button_holder">';
+		echo '  <div class="button_holder">';
 
 		// kalkulacija kot spremenljivka (lahko jo zbrisemo)
-        if ($condition < 0) {
-			echo '<button class="medium white-blue" onclick="brisi_spremenljivko(\''.(-$condition).'\'); return false;">'.$lang['srv_anketadelete_txt'].'</button>';				
-		}
+        if ($condition < 0) 
+			echo '      <button class="medium white-blue" onclick="brisi_spremenljivko(\''.(-$condition).'\'); return false;">'.$lang['srv_anketadelete_txt'].'</button>';				
 
-		echo '<button class="medium white-blue" onclick="window.location.reload(); return false;">'.$lang['edit1338'].'</button>';				
-		
-		echo '<button class="medium blue" onclick="popupClose(); return false;">'.$lang['srv_potrdi'].'</button>';
-		echo '</div>';
+		echo '      <button class="medium white-blue" onclick="window.location.reload(); return false;">'.$lang['srv_zapri'].'</button>';				
+		echo '      <button class="medium blue" onclick="window.location.reload(); return false;">'.$lang['srv_potrdi'].'</button>';
+		echo '  </div>';
         
         echo '</div>';
 
+
         echo '<div id="arrows_more_calculation" onclick=" $(\'#calculation_editing_inner\').animate({ scrollTop: $(\'#calculation_editing_inner\').attr(\'scrollHeight\') }, 2000); "><img src="img_0/bullet_arrow_down.png" /> '.$lang['srv_more'].'</div>';
 
         ?><script>

From c54031a92c3f1e91aa87eec94945f606d5d69e7b Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 30 May 2022 11:28:45 +0200
Subject: [PATCH 09/17] Redesign - popravki napak - odstranjena interpretacija
 ttesta

---
 admin/survey/classes/surveyAnalysis/class.SurveyTTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyTTest.php b/admin/survey/classes/surveyAnalysis/class.SurveyTTest.php
index 27b27ac3d..02658938c 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyTTest.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyTTest.php
@@ -336,12 +336,12 @@ class SurveyTTest
 		echo '  <input id="showChart" type="checkbox" onchange="showTableChart(\'ttest\');" '.($this->sessionData['ttest_charts']['showChart']==true?' checked="checked"':'' ).'><label for="showChart">'.$lang['srv_show_chart'].'</label>';
 		echo '</span>';
 
-        echo '<span class="setting_line">';
+        /*echo '<span class="setting_line">';
 		echo '  <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/ttest?from1ka=1" target="_blank">';
 		echo        $lang['srv_ttest_interpretacija_note'];
 		echo '  </a>';
 		echo Help::display('srv_ttest_interpretation');
-		echo '</span>';
+		echo '</span>';*/
 
 		echo '</div>';
 		

From 905980238262e60ab07223fab5e5e79f7aea9641 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 30 May 2022 11:52:49 +0200
Subject: [PATCH 10/17] Redesign - popravki napak - popravki knjiznice v
 urejanju ankete

---
 .../survey/classes/class.LibraryBranching.php |  2 ++
 admin/survey/script/library.js                | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/admin/survey/classes/class.LibraryBranching.php b/admin/survey/classes/class.LibraryBranching.php
index ded8e4ff0..a9b0e22ec 100644
--- a/admin/survey/classes/class.LibraryBranching.php
+++ b/admin/survey/classes/class.LibraryBranching.php
@@ -464,6 +464,7 @@ class LibraryBranching {
     private function displayRightQuestionItem($spremenljivka){
         global $lang;
         global $global_user_id;
+        global $admin_type;
 
         echo '<div id="question_item_holder_'.$spremenljivka['id'].'" class="question_item_holder" onClick="selectLibraryItem(\''.$spremenljivka['id'].'\');">';
 
@@ -498,6 +499,7 @@ class LibraryBranching {
     private function displayRightIfItem($if){
         global $lang;
         global $global_user_id;
+        global $admin_type;
 
         if($if['tip'] == 2){
             $type_string = '<span class="item_type">[LOOP]</span>';
diff --git a/admin/survey/script/library.js b/admin/survey/script/library.js
index 14a6ea303..6fbfcc3b2 100644
--- a/admin/survey/script/library.js
+++ b/admin/survey/script/library.js
@@ -267,6 +267,14 @@ function openLibraryFolder(folder_id){
     var tab = $('#active_tab').val();
 
     $("#lib_question_list").load('ajax.php?t=libraryBranching&a=displayLibraryQuestionList', {anketa: srv_meta_anketa_id, tab: tab, folder_id: folder_id});
+
+
+    // Ugasnemo vse prejšnje checkboxe
+    $(".question_item_check").removeClass('active').attr("checked", false);
+
+    // Nastavimo oznacene iteme na 0 in disablamo gumb
+    $('#selected_item_counter').html('0');
+    $("#insert_library_button").prop('disabled', true);
 }
 
 // Odpremo anketo - na desni prikazemo vprasanja
@@ -278,6 +286,14 @@ function openLibrarySurvey(folder_id, type){
     var tab = $('#active_tab').val();
 
     $("#lib_question_list").load('ajax.php?t=libraryBranching&a=displayLibrarySurveyQuestionList', {anketa: srv_meta_anketa_id, tab: tab, folder_id: folder_id});
+
+
+    // Ugasnemo vse prejšnje checkboxe
+    $(".question_item_check").removeClass('active').attr("checked", false);
+
+    // Nastavimo oznacene iteme na 0 in disablamo gumb
+    $('#selected_item_counter').html('0');
+    $("#insert_library_button").prop('disabled', true);
 }
 
 // Razpremo/skrcimo folder na levi
@@ -427,6 +443,8 @@ function deleteLibraryItem(item_id, item_type){
     $.post('ajax.php?t=libraryBranching&a=deleteItem', {anketa: srv_meta_anketa_id, item_id: item_id, item_type: item_type}, function(){
         $('#question_item_holder_'+item_id).remove();
     });
+
+    event.stopPropagation();
 }
 
 // Odpremo popup za dodajanje itema v knjiznico v urejanju ankete
@@ -436,6 +454,8 @@ function displayRenameLibraryItemPopup(item_id, type){
 
     $("#lib_additional_popup").fadeIn();
     $("#lib_additional_popup").load('ajax.php?t=libraryBranching&a=displayRenameLibraryItemPopup', {anketa: srv_meta_anketa_id, tab: tab, item_id: item_id, type: type});
+
+    event.stopPropagation();
 }
 
 // Preimenujemo obstojeci element

From b02a67110b2eb9f1d455c0b4271d92aaa3b5e31e Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 30 May 2022 12:48:12 +0200
Subject: [PATCH 11/17] Redesign - popravki napak - popravek
 nominalna/ordinalna preklop po dodajanju vprasanja, redesign urejanja
 povleci-spusti pri tabelah

---
 admin/survey/Branching.php                    |  28 +-
 admin/survey/script/branching.js              |   2 +-
 public/css/admin_new.css                      | 270 ++++++++++++------
 .../pages/survey_edit/questions/ranking.scss  | 238 ++++++++++-----
 4 files changed, 370 insertions(+), 168 deletions(-)

diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 42e17af12..15ba7dc6a 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -971,7 +971,7 @@ class Branching {
         echo '<span>' . $lang['srv_new_question_icon'] . '</span>';
         echo '<div class="tip_sample">';
         echo '<div class="tip_sample_text">' . $lang['srv_tip_sample_t21'] . '</div>';
-        echo '<div class="tip_sample_option"><textarea style="width:150px; height:12px">abc</textarea></div>';
+        echo '<div class="tip_sample_option"><textarea style="width:150px; height:25px; padding:0 4px;">abc</textarea></div>';
         echo '</div>';
         echo '</div>';
 
@@ -3987,8 +3987,11 @@ class Branching {
 				$num = mysqli_num_rows($sql1);
 				$size = $num * 50;
 
+
+                echo '<div class="ranking_holder">';
+
 				//zaslon razdelimo na dva dela - izris leve strani
-				echo '<div id="half" class="dropzone '.($this->lang_id==null?'allow_new':'').'" style="width: 50%; min-height:' . $size . 'px; float: left; border-right: 1px solid black;">';
+				echo '<div id="half" class="dropzone '.($this->lang_id==null?'allow_new':'').'">';
 				
 				while ($row1 = mysqli_fetch_array($sql1)) {
 					
@@ -4017,17 +4020,21 @@ class Branching {
 					if ($length > 30) $class = 'ranking_long'; $class = 'ranking';
 					
 					echo '<div class="variabla" id="variabla_'.$row1['id'].'" other="'.$row1['other'].'">';
+
 					echo '<span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span>';
 					
+                    
+
+					echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline '.$class.'" style="float:none" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'</div>';
+					
+
                     echo ' <div class="icons_holder">';
                     echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
 					echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
 					echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
 					echo ' <span class="faicon edit2 inline inline_edit"></span>';
                     echo ' </div>';
-
-					echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline '.$class.'" style="float:none" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'</div>';
-					
+                    
                     // koda za notranji IF
 					if ($row1['if_id'] > 0) {
 						echo ' <span class="red">*</span>';
@@ -4039,18 +4046,20 @@ class Branching {
 						if ($this->condition_check($row1['if_id']) != 0)
 							echo ' <span class="faicon warning icon-orange"></span>';
 					}
-					echo '</div>';
 
+					echo '</div>';
 				}
+
 				echo '</div>';
 				
+
 				//izris desne strani**************************************************************************************
 				
 				//***********za skatlasto obliko
 				$display_drag_and_drop_new_look = ($spremenljivkaParams->get('display_drag_and_drop_new_look') ? $spremenljivkaParams->get('display_drag_and_drop_new_look') : 0); //za checkbox
 				//***********za skatlasto obliko - konec
 
-				echo '<div id="half2" class="dropzone" style="width: 49%; min-height:' . $size . 'px; float: right;">';
+				echo '<div id="half2" class="dropzone">';
 				
 				$sql2 = sisplet_query("SELECT id, naslov, variable, vrstni_red FROM srv_grid WHERE spr_id='$spremenljivka' AND other=0 ORDER BY vrstni_red");
 				$row2 = mysqli_fetch_array($sql2);
@@ -4119,12 +4128,11 @@ class Branching {
 				echo	'</ul>';
 
 				
-				echo		'</div>'; //half2_$spremenljivka
+				echo		'</div>';   // half2_$spremenljivka
 
-				echo '<div class="clr"></div>';
+                echo '</div>';  // end ranking_holder;
 
 			//***********************Drag and drop grid konec*************************************************************
-			
 			}
 			//Image hot spot********************************************************************************************************
 			elseif( ($row['tip'] == 6) && $row['enota'] == 10){	//image hot spot
diff --git a/admin/survey/script/branching.js b/admin/survey/script/branching.js
index 8a686ad33..f791e996c 100644
--- a/admin/survey/script/branching.js
+++ b/admin/survey/script/branching.js
@@ -113,7 +113,7 @@ function branching_click(event) {
         id = id.replace('edit_', '');
 		
 		value = ta.parent().parent().parent().find('.spremenljivka_content').attr('skala');
-		if(value == 0) value = 1;
+		if(value == 0 || value == -1) value = 1;
 		else value = 0;
 		
         scale_ordnom(id, value);
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 79aeb032d..4b4ec084f 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -17841,90 +17841,6 @@ div.jezik_row.tip_17 .variable_holder .ranking_holder .dragdrop_frame {
   text-indent: -20px;
   text-align: left;
 }
-li.spr_tip_17 .variable_holder .ranking_holder .dragdrop_frame_grid,
-div.spr_tip_17 .variable_holder .ranking_holder .dragdrop_frame_grid,
-div.jezik_row.tip_17 .variable_holder .ranking_holder .dragdrop_frame_grid {
-  font-size: 14px;
-  width: 230px;
-  height: 25px;
-  padding: 0 0 2px 0;
-  margin: 0px auto 10px auto;
-  border: 1px black dashed;
-  background-color: #E5E5E5;
-  text-indent: -20px;
-  text-align: left;
-}
-li.spr_tip_17 .variable_holder .ranking_holder .dragdrop_frame_grid_box,
-div.spr_tip_17 .variable_holder .ranking_holder .dragdrop_frame_grid_box,
-div.jezik_row.tip_17 .variable_holder .ranking_holder .dragdrop_frame_grid_box {
-  font-size: 14px;
-  width: 230px;
-  height: 30px;
-  padding: 0 0 2px 0;
-  margin: 10px auto 0px auto;
-  border-left: 1px black dashed !important;
-  border-right: 1px black dashed !important;
-  border-bottom: 1px black dashed !important;
-  text-indent: -20px;
-  text-align: left;
-}
-li.spr_tip_17 .variable_holder .ranking_holder .drag_and_drop_box,
-div.spr_tip_17 .variable_holder .ranking_holder .drag_and_drop_box,
-div.jezik_row.tip_17 .variable_holder .ranking_holder .drag_and_drop_box {
-  cursor: pointer;
-  width: 230px;
-  padding: 5px;
-  margin: 0px auto 10px auto;
-  border: 1px solid #000;
-  height: 15px;
-  text-align: center;
-  overflow: hidden;
-  background-color: white;
-  cursor: pointer;
-  width: 230px;
-  padding: 5px;
-  margin: 0px auto 10px auto;
-  border: 1px solid #000;
-  height: 15px;
-  text-align: center;
-  overflow: hidden;
-  background-color: white;
-}
-li.spr_tip_17 .variable_holder .ranking_holder .drag_and_drop_box img,
-div.spr_tip_17 .variable_holder .ranking_holder .drag_and_drop_box img,
-div.jezik_row.tip_17 .variable_holder .ranking_holder .drag_and_drop_box img {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-li.spr_tip_17 .variable_holder .ranking_holder .drag_and_drop,
-div.spr_tip_17 .variable_holder .ranking_holder .drag_and_drop,
-div.jezik_row.tip_17 .variable_holder .ranking_holder .drag_and_drop {
-  top: -6px;
-  left: -6px;
-}
-li.spr_tip_17 .variable_holder .ranking_holder .drag_and_drop_right,
-div.spr_tip_17 .variable_holder .ranking_holder .drag_and_drop_right,
-div.jezik_row.tip_17 .variable_holder .ranking_holder .drag_and_drop_right {
-  top: -6px !important;
-  left: -6px !important;
-}
-li.spr_tip_17 .variable_holder .ranking_holder .drag_and_drop_box_right,
-div.spr_tip_17 .variable_holder .ranking_holder .drag_and_drop_box_right,
-div.jezik_row.tip_17 .variable_holder .ranking_holder .drag_and_drop_box_right {
-  top: 15px !important;
-  left: -6px !important;
-}
-li.spr_tip_17 .variable_holder .ranking_holder .drag_and_drop_box_right_after_refresh,
-div.spr_tip_17 .variable_holder .ranking_holder .drag_and_drop_box_right_after_refresh,
-div.jezik_row.tip_17 .variable_holder .ranking_holder .drag_and_drop_box_right_after_refresh {
-  left: -6px !important;
-}
-li.spr_tip_17 .variable_holder .ranking_holder .drag_and_drop_box_right_over,
-div.spr_tip_17 .variable_holder .ranking_holder .drag_and_drop_box_right_over,
-div.jezik_row.tip_17 .variable_holder .ranking_holder .drag_and_drop_box_right_over {
-  left: -6px !important;
-}
 li.spr_tip_17 .variable_holder .ranking_holder .inline_labele_podrocij,
 div.spr_tip_17 .variable_holder .ranking_holder .inline_labele_podrocij,
 div.jezik_row.tip_17 .variable_holder .ranking_holder .inline_labele_podrocij {
@@ -17959,6 +17875,192 @@ div.jezik_row.tip_17 .variable_holder .ranking_holder .enka-vizualna-skala {
   float: left;
 }
 
+li.spr_tip_6 .variable_holder .ranking_holder,
+div.spr_tip_6 .variable_holder .ranking_holder,
+div.jezik_row.tip_6 .variable_holder .ranking_holder,
+li.spr_tip_16 .variable_holder .ranking_holder,
+div.spr_tip_16 .variable_holder .ranking_holder,
+div.jezik_row.tip_16 .variable_holder .ranking_holder {
+  display: flex;
+  margin-top: 16px;
+}
+li.spr_tip_6 .variable_holder .ranking_holder #half,
+div.spr_tip_6 .variable_holder .ranking_holder #half,
+div.jezik_row.tip_6 .variable_holder .ranking_holder #half,
+li.spr_tip_16 .variable_holder .ranking_holder #half,
+div.spr_tip_16 .variable_holder .ranking_holder #half,
+div.jezik_row.tip_16 .variable_holder .ranking_holder #half {
+  width: 50%;
+  padding-right: 16px;
+  margin-right: 16px;
+  border-right: 1px #E5E5E5 solid;
+}
+li.spr_tip_6 .variable_holder .ranking_holder #half .variabla,
+div.spr_tip_6 .variable_holder .ranking_holder #half .variabla,
+div.jezik_row.tip_6 .variable_holder .ranking_holder #half .variabla,
+li.spr_tip_16 .variable_holder .ranking_holder #half .variabla,
+div.spr_tip_16 .variable_holder .ranking_holder #half .variabla,
+div.jezik_row.tip_16 .variable_holder .ranking_holder #half .variabla {
+  margin-bottom: 16px;
+}
+li.spr_tip_6 .variable_holder .ranking_holder #half .variabla:last-child,
+div.spr_tip_6 .variable_holder .ranking_holder #half .variabla:last-child,
+div.jezik_row.tip_6 .variable_holder .ranking_holder #half .variabla:last-child,
+li.spr_tip_16 .variable_holder .ranking_holder #half .variabla:last-child,
+div.spr_tip_16 .variable_holder .ranking_holder #half .variabla:last-child,
+div.jezik_row.tip_16 .variable_holder .ranking_holder #half .variabla:last-child {
+  margin-bottom: 0;
+}
+li.spr_tip_6 .variable_holder .ranking_holder #half .variabla .ranking,
+div.spr_tip_6 .variable_holder .ranking_holder #half .variabla .ranking,
+div.jezik_row.tip_6 .variable_holder .ranking_holder #half .variabla .ranking,
+li.spr_tip_16 .variable_holder .ranking_holder #half .variabla .ranking,
+div.spr_tip_16 .variable_holder .ranking_holder #half .variabla .ranking,
+div.jezik_row.tip_16 .variable_holder .ranking_holder #half .variabla .ranking {
+  overflow: hidden;
+  box-sizing: border-box;
+  flex-grow: 1;
+  width: calc(100% - 120px);
+  max-width: 250px;
+  min-height: 36px;
+  padding: 8px;
+  margin: 0 auto 0 auto;
+  font-size: 14px;
+  text-align: center;
+  background-color: #F8F8F8;
+  border: 1px solid #E5E5E5;
+  border-radius: 4px;
+}
+li.spr_tip_6 .variable_holder .ranking_holder #half .variabla .ranking img,
+div.spr_tip_6 .variable_holder .ranking_holder #half .variabla .ranking img,
+div.jezik_row.tip_6 .variable_holder .ranking_holder #half .variabla .ranking img,
+li.spr_tip_16 .variable_holder .ranking_holder #half .variabla .ranking img,
+div.spr_tip_16 .variable_holder .ranking_holder #half .variabla .ranking img,
+div.jezik_row.tip_16 .variable_holder .ranking_holder #half .variabla .ranking img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+li.spr_tip_6 .variable_holder .ranking_holder #half .variabla .ranking_long,
+div.spr_tip_6 .variable_holder .ranking_holder #half .variabla .ranking_long,
+div.jezik_row.tip_6 .variable_holder .ranking_holder #half .variabla .ranking_long,
+li.spr_tip_16 .variable_holder .ranking_holder #half .variabla .ranking_long,
+div.spr_tip_16 .variable_holder .ranking_holder #half .variabla .ranking_long,
+div.jezik_row.tip_16 .variable_holder .ranking_holder #half .variabla .ranking_long {
+  overflow: hidden;
+  box-sizing: border-box;
+  max-width: 250px;
+  max-height: 36px;
+  padding: 8px;
+  margin: 0 auto 0 auto;
+  font-size: 11px;
+  text-align: center;
+  background-color: #F8F8F8;
+  border: 1px solid #E5E5E5;
+  border-radius: 4px;
+}
+li.spr_tip_6 .variable_holder .ranking_holder #half .variabla .ranking_long img,
+div.spr_tip_6 .variable_holder .ranking_holder #half .variabla .ranking_long img,
+div.jezik_row.tip_6 .variable_holder .ranking_holder #half .variabla .ranking_long img,
+li.spr_tip_16 .variable_holder .ranking_holder #half .variabla .ranking_long img,
+div.spr_tip_16 .variable_holder .ranking_holder #half .variabla .ranking_long img,
+div.jezik_row.tip_16 .variable_holder .ranking_holder #half .variabla .ranking_long img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+li.spr_tip_6 .variable_holder .ranking_holder #half2,
+div.spr_tip_6 .variable_holder .ranking_holder #half2,
+div.jezik_row.tip_6 .variable_holder .ranking_holder #half2,
+li.spr_tip_16 .variable_holder .ranking_holder #half2,
+div.spr_tip_16 .variable_holder .ranking_holder #half2,
+div.jezik_row.tip_16 .variable_holder .ranking_holder #half2 {
+  width: 49%;
+}
+li.spr_tip_6 .variable_holder .ranking_holder #half2 .grid_inline_droppable_title,
+div.spr_tip_6 .variable_holder .ranking_holder #half2 .grid_inline_droppable_title,
+div.jezik_row.tip_6 .variable_holder .ranking_holder #half2 .grid_inline_droppable_title,
+li.spr_tip_16 .variable_holder .ranking_holder #half2 .grid_inline_droppable_title,
+div.spr_tip_16 .variable_holder .ranking_holder #half2 .grid_inline_droppable_title,
+div.jezik_row.tip_16 .variable_holder .ranking_holder #half2 .grid_inline_droppable_title {
+  box-sizing: border-box;
+  width: 250px;
+  min-height: 36px;
+  height: auto;
+  padding: 8px;
+  margin: 0 auto;
+  text-align: center;
+  font-size: 14px;
+  border: 1px dashed #E5E5E5;
+  border-bottom: 0;
+  border-radius: 4px 4px 0 0;
+}
+li.spr_tip_6 .variable_holder .ranking_holder #half2 .dragdrop_frame_grid,
+div.spr_tip_6 .variable_holder .ranking_holder #half2 .dragdrop_frame_grid,
+div.jezik_row.tip_6 .variable_holder .ranking_holder #half2 .dragdrop_frame_grid,
+li.spr_tip_16 .variable_holder .ranking_holder #half2 .dragdrop_frame_grid,
+div.spr_tip_16 .variable_holder .ranking_holder #half2 .dragdrop_frame_grid,
+div.jezik_row.tip_16 .variable_holder .ranking_holder #half2 .dragdrop_frame_grid {
+  box-sizing: border-box;
+  width: 250px;
+  height: 36px;
+  padding: 8px;
+  margin: 0 auto 16px auto;
+  font-size: 14px;
+  text-align: center;
+  background-color: #F8F8F8;
+  border: 1px dashed #E5E5E5;
+  border-radius: 0 0 4px 4px;
+}
+li.spr_tip_6 .variable_holder .ranking_holder #half2 .dragdrop_frame_grid_box,
+div.spr_tip_6 .variable_holder .ranking_holder #half2 .dragdrop_frame_grid_box,
+div.jezik_row.tip_6 .variable_holder .ranking_holder #half2 .dragdrop_frame_grid_box,
+li.spr_tip_16 .variable_holder .ranking_holder #half2 .dragdrop_frame_grid_box,
+div.spr_tip_16 .variable_holder .ranking_holder #half2 .dragdrop_frame_grid_box,
+div.jezik_row.tip_16 .variable_holder .ranking_holder #half2 .dragdrop_frame_grid_box {
+  box-sizing: border-box;
+  width: 250px;
+  height: 36px;
+  padding: 8px;
+  margin: 0 auto;
+  font-size: 14px;
+  text-align: center;
+  background-color: #FFFFFF;
+  border: 1px dashed #C4C4C4;
+  border-top: 0;
+  border-radius: 0 0 4px 4px;
+}
+li.spr_tip_6 .variable_holder .ranking_holder #half2 .grid_inline_droppable_title_box,
+div.spr_tip_6 .variable_holder .ranking_holder #half2 .grid_inline_droppable_title_box,
+div.jezik_row.tip_6 .variable_holder .ranking_holder #half2 .grid_inline_droppable_title_box,
+li.spr_tip_16 .variable_holder .ranking_holder #half2 .grid_inline_droppable_title_box,
+div.spr_tip_16 .variable_holder .ranking_holder #half2 .grid_inline_droppable_title_box,
+div.jezik_row.tip_16 .variable_holder .ranking_holder #half2 .grid_inline_droppable_title_box {
+  box-sizing: border-box;
+  width: 250px;
+  min-height: 36px;
+  height: auto;
+  padding: 8px;
+  margin: 0 auto 16px auto;
+  text-align: center;
+  font-size: 14px;
+  border: 0;
+}
+li.spr_tip_6 .variable_holder .ranking_holder #half2 li:last-child .grid_inline_droppable_title_box,
+li.spr_tip_6 .variable_holder .ranking_holder #half2 li:last-child .dragdrop_frame_grid,
+div.spr_tip_6 .variable_holder .ranking_holder #half2 li:last-child .grid_inline_droppable_title_box,
+div.spr_tip_6 .variable_holder .ranking_holder #half2 li:last-child .dragdrop_frame_grid,
+div.jezik_row.tip_6 .variable_holder .ranking_holder #half2 li:last-child .grid_inline_droppable_title_box,
+div.jezik_row.tip_6 .variable_holder .ranking_holder #half2 li:last-child .dragdrop_frame_grid,
+li.spr_tip_16 .variable_holder .ranking_holder #half2 li:last-child .grid_inline_droppable_title_box,
+li.spr_tip_16 .variable_holder .ranking_holder #half2 li:last-child .dragdrop_frame_grid,
+div.spr_tip_16 .variable_holder .ranking_holder #half2 li:last-child .grid_inline_droppable_title_box,
+div.spr_tip_16 .variable_holder .ranking_holder #half2 li:last-child .dragdrop_frame_grid,
+div.jezik_row.tip_16 .variable_holder .ranking_holder #half2 li:last-child .grid_inline_droppable_title_box,
+div.jezik_row.tip_16 .variable_holder .ranking_holder #half2 li:last-child .dragdrop_frame_grid {
+  margin-bottom: 0;
+}
+
 /*
 To change this license header, choose License Headers in Project Properties.
 To change this template file, choose Tools | Templates
diff --git a/resources/sass/admin_new/pages/survey_edit/questions/ranking.scss b/resources/sass/admin_new/pages/survey_edit/questions/ranking.scss
index f4750c24a..a4ce3861d 100644
--- a/resources/sass/admin_new/pages/survey_edit/questions/ranking.scss
+++ b/resources/sass/admin_new/pages/survey_edit/questions/ranking.scss
@@ -12,7 +12,7 @@ and open the template in the editor.
 
 li.spr_tip_17,
 div.spr_tip_17,
-div.jezik_row.tip_17{ 
+div.jezik_row.tip_17{
 
     .variable_holder .ranking_holder{
 
@@ -177,12 +177,6 @@ div.jezik_row.tip_17{
         }
 
 
-
-
-
-
-        
-        
         .dragdrop_frame {
             font-size: 14px;
             width: 230px;
@@ -194,72 +188,7 @@ div.jezik_row.tip_17{
             text-indent: -20px;
             text-align: left;
         }
-        .dragdrop_frame_grid {
-            font-size: 14px;
-            width: 230px;
-            height: 25px;
-            padding: 0 0 2px 0;
-            margin: 0px auto 10px auto;
-            border: 1px black dashed;
-            background-color: $gray;
-            text-indent: -20px;
-            text-align: left;
-        }
-        .dragdrop_frame_grid_box {
-            font-size: 14px;
-            width: 230px;
-            height: 30px;
-            padding: 0 0 2px 0;
-            margin: 10px auto 0px auto;
-            border-left: 1px black dashed !important;
-            border-right: 1px black dashed !important;
-            border-bottom: 1px black dashed !important;
-            text-indent: -20px;
-            text-align: left;
-        }
-        .drag_and_drop_box {
-            cursor: pointer;
-            width: 230px;
-            padding: 5px;
-            margin: 0px auto 10px auto;
-            border: 1px solid #000;
-            height: 15px;
-            text-align: center;
-            overflow: hidden;
-            background-color: white;
-            cursor: pointer;
-            width: 230px;
-            padding: 5px;
-            margin: 0px auto 10px auto;
-            border: 1px solid #000;
-            height: 15px;
-            text-align: center;
-            overflow: hidden;
-            background-color: white;
-            img {
-                display: block;
-                margin-left: auto;
-                margin-right: auto;
-            }
-        }
-        .drag_and_drop {
-            top: -6px;
-            left: -6px;
-        }
-        .drag_and_drop_right {
-            top: -6px !important;
-            left: -6px !important;
-        }
-        .drag_and_drop_box_right {
-            top: 15px !important;
-            left: -6px !important;
-        }
-        .drag_and_drop_box_right_after_refresh {
-            left: -6px !important;
-        }
-        .drag_and_drop_box_right_over {
-            left: -6px !important;
-        }
+   
         .inline_labele_podrocij {
             text-align: center !important;
         }
@@ -292,3 +221,166 @@ div.jezik_row.tip_17{
 }
 
 
+li.spr_tip_6 .variable_holder .ranking_holder,
+div.spr_tip_6 .variable_holder .ranking_holder,
+div.jezik_row.tip_6 .variable_holder .ranking_holder,
+li.spr_tip_16 .variable_holder .ranking_holder,
+div.spr_tip_16 .variable_holder .ranking_holder,
+div.jezik_row.tip_16 .variable_holder .ranking_holder{ 
+    display: flex;
+
+    margin-top: 16px;
+
+    #half{
+        width: 50%;
+
+        padding-right: 16px;
+        margin-right: 16px;
+
+        border-right: 1px $gray solid;
+
+        .variabla{
+            margin-bottom: 16px;
+
+            &:last-child{
+                margin-bottom: 0;
+            }
+
+            .ranking {
+                overflow: hidden;
+                box-sizing: border-box;
+                flex-grow: 1;
+
+                width: calc(100% - 120px);
+                max-width: 250px;
+                min-height: 36px;
+                padding: 8px;
+                margin: 0 auto 0 auto;
+                
+                font-size: 14px;
+                text-align: center;
+
+                background-color: $light-gray;
+                border: 1px solid $gray;
+                border-radius: 4px;
+                
+                img {
+                    display: block;
+                    margin-left: auto;
+                    margin-right: auto;
+                }
+            }
+
+            .ranking_long {
+                overflow: hidden;
+                box-sizing: border-box;
+
+                max-width: 250px;
+                max-height: 36px;
+                padding: 8px;
+                margin: 0 auto 0 auto;
+                
+                font-size: 11px;
+                text-align: center;
+
+                background-color: $light-gray;
+                border: 1px solid $gray;
+                border-radius: 4px;
+                
+                img {
+                    display: block;
+                    margin-left: auto;
+                    margin-right: auto;
+                }
+            }
+        }
+
+        
+        
+    }
+
+    // Desna stran
+    #half2{
+        width: 49%;
+
+
+        .grid_inline_droppable_title{
+            box-sizing: border-box;
+
+            width: 250px;
+            min-height: 36px;
+            height: auto;
+            padding: 8px;
+            margin: 0 auto;
+
+            text-align: center;
+            font-size: 14px;
+
+            border: 1px dashed $gray;
+            border-bottom: 0;
+            border-radius: 4px 4px 0 0;
+        }
+
+        .dragdrop_frame_grid {
+            box-sizing: border-box;
+
+            width: 250px;
+            height: 36px;
+            padding: 8px;
+            margin: 0 auto 16px auto;
+            
+            font-size: 14px;
+            text-align: center;
+
+            background-color: $light-gray;
+            border: 1px dashed $gray;
+            border-radius: 0 0 4px 4px;
+        }
+
+
+        .dragdrop_frame_grid_box {
+            box-sizing: border-box;
+
+            width: 250px;
+            height: 36px;
+            padding: 8px;
+            margin: 0 auto;
+            
+            font-size: 14px;
+            text-align: center;
+
+            background-color: $white;
+            border: 1px dashed $dark-gray;
+            border-top: 0;
+            border-radius: 0 0 4px 4px;
+        }
+
+        .grid_inline_droppable_title_box{
+            box-sizing: border-box;
+
+            width: 250px;
+            min-height: 36px;
+            height: auto;
+            padding: 8px;
+            margin: 0 auto 16px auto;
+
+            text-align: center;
+            font-size: 14px;
+
+            border: 0;
+        }
+
+
+        li:last-child{
+            .grid_inline_droppable_title_box,
+            .dragdrop_frame_grid{
+                margin-bottom: 0;
+            }
+        }
+    }
+
+    
+    
+}
+
+

From b33e773a7f2b2e42fbb8ec7fc37dc72e76807a66 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Tue, 31 May 2022 09:38:58 +0200
Subject: [PATCH 12/17] Redesign - popravki napak - vabila

---
 admin/survey/script/invitations.js | 8 +++++++-
 admin/survey/script/js-lang.php    | 1 +
 lang/1.php                         | 1 +
 lang/2.php                         | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/admin/survey/script/invitations.js b/admin/survey/script/invitations.js
index 67e9a18db..221b176c1 100644
--- a/admin/survey/script/invitations.js
+++ b/admin/survey/script/invitations.js
@@ -511,12 +511,18 @@ function invChangeMessage(mid) {
 }
 
 function invMessageDelete() {
+
 	var mid = $("#invitation_messages ol li.active").attr("mid");
-	if (confirm(lang['srv_inv_recipients_delete_profile_confirm'])) {
+
+	if (confirm(lang['srv_inv_recipients_delete_message_confirm'])) {
+
 		if(CKEDITOR.instances['inv_message_body']) {
 			delete CKEDITOR.instances['inv_message_body'];
 		}
+
 		$("#anketa_edit").load('ajax.php?t=invitations&a=delete_msg_profile', {anketa:srv_meta_anketa_id, mid:mid });
+
+        event.stopPropagation();
 	}
 }	
 
diff --git a/admin/survey/script/js-lang.php b/admin/survey/script/js-lang.php
index 917751ab4..82b4b8833 100644
--- a/admin/survey/script/js-lang.php
+++ b/admin/survey/script/js-lang.php
@@ -108,6 +108,7 @@ lang('srv_disable');
 lang('srv_if_new');
 lang('srv_if_new_question');
 lang('srv_chart_edit_warning');
+lang('srv_inv_recipients_delete_message_confirm');
 lang('srv_inv_recipients_delete_profile_confirm');
 lang('srv_inv_recipients_delete_list_confirm');
 lang('srv_inv_recipients_delete_multi');
diff --git a/lang/1.php b/lang/1.php
index 838549b37..d596cacf4 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -4980,6 +4980,7 @@ $lang = array (
 	'srv_inv_recipients_edit_profile' 			=> "Preimenuj seznam",
 	'srv_inv_recipients_delete_profile_confirm'	=> "Ali resnično želite izbrisati seznam?",
 	'srv_inv_recipients_delete_list_confirm'	=> "Ali resnično želite izbrisati seznam respondentov?",
+	'srv_inv_recipients_delete_message_confirm'	=> "Ali resnično želite izbrisati sporočilo?",
 	'srv_inv_recipiens_add_success_cnt' 		=> "Število uspešno dodanih prejemnikov:",
 	'srv_inv_recipiens_add_success_update_cnt' 	=> "Število popravljenih prejemnikov:",
 	'srv_inv_recipiens_add_error' 				=> "Noben prejemnik ni bil dodan!",
diff --git a/lang/2.php b/lang/2.php
index 225447495..b1cb49a63 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -4950,6 +4950,7 @@ $lang = array (
 	'srv_inv_recipients_edit_profile' 			=> "Rename list",
 	'srv_inv_recipients_delete_profile_confirm'	=> "Do you really want to delete list?",
 	'srv_inv_recipients_delete_list_confirm'	=> "Do you really want to delete list of respondents?",
+    'srv_inv_recipients_delete_message_confirm'	=> "Do you really want to delete message?",
 	'srv_inv_recipiens_add_success_cnt' 		=> "The number of added recipients:",
 	'srv_inv_recipiens_add_success_update_cnt' 	=> "The number of updated recipients:",
 	'srv_inv_recipiens_add_error' 				=> "None of the recipient was added!",

From 02127c58adc5282cee65f8adfea2a3922841228a Mon Sep 17 00:00:00 2001
From: patrik2020 <patrik.pucer@gmail.com>
Date: Tue, 31 May 2022 09:53:20 +0200
Subject: [PATCH 13/17] Latex za izvoze: KLIENT-101: NIJZ- izvoz odgovorov
 posameznega respondenta v PDF - ureditev tezave z izpisom minusa

---
 .../textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls      | 3 ++-
 .../latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls  | 3 ++-
 .../export/latexclasses/textemp/latexTemplatePdfSurvey.cls     | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls b/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls
index 7dd147707..fa222fbaa 100644
--- a/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls
+++ b/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls
@@ -98,4 +98,5 @@
 \DeclareUnicodeCharacter{03B5}{$\epsilon$
 \DeclareUnicodeCharacter{2003}{$\enspace$}}
 \DeclareUnicodeCharacter{0014}{$\thinspace$}	%ni ta pravi nadomestek, ker v Latexu tak simbol ne obstaja
-\DeclareUnicodeCharacter{0301}{$'$}
\ No newline at end of file
+\DeclareUnicodeCharacter{0301}{$'$}
+\DeclareUnicodeCharacter{2212}{-}
\ No newline at end of file
diff --git a/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls b/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls
index d8be52dab..952ddf599 100644
--- a/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls
+++ b/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls
@@ -96,4 +96,5 @@
 \DeclareUnicodeCharacter{03B5}{$\epsilon$}
 \DeclareUnicodeCharacter{2003}{$\enspace$}
 \DeclareUnicodeCharacter{0014}{$\thinspace$}	%ni ta pravi nadomestek, ker v Latexu tak simbol ne obstaja
-\DeclareUnicodeCharacter{0301}{$'$}
\ No newline at end of file
+\DeclareUnicodeCharacter{0301}{$'$}
+\DeclareUnicodeCharacter{2212}{-}
\ No newline at end of file
diff --git a/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls b/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls
index 2106dcc71..f9612c4dc 100644
--- a/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls
+++ b/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls
@@ -37,6 +37,7 @@
 \DeclareUnicodeCharacter{2003}{$\enspace$}
 \DeclareUnicodeCharacter{0014}{$\thinspace$}	%ni ta pravi nadomestek, ker v Latexu tak simbol ne obstaja
 \DeclareUnicodeCharacter{0301}{$'$}
+\DeclareUnicodeCharacter{2212}{-}
 
 %Emoji - izpis urejen s slikicami emoji-jev
 \DeclareUnicodeCharacter{1F600}{\includegraphics[height=1em]{1F600.png}}

From d8baef60cc9f7ad3dacc2f61d1faafb747cccd64 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Tue, 31 May 2022 09:57:31 +0200
Subject: [PATCH 14/17] Redesign - popravki napak - arhiv analiz

---
 .../surveyAnalysis/class.SurveyAnalysisArchive.php | 14 +++++++++-----
 public/css/admin_new.css                           |  2 ++
 .../admin_new/pages/survey_analysis/archive.scss   |  2 ++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
index d7a577317..078c45ed4 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
@@ -1259,7 +1259,9 @@ class SurveyAnalysisArchive {
 	 * 
 	 */
 	static function createArchiveFromAnaliza() {
+
 		$content = null;
+
 		if($_POST['podstran'] == 'charts'){
 			# kreiramo arhiv za grafe
 			$SC = new SurveyChart();
@@ -1280,13 +1282,15 @@ class SurveyAnalysisArchive {
 			if ($_POST['podstran'] == 'anal_arch') {
 				$_POST['podstran'] = 'sumarnik';
 			}
+            
 			if (!isset($_POST['content'])) {
 				SurveyAnalysis::Init(self::$sid);
 				SurveyAnalysis::setUpIsForArchive(true);
 				SurveyAnalysis::setUpReturnAsHtml(true);
 				
 				$content = SurveyAnalysis::Display();
-			} else {
+			} 
+            else {
 				$content = $_POST['content'];
 			}
 		}	
@@ -1301,12 +1305,12 @@ class SurveyAnalysisArchive {
 		$ArchiveTypes = array(M_ANALIZA_SUMS => 0, M_ANALIZA_DESCRIPTOR=>1, M_ANALIZA_FREQUENCY=>2, M_ANALIZA_CROSSTAB=>3, M_ANALYSIS_MEANS=>4, M_ANALYSIS_TTEST=>5, M_ANALYSIS_BREAK=>6, M_ANALYSIS_CHARTS=>7, M_ANALYSIS_CREPORT=>8);
 		if (isset($_POST['podstran']))
 			$type = $ArchiveTypes[$_POST['podstran']];
-		if (isset($content) && trim($content) != null && self::$sid > 0) {
 
+		if (isset($content) && trim($content) != null && self::$sid > 0) {
 			SurveyAnalysisArchive :: Init(self::$sid);
-			SurveyAnalysisArchive :: CreateArchive($content,$name,$note,$access,$type,$duration,$durationType,$settings,$access_password);
-						
-		} else {
+			SurveyAnalysisArchive :: CreateArchive($content,$name,$note,$access,$type,$duration,$durationType,$settings,$access_password);		
+		} 
+        else {
 			echo 'Error! (SurveyAnalysisArchive :: CreateArchive)';
 		}
 		
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 4b4ec084f..6cbd02ff6 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -30394,6 +30394,8 @@ input#endDate {
 #arch_body_div .analysis_bottom_settings {
   margin-bottom: 32px;
 }
+#arch_body_div .analysis_bottom_settings .comment_holder,
+#arch_body_div .analysis_bottom_settings a:nth-child(2),
 #arch_body_div .analysis_bottom_settings a:nth-child(6) {
   display: none;
 }
diff --git a/resources/sass/admin_new/pages/survey_analysis/archive.scss b/resources/sass/admin_new/pages/survey_analysis/archive.scss
index 0b2b3d54a..025f43a2d 100644
--- a/resources/sass/admin_new/pages/survey_analysis/archive.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/archive.scss
@@ -16,6 +16,8 @@
     .analysis_bottom_settings{
         margin-bottom: 32px;
 
+        .comment_holder,
+        a:nth-child(2),
         a:nth-child(6){
             display: none;
         }

From af2b211d63b9fdf094391f593be888507bf53092 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Tue, 31 May 2022 11:07:52 +0200
Subject: [PATCH 15/17] Redesign - popravki napak - porocilo po meri, analize

---
 .../classes/class.SurveyCustomReport.php      |  46 +++--
 .../surveyAnalysis/class.SurveyChart.php      |  29 +--
 .../class.SurveyMultiCrosstabs.php            |   4 +-
 public/css/admin_new.css                      | 109 +++++++---
 .../pages/survey_analysis/page_charts.scss    |  20 +-
 .../pages/survey_analysis/page_crosstab.scss  | 186 +++++++++---------
 .../survey_analysis/page_custom_report.scss   |  37 +++-
 7 files changed, 278 insertions(+), 153 deletions(-)

diff --git a/admin/survey/classes/class.SurveyCustomReport.php b/admin/survey/classes/class.SurveyCustomReport.php
index 99427fc45..cf26bc19e 100644
--- a/admin/survey/classes/class.SurveyCustomReport.php
+++ b/admin/survey/classes/class.SurveyCustomReport.php
@@ -367,7 +367,7 @@ class SurveyCustomReport {
 
             if(SurveyInfo::getInstance()->getSurveyColumn("survey_type") != 0){
 			    echo	'<option value="5" '.($reportElement['type'] == 5 ? 'selected="selected"' : '').'>'.$lang['srv_crosstabs'].'</option>';
-			    echo	'<option value="10" '.($reportElement['type'] == 10 ? 'selected="selected"' : '').'>'.$lang['srv_multicrosstab'].'</option>';
+			    //echo	'<option value="10" '.($reportElement['type'] == 10 ? 'selected="selected"' : '').'>'.$lang['srv_multicrosstab'].'</option>';
 			    echo	'<option value="6" '.($reportElement['type'] == 6 ? 'selected="selected"' : '').'>'.$lang['srv_means_label'].'</option>';
 			    echo	'<option value="7" '.($reportElement['type'] == 7 ? 'selected="selected"' : '').'>'.$lang['srv_ttest'].'</option>';
 			    echo	'<option value="9" '.($reportElement['type'] == 9 ? 'selected="selected"' : '').'>'.$lang['srv_break'].'</option>';		
@@ -472,8 +472,11 @@ class SurveyCustomReport {
 				echo '</select>';
 				
 				// Izbira podtipa (tabela / graf)
-				echo ' <input style="margin-left:20px;" type="radio" value="0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />Tabela ';
-				echo '<input type="radio" value="1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />Graf';
+				echo '  <input style="margin-left:16px;" type="radio" value="0" id="report_element_sub_type_'.$reportElement['id'].'_0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
+                echo '  <label for="report_element_sub_type_'.$reportElement['id'].'_0">'.$lang['srv_table'].'</label>';
+
+				echo '  <input type="radio" value="1" id="report_element_sub_type_'.$reportElement['id'].'_1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
+                echo '  <label for="report_element_sub_type_'.$reportElement['id'].'_1">'.$lang['srv_chart'].'</label>';
 			}
 			
 			// Nastavitve za MULTICROSSTABE
@@ -557,8 +560,11 @@ class SurveyCustomReport {
 				
 				
 				// Izbira podtipa (tabela / graf)
-				echo ' <input style="margin-left:20px;" type="radio" value="0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />Tabela ';
-				echo '<input type="radio" value="1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />Graf';
+				echo '  <input style="margin-left:16px;" type="radio" value="0" id="report_element_sub_type_'.$reportElement['id'].'_0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
+                echo '  <label for="id="report_element_sub_type_'.$reportElement['id'].'_0">'.$lang['srv_table'].'</label>';
+
+				echo '  <input type="radio" value="1" id="report_element_sub_type_'.$reportElement['id'].'_1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
+                echo '  <label for="id="report_element_sub_type_'.$reportElement['id'].'_1">'.$lang['srv_chart'].'</label>';
 			}
 			
 			// Nastavitve za TTEST
@@ -619,8 +625,11 @@ class SurveyCustomReport {
 				
 				
 				// Izbira podtipa (tabela / graf)
-				echo ' <input style="margin-left:20px;" type="radio" value="0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />Tabela ';
-				echo '<input type="radio" value="1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />Graf';
+				echo '  <input style="margin-left:16px;" type="radio" value="0" id="report_element_sub_type_'.$reportElement['id'].'_0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
+                echo '  <label for="report_element_sub_type_'.$reportElement['id'].'_0">'.$lang['srv_table'].'</label>';
+				
+                echo '  <input type="radio" value="1" id="report_element_sub_type_'.$reportElement['id'].'_1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
+                echo '  <label for="report_element_sub_type_'.$reportElement['id'].'_1">'.$lang['srv_chart'].'</label>';
 			
 				
 				// Izbira dveh podvariabel za prvo variablo
@@ -694,8 +703,11 @@ class SurveyCustomReport {
 				echo '</select>';
 				
 				// Izbira podtipa (tabela / graf)
-				echo ' <input style="margin-left:20px;" type="radio" value="0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />'.$lang['srv_table'];
-				echo ' <input type="radio" value="1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />'.$lang['srv_chart'];
+				echo '  <input style="margin-left:16px;" type="radio" value="0" id="report_element_sub_type_'.$reportElement['id'].'_0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
+                echo '  <label for="report_element_sub_type_'.$reportElement['id'].'_0">'.$lang['srv_table'].'</label>';
+				
+                echo '  <input type="radio" value="1" id="report_element_sub_type_'.$reportElement['id'].'_1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
+                echo '  <label for="report_element_sub_type_'.$reportElement['id'].'_1">'.$lang['srv_chart'].'</label>';
 			}
 				
 			echo '</div>';
@@ -723,7 +735,7 @@ class SurveyCustomReport {
 	function displayTTestSubVar($reportElement){
 		global $lang;
 		
-		echo '<div id="ttestVariablesSpan" style="margin: 10px 0 10px 80px;">';
+		echo '<div id="ttestVariablesSpan" style="margin: 0 0 0 32px;">';
 		
 		$ttestData1 = explode("-", $reportElement['spr1']);
 		$spr = $ttestData1[1];
@@ -745,7 +757,8 @@ class SurveyCustomReport {
 					$checked = ($check1 == $spr.'_'.$sekvenca.'_'.$value || $check2 == $spr.'_'.$sekvenca.'_'.$value) ? true : false;
 					$disabled = ($check1 != null && $check2 != null && !$checked) ? ' disabled="disabled"' : '';
 					
-					echo '<label '.($disabled == ' disabled="disabled"' ? 'class="gray"' : '').'><input name="subTtest" class="subTtest_'.$reportElement['id'].'" type="checkbox" value="'.$spr.'_'.$sekvenca.'_'.$value.'" '.($checked ? ' checked="checked"' : '').' onchange="editCustomReportTTestVar(\''.$reportElement['id'].'\');" '.$disabled.' />('.$value.') - '.$option.'</label><br/>';
+					echo '<input id="subTtest_'.$reportElement['id'].'_'.$value.'" name="subTtest" class="subTtest_'.$reportElement['id'].'" type="checkbox" value="'.$spr.'_'.$sekvenca.'_'.$value.'" '.($checked ? ' checked="checked"' : '').' onchange="editCustomReportTTestVar(\''.$reportElement['id'].'\');" '.$disabled.' />';
+                    echo '<label for="subTtest_'.$reportElement['id'].'_'.$value.'" '.($disabled == ' disabled="disabled"' ? 'class="gray"' : '').'>('.$value.') - '.$option.'</label><br/>';
 				}
 				break;
 				
@@ -756,7 +769,8 @@ class SurveyCustomReport {
 					$checked = ($check1 == $spr.'_'.$variable['sequence'].'_'.$option || $check2 == $spr.'_'.$variable['sequence'].'_'.$option) ? true : false;
 					$disabled = ($check1 != null && $check2 != null && !$checked) ? ' disabled="disabled"' : '';
 					
-					echo '<label '.($disabled == ' disabled="disabled"' ? 'class="gray"' : '').'><input name="subTtest" class="subTtest_'.$reportElement['id'].'" type="checkbox" value="'.$spr.'_'.$variable['sequence'].'_'.$option.'" '.($checked ? ' checked="checked"' : '').' onchange="editCustomReportTTestVar(\''.$reportElement['id'].'\');" '.$disabled.' />('.$variable['variable'].') - '.$variable['naslov'].'</label><br/>';
+					echo '<input id="subTtest_'.$reportElement['id'].'_'.$variable['variable'].'" name="subTtest" class="subTtest_'.$reportElement['id'].'" type="checkbox" value="'.$spr.'_'.$variable['sequence'].'_'.$option.'" '.($checked ? ' checked="checked"' : '').' onchange="editCustomReportTTestVar(\''.$reportElement['id'].'\');" '.$disabled.' />';
+                    echo '<label for="subTtest_'.$reportElement['id'].'_'.$variable['variable'].'" '.($disabled == ' disabled="disabled"' ? 'class="gray"' : '').'>('.$variable['variable'].') - '.$variable['naslov'].'</label><br/>';
 				}
 				break;
 				
@@ -768,20 +782,22 @@ class SurveyCustomReport {
 					$checked = ($check1 == $spr.'_'.$sekvenca.'_'.$value || $check2 == $spr.'_'.$sekvenca.'_'.$value) ? true : false;
 					$disabled = ($check1 != null && $check2 != null && !$checked) ? ' disabled="disabled"' : '';
 					
-					echo '<label '.($disabled == ' disabled="disabled"' ? 'class="gray"' : '').'><input name="subTtest" class="subTtest_'.$reportElement['id'].'" type="checkbox" value="'.$spr.'_'.$sekvenca.'_'.$value.'" '.($checked ? ' checked="checked"' : '').' onchange="editCustomReportTTestVar(\''.$reportElement['id'].'\');" '.$disabled.' />('.$value.') - '.$option.'</label><br/>';
+					echo '<input id="subTtest_'.$reportElement['id'].'_'.$value.'" name="subTtest" class="subTtest_'.$reportElement['id'].'" type="checkbox" value="'.$spr.'_'.$sekvenca.'_'.$value.'" '.($checked ? ' checked="checked"' : '').' onchange="editCustomReportTTestVar(\''.$reportElement['id'].'\');" '.$disabled.' />';
+                    echo '<label for="subTtest_'.$reportElement['id'].'_'.$value.'" '.($disabled == ' disabled="disabled"' ? 'class="gray"' : '').'>('.$value.') - '.$option.'</label><br/>';
 				}
 				break;
 				
 			case 16:	#mcheck
 				#nardimo inpute za vse opcije
-				# poi��emo pripadajo�o sekvenco
+				# poiščemo pripadajočo sekvenco
 				#nardimo inpute za vse opcije
 				$option = '1';
 				foreach ($_spr_data['grids'][$grid]['variables'] as $vid => $variable) {
 					$checked = ($check1 == $spr.'_'.$variable['sequence'].'_'.$option || $check2 == $spr.'_'.$variable['sequence'].'_'.$option) ? true : false;
 					$disabled = ($check1 != null && $check2 != null && !$checked) ? ' disabled="disabled"' : '';
 					
-					echo '<label '.($disabled == ' disabled="disabled"' ? 'class="gray"' : '').'><input name="subTtest" class="subTtest_'.$reportElement['id'].'" type="checkbox" value="'.$spr.'_'.$variable['sequence'].'_'.$option.'" '.($checked ? ' checked="checked"' : '').' onchange="editCustomReportTTestVar(\''.$reportElement['id'].'\');" '.$disabled.' />('.$variable['variable'].') - '.$variable['naslov'].'</label><br/>';
+					echo '<input id="subTtest_'.$reportElement['id'].'_'.$variable['variable'].'" name="subTtest" class="subTtest_'.$reportElement['id'].'" type="checkbox" value="'.$spr.'_'.$variable['sequence'].'_'.$option.'" '.($checked ? ' checked="checked"' : '').' onchange="editCustomReportTTestVar(\''.$reportElement['id'].'\');" '.$disabled.' />';
+                    echo '<label for="subTtest_'.$reportElement['id'].'_'.$variable['variable'].'" '.($disabled == ' disabled="disabled"' ? 'class="gray"' : '').'>('.$variable['variable'].') - '.$variable['naslov'].'</label><br/>';
 				}
 				break;
 
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
index 764420b1e..ce2373ce4 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
@@ -8778,25 +8778,28 @@ class SurveyChart {
 		global $site_path;
 		global $lang;
 		
-		echo '<div class="chart_settings_inner">';
-		echo '<span class="title">'.$lang['srv_chart_settings'].'</span>';
-				
-		//Poravnava texta
-		echo '<div class="chart_setting">';
-			
-		echo '<input type="checkbox" id="chart_other_otherType_'.$spid.'_loop_'.self::$current_loop.'" name="chart_other_otherType" '.(self::$settings['otherType']=='1'?' checked="checked"':'').' onchange="changeOther(\''.$spid.'\', \'otherType\', \''.self::$current_loop.'\');">';
-		echo '<label for="chart_other_otherType_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_table_align'].'</label>';
+		echo '<div class="chart_settings_content">';
 
+		//echo '<span class="title">'.$lang['srv_chart_settings'].'</span>';
+
+
+		echo '<div class="chart_settings_inner">';
+				
+		// Poravnava texta
+		echo '<div class="chart_setting">';
+		echo '  <input type="checkbox" id="chart_other_otherType_'.$spid.'_loop_'.self::$current_loop.'" name="chart_other_otherType" '.(self::$settings['otherType']=='1'?' checked="checked"':'').' onchange="changeOther(\''.$spid.'\', \'otherType\', \''.self::$current_loop.'\');">';
+		echo '  <label for="chart_other_otherType_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_table_align'].'</label>';
 		echo '</div>';		
 		
-		//Prikaz frekvenc
+		// Prikaz frekvenc
 		echo '<div class="chart_setting">';
-			
-		echo '<input type="checkbox" id="chart_other_otherFreq_'.$spid.'_loop_'.self::$current_loop.'" name="chart_other_otherFreq" '.(self::$settings['otherFreq']=='1'?' checked="checked"':'').' onchange="changeOther(\''.$spid.'\', \'otherFreq\', \''.self::$current_loop.'\');">';
-		echo '<label for="chart_other_otherFreq_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_table_freq'].'</label>';
-
+		echo '  <input type="checkbox" id="chart_other_otherFreq_'.$spid.'_loop_'.self::$current_loop.'" name="chart_other_otherFreq" '.(self::$settings['otherFreq']=='1'?' checked="checked"':'').' onchange="changeOther(\''.$spid.'\', \'otherFreq\', \''.self::$current_loop.'\');">';
+		echo '  <label for="chart_other_otherFreq_'.$spid.'_loop_'.self::$current_loop.'">'.$lang['srv_chart_table_freq'].'</label>';
 		echo '</div>';
 		
+		echo '</div>';
+
+        
 		echo '</div>';
 	}
 	
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
index 4af44f382..87be3ea6f 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
@@ -256,7 +256,7 @@ class SurveyMultiCrosstabs {
 		$this->getSelectedVars();
 
         // Zvezdica za creport - ce smo v custom reportu tega ne izpisemo
-		if($_GET['m'] != 'analysis_creport'){
+		/*if($_GET['m'] != 'analysis_creport'){
 		
             echo '<div class="mc_table_top_settings">';
 
@@ -264,7 +264,7 @@ class SurveyMultiCrosstabs {
 			SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=10, $sub_type=0, $spr1=$this->table_id);
 
 			echo '</div>';
-		}
+		}*/
 
 		echo '<table id="'.$this->table_id.'" cellspacing="0" cellpadding="0" class="mc_table">';
 
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 6cbd02ff6..8195c439d 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -27227,7 +27227,11 @@ iframe#ifmcontentstoprint {
 #div_analiza_data.crosstabs #crosstab_tables .table_holder table.table_crosstab table.cell_table > tbody > tr table.cell_table tr td:last-child {
   border-right: 0;
 }
-#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend {
+#div_analiza_data.crosstabs #crosstab_tables .table_holder .crosstab_chart_holder {
+  margin: 16px auto 0 auto;
+}
+
+#crosstab_legend {
   display: flex;
   align-items: center;
   width: fit-content;
@@ -27237,23 +27241,23 @@ iframe#ifmcontentstoprint {
   border: 1px solid #E5E5E5;
   border-radius: 2px;
 }
-#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line {
+#crosstab_legend .crosstab_legend_line {
   display: flex;
 }
-#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line:nth-child(2) {
+#crosstab_legend .crosstab_legend_line:nth-child(2) {
   margin-left: 32px;
 }
-#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line .title {
+#crosstab_legend .crosstab_legend_line .title {
   margin-right: 8px;
   font-size: 14px;
   line-height: 20px;
 }
-#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line .trak {
+#crosstab_legend .crosstab_legend_line .trak {
   display: flex;
   align-items: center;
   justify-content: center;
 }
-#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line .trak div {
+#crosstab_legend .crosstab_legend_line .trak div {
   width: 22px;
   height: 22px;
   font-weight: 400;
@@ -27261,52 +27265,64 @@ iframe#ifmcontentstoprint {
   text-align: center;
   line-height: 20px;
 }
-#div_analiza_data.crosstabs #crosstab_tables .table_holder .crosstab_chart_holder {
-  margin: 16px auto 0 auto;
-}
-#div_analiza_data.crosstabs .ctbChck_sp0 {
+
+.ctbChck_sp0 {
   background-color: #fcfcfc !important;
 }
-#div_analiza_data.crosstabs .ctbChck_sp1 {
+
+.ctbChck_sp1 {
   background-color: #FEFFE3 !important;
 }
-#div_analiza_data.crosstabs .ctbChck_sp2 {
+
+.ctbChck_sp2 {
   background-color: #FCFFC2 !important;
 }
-#div_analiza_data.crosstabs .ctbChck_sp3 {
+
+.ctbChck_sp3 {
   background-color: #FBFFA8 !important;
 }
-#div_analiza_data.crosstabs .crossCheck_EC {
+
+.crossCheck_EC {
   background-color: #FFFAE8 !important;
 }
-#div_analiza_data.crosstabs .crossCheck_RE {
+
+.crossCheck_RE {
   background-color: #FFF6D1 !important;
 }
-#div_analiza_data.crosstabs .crossCheck_SR {
+
+.crossCheck_SR {
   background-color: #FFECA2 !important;
 }
-#div_analiza_data.crosstabs .crossCheck_AR {
+
+.crossCheck_AR {
   background-color: #FFDA46 !important;
 }
-#div_analiza_data.crosstabs .rsdl_bck0 {
+
+.rsdl_bck0 {
   background-color: white !important;
 }
-#div_analiza_data.crosstabs .rsdl_bck1 {
+
+.rsdl_bck1 {
   background-color: #fae2e2 !important;
 }
-#div_analiza_data.crosstabs .rsdl_bck2 {
+
+.rsdl_bck2 {
   background-color: #ff9d9d !important;
 }
-#div_analiza_data.crosstabs .rsdl_bck3 {
+
+.rsdl_bck3 {
   background-color: #f84242 !important;
 }
-#div_analiza_data.crosstabs .rsdl_bck4 {
+
+.rsdl_bck4 {
   background-color: #E8F1FF !important;
 }
-#div_analiza_data.crosstabs .rsdl_bck5 {
+
+.rsdl_bck5 {
   background-color: #B9D5FF !important;
 }
-#div_analiza_data.crosstabs .rsdl_bck6 {
+
+.rsdl_bck6 {
   background-color: #74ACFF !important;
 }
 
@@ -28091,7 +28107,7 @@ iframe#ifmcontentstoprint {
 }
 .chart_holder .other_settings,
 .tableChart .other_settings {
-  margin-top: 50px;
+  margin-top: 70px;
   margin-bottom: 20px;
   /*height: 60px;*/
 }
@@ -28118,9 +28134,22 @@ iframe#ifmcontentstoprint {
 
 .tableChart {
   position: relative;
+  padding-bottom: 24px;
 }
 .tableChart .custom_report_include {
-  display: none;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  margin: 0 !important;
+}
+.tableChart .custom_report_include a {
+  text-decoration: none;
+}
+.tableChart .custom_report_include a .faicon:before {
+  vertical-align: 1px;
+}
+.tableChart .custom_report_include {
+  display: none !important;
 }
 .tableChart .chart_setting_exportLinks {
   justify-content: flex-end;
@@ -28440,7 +28469,7 @@ ul.vrednost_sort input[type=text] {
 .subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_head {
   cursor: pointer;
   display: flex;
-  align-items: center;
+  align-items: baseline;
   justify-content: space-between;
   padding: 8px 8px 8px 16px;
   background-color: #F8F8F8;
@@ -28449,6 +28478,10 @@ ul.vrednost_sort input[type=text] {
   font-weight: 600;
   text-transform: uppercase;
 }
+.subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_head .report_element_icons {
+  display: flex;
+  flex-wrap: nowrap;
+}
 .subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_head .report_element_icons .faicon:before {
   color: #1E88E5;
   font-size: 16px;
@@ -28458,11 +28491,33 @@ ul.vrednost_sort input[type=text] {
 }
 .subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_settings {
   display: flex;
+  align-items: center;
   padding: 16px 16px 8px 16px;
 }
 .subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_settings select {
   margin: 0 16px 0 0;
 }
+.subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_settings #ttestVariablesSpan {
+  display: flex;
+  flex-direction: column;
+  padding: 8px;
+  max-width: 300px;
+  background-color: #F8F8F8;
+  border: 1px solid #E5E5E5;
+}
+.subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_settings #ttestVariablesSpan span {
+  margin-bottom: 8px;
+  color: #333333;
+}
+.subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_settings #ttestVariablesSpan span label {
+  font-size: 14px;
+}
+.subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_settings #ttestVariablesSpan span.gray {
+  color: #C4C4C4;
+}
+.subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_settings #ttestVariablesSpan span:last-of-type {
+  margin-bottom: 0;
+}
 .subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_data {
   padding: 16px 16px;
 }
diff --git a/resources/sass/admin_new/pages/survey_analysis/page_charts.scss b/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
index df1522536..b5de8317f 100644
--- a/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
@@ -291,7 +291,7 @@
     }
 
     .other_settings {
-        margin-top: 50px;
+        margin-top: 70px;
         margin-bottom: 20px;
         /*height: 60px;*/
         
@@ -316,9 +316,25 @@
 
 .tableChart{
     position: relative;
+    padding-bottom: 24px;
 
     .custom_report_include{
-        display: none;
+        position: absolute;
+        bottom: 0;
+        left: 0;
+
+        margin: 0 !important;
+
+        a{
+            text-decoration: none;
+
+            .faicon:before{
+                vertical-align: 1px;
+            }
+        }
+    }
+    .custom_report_include{
+        display: none !important;
     }
 
     .chart_setting_exportLinks{
diff --git a/resources/sass/admin_new/pages/survey_analysis/page_crosstab.scss b/resources/sass/admin_new/pages/survey_analysis/page_crosstab.scss
index e1e79c6b0..bd82d1fc3 100644
--- a/resources/sass/admin_new/pages/survey_analysis/page_crosstab.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/page_crosstab.scss
@@ -151,104 +151,104 @@
                 }
             }    
 
-            #crosstab_legend{
-                display: flex;
-                align-items: center;
-
-                width: fit-content;
-                margin-top: 16px;
-                padding: 8px 16px;
-
-                background-color: $light-gray;
-                border: 1px solid $gray;
-                border-radius: 2px;
-
-                .crosstab_legend_line{
-                    display: flex;
-
-                    &:nth-child(2){
-                        margin-left: 32px;
-                    }
-
-                    .title{
-                        margin-right: 8px;
-
-                        font-size: 14px;
-                        line-height: 20px;
-                    }
-
-                    .trak{
-                        display: flex;
-                        align-items: center;
-                        justify-content: center;
-
-                        div{
-                            width: 22px;
-                            height: 22px;
-
-                            font-weight: 400;
-                            font-size: 16px;
-                            text-align: center;
-                            line-height: 20px;
-                        }
-                    }              
-                }     
-            }
-
             .crosstab_chart_holder{
                 margin: 16px auto 0 auto;
             }
         }
     }
-    
-    
-    // Barve
-    .ctbChck_sp0 {
-        background-color: #fcfcfc !important;
-    }
-    .ctbChck_sp1 {
-        background-color: #FEFFE3 !important;
-    }
-    .ctbChck_sp2 {
-        background-color: #FCFFC2 !important;
-    }
-    .ctbChck_sp3 {
-        background-color: #FBFFA8 !important;
-    }
-    .crossCheck_EC {
-        background-color: #FFFAE8 !important;
-    }
-    .crossCheck_RE {
-        background-color: #FFF6D1 !important;
-    }
-    .crossCheck_SR {
-        background-color: #FFECA2 !important;
-    }
-    .crossCheck_AR {
-        background-color: #FFDA46 !important;
-    }
-    .rsdl_bck0 {
-        background-color: white !important;
-    }
-    .rsdl_bck1 {
-        background-color: rgb(250, 226, 226) !important;
-    }
-    .rsdl_bck2 {
-        background-color: rgb(255, 157, 157) !important;
-    }
-    .rsdl_bck3 {
-        background-color: rgb(248, 66, 66) !important;
-    }
-    .rsdl_bck4 {
-        background-color: #E8F1FF !important;
-    }
-    .rsdl_bck5 {
-        background-color: #B9D5FF !important;
-    }
-    .rsdl_bck6 {
-        background-color: #74ACFF !important;
-    }
-
+}
+
+
+#crosstab_legend{
+    display: flex;
+    align-items: center;
+
+    width: fit-content;
+    margin-top: 16px;
+    padding: 8px 16px;
+
+    background-color: $light-gray;
+    border: 1px solid $gray;
+    border-radius: 2px;
+
+    .crosstab_legend_line{
+        display: flex;
+
+        &:nth-child(2){
+            margin-left: 32px;
+        }
+
+        .title{
+            margin-right: 8px;
+
+            font-size: 14px;
+            line-height: 20px;
+        }
+
+        .trak{
+            display: flex;
+            align-items: center;
+            justify-content: center;
+
+            div{
+                width: 22px;
+                height: 22px;
+
+                font-weight: 400;
+                font-size: 16px;
+                text-align: center;
+                line-height: 20px;
+            }
+        }              
+    }     
+}
+
+
+// Barve
+.ctbChck_sp0 {
+    background-color: #fcfcfc !important;
+}
+.ctbChck_sp1 {
+    background-color: #FEFFE3 !important;
+}
+.ctbChck_sp2 {
+    background-color: #FCFFC2 !important;
+}
+.ctbChck_sp3 {
+    background-color: #FBFFA8 !important;
+}
+.crossCheck_EC {
+    background-color: #FFFAE8 !important;
+}
+.crossCheck_RE {
+    background-color: #FFF6D1 !important;
+}
+.crossCheck_SR {
+    background-color: #FFECA2 !important;
+}
+.crossCheck_AR {
+    background-color: #FFDA46 !important;
+}
+.rsdl_bck0 {
+    background-color: white !important;
+}
+.rsdl_bck1 {
+    background-color: rgb(250, 226, 226) !important;
+}
+.rsdl_bck2 {
+    background-color: rgb(255, 157, 157) !important;
+}
+.rsdl_bck3 {
+    background-color: rgb(248, 66, 66) !important;
+}
+.rsdl_bck4 {
+    background-color: #E8F1FF !important;
+}
+.rsdl_bck5 {
+    background-color: #B9D5FF !important;
+}
+.rsdl_bck6 {
+    background-color: #74ACFF !important;
 }
 
 
diff --git a/resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss b/resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss
index e914e0788..218a0dcd2 100644
--- a/resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss
@@ -163,7 +163,7 @@
                             cursor: pointer;
 
                             display: flex;
-                            align-items: center;
+                            align-items: baseline;
                             justify-content: space-between;
 
                             padding: 8px 8px 8px 16px;
@@ -176,6 +176,8 @@
                             }
 
                             .report_element_icons{
+                                display: flex;
+                                flex-wrap: nowrap;
 
                                 .faicon{
 
@@ -194,12 +196,45 @@
 
                         .report_element_settings{
                             display: flex;
+                            align-items: center;
 
                             padding: 16px 16px 8px 16px;
 
                             select{
                                 margin: 0 16px 0 0;
                             }
+
+                            #ttestVariablesSpan{
+                                display: flex;
+                                flex-direction: column;
+
+                                padding: 8px;
+                                max-width: 300px;
+                        
+                                background-color: $light-gray;
+                                border: 1px solid $gray;
+                        
+                                span{
+                                    margin-bottom: 8px;
+                                    color: $black;   
+                                        
+                                    label{
+                                        font-size: 14px;
+                                    }
+                                    
+                                    &.gray{
+                                        color: $dark-gray;
+                                    }
+                        
+                                    &:last-of-type{
+                                        margin-bottom: 0;
+                                    }
+                                }  
+                                
+                                &.active {
+                                    //background-color: rgba(255, 199, 0, 0.05);     
+                                }
+                            }
                         }
 
                         .report_element_data{

From e0f0d5d0af9d176cba4aa2159d4c2aa534120976 Mon Sep 17 00:00:00 2001
From: patrik2020 <patrik.pucer@gmail.com>
Date: Tue, 31 May 2022 11:10:38 +0200
Subject: [PATCH 16/17] Latex za izvoze: pomisljaj namesto minusa

---
 .../export/latexclasses/textemp/latexTemplatePdfSurvey.cls      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls b/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls
index f9612c4dc..f7957dc4b 100644
--- a/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls
+++ b/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls
@@ -37,7 +37,7 @@
 \DeclareUnicodeCharacter{2003}{$\enspace$}
 \DeclareUnicodeCharacter{0014}{$\thinspace$}	%ni ta pravi nadomestek, ker v Latexu tak simbol ne obstaja
 \DeclareUnicodeCharacter{0301}{$'$}
-\DeclareUnicodeCharacter{2212}{-}
+\DeclareUnicodeCharacter{2212}{-} %namesto minusa, pomisljaj
 
 %Emoji - izpis urejen s slikicami emoji-jev
 \DeclareUnicodeCharacter{1F600}{\includegraphics[height=1em]{1F600.png}}

From 51ca18692a3dd5e92e5349155445bffc1fc3acc7 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Wed, 1 Jun 2022 13:44:27 +0200
Subject: [PATCH 17/17] Redesign - popravki urejanja vprasanj

---
 admin/survey/classes/class.Vprasanje.php | 43 +++++++++++++-----------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php
index 9b74555d3..a0441173f 100644
--- a/admin/survey/classes/class.Vprasanje.php
+++ b/admin/survey/classes/class.Vprasanje.php
@@ -8315,7 +8315,7 @@ class Vprasanje {
         echo '      <span class="content">';
 
 		echo '          <input type="checkbox" value="1" name="diferencial_trak" '.( $diferencial_trak == 1 ? ' checked="checked"' : '') .' onChange="diferencial_trak_checkbox_prop('.$this->spremenljivka.', '.$row['grids'].');" id="diferencial_trak_'.$this->spremenljivka.'">';
-        echo '          <label for="diferencial_trak_'.$this->spremenljivka.'">'.$lang['srv_diferencial_trak'].Help::display('srv_vprasanje_trak').':</label>';
+        echo '          <label for="diferencial_trak_'.$this->spremenljivka.'">'.$lang['srv_diferencial_trak'].Help::display('srv_vprasanje_trak').'</label>';
 		echo '          <input '.$disable_diferencial_trak_hidden.' type="hidden" value="0" name="diferencial_trak" id="diferencial_trak_hidden_'.$this->spremenljivka.'">';
 
         echo '      </span>';
@@ -8446,17 +8446,19 @@ class Vprasanje {
 		$display = ( ( $row['tip'] == 6 && ($row['enota'] == 0 || $row['enota'] == 1) ) || ( $row['tip'] == 16 && ($row['enota'] == 0 || $row['enota'] == 1) ) ) && ($diferencial_trak == 0) ? '' : 'style="display:none;"';
 		
 	
-		echo '<div class="drop_custom_column_labels" '.$display.'>';
+        echo '<div class="vprasanje_setting_holder drop_custom_column_labels" '.$display.'>';	
         
-        echo '<p><span class="title" >'.$lang['srv_custom_column_labels_presentation'].':</span>';
+        echo '  <div class="vprasanje_setting_line half-half">';
         
-		echo '<span class="content"><select name="custom_column_label_option" id="custom_column_label_option_'.$row['id'].'" >';
-		echo '<option value="1"'.($custom_column_label_option=='1'?' selected':'').'>'.$lang['srv_custom_column_labels_o1'].'</option>';
-		echo '<option value="2"'.($custom_column_label_option=='2'?' selected':'').'>'.$lang['srv_custom_column_labels_o2'].'</option>';
-		echo '<option value="3"'.($custom_column_label_option=='3'?' selected':'').'>'.$lang['srv_custom_column_labels_o3'].'</option>';
-		echo '</select></span>';
+        echo '      <label>'.$lang['srv_custom_column_labels_presentation'].':</label>';
         
-        echo '</p>';
+		echo '      <span class="content"><select name="custom_column_label_option" id="custom_column_label_option_'.$row['id'].'" >';
+		echo '          <option value="1"'.($custom_column_label_option=='1'?' selected':'').'>'.$lang['srv_custom_column_labels_o1'].'</option>';
+		echo '          <option value="2"'.($custom_column_label_option=='2'?' selected':'').'>'.$lang['srv_custom_column_labels_o2'].'</option>';
+		echo '          <option value="3"'.($custom_column_label_option=='3'?' selected':'').'>'.$lang['srv_custom_column_labels_o3'].'</option>';
+		echo '      </select></span>';
+        
+        echo '  </div>';
         
         echo '</div>';
     }
@@ -8470,19 +8472,22 @@ class Vprasanje {
         
 		$grid_repeat_header = ($spremenljivkaParams->get('grid_repeat_header') ? $spremenljivkaParams->get('grid_repeat_header') : 0);
 
-		echo '<div class="grid_repeat_header">';
+
+        echo '<div class="vprasanje_setting_holder grid_repeat_header">';	
+
+        echo '  <div class="vprasanje_setting_line half-half">';
         
-        echo '<p><span class="title" >'.$lang['srv_grid_repeat_header'].':</span>';
+        echo '      <label>'.$lang['srv_grid_repeat_header'].':</label>';
         
-		echo '<span class="content"><select name="grid_repeat_header" id="grid_repeat_header_'.$row['id'].'" >';
-		echo '<option value="0"'.($grid_repeat_header=='0'?' selected':'').'>'.$lang['srv_grid_repeat_header_0'].'</option>';
-		echo '<option value="5"'.($grid_repeat_header=='5'?' selected':'').'>'.$lang['srv_grid_repeat_header_5'].'</option>';
-		echo '<option value="10"'.($grid_repeat_header=='10'?' selected':'').'>'.$lang['srv_grid_repeat_header_10'].'</option>';
-		echo '<option value="15"'.($grid_repeat_header=='15'?' selected':'').'>'.$lang['srv_grid_repeat_header_15'].'</option>';
-		echo '<option value="20"'.($grid_repeat_header=='20'?' selected':'').'>'.$lang['srv_grid_repeat_header_20'].'</option>';
-		echo '</select></span>';
+		echo '      <span class="content"><select name="grid_repeat_header" id="grid_repeat_header_'.$row['id'].'" >';
+		echo '          <option value="0"'.($grid_repeat_header=='0'?' selected':'').'>'.$lang['srv_grid_repeat_header_0'].'</option>';
+		echo '          <option value="5"'.($grid_repeat_header=='5'?' selected':'').'>'.$lang['srv_grid_repeat_header_5'].'</option>';
+		echo '          <option value="10"'.($grid_repeat_header=='10'?' selected':'').'>'.$lang['srv_grid_repeat_header_10'].'</option>';
+		echo '          <option value="15"'.($grid_repeat_header=='15'?' selected':'').'>'.$lang['srv_grid_repeat_header_15'].'</option>';
+		echo '          <option value="20"'.($grid_repeat_header=='20'?' selected':'').'>'.$lang['srv_grid_repeat_header_20'].'</option>';
+		echo '      </select></span>';
         
-        echo '</p>';
+        echo '  </div>';
         
         echo '</div>';
     }