Index: branches/unlabeled/unlabeled-1.16.2/core/admin_templates/categories/xml/categories_list.tpl
===================================================================
diff -u -r6106 -r6528
--- branches/unlabeled/unlabeled-1.16.2/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 6106)
+++ branches/unlabeled/unlabeled-1.16.2/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 6528)
@@ -1,3 +1,5 @@
+<inp2:lang.current_Field name="Charset" result_to_var="charset"/>
+<inp2:m_Header data="Content-type: text/plain; charset=$charset"/>
 <inp2:m_include t="incs/blocks"/>
 <inp2:m_include t="incs/grid_blocks"/>
 <inp2:c_InitList no_special="1" per_page="-1"/>
Index: branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/inportal_upgrade_v1.3.1.sql
===================================================================
diff -u
--- branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/inportal_upgrade_v1.3.1.sql	(revision 0)
+++ branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/inportal_upgrade_v1.3.1.sql	(revision 6528)
@@ -0,0 +1,12 @@
+UPDATE StatItem SET ValueSQL = REPLACE(ValueSQL, 'Topic_VotesToHot', 'Topic_MaxHotNumber');
+UPDATE StatItem SET ValueSQL = REPLACE(ValueSQL, 'Link_VotesToHot', 'Link_MaxHotNumber');
+UPDATE StatItem SET ValueSQL = REPLACE(ValueSQL, 'News_VotesToHot', 'News_MaxHotNumber');
+
+ALTER TABLE Language CHANGE ThousandSep ThousandSep TINYTEXT NULL;
+
+UPDATE Phrase SET Translation = TRIM(TRAILING CHAR(10) FROM Translation);
+UPDATE Phrase SET Translation = TRIM(TRAILING CHAR(13) FROM Translation);
+UPDATE Phrase SET Translation = TRIM(TRAILING CHAR(10) FROM Translation);
+UPDATE Phrase SET Translation = TRIM(TRAILING CHAR(13) FROM Translation);
+
+UPDATE Modules SET Version = '1.3.1' WHERE Name = 'In-Portal';
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.2.2/kernel/admin_templates/catalog_tab.tpl
===================================================================
diff -u -r6514 -r6528
--- branches/unlabeled/unlabeled-1.2.2/kernel/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 6514)
+++ branches/unlabeled/unlabeled-1.2.2/kernel/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 6528)
@@ -2,6 +2,8 @@
 	<div id="categories_div" prefix="c.showall" view_template="catalog_tab" edit_template="categories/categories_edit" category_id="-1" dep_buttons="" class="catalog-tab"></div>
 	<script type="text/javascript">$Catalog.registerTab('categories');</script>
 <inp2:m_else/>
+	<inp2:lang.current_Field name="Charset" result_to_var="charset"/>
+	<inp2:m_Header data="Content-type: text/plain; charset=$charset"/>
 	<inp2:m_include t="incs/blocks"/>
 	<inp2:m_include t="incs/grid_blocks"/>
 	<inp2:m_include t="categories/ci_blocks"/>
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/catalog_tab.tpl
===================================================================
diff -u -r6514 -r6528
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 6514)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 6528)
@@ -2,6 +2,8 @@
 	<div id="categories_div" prefix="c.showall" view_template="catalog_tab" edit_template="categories/categories_edit" category_id="-1" dep_buttons="" class="catalog-tab"></div>
 	<script type="text/javascript">$Catalog.registerTab('categories');</script>
 <inp2:m_else/>
+	<inp2:lang.current_Field name="Charset" result_to_var="charset"/>
+	<inp2:m_Header data="Content-type: text/plain; charset=$charset"/>
 	<inp2:m_include t="incs/blocks"/>
 	<inp2:m_include t="incs/grid_blocks"/>
 	<inp2:m_include t="categories/ci_blocks"/>
Index: branches/unlabeled/unlabeled-1.16.2/kernel/admin_templates/xml/categories_list.tpl
===================================================================
diff -u -r6106 -r6528
--- branches/unlabeled/unlabeled-1.16.2/kernel/admin_templates/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 6106)
+++ branches/unlabeled/unlabeled-1.16.2/kernel/admin_templates/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 6528)
@@ -1,3 +1,5 @@
+<inp2:lang.current_Field name="Charset" result_to_var="charset"/>
+<inp2:m_Header data="Content-type: text/plain; charset=$charset"/>
 <inp2:m_include t="incs/blocks"/>
 <inp2:m_include t="incs/grid_blocks"/>
 <inp2:c_InitList no_special="1" per_page="-1"/>