diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 3e762b9b6..fd056a9d2 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -138,7 +138,7 @@ class SurveyAdminSettings {
 
 				echo '<div class="setting_holder">';
 				echo '<label for="anketa_folder">'. $lang['srv_newSurvey_survey_new_folder'] .Help::display('srv_nova_shrani').':</label>';
-				echo '<select class="dropdown large" name="anketa_folder" id="anketa_folder">';
+				echo '<select class="dropdown large w400" name="anketa_folder" id="anketa_folder">';
 				echo '<option value="0" '.($selected_folder == 0 ? ' selected="selected"' : '').'>'.$lang['srv_newSurvey_survey_new_folder_def'].'</option>';
 				while($rowF = mysqli_fetch_array($sqlF)){
 					echo '<option value="'.$rowF['id'].'" '.($rowF['id'] == $selected_folder ? ' selected="selected"' : '').'>'.$rowF['naslov'].'</option>';
@@ -208,28 +208,31 @@ class SurveyAdminSettings {
 			echo '</div>';
             
             // Ta del se v 2. fazi zamenja z gumbom "Večjezične ankete"
-			echo '<div class="setting_holder">';
 
-			echo '<p class="bottom8">'.$lang['srv_language_link2'].':';
 			// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
             $userAccess = UserAccess::getInstance($global_user_id);
             if($userAccess->checkUserAccess($what='prevajanje')){
-                echo '&nbsp;<a href="index.php?anketa='.$this->anketa.'&a=prevajanje" title="'.$lang['srv_language_link'].'"><span class="bold">'.$lang['srv_language_link'].'</span></a></p>';
-            }
-            else{            
-                echo '&nbsp;<a href="#" onClick=popupUserAccess(\'prevajanje\'); return false;" title="'.$lang['srv_language_link'].'" class="user_access_locked"><span class="bold">'.$lang['srv_language_link'].'</span></a></p>';
-            }			
-			echo '<p>'.$lang['srv_language_mySurveys'].'.</p>';
 
+				$lang_link = 'window.location.href=\'index.php?anketa='.$this->anketa.'&a=prevajanje\'; return false;';
+				$color = 'blue';
+            }
+            else{  
+				$lang_link = 'popupUserAccess(\'prevajanje\'); return false;';
+				$color = 'yellow user_access_locked';          
+            }	
+
+			echo '<div class="button_holder top16 bottom0">';
+			echo '<button class="medium '.$color.'" onClick="'.$lang_link.'">'.$lang['srv_multi_lang'].'</button>';				
 			echo '</div>';
+
 			
 			echo '</fieldset>';
 
-			// Gumb shrani - vmes
+			/*/ Gumb shrani - vmes
 			echo '<div class="button_holder">';
 			echo '<button class="medium white-blue" onClick="window.location='.$preklici_url.';return false;">'.$lang['edit1338'].'</button>';				
 			echo '<button class="medium blue" onclick="document.settingsanketa_' . $row['id'] . '.submit(); return false;">'.$lang['edit1337'].'</button>';
-			echo '</div>';
+			echo '</div>';*/
 			
 					
 			/* INTERAKTIVNI ELEMENTI */
@@ -251,33 +254,67 @@ class SurveyAdminSettings {
 				
 			// Indikator napredka
 			echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'.$lang['srv_te_progressbar'].' '.Help::display('srv_show_progressbar').':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="progressbar1" name="progressbar" value="1" '.($row['progressbar'] == 1 && $multiple_pages ? ' checked="checked"' : '').' '.(!$multiple_pages ? 'disabled' : '').'>';
-			echo '<label for="progressbar1" '.(!$multiple_pages ? 'disabled' : '').'>'. $lang['yes'] .'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="progressbar0" name="progressbar" value="0" '.($row['progressbar'] == 0 || !$multiple_pages ? ' checked="checked"' : '').' '.(!$multiple_pages ? 'disabled' : '').'>';
-			echo '<label for="progressbar0" '.(!$multiple_pages ? 'disabled' : '').'>'. $lang['no1'].'</label> ';
-			echo '</div>';
-
+			echo '<input type="hidden" name="progressbar" value="0">';
+            echo '<input type="checkbox" id="progressbar" name="progressbar" value="1" '.($row['progressbar'] == 1 && $multiple_pages ? ' checked="checked"' : '').' '.(!$multiple_pages ? 'disabled' : '').'>';
+            echo '<label for="progressbar">'.$lang['srv_te_progressbar'].' '.Help::display('srv_show_progressbar').'</label> ';
 			echo '</div>';
 			
 			// Naslov ankete za uporabnike
 			echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'.$lang['srv_show_title'].':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="survey_hide_title1" name="survey_hide_title" value="0" '.($survey_hide_title == 0 ? ' checked="checked"' : '').'>';
-			echo '<label for="survey_hide_title1">'. $lang['yes'] .'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="survey_hide_title0" name="survey_hide_title" value="1" '.($survey_hide_title == 1 ? ' checked="checked"' : '').'>';
-			echo '<label for="survey_hide_title0">'. $lang['no1'] .'</label> ';
+			echo '<input type="hidden" name="survey_hide_title" value="1">';
+            echo '<input type="checkbox" id="survey_hide_title" name="survey_hide_title" value="0" '.($survey_hide_title == 0 ? ' checked="checked"' : '').'>';
+            echo '<label for="survey_hide_title">'.$lang['srv_show_title'].'</label> ';
 			echo '</div>';
 
+			// Nadaljuj kasneje
+			if($this->survey_type > 1){
+                echo '<div class="setting_holder">';
+				echo '<input type="hidden" name="continue_later" value="0">';
+            	echo '<input type="checkbox" id="continue_later" name="continue_later" value="1" '.($row['continue_later'] == 1 ? ' checked="checked"' : '').'>';
+            	echo '<label for="continue_later">'.$lang['srv_show_continue_later'].' '.Help::display('srv_continue_later_setting').'</label> ';
+                echo '</div>';
+			}
+
+			// Gumb nazaj
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="display_backlink" value="0">';
+			echo '<input type="checkbox" id="display_backlink" name="display_backlink" value="1" '.($display_backlink!=='0'?' checked':'').'>';
+			echo '<label for="display_backlink">'.$lang['srv_slideshow_sett_back_button_lbl'].'</label> ';
 			echo '</div>';
+
+			// Namig
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="survey_hint" value="0">';
+			echo '<input type="checkbox" id="survey_hint" name="survey_hint" value="1" '.($survey_hint == 1 ? ' checked="checked"' : '').'>';
+			echo '<label for="survey_hint">'.$lang['srv_hint'].' '.Help::display('srv_namig_setting').'</label> ';
+			echo '</div>';
+
+			/* KNJIZNICA */
+			$sqlk = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$this->anketa' AND uid='$global_user_id'");
+			$moje = mysqli_num_rows($sqlk);
+			$sqlk = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$this->anketa' AND uid='0'");
+			$javne = mysqli_num_rows($sqlk);
+			
+			if ($admin_type == 0 || $admin_type == 1) {
+
+				echo '<div class="setting_holder">';
+				echo '<input type="hidden" name="javne_ankete" value="0">';
+				echo '<input type="checkbox" id="javne_ankete" name="javne_ankete" value="1" '.($javne==1?' checked':'').' onchange="javascript:check_library();">';
+				echo '<label for="javne_ankete">'.$lang['srv_javne_ankete'].'</label> ';
+				echo '</div>';				
+			}
+			
+			echo '<div class="setting_holder" id="moje_ankete">';
+			echo '<input type="hidden" name="moje_ankete" value="0">';
+			echo '<input type="checkbox" id="moje_ankete" name="moje_ankete" value="1" '.($moje==1?' checked':'').'>';
+			echo '<label for="moje_ankete">'.$lang['srv_moje_ankete'].' '.Help::display('srv_moje_ankete_setting').'</label> ';
+			echo '</div>';
+
+			?>
+			<script>
+			check_library();
+			</script>
+			<?
 			
 			// Politika zasebnosti
 			echo '<div class="setting_holder">';
@@ -298,52 +335,6 @@ class SurveyAdminSettings {
 
 			echo '</div>';
 			
-			// Nadaljuj kasneje
-			if($this->survey_type > 1){
-                echo '<div class="setting_holder">';
-                echo '<span class="setting_title">'. $lang['srv_show_continue_later'].' '.Help::display('srv_continue_later_setting').':</span>';
-                
-                echo '<div class="setting_item">';
-                echo '<input type="radio" name="continue_later" value="1" id="continue_later_1"' . ($row['continue_later'] == 1 ? ' checked="checked"' : '') . '>';
-                echo '<label for="continue_later_1">'.$lang['yes'].'</label>';
-                echo '</div>';
-                echo '<div class="setting_item">';
-                echo '<input type="radio" name="continue_later" value="0" id="continue_later_0"' . ($row['continue_later'] == 0 ? ' checked="checked"' : '') . '>';
-                echo '<label for="continue_later_0">'.$lang['no1'].'</label>';
-                echo '</div>';
-
-                echo '</div>';
-			}
-			
-			// Gumb nazaj
-			echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'.$lang['srv_slideshow_sett_back_button_lbl'].':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="display_backlink" id="display_backlink_1" '.($display_backlink!=='0'?' checked':'').' value="">';
-			echo '<label for="display_backlink_1">'.$lang['yes'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="display_backlink" id="display_backlink_0" '.($display_backlink==='0'?' checked':'').' value="0">';
-			echo '<label for="display_backlink_0">'.$lang['no'].'</label>';
-			echo '</div>';
-
-			echo '</div>';
-			
-			// Namig
-			echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'.$lang['srv_hint'].' '.Help::display('srv_namig_setting').':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="namig1" name="survey_hint" value="1"' . ($survey_hint == 1 ? ' checked="checked"' : '') . '>';
-			echo '<label for="namig1">'.$lang['yes'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input id="namig0" type="radio" name="survey_hint" value="0"' . ($survey_hint == 0 ? ' checked="checked"' : '') . '>';
-			echo '<label for="namig0">'.$lang['no1'].'</label>';
-			echo '</div>';
-			
-			echo '</div>';
 			
 			// Oozorilo na vprašanja
 			echo '<div class="setting_holder">';
@@ -360,7 +351,7 @@ class SurveyAdminSettings {
 			
 			echo '</div>';
 			
-			// Napredni parapodatki
+			/*/ Napredni parapodatki
 			if (($admin_type == 0 || $admin_type == 1) && $this->survey_type > 0) {
 				echo '<div class="setting_holder">';
 				echo '<span class="seting_title">'.$lang['srv_parapodatki'].':</span>';
@@ -410,7 +401,7 @@ class SurveyAdminSettings {
 				echo '</div>';
 	
 				echo '</div>';
-			}
+			}*/
  
 			echo '</fieldset>';
 					
@@ -501,44 +492,6 @@ class SurveyAdminSettings {
 				echo '</fieldset>';			
 			}
 						
-			/* KNJIZNICA */
-			$sqlk = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$this->anketa' AND uid='$global_user_id'");
-			$moje = mysqli_num_rows($sqlk);
-			$sqlk = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$this->anketa' AND uid='0'");
-			$javne = mysqli_num_rows($sqlk);
-			
-			echo '<fieldset>';
-			echo '<legend>'.$lang['srv_library'].'</legend>';
-			if ($admin_type == 0 || $admin_type == 1) {
-				echo '<span class="setting_title" >'.$lang['srv_javne_ankete'].':';
-
-				echo '<div class="setting_holder">';
-
-				echo '<div class="setting_item">';
-				echo '<input type="radio" id="javne_ankete0" name="javne_ankete" value="0"'.($javne==0?' checked':'').' onchange="javascript:check_library();">';
-				echo '<label for="javne_ankete0">'.$lang['no'].'</label>';
-				echo '</div>';
-				echo '<div class="setting_item">';
-				echo '<input type="radio" id="javne_ankete1" name="javne_ankete" value="1"'.($javne==1?' checked':'').' onchange="javascript:check_library();">';
-				echo '<label for="javne_ankete1">'.$lang['yes'].'</label>';
-				echo '</div>';
-				
-				echo '</div>';				
-			}
-			
-			echo '<div class="setting_holder" id="moje_ankete">';
-			echo '<span class="setting_title">'.$lang['srv_moje_ankete'].' '.Help::display('srv_moje_ankete_setting').':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="moje_ankete0" name="moje_ankete" value="0"'.($moje==0?' checked':'').'>';
-			echo '<label for="moje_ankete0">'.$lang['no'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="moje_ankete1" name="moje_ankete" value="1"'.($moje==1?' checked':'').'>';
-			echo '<label for="moje_ankete1">'.$lang['yes'].'</label>';
-			echo '</div>';
-
-			echo '</div>';
 			
 			// zamakni
 			/*echo '<div class="setting_holder">';
@@ -562,20 +515,23 @@ class SurveyAdminSettings {
 			echo '</div>';
 
 			echo '</div>';*/
-
 			
-			echo '</fieldset>';
 			
-			?>
-			<script>
-			check_library();
-			</script>
-			<?
-						
 			/* STEVILCENJE */
 			echo '<fieldset>';
 			echo '<legend>' . $lang['srv_nastavitveStevilcenje'] . '</legend>';
 
+			// Izklop prestevilcevanja
+			$enumerate = SurveySetting::getInstance()->getSurveyMiscSetting('enumerate'); if ($enumerate == '') $enumerate = 1;
+			
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="enumerate" value="0">';
+			echo '<input type="checkbox" id="enumerate" name="enumerate" value="1" '.($enumerate == 1 ? ' checked' : '').'>';
+			echo '<label for="enumerate">'.$lang['srv_nastavitvePrestevilcevanje'].'</label> ';
+			echo '</div>';
+
+			//način številčenja
+
 			echo '<div class="setting_holder">';
 			echo '<span class="setting_title"><label for="anketa_countType">' . $lang['srv_nastavitveStevilcenjeType'] . ':</label></span>';
 
@@ -598,33 +554,14 @@ class SurveyAdminSettings {
 
 			echo '</div>';
 			
-			// Izklop prestevilcevanja
-			$enumerate = SurveySetting::getInstance()->getSurveyMiscSetting('enumerate'); if ($enumerate == '') $enumerate = 1;
-			
-			echo '<div class="setting_holder">';
-			echo '<span class="setting_title"><label for="anketa_enumerate">'.$lang['srv_nastavitvePrestevilcevanje'].':</label></span>';
-
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="enumerate" id="enumerate_1" '.($enumerate == 1 ? ' checked' : '').' value="1">';
-			echo '<label for="enumerate_1">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="enumerate" id="enumerate_0" '.($enumerate == 0 ? ' checked' : '').' value="0">';
-			echo '<label for="enumerate_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-			
-			echo '</div>';
-
 			echo '</fieldset>';
 						
 			/* JS TRACKING */
 			if ($admin_type == 0 || $admin_type == 1) {
 				echo '<fieldset><legend>'.$lang['srv_js_tracking'].'</legend>';
 				echo '<div class="setting_holder">';
-				echo '<textarea name="js_tracking">'.$row['js_tracking'].'</textarea>';
-				echo '<p>'.$lang['js_tracking_note'].'</p>';
-
+				echo '<span class="setting_title">'.$lang['js_tracking_note'].'</span>';
+				echo '<textarea class="textarea w800" name="js_tracking">'.$row['js_tracking'].'</textarea>';
 				echo '</div>';
 
 				echo '</fieldset>';
diff --git a/lang/1.php b/lang/1.php
index 7a69fc1ab..235bcd55a 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -1990,12 +1990,12 @@ $lang = array (
 	"srv_settings_help"				=>	"Pomoč",
 	"srv_settingsPersonal"			=>	"Uporabni&#154;ke nastavitve",
 	"srv_nastavitveStevilcenje"			=>	"&#352;tevil&#269;enje vpra&#353;anj",
-	"srv_nastavitveStevilcenjeType"		=>	"Na&#269;in &#154;tevil&#269;enja",
+	"srv_nastavitveStevilcenjeType"		=>	"Način številčenja za respondente",
 	"srv_nastavitveStevilcenjeType0"	=>	"Brez &#154;tevil&#269;enja",
-	"srv_nastavitveStevilcenjeType1"	=>	"Z zaporedno &#353;tevilko [ 1), 2) ... ]",
+	"srv_nastavitveStevilcenjeType1"	=>	"Z zaporedno &#353;tevilko spremenljivke [ 1), 2) ... ]",
 	"srv_nastavitveStevilcenjeType2"	=>	"Z imenom spremenljivke [ V1, V2 ... ]",
-	"srv_nastavitveStevilcenjeType3"	=>	"Z imenom in zaporedno &#154;tevilko",
-	"srv_nastavitvePrestevilcevanje"	=>	"Avtomatsko preštevilčevanje",
+	"srv_nastavitveStevilcenjeType3"	=>	"Z imenom in zaporedno &#154;tevilko spremenljivke",
+	"srv_nastavitvePrestevilcevanje"	=>	"Avtomatsko preštevilčevanje vprašanj ob spreminjanju vrstnega reda vprašanj",
 	"srv_nastavitveStevilcenjePDF" =>	"O&#353;tevil&#269;i vpra&#353;anja v PDF izvozih",
 	"srv_nastavitveStevilcenjeRTF" =>	"O&#353;tevil&#269;i vpra&#353;anja v DOC (Word) izvozih",
 	"srv_nastavitveStevilcenjeFrekvence" =>	"O&#353;tevil&#269;i vpra&#353;anja v Frekvencah",
@@ -2984,8 +2984,8 @@ $lang = array (
 	"srv_podrobno_datoteke"			=>	"Datoteke",
 	"srv_pregledovanje"				=>	"Moje ankete",
 	"srv_seznam"					=>	"Seznam",
-	"srv_javne_ankete"				=>	"Javne ankete",
-	"srv_moje_ankete"				=>	"Moje ankete",
+	"srv_javne_ankete"				=>	"Dodaj anketo v javno knjižnico",
+	"srv_moje_ankete"				=>	"Dodaj anketo v mojo knjižnico",
 	"srv_javna_knjiznica"			=>	"Javna knjižnica",
 	"srv_moja_knjiznica"			=>	"Moja knjižnica",
 	"srv_javna_vprasanja"			=>	"Javna vpra&#154;anja",
@@ -3269,7 +3269,7 @@ $lang = array (
 	"srv_slideshow_sett_autostart_opt_3"	=>	"Animacijo zažene katerakoli od naštetih akcij (Gumb 'Naprej', Timer vprašanja, Klik na vprašanje)",
 	"srv_slideshow_sett_autostart_opt_3_short"	=>	"Karkoli",
 	"srv_slideshow_sett_next_button_lbl"	=>	"Prikaz gumba 'Naprej'",
-	"srv_slideshow_sett_back_button_lbl"	=>	"Prikaz gumba 'Nazaj'",
+	"srv_slideshow_sett_back_button_lbl"	=>	"Gumb 'Nazaj' je prikazan",
 	"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",
@@ -3298,7 +3298,7 @@ $lang = array (
     "srv_fieldwork_device_pass"     =>  "Geslo naprave",
     "srv_fieldwork_device_surveyID" =>  "ID te ankete na napravi",
     "srv_fieldwork_sync_data"       =>  "Sinhroniziraj podatke",
-    "srv_hint"							=>	"Namig",
+    "srv_hint"							=>	"Možnost namiga za respondente",
 	"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",
@@ -4018,6 +4018,7 @@ $lang = array (
 	"srv_standardne_besede"				=>	"Standardne besede",
 	"srv_prevajanje_dodaj"				=>	"Dodaj nov prevod za",
 	"srv_base_lang"						=>	"Osnovni jezik",
+	"srv_multi_lang"						=>	"Večjezične ankete",
 	"srv_lang_elements"					=>	"Standardne besede",
 	"srv_trans_lang"					=>	"Prevod",
 	"srv_trans_langs"					=>	"Prikaži dodatni jezik",
@@ -6394,7 +6395,7 @@ $lang = array (
 	'srv_aapor_show_calculation'				=>	'Prikaz izračunov:',
 	'srv_aapor_show_approximate_calculation'	=>	'Prikaz približnih izračunov:',
     'srv_aapor_show_approximate'	            =>	'Prikaži približke',
-	'srv_show_continue_later'					=>	'Opcija za nadaljevanje kasneje',
+	'srv_show_continue_later'					=>	'Možnost kasnejšega nadaljevanja izpolnjevanja ankete',
 	'srv_themes_select'							=>	'Izbira teme',
 	'srv_themes_mod'							=>	'Prilagoditev teme',
 	'srv_themes_mod2'							=>	'Trenutno urejate temo',
@@ -6412,7 +6413,7 @@ $lang = array (
 	'srv_new_theme_alert'						=>	'Dodana je nova prilagoditev teme <b>%s</b>. Uredite jo lahko spodaj.',
 	'srv_new_theme_alert_css'					=>	'Dodana je nova CSS tema <b>%s</b>. Uredite jo lahko spodaj.',
 	'srv_js_tracking'							=>	'JavaScript koda za sledenje',
-	'js_tracking_note'							=>	'Skopirajte celotno kodo (iz npr. Google Analytics), vključno s &lt;script&gt; blokom.',
+	'js_tracking_note'							=>	'Vnesite celotno kodo za sledenje (iz npr. Google Analytics) - vključno s &lt;script&gt; blokom.',
 	'srv_editing_mode'							=>	'Napredna 1KA',
 	'srv_editing_mode_0'						=>	'Enostavno',
 	'srv_editing_mode_1'						=>	'Napredno',
@@ -6823,7 +6824,6 @@ $lang = array (
 	'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',
-	'srv_hint'									=>	'Namig',
 	'srv_para_label_variables'					=>	'Spremenljivke',
 	'srv_para_label_details'					=>	'Podrobno',
 	'srv_para_label_breaks'						=>	'Prekinitve',
@@ -7127,7 +7127,7 @@ $lang = array (
 	'one_click_create'			                =>  "Enklik kreiranje",
 	'edit_hide'			                		=>  "Skrij",
 	'edit_show'			                		=>  "Prikaži",
-	'srv_show_title'			               	=>  "Naslov ankete za uporabnike",
+	'srv_show_title'			               	=>  "Naslov ankete je viden respondentom",
 	'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",
@@ -7191,7 +7191,7 @@ $lang = array (
 	'srv_orientacija_tabela_da_ne'				=>	"Tabela DA/NE",
 	'srv_privacy_0'								=>	"Brez potrditve (povezava v nogi ankete)",
 	'srv_privacy_1'								=>	"Potrditev s klikom naprej",
-	'srv_privacy_2'								=>	"Potrditev s checkboxom",
+	'srv_privacy_2'								=>	"Potrditev s potrditvenim poljem (checkbox)",
   'cookiePopupTitle'                       	=>  'Uporaba piškotkov',
   'cookiePopupText'                       	=>  '<p>Za izbolj&#154;anje uporabni&#154;ke izku&#154;nje, vam bomo kot prijavljenim uporabnikom dodelili pi&#154;kotke (<a target="_blank" href="https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/politika-piskotkov" style="color: blue; text-decoration: underline;">pojasnilo</a>).</p><p>Ali se &#382;elite prijaviti?</p>',
   'aaiPopupTitle'                         => 'AAI-prijava',
diff --git a/lang/2.php b/lang/2.php
index 421a28c8d..ce1da4a75 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -1978,12 +1978,12 @@ $lang = array (
 	"srv_settings_help"				=>	"Help",
 	"srv_settingsPersonal"			=>	"Personal setting",
 	"srv_nastavitveStevilcenje"		=>	"Question numbering",
-	"srv_nastavitveStevilcenjeType"	=>	"Numbering style",
+	"srv_nastavitveStevilcenjeType"	=>	"Numbering style for respondents",
 	"srv_nastavitveStevilcenjeType0"=>	"Without numbering",
-	"srv_nastavitveStevilcenjeType1"=>	"With consecutive numbers [ 1), 2), ... ]",
+	"srv_nastavitveStevilcenjeType1"=>	"With consecutive numbers of variables [ 1), 2), ... ]",
 	"srv_nastavitveStevilcenjeType2"=>	"With variable names [ V1, V2, ... ]",
-	"srv_nastavitveStevilcenjeType3"=>	"With names and consecutive numbers",
-	"srv_nastavitvePrestevilcevanje"=>	"Automatic renumbering",
+	"srv_nastavitveStevilcenjeType3"=>	"With names and consecutive numbers of variables",
+	"srv_nastavitvePrestevilcevanje"=>	"Automatic renumbering of questions when changing the order of questions",
 	"srv_nastavitveStevilcenjePDF" 	=>	"Numbered questions in PDF",
 	"srv_nastavitveStevilcenjeRTF" 	=>	"Numbered questions in RTF",
 	"srv_nastavitveStevilcenjeFrekvence"	=> "Numbered questions in Frequency statistics",
@@ -3239,8 +3239,8 @@ $lang = array (
 	"srv_slideshow_sett_autostart_opt_2_short"	=>	"Click on first question",
 	"srv_slideshow_sett_autostart_opt_3"	=>	"Start by any action (Button 'Forward', First question timer, Click on first question)",
 	"srv_slideshow_sett_autostart_opt_3_short"	=>	"Any action",
-	"srv_slideshow_sett_next_button_lbl"	=>	"Display 'Forward' option",
-	"srv_slideshow_sett_back_button_lbl"	=>	"Display 'Back' option",
+	"srv_slideshow_sett_next_button_lbl"	=>	"Display 'Forward' button",
+	"srv_slideshow_sett_back_button_lbl"	=>	"Display 'Back' button",
 	"srv_slideshow_sett_pause_button_lbl"	=>	"Display 'Pause' opiton",
 	"srv_slideshow_sett_button_opt_0"	=>	"Don't show button",
 	"srv_slideshow_sett_button_opt_1"	=>	"Show button",
@@ -3269,7 +3269,7 @@ $lang = array (
     "srv_fieldwork_device_pass"     =>  "Device password",
     "srv_fieldwork_device_surveyID" =>  "Survey ID on the device",
     "srv_fieldwork_sync_data"       =>  "Synchronise data",
-	"srv_hint"							=>	"Hint",
+	"srv_hint"							=>	"Hint option for respondents",
 	"srv_hint_datapiping"				=>	"When editing conclusion or email, use <b>Data piping</b> to display final score.</p><p>Use question label for computed value, embraced with hash, <B>#score#</B>",
 	"srv_missing_profile_title1"		=>	"Selected values are not used in the analysis and are treated as missing values!",
 	"srv_missing_profile_title2"		=>	"Missing values - undefined answers",
@@ -3986,6 +3986,7 @@ $lang = array (
 	"srv_mobile_survey"					=>	"Survey created with mobile app",
     "srv_mobile_add_question"			=>	"Add question",
 	"srv_prevajanje_dodaj"				=>	"Add translation for",
+	"srv_multi_lang"						=>	"Multilanguage surveys",
 	"srv_base_lang"						=>	"Basic language",
 	"srv_lang_elements"					=>	"Standard text",
 	"srv_trans_lang"					=>	"Translation",
@@ -6287,7 +6288,7 @@ $lang = array (
     'srv_aapor_show_calculation'				=>	'Show calculations:',
     'srv_aapor_show_approximate_calculation'	=>	'Show approximate calculations:',
     'srv_aapor_show_approximate'	            =>	'Show approximate',
-	'srv_show_continue_later'					=>	'Display continue later option',
+	'srv_show_continue_later'					=>	'Option to continue the survey at a later date',
 	'srv_themes_select'							=>	'Theme selection',
 	'srv_themes_mod'							=>	'Theme modifiation',
 	'srv_themes_mod2'							=>	'Currently editing',
@@ -6305,7 +6306,7 @@ $lang = array (
 	'srv_new_theme_alert'						=>	'New modification theme <b>%s</b> has been added. You can edit it below.',
 	'srv_new_theme_alert_css'					=>	'New CSS theme <b>%s</b> has been added. You can edit it below.',
 	'srv_js_tracking'							=>	'JavaScript code for tracking',
-	'js_tracking_note'							=>	'Copy the entire code (e.g. from Google Analytics), including the &lt;script&gt; block.',
+	'js_tracking_note'							=>	'Enter the full tracking code (from e.g. Google Analytics), including the &lt;script&gt; block:',
 	'srv_editing_mode'							=>	'Advanced 1KA',
 	'srv_editing_mode_0'						=>	'Basic',
 	'srv_editing_mode_1'						=>	'Advanced',
@@ -6705,7 +6706,6 @@ $lang = array (
 	'srv_parapodatki'							=>	'Advanced paradata',
 	'pasteFromWordAlert'						=>	'<b>Text copying is strongly discouraged!</b> <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/zakaj-priporocljivo-kopiranje-besedila?from1ka=1" target="_blank">More >></a>',
 	'srv_interaktivni_elementi'					=>	'Interactive elements',
-	'srv_hint'									=>	'Hint',
 	'srv_para_label_variables'					=>	'Variables',
 	'srv_para_label_details'					=>	'Details',
 	'srv_para_label_breaks'						=>	'Breaks',
@@ -7010,7 +7010,7 @@ $lang = array (
 	'one_click_create'			                =>  "Oneclick create",
 	'edit_hide'			                		=>  "Hide",
 	'edit_show'			                		=>  "Show",
-	'srv_show_title'			               	=>  "Survey title for respondents",
+	'srv_show_title'			               	=>  "Survey title is visible to respondents",
 	'srv_create_show_intro'			            =>  "Intro is visible to respondents",
 	'srv_create_show_concl'			            =>  "Conclusion is visible to respondents",
 	'srv_create_show_title'			            =>  "Title is visible to respondents",
@@ -7073,7 +7073,7 @@ $lang = array (
 	'srv_select_box_vse'						=>	"all",
 	'srv_orientacija_tabela_da_ne'				=>	"Table YES/NO",
 	'srv_privacy_0'								=>	"Without confirmation (link in footer)",
-	'srv_privacy_1'								=>	"Confirmation with button next",
+	'srv_privacy_1'								=>	"Confirmation with 'Next' button",
 	'srv_privacy_2'								=>	"Confirmation with checkbox",
 	'cookiePopupTitle'                       	=>  'Cookie usage',
   'cookiePopupText'                      		=>  '<p>This site uses cookies to improve user experience for logged in users.</p><p>Do you wish to proceed?</p>',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 6e66ed88b..a7d855902 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10000,6 +10000,9 @@ textarea {
 textarea.wauto {
   width: auto;
 }
+textarea.w800 {
+  width: 800px;
+}
 textarea.disabled {
   border-color: #C4C4C4;
   background-color: #E5E5E5;
diff --git a/resources/sass/admin_new/components/form/textarea.scss b/resources/sass/admin_new/components/form/textarea.scss
index 0ce88cbf6..be72e9e56 100644
--- a/resources/sass/admin_new/components/form/textarea.scss
+++ b/resources/sass/admin_new/components/form/textarea.scss
@@ -5,6 +5,9 @@ textarea {
     &.wauto {
         width: auto;
     }
+    &.w800{
+        width: 800px;
+    }
 
     border: 1px solid $dark-gray;
     box-sizing: border-box;