From cd9c00b1ab440245facdd7de8a098bf026daf8db Mon Sep 17 00:00:00 2001
From: pherum83 <pherum83@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Tue, 26 Jul 2011 10:45:02 +0000
Subject: [PATCH] r156

 git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@156 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/config.php                           | 2 +-
 upload/templates/default/posting_editor.tpl | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/upload/config.php b/upload/config.php
index 1891d775f..d4d2e679f 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1;
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.0.2';
-$bb_cfg['tp_release_state'] = 'TP II r154';
+$bb_cfg['tp_release_state'] = 'TP II r156';
 $bb_cfg['tp_release_date'] = '26-07-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
diff --git a/upload/templates/default/posting_editor.tpl b/upload/templates/default/posting_editor.tpl
index 3a24bda52..a349b1f96 100644
--- a/upload/templates/default/posting_editor.tpl
+++ b/upload/templates/default/posting_editor.tpl
@@ -11,7 +11,7 @@ ajax.callback.posts = function(data){
 </script>
 <div class="mrg_4" style="padding-left:2px;">
 <select name="fontFace">
-	<option style="font-family: Verdana" value="-1" selected="selected">{L_FONT_SEL}:</option>
+	<option style="font-family: Verdana" value="-1" selected="selected">{L_QR_FONT_SEL}:</option>
 	<option style="font-family: Courier" value="Courier">&nbsp;Courier</option>
 	<option style="font-family: 'Courier New'" value="'Courier New'">&nbsp;Courier New</option>
 	<option style="font-family: monospace" value="monospace">&nbsp;monospace</option>
@@ -28,7 +28,7 @@ ajax.callback.posts = function(data){
 </select>
 &nbsp;
 <select name="codeColor" class="text_color">
-	<option style="color: black; background: #fff;" value="black" selected="selected">{L_FONT_COLOR_SEL}:</option>
+	<option style="color: black; background: #fff;" value="black" selected="selected">{L_QR_COLOR_SEL}:</option>
 	<option style="color: darkred;" value="darkred">&nbsp;{L_COLOR_DARK_RED}</option>
 	<option style="color: brown;" value="brown">&nbsp;{L_COLOR_BROWN}</option>
 	<option style="color: #996600;" value="#996600">&nbsp;{L_COLOR_ORANGE}</option>
@@ -41,11 +41,11 @@ ajax.callback.posts = function(data){
 	<option style="color: blue;" value="blue">&nbsp;{L_COLOR_BLUE}</option>
 	<option style="color: darkblue;" value="darkblue">&nbsp;{L_COLOR_DARK_BLUE}</option>
 	<option style="color: indigo;" value="indigo">&nbsp;{L_COLOR_INDIGO}</option>
-	<option style="color: #006699;" value="#006699">&nbsp;{L_STEEL_BLUE}</option>
+	<option style="color: #006699;" value="#006699">&nbsp;{L_COLOR_STEEL_BLUE}</option>
 </select>
 &nbsp;
 <select name="codeSize" class="text_size">
-	<option value="12" selected="selected">{L_FONT_SIZE_SEL}:</option>
+	<option value="12" selected="selected">{L_QR_SIZE_SEL}:</option>
 	<option value="9" class="em">{L_FONT_SMALL}</option>
 	<option value="10">&nbsp;size=10</option>
 	<option value="11">&nbsp;size=11</option>