Index: trunk/core/units/phrases/phrases_config.php
===================================================================
diff -u -N -r4743 -r4940
--- trunk/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 4743)
+++ trunk/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 4940)
@@ -40,8 +40,6 @@
 											),
 					'IDField'			=>	'PhraseId',
 
-					'StatusField'		=>	Array('Type'),
-
 					'TitleField'		=>	'Phrase',
 
 					'TitlePresets'		=>	Array(
Index: trunk/kernel/units/phrases/phrases_config.php
===================================================================
diff -u -N -r4743 -r4940
--- trunk/kernel/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 4743)
+++ trunk/kernel/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 4940)
@@ -40,8 +40,6 @@
 											),
 					'IDField'			=>	'PhraseId',
 
-					'StatusField'		=>	Array('Type'),
-
 					'TitleField'		=>	'Phrase',
 
 					'TitlePresets'		=>	Array(
Index: trunk/admin/install/langpacks/english.lang
===================================================================
diff -u -N -r4743 -r4940
--- trunk/admin/install/langpacks/english.lang	(.../english.lang)	(revision 4743)
+++ trunk/admin/install/langpacks/english.lang	(.../english.lang)	(revision 4940)
@@ -205,9 +205,11 @@
 			<PHRASE Label="la_DownloadLanguageExport" Module="In-Portal" Type="1">RG93bmxvYWQgTGFuZ3VhZ2UgRXhwb3J0</PHRASE>
 			<PHRASE Label="la_EditingInProgress" Module="In-Portal" Type="1">WW91IGhhdmUgbm90IHNhdmVkIGNoYW5nZXMgdG8gdGhlIGl0ZW0geW91IGFyZSBlZGl0aW5nITxiciAvPkNsaWNrIE9LIHRvIGxvb3NlIGNoYW5nZXMgYW5kIGdvIHRvIHRoZSBzZWxlY3RlZCBzZWN0aW9uPGJyIC8+b3IgQ2FuY2VsIHRvIHN0YXkgaW4gdGhlIGN1cnJlbnQgc2VjdGlvbi4=</PHRASE>
 			<PHRASE Label="la_EmptyFile" Module="In-Portal" Type="1">RmlsZSBpcyBlbXB0eQ==</PHRASE>
+			<PHRASE Label="la_EmptyValue" Module="In-Portal" Type="1">IA==</PHRASE>
 			<PHRASE Label="la_Enabled" Module="In-Portal" Type="1">RW5hYmxlZA==</PHRASE>
 			<PHRASE Label="la_error_cant_save_file" Module="In-Portal" Type="1">Q2FuJ3Qgc2F2ZSBhIGZpbGU=</PHRASE>
 			<PHRASE Label="la_error_copy_subcategory" Module="In-Portal" Type="1">RXJyb3IgY29weWluZyBzdWJjYXRlZ29yaWVz</PHRASE>
+			<PHRASE Label="la_error_CustomExists" Module="In-Portal" Type="1">Q3VzdG9tIGZpZWxkIHdpdGggaWRlbnRpY2FsIG5hbWUgYWxyZWFkeSBleGlzdHM=</PHRASE>
 			<PHRASE Label="la_error_duplicate_username" Module="In-Portal" Type="1">VXNlcm5hbWUgeW91IGhhdmUgZW50ZXJlZCBhbHJlYWR5IGV4aXN0cyBpbiB0aGUgc3lzdGVtLCBwbGVhc2UgY2hvb3NlIGFub3RoZXIgdXNlcm5hbWUu</PHRASE>
 			<PHRASE Label="la_error_FileTooLarge" Module="In-Portal" Type="1">RmlsZSBpcyB0b28gbGFyZ2U=</PHRASE>
 			<PHRASE Label="la_error_InvalidFileFormat" Module="In-Portal" Type="1">SW52YWxpZCBGaWxlIEZvcm1hdA==</PHRASE>
@@ -269,6 +271,7 @@
 			<PHRASE Label="la_event_user.validate" Module="In-Portal" Type="1">VmFsaWRhdGUgVXNlcg==</PHRASE>
 			<PHRASE Label="la_ExportError" Module="In-Portal" Type="1">QW4gZXJyb3IgaGFzIG9jY3VyZWQgZHVyaW5nIGV4cG9ydC4=</PHRASE>
 			<PHRASE Label="la_Field" Module="In-Portal" Type="1">RmllbGQ=</PHRASE>
+			<PHRASE Label="la_field_displayorder" Module="In-Portal" Type="1">RGlzcGxheSBPcmRlcg==</PHRASE>
 			<PHRASE Label="la_fld_AddressLine" Module="In-Portal" Type="1">QWRkcmVzcyBMaW5l</PHRASE>
 			<PHRASE Label="la_fld_AdvancedCSS" Module="In-Portal" Type="1">QWR2YW5jZWQgQ1NT</PHRASE>
 			<PHRASE Label="la_fld_AutomaticFilename" Module="In-Portal" Type="1">QXV0b21hdGljIEZpbGVuYW1l</PHRASE>
@@ -597,6 +600,7 @@
 			<PHRASE Label="la_prompt_DisabledArticles" Module="In-Portal" Type="1">RGlzYWJsZWQgQXJ0aWNsZXM=</PHRASE>
 			<PHRASE Label="la_prompt_DisabledCategories" Module="In-Portal" Type="1">RGlzYWJsZWQgQ2F0ZWdvcmllcw==</PHRASE>
 			<PHRASE Label="la_prompt_DisabledLinks" Module="In-Portal" Type="1">RGlzYWJsZWQgTGlua3M=</PHRASE>
+			<PHRASE Label="la_prompt_DisplayOrder" Module="In-Portal" Type="1">RGlzcGxheSBPcmRlcg==</PHRASE>
 			<PHRASE Label="la_prompt_download_export" Module="In-Portal" Type="2">RG93bmxvYWQgTGFuZ3VhZ2UgRXhwb3J0Og==</PHRASE>
 			<PHRASE Label="la_prompt_DupRating" Module="In-Portal" Type="2">QWxsb3cgRHVwbGljYXRlIFJhdGluZyBWb3Rlcw==</PHRASE>
 			<PHRASE Label="la_prompt_DupReviews" Module="In-Portal" Type="2">QWxsb3cgRHVwbGljYXRlIFJldmlld3M=</PHRASE>
@@ -895,6 +899,7 @@
 			<PHRASE Label="la_SearchMenu_Clear" Module="In-Portal" Type="1">Q2xlYXIgU2VhcmNo</PHRASE>
 			<PHRASE Label="la_SearchMenu_New" Module="In-Portal" Type="1">TmV3IFNlYXJjaA==</PHRASE>
 			<PHRASE Label="la_Sectionheader_MetaInformation" Module="In-Portal" Type="1">TUVUQSBJbmZvcm1hdGlvbg==</PHRASE>
+			<PHRASE Label="la_section_CustomFields" Module="In-Portal" Type="1">Q3VzdG9tIEZpZWxkcw==</PHRASE>
 			<PHRASE Label="la_section_General" Module="In-Portal" Type="1">R2VuZXJhbA==</PHRASE>
 			<PHRASE Label="la_section_Message" Module="In-Portal" Type="1">TWVzc2FnZQ==</PHRASE>
 			<PHRASE Label="la_section_overview" Module="In-Portal" Type="1">U2VjdGlvbiBPdmVydmlldw==</PHRASE>
@@ -964,6 +969,7 @@
 			<PHRASE Label="la_tab_MissingLabels" Module="In-Portal" Type="1">TWlzc2luZyBMYWJlbHM=</PHRASE>
 			<PHRASE Label="la_tab_modules" Module="In-Portal" Type="1">TW9kdWxlcw==</PHRASE>
 			<PHRASE Label="la_tab_ModulesManagement" Module="In-Portal" Type="1">TW9kdWxlcyBNYW5hZ2VtZW50</PHRASE>
+			<PHRASE Label="la_tab_ModulesSettings" Module="In-Portal" Type="1">TW9kdWxlcyAmIFNldHRpbmdz</PHRASE>
 			<PHRASE Label="la_tab_Overview" Module="In-Portal" Type="1">T3ZlcnZpZXc=</PHRASE>
 			<PHRASE Label="la_tab_PackageContent" Module="In-Portal" Type="1">UGFja2FnZSBDb250ZW50</PHRASE>
 			<PHRASE Label="la_tab_Permissions" Module="In-Portal" Type="1">UGVybWlzc2lvbnM=</PHRASE>
@@ -1224,6 +1230,7 @@
 			<PHRASE Label="la_Text_Within" Module="In-Portal" Type="1">V2l0aGlu</PHRASE>
 			<PHRASE Label="la_Text_Year" Module="In-Portal" Type="1">WWVhcnM=</PHRASE>
 			<PHRASE Label="la_Text_Zip" Module="In-Portal" Type="1">Wmlw</PHRASE>
+			<PHRASE Label="la_title_addingCustom" Module="In-Portal" Type="1">QWRkaW5nIEN1c3RvbSBGaWVsZA==</PHRASE>
 			<PHRASE Label="la_title_Adding_BaseStyle" Module="In-Portal" Type="1">QWRkaW5nIEJhc2UgU3R5bGU=</PHRASE>
 			<PHRASE Label="la_title_Adding_BlockStyle" Module="In-Portal" Type="1">QWRkaW5nIEJsb2NrIFN0eWxl</PHRASE>
 			<PHRASE Label="la_title_Adding_Group" Module="In-Portal" Type="1">QWRkaW5nIEdyb3Vw</PHRASE>
@@ -1243,6 +1250,7 @@
 			<PHRASE Label="la_title_Censorship" Module="In-Portal" Type="1">Q2Vuc29yc2hpcA==</PHRASE>
 			<PHRASE Label="la_title_Community" Module="In-Portal" Type="1">Q29tbXVuaXR5</PHRASE>
 			<PHRASE Label="la_title_Configuration" Module="In-Portal" Type="1">Q29uZmlndXJhdGlvbg==</PHRASE>
+			<PHRASE Label="la_title_CustomFields" Module="In-Portal" Type="1">Q3VzdG9tIEZpZWxkcw==</PHRASE>
 			<PHRASE Label="la_title_Done" Module="In-Portal" Type="1">RG9uZQ==</PHRASE>
 			<PHRASE Label="la_title_EditingEmailEvent" Module="In-Portal" Type="1">RWRpdGluZyBFbWFpbCBFdmVudA==</PHRASE>
 			<PHRASE Label="la_title_EditingGroup" Module="In-Portal" Type="1">RWRpdGluZyBHcm91cA==</PHRASE>
@@ -1251,6 +1259,7 @@
 			<PHRASE Label="la_title_Editing_BaseStyle" Module="In-Portal" Type="1">RWRpdGluZyBCYXNlIFN0eWxl</PHRASE>
 			<PHRASE Label="la_title_Editing_BlockStyle" Module="In-Portal" Type="1">RWRpdGluZyBCbG9jayBTdHlsZQ==</PHRASE>
 			<PHRASE Label="la_title_Editing_Category" Module="In-Portal" Type="1">RWRpdGluZyBDYXRlZ29yeQ==</PHRASE>
+			<PHRASE Label="la_title_Editing_CustomField" Module="In-Portal" Type="1">RWRpdGluZyBDdXN0b20gRmllbGQ=</PHRASE>
 			<PHRASE Label="la_title_Editing_Group" Module="In-Portal" Type="1">RWRpdGluZyBHcm91cA==</PHRASE>
 			<PHRASE Label="la_title_Editing_Language" Module="In-Portal" Type="1">RWRpdGluZyBMYW5ndWFnZQ==</PHRASE>
 			<PHRASE Label="la_title_Editing_Phrase" Module="In-Portal" Type="1">RWRpdGluZyBQaHJhc2U=</PHRASE>
@@ -1286,6 +1295,7 @@
 			<PHRASE Label="la_Title_LanguageImport" Module="In-Portal" Type="1">SW5zdGFsbCBMYW5ndWFnZSBQYWNr</PHRASE>
 			<PHRASE Label="la_title_LanguagePacks" Module="In-Portal" Type="1">TGFuZ3VhZ2UgUGFja3M=</PHRASE>
 			<PHRASE Label="la_title_Module_Status" Module="In-Portal" Type="1">TW9kdWxlIFN0YXR1cw==</PHRASE>
+			<PHRASE Label="la_title_NewCustomField" Module="In-Portal" Type="1">TmV3IEN1c3RvbSBGaWVsZA==</PHRASE>
 			<PHRASE Label="la_title_New_BaseStyle" Module="In-Portal" Type="1">TmV3IEJhc2UgU3R5bGU=</PHRASE>
 			<PHRASE Label="la_title_New_BlockStyle" Module="In-Portal" Type="1">TmV3IEJsb2NrIFN0eWxl</PHRASE>
 			<PHRASE Label="la_title_New_Group" Module="In-Portal" Type="1">TmV3IEdyb3Vw</PHRASE>
@@ -1399,7 +1409,9 @@
 			<PHRASE Label="la_ToolTip_Restore" Module="In-Portal" Type="1">UmVzdG9yZQ==</PHRASE>
 			<PHRASE Label="la_tooltip_save" Module="In-Portal" Type="1">U2F2ZQ==</PHRASE>
 			<PHRASE Label="la_ToolTip_Search" Module="In-Portal" Type="1">U2VhcmNo</PHRASE>
+			<PHRASE Label="la_ToolTip_SearchReset" Module="In-Portal" Type="1">UmVzZXQ=</PHRASE>
 			<PHRASE Label="la_ToolTip_Select" Module="In-Portal" Type="1">U2VsZWN0</PHRASE>
+			<PHRASE Label="la_tooltip_SelectUser" Module="In-Portal" Type="1">U2VsZWN0IFVzZXI=</PHRASE>
 			<PHRASE Label="la_ToolTip_SendEmail" Module="In-Portal" Type="1">U2VuZCBFLW1haWw=</PHRASE>
 			<PHRASE Label="la_ToolTip_SendMail" Module="In-Portal" Type="1">U2VuZCBFLW1haWw=</PHRASE>
 			<PHRASE Label="la_tooltip_setPrimary" Module="In-Portal" Type="1">U2V0IFByaW1hcnk=</PHRASE>
Index: trunk/tools/debug_sample.php
===================================================================
diff -u -N -r4135 -r4940
--- trunk/tools/debug_sample.php	(.../debug_sample.php)	(revision 4135)
+++ trunk/tools/debug_sample.php	(.../debug_sample.php)	(revision 4940)
@@ -1,8 +1,9 @@
 <?php
 
-	//define('SILENT_LOG', 1);
+//	define('SILENT_LOG', 1); // write all sql errors to log
+//	define('DBG_REQUREST_LOG', $_SERVER['DOCUMENT_ROOT'].'/../request.log'); // write all POST/GET request log to file
 	
-	define('DEBUG_MODE', 1);
+	define('DEBUG_MODE', 1); // enable/disable debug mode
 	if( defined('DEBUG_MODE') && DEBUG_MODE ) InitDebugger();
 	
 	//define('DBG_SITE_PATH', '/');	// set alternative BASE_PATH for old in-portal parts (where no K4 included)
@@ -11,27 +12,29 @@
 	
 	function InitDebugger()
 	{
-		define('DBG_LOCAL_BASE_PATH', 'w:');
+		define('DBG_LOCAL_BASE_PATH', 'w:'); // replace server's DocumentRoot by this path in filenames in errors
 		
-//		define('DBG_RAISE_ON_WARNINGS',1);
+//		define('DBG_RAISE_ON_WARNINGS', 1); // show debugger automatically if some errors occured
 		define('DBG_SQL_PROFILE',1);	// profile SQL queries
 		define('DBG_SQL_FAILURE', defined('IS_INSTALL') && IS_INSTALL ? 0 : 1);	// assume sql errors as php fatal errors, warning otherwise
 		
+//		define('DBG_PROFILE_INCLUDES', 1);
+
 		define('DBG_SHOW_HTTPQUERY', 1);	// show http query content
 		define('DBG_SHOW_SESSIONDATA', 1);	// show session data
 
-		define('DBG_SHOW_EXPIRATION', 1); // show session expiration counter in admin
-		
 //		define('DBG_EDIT_HELP', 1);	// Show help filename on help screen
 //		define('DBG_HELP', 1);		// Show FCK editor when viewing help screen
 		
 //		define('DBG_FORCE_THEME', 1);	// Use this ThemeId, not one passed in env
 		define('DBG_PHRASES', 1);		// Add ability to translate phrases on the fly (K4 only)
+//		define('DBG_PHRASES_HIGHLIGHT', 1); // used for phrase existance detection debugging
+		
 		define('DBG_WINDOW_WIDTH', 700);// Set custom debugger layer width (in pixels)
 		
-		define('DBG_CACHE', 1);	// debug cache usage
-//		define('DBG_REDIRECT', 1);
-//		define('DBG_ZEND_PRESENT',0);
+//		define('DBG_CACHE', 1);	// debug cache usage
+//		define('DBG_REDIRECT', 1); // set this to debug get redirect attempts
+		define('DBG_ZEND_PRESENT', 0); // set this to zero to debug debugger
 		//define('DBG_VALIDATE_CONFIGS',1);	// check that config fields match ones from database
 //		define('DBG_SHOW_TAGS', 1);		// show tags beeing processed
 		
Index: trunk/core/kernel/languages/phrases_cache.php
===================================================================
diff -u -N -r4880 -r4940
--- trunk/core/kernel/languages/phrases_cache.php	(.../phrases_cache.php)	(revision 4880)
+++ trunk/core/kernel/languages/phrases_cache.php	(.../phrases_cache.php)	(revision 4940)
@@ -105,8 +105,22 @@
 		$label = strtoupper($label);
 		if(isset($this->Phrases[$label])) {
 			$translated_label = $this->Phrases[$label];
-			if (defined('DEBUG_MODE') && DEBUG_MODE && constOn('DBG_PHRASES_HIGHLIGHT') && !$this->Application->IsAdmin()) {
-				$translated_label = '<span style="border: 1px solid #999999; background-color: #cccccc; color: #999999; ">'.$translated_label.'</span></a> <span style="color: red; background-color:#ffffcc">'.$original_label.'</span>';
+			// debug mode is checked directly to improve performance
+			if (defined('DEBUG_MODE') && DEBUG_MODE && constOn('DBG_PHRASES_HIGHLIGHT')) {
+				if (!$this->Application->isDebugMode()) return $translated_label;			
+				
+				if ($this->Application->IsAdmin()) {
+					$sql = 'SELECT Module
+							FROM '.TABLE_PREFIX.'Phrase
+							WHERE (LanguageId = '.$this->LanguageId.') AND (Phrase = '.$this->Conn->qstr($label).')';
+					$this->Application->Debugger->appendHTML('Phrase: <b>'.$label.'</b>; Module: <b>'.$this->Conn->GetOne($sql).'</b>');
+//					$translated_label = $translated_label.' [m: '.$this->Conn->GetOne($sql).'; l: '.$label.']';
+				}
+				else {
+					// highlight text created via translated phrase (used to detect if text on screen is phrase or not)
+					$translated_label = '<span style="border: 1px solid #999999; background-color: #cccccc; color: #999999; ">'.$translated_label.'</span></a> <span style="color: red; background-color:#ffffcc">'.$original_label.'</span>';
+				}
+				
 			}
 			return $translated_label;
 		}