0.8 released

2014-06-09 17:55:15 +04:00
parent 545be98ee4
commit aedc787ca9
17 changed files with 2117 additions and 1782 deletions
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 TV Charting Library
 ================

-**0.7 stable**
+**0.8 stable**

 This repository contains Charting Library package & bugtracker. You may find the documentation [on Google Drive](https://docs.google.com/document/d/1rAigRhQUSLgLCzUAiVBJGAB7uchb-PzFVe0Bl8WTtF0/edit).

--- a/charting_library/charting_library.js
+++ b/charting_library/charting_library.js
@@ -1,345 +0,0 @@
-(function() {
-
-if (window.TradingView) {
-	return;
-}
-
-var TradingView = {
-
-	version: function() {
-		return "0.7";
-	},
-
-	gEl : function(id) {
-		return document.getElementById(id);
-	},
-	gId : function() {
-		return 'tradingview_' + (((1+Math.random())*0x100000)|0).toString(16).substring(1);
-	},
-	onready : function(callback) {
-		if (window.addEventListener) {
-			window.addEventListener('DOMContentLoaded', callback, false);
-		} else {
-			window.attachEvent('onload', callback);
-		}
-	},
-	css : function(css_content) {
-		var head = document.getElementsByTagName('head')[0],
-			style = document.createElement('style'), rules;
-
-		style.type = 'text/css';
-		if (style.styleSheet) {
-			style.styleSheet.cssText = css_content;
-		} else {
-			rules = document.createTextNode(css_content);
-			style.appendChild(rules);
-		}
-		head.appendChild(style);
-	},
-	bindEvent : function(o, ev, fn){
-		if (o.addEventListener){
-			o.addEventListener(ev, fn, false);
-		} else if (o.attachEvent){
-			o.attachEvent('on' + ev, fn);
-		}
-	},
-	unbindEvent : function(o, ev, fn){
-		if (o.removeEventListener){
-			o.removeEventListener(ev, fn, false);
-		} else if (o.detachEvent){
-			o.detachEvent('on' + ev, fn);
-		}
-	},
-
-
-
-	widget : function(options) {
-		this.id = TradingView.gId();
-		var _url_params = TradingView.getUrlParams();
-		var _symbol = _url_params.symbol || options.symbol || 'FX:SPX500';
-
-		if (!options.datafeed) {
-			throw "Datafeed is not defined";
-		}
-
-		this.options = {
-			width : options.width || 800,
-			height : options.height || 500,
-			symbol : _symbol,
-			interval : options.interval || '1',
-			timezone : options.timezone || '',
-			autosize : options.autosize,
-			save_image : options.save_image !== undefined ? options.save_image : true,
-			container : options.container_id || '',
-			toolbar_bg : options.toolbar_bg || 'f4f7f9',
-			studies : options.studies || [],
-			theme : options.theme || '',
-			widgetbar_width: +options.widgetbar_width || undefined,
-			datafeed: options.datafeed,
-			path: options.library_path,
-			enabledStudies: options.enabled_studies || [],
-			enabledDrawings: options.enabled_drawings || [],
-			disabledDrawings: options.disabled_drawings || [],
-			savedData: options.savedData || undefined,
-			locale: options.locale
-		};
-
-		if (options.news && options.news.length){
-			this.options.news_vendors = [];
-			for (var i=0; i<options.news.length; i++){
-				switch (options.news[i]){
-					case 'headlines':
-					case 'stocktwits':
-						this.options.news_vendors.push(options.news[i]);
-				}
-			}
-			if (!this.options.news_vendors){
-				delete this.options.news_vendors;
-			}
-		}
-
-		if (isFinite(options.widgetbar_width) && options.widgetbar_width > 0){
-			this.options.widgetbar_width = options.widgetbar_width;
-		}
-
-		this._ready_handlers = [];
-		this.create();
-	},
-};
-
-
-TradingView.widget.prototype = {
-
-	_messageTarget: function () { return TradingView.gEl(this.id).contentWindow },
-
-	create : function() {
-		var widget_html = this.render(),
-			self = this,
-			c;
-		if (this.options.container) {
-			TradingView.gEl(this.options.container).innerHTML = widget_html;
-		} else {
-			document.write(widget_html);
-		}
-
-		c = TradingView.gEl(this.id);
-		this.postMessage = TradingView.postMessageWrapper(c.contentWindow, this.id);
-		TradingView.bindEvent(c, 'load', function() {
-			self.postMessage.get('widgetReady', {}, function() {
-				var i;
-				self._ready = true;
-				for (i = self._ready_handlers.length; i--;) {
-					self._ready_handlers[i].call(self);
-				}
-
-				self.postMessage.post(c.contentWindow, "initializationFinished")
-			});
-		});
-	},
-
-	render : function() {
-
-		window.Datafeed = this.options.datafeed;
-
-		var url = (this.options.path || "") + "static/tv-chart.html" +
-			'?localserver=1' +
-			'&symbol=' + encodeURIComponent(this.options.symbol) +
-			'&interval=' + encodeURIComponent(this.options.interval) +
-			'&toolbarbg=' + this.options.toolbar_bg.replace('#', '') +
-			(this.options.widgetbar_width ? '&widgetbarwidth=' + this.options.widgetbar_width : '') +
-			(this.options.studies ? '&studies='+encodeURIComponent(this.options.studies.join('\x1F')) : '') +
-			(this.options.theme ? '&theme='+encodeURIComponent(this.options.theme) : '') +
-			'&enabledStudies='+ encodeURIComponent(JSON.stringify(this.options.enabledStudies)) +
-			'&enabledDrawings='+ encodeURIComponent(JSON.stringify(this.options.enabledDrawings)) +
-			'&disabledDrawings='+ encodeURIComponent(JSON.stringify(this.options.disabledDrawings)) +
-			'&locale='+ encodeURIComponent(this.options.locale) +
-			(this.options.timezone ? '&timezone='+encodeURIComponent(this.options.timezone) : '');
-
-		if (!!this.options.savedData) {
-			window.__TVSavedChart = this.options.savedData;
-		}
-
-		return '<iframe id="' + this.id + '"' +
-			' src="' + url + '"' +
-			( this.options.autosize
-				? ' style="width: 100%; height: 100%;"'
-				: ' width="' + this.options.width + '"' + ' height="' + this.options.height + '"'
-			) +
-			' frameborder="0" allowTransparency="true" scrolling="no"></iframe>';
-	},
-
-	onChartReady : function(callback) {
-		if (this._ready) {
-			callback.call(this);
-		} else {
-			this._ready_handlers.push(callback);
-		}
-	},
-
-	setSymbol: function(symbol, interval) {
-		this.postMessage.post(this._messageTarget(), 'changeSymbol', {
-			symbol: symbol,
-			interval: interval
-		});
-	},
-
-	createStudy: function(name, lock) {
-		this.postMessage.post(this._messageTarget(), 'createStudy', {name: name, lock: lock});
-	},
-
-	createShape: function(point, options) {
-		this.postMessage.post(this._messageTarget(), 'createShape', {
-			point: point,
-			options: options
-		});
-
-		var that = this;
-		this.postMessage.on('onIconCreated', function(uid) {
-			that.postMessage.on('onIconClicked', function(clickedIconUid) {
-				if (uid == clickedIconUid) {
-					//	onClickedCallback();
-				}
-			})
-		});
-	},
-
-	removeIcon: function(uid) {
-	},
-
-
-	onSymbolChange: function(callback) {
-		this.postMessage.on('onSymbolChange', callback);
-	},
-
-	onTick: function(callback) {
-		this.postMessage.on('onTick', callback);
-	},
-
-	remove : function() {
-		var widget = TradingView.gEl(this.id);
-		widget.parentNode.removeChild(widget);
-	},
-
-	onAutoSaveNeeded : function(callback) {
-		this.postMessage.on('onAutoSaveNeeded', callback);
-	},
-
-	save : function(callback) {
-		this.postMessage.on('onChartSaved', callback);
-		this.postMessage.post(this._messageTarget(), 'saveChart', {});
-	},
-
-	load : function(json) {
-		window.__TVSavedChart = json;
-		this.remove();
-		this.create();
-	}
-};
-
-
-TradingView.postMessageWrapper = (function() {
-	var get_handlers = {},
-		on_handlers = {},
-		client_targets = {},
-		on_target,
-		call_id = 0,
-		post_id = 0,
-		provider_id = 'TradingView';
-
-	if (window.addEventListener){
-		window.addEventListener('message', function (e) {
-			var msg, i;
-			try {
-				msg = JSON.parse(e.data);
-			} catch (e) {
-				return;
-			}
-			if (!msg.provider || msg.provider != provider_id) {
-				return;
-			}
-			if (msg.type == 'get') {
-				on_handlers[msg.name].call(msg, msg.data, function(result) {
-					var reply = {
-						id: msg.id,
-						type: 'on',
-						name: msg.name,
-						client_id: msg.client_id,
-						data: result,
-						provider: provider_id
-					};
-					on_target.postMessage(JSON.stringify(reply), '*');
-				});
-			} else if (msg.type == 'on') {
-				if (get_handlers[msg.client_id] && get_handlers[msg.client_id][msg.id]) {
-					get_handlers[msg.client_id][msg.id].call(msg, msg.data);
-					delete get_handlers[msg.client_id][msg.id];
-				}
-			} else if (msg.type == 'post') {
-				if (typeof on_handlers[msg.name] === "function") {
-					on_handlers[msg.name].call(msg, msg.data, function(){});
-				}
-			}
-		});
-	}
-
-	return function(target, client_id) {
-		get_handlers[client_id] = {};
-		client_targets[client_id] = target;
-		on_target = target;
-
-		return {
-			on : function(name, callback) {
-				on_handlers[name] = callback;
-			},
-
-			get : function(name, data, callback) {
-				var msg = {
-					id: call_id++,
-					type: 'get',
-					name: name,
-					client_id: client_id,
-					data: data,
-					provider: provider_id
-				};
-				get_handlers[client_id][msg.id] = callback;
-				client_targets[client_id].postMessage(JSON.stringify(msg), '*');
-			},
-
-			post : function(target, name, data) {
-				var msg = {
-					id: post_id++,
-					type: 'post',
-					name: name,
-					data: data,
-					provider: provider_id
-				};
-				if (target && typeof target.postMessage === 'function'){
-					target.postMessage(JSON.stringify(msg), '*')
-				}
-			}
-		};
-	};
-})();
-
-
-TradingView.getUrlParams = function () {
-	var match,
-		pl     = /\+/g,
-		search = /([^&=]+)=?([^&]*)/g,
-		decode = function (s) { return decodeURIComponent(s.replace(pl, " ")); },
-		query  = window.location.search.substring(1),
-		result = {};
-
-	while (match = search.exec(query)) {
-		result[decode(match[1])] = decode(match[2]);
-	}
-	return result;
-};
-
-
-if (window.TradingView && jQuery) {
-	jQuery.extend(window.TradingView, TradingView);
-} else {
-	window.TradingView = TradingView;
-}
-})();
--- a/charting_library/charting_library.min.js
+++ b/charting_library/charting_library.min.js
@@ -0,0 +1,12 @@
+(function(){if(!window.TradingView){var e={version:function(){return"0.8 dev"},gEl:function(a){return document.getElementById(a)},gId:function(){return"tradingview_"+(1048576*(1+Math.random())|0).toString(16).substring(1)},onready:function(a){window.addEventListener?window.addEventListener("DOMContentLoaded",a,!1):window.attachEvent("onload",a)},css:function(a){var b=document.getElementsByTagName("head")[0],d=document.createElement("style");d.type="text/css";d.styleSheet?d.styleSheet.cssText=a:(a=
+document.createTextNode(a),d.appendChild(a));b.appendChild(d)},bindEvent:function(a,b,d){a.addEventListener?a.addEventListener(b,d,!1):a.attachEvent&&a.attachEvent("on"+b,d)},unbindEvent:function(a,b,d){a.removeEventListener?a.removeEventListener(b,d,!1):a.detachEvent&&a.detachEvent("on"+b,d)},widget:function(a){this.id=e.gId();var b=e.getUrlParams().symbol||a.symbol||"FX:SPX500";if(!a.datafeed)throw"Datafeed is not defined";this.options={width:a.width||800,height:a.height||500,symbol:b,interval:a.interval||
+"1",timezone:a.timezone||"",autosize:a.autosize,container:a.container_id||"",toolbar_bg:a.toolbar_bg||"f4f7f9",studies:a.studies||[],theme:a.theme||"",widgetbar_width:+a.widgetbar_width||void 0,datafeed:a.datafeed,path:a.library_path,enabledStudies:a.enabled_studies||[],enabledDrawings:a.enabled_drawings||[],disabledDrawings:a.disabled_drawings||[],savedData:a.savedData||void 0,locale:a.locale,overrides:a.overrides||{}};if(a.news&&a.news.length){this.options.news_vendors=[];for(b=0;b<a.news.length;b++)switch(a.news[b]){case "headlines":case "stocktwits":this.options.news_vendors.push(a.news[b])}this.options.news_vendors||
+delete this.options.news_vendors}isFinite(a.widgetbar_width)&&0<a.widgetbar_width&&(this.options.widgetbar_width=a.widgetbar_width);this._ready_handlers=[];this.create()}};e.widget.prototype={_messageTarget:function(){return e.gEl(this.id).contentWindow},create:function(){var a=this.render(),b=this,d;this.options.container?e.gEl(this.options.container).innerHTML=a:document.write(a);d=e.gEl(this.id);this.postMessage=e.postMessageWrapper(d.contentWindow,this.id);e.bindEvent(d,"load",function(){b.postMessage.get("widgetReady",
+{},function(){var a;b._ready=!0;for(a=b._ready_handlers.length;a--;)b._ready_handlers[a].call(b);b.postMessage.post(d.contentWindow,"initializationFinished")})})},render:function(){window.Datafeed=this.options.datafeed;var a=(this.options.path||"")+"static/tv-chart.html?localserver=1&symbol="+encodeURIComponent(this.options.symbol)+"&interval="+encodeURIComponent(this.options.interval)+"&toolbarbg="+this.options.toolbar_bg.replace("#","")+(this.options.widgetbar_width?"&widgetbarwidth="+this.options.widgetbar_width:
+"")+(this.options.studies?"&studies="+encodeURIComponent(this.options.studies.join("\u001f")):"")+(this.options.theme?"&theme="+encodeURIComponent(this.options.theme):"")+"&enabledStudies="+encodeURIComponent(JSON.stringify(this.options.enabledStudies))+"&enabledDrawings="+encodeURIComponent(JSON.stringify(this.options.enabledDrawings))+"&disabledDrawings="+encodeURIComponent(JSON.stringify(this.options.disabledDrawings))+"&overrides="+encodeURIComponent(JSON.stringify(this.options.overrides))+"&locale="+
+encodeURIComponent(this.options.locale)+(this.options.timezone?"&timezone="+encodeURIComponent(this.options.timezone):"");this.options.savedData&&(window.__TVSavedChart=this.options.savedData);return'<iframe id="'+this.id+'" src="'+a+'"'+(this.options.autosize?' style="width: 100%; height: 100%;"':' width="'+this.options.width+'" height="'+this.options.height+'"')+' frameborder="0" allowTransparency="true" scrolling="no"></iframe>'},onChartReady:function(a){this._ready?a.call(this):this._ready_handlers.push(a)},
+setSymbol:function(a,b){this.postMessage.post(this._messageTarget(),"changeSymbol",{symbol:a,interval:b})},createStudy:function(a,b){this.postMessage.post(this._messageTarget(),"createStudy",{name:a,lock:b})},createShape:function(a,b){this.postMessage.post(this._messageTarget(),"createShape",{point:a,options:b});var d=this;this.postMessage.on("onIconCreated",function(a){d.postMessage.on("onIconClicked",function(a){})})},removeIcon:function(a){},onSymbolChange:function(a){this.postMessage.on("onSymbolChange",
+a)},onTick:function(a){this.postMessage.on("onTick",a)},remove:function(){var a=e.gEl(this.id);a.parentNode.removeChild(a)},onMarkClick:function(a){this.postMessage.on("onMarkClick",a)},onAutoSaveNeeded:function(a){this.postMessage.on("onAutoSaveNeeded",a)},save:function(a){this.postMessage.on("onChartSaved",a);this.postMessage.post(this._messageTarget(),"saveChart",{})},load:function(a){window.__TVSavedChart=a;this.remove();this.create()}};e.postMessageWrapper=function(){var a={},b={},d={},e,f=0,
+g=0;window.addEventListener&&window.addEventListener("message",function(d){var c;try{c=JSON.parse(d.data)}catch(l){return}c.provider&&"TradingView"==c.provider&&("get"==c.type?b[c.name].call(c,c.data,function(a){e.postMessage(JSON.stringify({id:c.id,type:"on",name:c.name,client_id:c.client_id,data:a,provider:"TradingView"}),"*")}):"on"==c.type?a[c.client_id]&&a[c.client_id][c.id]&&(a[c.client_id][c.id].call(c,c.data),delete a[c.client_id][c.id]):"post"==c.type&&"function"===typeof b[c.name]&&b[c.name].call(c,
+c.data,function(){}))});return function(h,c){a[c]={};e=d[c]=h;return{on:function(a,c){b[a]=c},get:function(b,e,k){b={id:f++,type:"get",name:b,client_id:c,data:e,provider:"TradingView"};a[c][b.id]=k;d[c].postMessage(JSON.stringify(b),"*")},post:function(a,b,c){b={id:g++,type:"post",name:b,data:c,provider:"TradingView"};a&&"function"===typeof a.postMessage&&a.postMessage(JSON.stringify(b),"*")}}}}();e.getUrlParams=function(){for(var a,b=/\+/g,d=/([^&=]+)=?([^&]*)/g,e=window.location.search.substring(1),
+f={};a=d.exec(e);)f[decodeURIComponent(a[1].replace(b," "))]=decodeURIComponent(a[2].replace(b," "));return f};window.TradingView&&jQuery?jQuery.extend(window.TradingView,e):window.TradingView=e}})();
--- a/charting_library/customization.txt
+++ b/charting_library/customization.txt
@@ -0,0 +1,110 @@
+//
+//	This file contains soem chart properties description. These properties are treated
+//	as customizable ones. Other properties customization is not supported. See the documentation for details.
+//
+//	This file format:
+//
+//		<property_path>: <default Charting Library value>
+//
+
+
+	paneProperties.background: "#ffffff"
+	paneProperties.gridProperties.color: "#E6E6E6"
+
+	//	Margins (percent). Used for auto scaling.
+	paneProperties.topMargin: 5
+	paneProperties.bottomMargin: 5
+
+	scalesProperties.showLeftScale : false
+	scalesProperties.showRightScale : true
+	scalesProperties.backgroundColor : "#ffffff"
+	scalesProperties.lineColor : "#555"
+	scalesProperties.textColor : "#555"
+	scalesProperties.scaleSeriesOnly : false
+
+
+	//	Series style. See the supported values below
+	//		bars = 0
+	//		candles = 1
+	//		line = 2
+	//		area = 3
+	//		heiken ashi = 8
+	//		candles = 9
+	mainSeriesProperties.style: 1
+
+	mainSeriesProperties.showCountdown: true
+	mainSeriesProperties.showLastValue:true
+	mainSeriesProperties.visible:true
+	mainSeriesProperties.showPriceLine: true
+	mainSeriesProperties.priceLineWidth: 1
+	mainSeriesProperties.lockScale: false
+	mainSeriesProperties.minTick: "default"
+	mainSeriesProperties.extendedHours: false
+
+	mainSeriesProperties.priceAxisProperties.autoScale:true
+	mainSeriesProperties.priceAxisProperties.autoScaleDisabled:false
+	mainSeriesProperties.priceAxisProperties.percentage:false
+	mainSeriesProperties.priceAxisProperties.percentageDisabled:false
+	mainSeriesProperties.priceAxisProperties.log:false
+	mainSeriesProperties.priceAxisProperties.logDisabled:false
+
+	symbolWatermarkProperties.color : "#555"
+
+	//	Percent
+	symbolWatermarkProperties.transparency: 85
+
+
+	//	Different chart types defaults
+
+	//	Candles styles
+	mainSeriesProperties.candleStyle.upColor: "#6ba583"
+	mainSeriesProperties.candleStyle.downColor: "#d75442"
+	mainSeriesProperties.candleStyle.drawWick: true
+	mainSeriesProperties.candleStyle.drawBorder: true
+	mainSeriesProperties.candleStyle.borderColor: "#378658"
+	mainSeriesProperties.candleStyle.borderUpColor: "#225437"
+	mainSeriesProperties.candleStyle.borderDownColor: "#5b1a13"
+	mainSeriesProperties.candleStyle.wickColor: "#737375"
+	mainSeriesProperties.candleStyle.barColorsOnPrevClose: false
+
+	//	Hollow Candles styles
+	mainSeriesProperties.hollowCandleStyle.upColor: "#6ba583"
+	mainSeriesProperties.hollowCandleStyle.downColor: "#d75442"
+	mainSeriesProperties.hollowCandleStyle.drawWick: true
+	mainSeriesProperties.hollowCandleStyle.drawBorder: true
+	mainSeriesProperties.hollowCandleStyle.borderColor: "#378658"
+	mainSeriesProperties.hollowCandleStyle.borderUpColor: "#225437"
+	mainSeriesProperties.hollowCandleStyle.borderDownColor: "#5b1a13"
+	mainSeriesProperties.hollowCandleStyle.wickColor: "#737375"
+
+	//	Heiken Ashi styles
+	mainSeriesProperties.haStyle.upColor: "#6ba583"
+	mainSeriesProperties.haStyle.downColor: "#d75442"
+	mainSeriesProperties.haStyle.drawWick: true
+	mainSeriesProperties.haStyle.drawBorder: true
+	mainSeriesProperties.haStyle.borderColor: "#378658"
+	mainSeriesProperties.haStyle.borderUpColor: "#225437"
+	mainSeriesProperties.haStyle.borderDownColor: "#5b1a13"
+	mainSeriesProperties.haStyle.wickColor: "#737375"
+	mainSeriesProperties.haStyle.barColorsOnPrevClose: false
+
+	//	Bars styles
+	mainSeriesProperties.barStyle.upColor: "#6ba583"
+	mainSeriesProperties.barStyle.downColor: "#d75442"
+	mainSeriesProperties.barStyle.barColorsOnPrevClose: false
+	mainSeriesProperties.barStyle.dontDrawOpen: false
+
+	//	Line styles
+	mainSeriesProperties.lineStyle.color: "#0303F7"
+	mainSeriesProperties.lineStyle.linestyle: CanvasEx.LINESTYLE_SOLID
+	mainSeriesProperties.lineStyle.linewidth: 1
+	mainSeriesProperties.lineStyle.priceSource: "close"
+
+	//	Area styles
+	mainSeriesProperties.areaStyle.color1: "#606090"
+	mainSeriesProperties.areaStyle.color2: "#01F6F5"
+	mainSeriesProperties.areaStyle.linecolor: "#0094FF"
+	mainSeriesProperties.areaStyle.linestyle: CanvasEx.LINESTYLE_SOLID
+	mainSeriesProperties.areaStyle.linewidth: 1
+	mainSeriesProperties.areaStyle.priceSource: "close"
+	mainSeriesProperties.areaStyle.transparency: 50
--- a/charting_library/datafeed/udf/datafeed.js
+++ b/charting_library/datafeed/udf/datafeed.js
@@ -2,7 +2,7 @@
 	This class implements interaction with UDF-compatible datafeed.
 	Please remember this class is a separate component and may interact to other code through Datafeeds.DatafeedInterface interface functions ONLY

-See UDF protocol reference at
+	See UDF protocol reference at
 	https://docs.google.com/document/d/1rAigRhQUSLgLCzUAiVBJGAB7uchb-PzFVe0Bl8WTtF0
 */

@@ -131,6 +131,9 @@ Datafeeds.UDFCompatibleDatafeed.prototype._setupWithConfiguration = function(con
 //	===============================================================================================================================
 //	The functions set below is the implementation of JavaScript API.

+Datafeeds.UDFCompatibleDatafeed.prototype.getMarks = function (symbolInfo, rangeStart, rangeEnd, onDataCallback) {
+}
+

 Datafeeds.UDFCompatibleDatafeed.prototype.searchSymbolsByName = function(ticker, exchange, type, onResultReadyCallback) {
 	var MAX_SEARCH_RESULTS = 30;
@@ -161,6 +164,10 @@ Datafeeds.UDFCompatibleDatafeed.prototype.searchSymbolsByName = function(ticker,
 	}
 	else {

+		if (!this._symbolSearch) {
+			throw "Datafeed error: inconsistent configuration (symbol search)";
+		}
+
 		var searchArgument = {
 			ticker: ticker,
 			exchange: exchange,
@@ -547,47 +554,49 @@ Datafeeds.PulseUpdater = function(datafeed) {

 			that._requestsPending++;

-			that._datafeed.getBars(subscriptionRecord.symbolInfo, resolution, datesRangeLeft, datesRangeRight, function(bars) {
-				that._requestsPending--;
+			(function(_subscriptionRecord) {
+					that._datafeed.getBars(_subscriptionRecord.symbolInfo, resolution, datesRangeLeft, datesRangeRight, function(bars) {
+					that._requestsPending--;

-				//	means the subscription was cancelled while waiting for data
-				if (!that._subscribers.hasOwnProperty(listenerGUID)) {
-					return;
-				}
-
-				var lastBar = bars[bars.length - 1];
-				if (!isNaN(subscriptionRecord.lastBarTime) && lastBar.time < subscriptionRecord.lastBarTime) {
-					return;
-				}
-
-				var subscribers = subscriptionRecord.listeners;
-				var isNewBar = !isNaN(subscriptionRecord.lastBarTime) && lastBar.time > subscriptionRecord.lastBarTime;
-
-				//	Pulse updating may miss some trades data (ie, if pulse period = 10 secods and new bar is started 5 seconds later after the last update, the
-				//	old bar's last 5 seconds trades will be lost). Thus, at fist we should broadcast old bar updates when it's ready.
-				if (isNewBar) {
-
-					if (bars.length < 2) {
-						throw "Not enough bars in history for proper pulse update. Need at least 2.";
+					//	means the subscription was cancelled while waiting for data
+					if (!that._subscribers.hasOwnProperty(listenerGUID)) {
+						return;
 					}

-					var previousBar = bars[bars.length - 2];
+					var lastBar = bars[bars.length - 1];
+					if (!isNaN(_subscriptionRecord.lastBarTime) && lastBar.time < _subscriptionRecord.lastBarTime) {
+						return;
+					}
+
+					var subscribers = _subscriptionRecord.listeners;
+					var isNewBar = !isNaN(_subscriptionRecord.lastBarTime) && lastBar.time > _subscriptionRecord.lastBarTime;
+
+					//	Pulse updating may miss some trades data (ie, if pulse period = 10 secods and new bar is started 5 seconds later after the last update, the
+					//	old bar's last 5 seconds trades will be lost). Thus, at fist we should broadcast old bar updates when it's ready.
+					if (isNewBar) {
+
+						if (bars.length < 2) {
+							throw "Not enough bars in history for proper pulse update. Need at least 2.";
+						}
+
+						var previousBar = bars[bars.length - 2];
+						for (var i =0; i < subscribers.length; ++i) {
+							subscribers[i](previousBar);
+						}
+					}
+
+					_subscriptionRecord.lastBarTime = lastBar.time;
+
 					for (var i =0; i < subscribers.length; ++i) {
-						subscribers[i](previousBar);
+						subscribers[i](lastBar);
 					}
-				}
+				},

-				subscriptionRecord.lastBarTime = lastBar.time;
-
-				for (var i =0; i < subscribers.length; ++i) {
-					subscribers[i](lastBar);
-				}
-			},
-
-			//	on error
-			function() {
-				that._requestsPending--;
-			});
+				//	on error
+				function() {
+					that._requestsPending--;
+				});
+			})(subscriptionRecord);

 		}
 	},
--- a/charting_library/license.pdf
+++ b/charting_library/license.pdf
--- a/charting_library/static/chart-client/css/chartclient.compiled.css
+++ b/charting_library/static/chart-client/css/chartclient.compiled.css
@@ -6470,6 +6470,27 @@ span.back-to-present.hidden {
  float: right;
  margin: 1px 10px 0 0;
 }
+.bar-mark-tooltip {
+  display: none;
+  position: absolute;
+  z-index: 14;
+  padding: 8px 10px 8px 8px;
+  background: rgba(255, 255, 255, 0.9);
+  min-height: 24px;
+  margin-top: -35px;
+  border: solid 1px;
+  border-color: #808080;
+}
+.bar-mark-tooltip .text {
+  padding-left: 4px;
+  padding-top: 2px;
+  max-width: 250px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: inline-block;
+  font-size: 13px;
+  line-height: 13px;
+}
 .published-charts-tooltip {
  display: none;
  position: absolute;
--- a/charting_library/static/chart-client/css/chartclient.compiled.css.map
+++ b/charting_library/static/chart-client/css/chartclient.compiled.css.map
--- a/charting_library/static/css/site.compiled.css
+++ b/charting_library/static/css/site.compiled.css
@@ -4155,6 +4155,18 @@ textarea.save-chart-dialog {
  overflow: auto;
  -webkit-overflow-scrolling: touch;
 }
+.custom-scroll-container {
+  position: relative;
+}
+.custom-scroll-container .sb-scrollbar-body {
+  border: 0;
+  background: #d8d8d8;
+  width: 6px;
+}
+.custom-scroll-container .sb-scrollbar-top,
+.custom-scroll-container .sb-scrollbar-bottom {
+  display: none;
+}
 .load-chart .touch {
  visibility: visible;
  opacity: 0.3;
@@ -4668,8 +4680,6 @@ textarea.save-chart-dialog {
  text-overflow: ellipsis;
 }
 .insert-study-tabs {
-  margin: 0;
-  padding: 0;
  width: 189px;
  min-height: 420px;
  float: left;
@@ -4678,28 +4688,7 @@ textarea.save-chart-dialog {
  line-height: 13px;
  border-right: 1px solid #d6d6d6;
 }
-.insert-study-tabs li {
-  padding: 11px 26px 9px;
-  width: 100%;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  float: left;
-  clear: both;
-  color: #595959;
-  cursor: pointer;
-}
-.insert-study-tabs li:hover {
-  background: #f4f7f9;
-}
-.insert-study-tabs li.active:not(.search) {
-  border: 0;
-  padding-left: 22px;
-  font-weight: bold;
-  background: #f4f7f9;
-  border-left: 4px solid #5cb888;
-}
-.insert-study-tabs li.search {
+.insert-study-tabs .search {
  position: relative;
  padding: 0px;
  width: 100%;
@@ -4711,15 +4700,15 @@ textarea.save-chart-dialog {
  border-top: 1px solid #d6d6d6;
  border-bottom: 1px solid #d6d6d6;
 }
-.insert-study-tabs li.search.active {
+.insert-study-tabs .search.active {
  border-top: 1px solid #4c82ce;
  border-bottom: 1px solid #4c82ce;
 }
-.insert-study-tabs li.search.active .left-border,
-.insert-study-tabs li.search.active .right-border {
+.insert-study-tabs .search.active .left-border,
+.insert-study-tabs .search.active .right-border {
  display: block;
 }
-.insert-study-tabs li.search input {
+.insert-study-tabs .search input {
  padding: 9px 9px 9px 29px;
  width: 100%;
  height: 100%;
@@ -4729,7 +4718,7 @@ textarea.save-chart-dialog {
  margin: 0;
  border: none;
 }
-.insert-study-tabs li.search div {
+.insert-study-tabs .search div {
  content: " ";
  display: block;
  position: absolute;
@@ -4739,35 +4728,74 @@ textarea.save-chart-dialog {
  top: 12px;
  left: 12px;
 }
-.insert-study-tabs li.search .left-border,
-.insert-study-tabs li.search .right-border {
+.insert-study-tabs .search .left-border,
+.insert-study-tabs .search .right-border {
  display: none;
  width: 1px;
  height: 36px;
  top: -1px;
  background: #4c82ce;
 }
-.insert-study-tabs li.search .left-border {
+.insert-study-tabs .search .left-border {
  left: 0;
 }
-.insert-study-tabs li.search .right-border {
+.insert-study-tabs .search .right-border {
  left: 100%;
 }
-.insert-study-tabs li.search .input-reset {
+.insert-study-tabs .search .input-reset {
  top: 9px;
  right: 18px;
 }
-.insert-study-tabs li.market-tabs {
+.insert-study-tabs .insert-study-tabs-list-container {
+  position: relative;
+}
+.insert-study-tabs .insert-study-tabs-list-container .sb-scrollbar-body {
+  border: 0;
+  background: #d8d8d8;
+  width: 6px;
+}
+.insert-study-tabs .insert-study-tabs-list-container .sb-scrollbar-top,
+.insert-study-tabs .insert-study-tabs-list-container .sb-scrollbar-bottom {
+  display: none;
+}
+.insert-study-tabs .insert-study-tabs-list-container .insert-study-tabs-list {
+  margin: 0;
+  padding: 0;
+  position: absolute;
+  width: 100%;
+}
+.insert-study-tabs .insert-study-tabs-list-container .insert-study-tabs-list li {
+  padding: 11px 26px 9px;
+  width: 100%;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  float: left;
+  clear: both;
+  color: #595959;
+  cursor: pointer;
+}
+.insert-study-tabs .insert-study-tabs-list-container .insert-study-tabs-list li:hover {
+  background: #f4f7f9;
+}
+.insert-study-tabs .insert-study-tabs-list-container .insert-study-tabs-list li.active:not(.search) {
+  border: 0;
+  padding-left: 22px;
+  font-weight: bold;
+  background: #f4f7f9;
+  border-left: 4px solid #5cb888;
+}
+.insert-study-tabs .insert-study-tabs-list-container .insert-study-tabs-list li.market-tabs {
  padding: 0;
  position: relative;
 }
-.insert-study-tabs li.market-tabs:hover {
+.insert-study-tabs .insert-study-tabs-list-container .insert-study-tabs-list li.market-tabs:hover {
  background: none;
 }
-.insert-study-tabs li.market-tabs .text {
+.insert-study-tabs .insert-study-tabs-list-container .insert-study-tabs-list li.market-tabs .text {
  padding: 11px 26px 9px;
 }
-.insert-study-tabs li.market-tabs .text:before {
+.insert-study-tabs .insert-study-tabs-list-container .insert-study-tabs-list li.market-tabs .text:before {
  content: " ";
  position: absolute;
  display: block;
@@ -4778,28 +4806,28 @@ textarea.save-chart-dialog {
  background: url("../images/select-bg.png");
  background-position: 10px 0;
 }
-.insert-study-tabs li.market-tabs .text.open:before {
+.insert-study-tabs .insert-study-tabs-list-container .insert-study-tabs-list li.market-tabs .text.open:before {
  width: 9px;
  height: 5px;
  top: 14px;
  left: 12px;
  background-position: 0 0;
 }
-.insert-study-tabs li.market-tabs ul {
+.insert-study-tabs .insert-study-tabs-list-container .insert-study-tabs-list li.market-tabs ul {
  width: 100%;
  padding: 0;
 }
-.insert-study-tabs li.market-tabs ul li,
-.insert-study-tabs li.market-tabs ul li:hover,
-.insert-study-tabs li.market-tabs ul li:active {
+.insert-study-tabs .insert-study-tabs-list-container .insert-study-tabs-list li.market-tabs ul li,
+.insert-study-tabs .insert-study-tabs-list-container .insert-study-tabs-list li.market-tabs ul li:hover,
+.insert-study-tabs .insert-study-tabs-list-container .insert-study-tabs-list li.market-tabs ul li:active {
  padding-left: 34px;
 }
-.insert-study-tabs li.market-tabs ul li.active,
-.insert-study-tabs li.market-tabs ul li:hover.active,
-.insert-study-tabs li.market-tabs ul li:active.active {
+.insert-study-tabs .insert-study-tabs-list-container .insert-study-tabs-list li.market-tabs ul li.active,
+.insert-study-tabs .insert-study-tabs-list-container .insert-study-tabs-list li.market-tabs ul li:hover.active,
+.insert-study-tabs .insert-study-tabs-list-container .insert-study-tabs-list li.market-tabs ul li:active.active {
  padding-left: 30px;
 }
-.insert-study-tabs li .beta-sign {
+.insert-study-tabs .insert-study-tabs-list-container .insert-study-tabs-list li .beta-sign {
  color: #5cb888;
  font-size: 10px;
  position: relative;
@@ -13023,6 +13051,9 @@ a.fancy-box-arrow:hover {
  line-height: 20px;
  margin: 0;
 }
+.tv-widget-page h2 a {
+  color: #4B4B4D;
+}
 .tv-widget-page p {
  margin: 3px 0;
 }
@@ -15769,6 +15800,7 @@ addons
 }
 .content-page.features .broad-market-icon-container {
  text-align: center;
+  overflow: hidden;
 }
 .content-page.features .broad-market-icon-container .broad-market-icon {
  height: 104px;
@@ -16364,6 +16396,7 @@ addons
 }
 .content-page.tv-widget-page .intro {
  text-align: center;
+  overflow: hidden;
  padding-bottom: 0px;
 }
 .content-page.tv-widget-page .intro .image {
--- a/charting_library/static/css/site.compiled.css.map
+++ b/charting_library/static/css/site.compiled.css.map
--- a/charting_library/static/css/widget.css
+++ b/charting_library/static/css/widget.css
@@ -18,12 +18,16 @@ html, body {background: none; overflow: hidden; min-width: 240px; height: 100%;}

 .insert-study-dialog.minimized
 {
-	width: 480px;
+	width: 490px;
 }
 .insert-study-dialog.minimized .insert-study-tabs
 {
 	display: none;
 }
+.insert-study-dialog.minimized .insert-study-page-content.page-padded
+{
+	padding: 10px 0 0 10px;
+}
 .insert-study-dialog.scrollbar.minimized
 {
 	width: 498px;
@@ -51,7 +55,7 @@ html, body {background: none; overflow: hidden; min-width: 240px; height: 100%;}
 	display: none;
 }

-.minimized .insert-study-pages { width: 480px; }
+.minimized .insert-study-pages { width: 490px; }
 .minimized .insert-study-pages .search-header { padding-left: 4px; }
 .minimized .insert-study-items ul.column { width: 150px; }
 .minimized  .search-header{ display: none; }
@@ -239,7 +243,6 @@ html, body {background: none; overflow: hidden; min-width: 240px; height: 100%;}

 .tv-embed-buttons-contaner {
 	float:right;
-	padding-top: 3px;
 }

 /* cme get image button */
--- a/charting_library/static/localization/translations/cn_s.json
+++ b/charting_library/static/localization/translations/cn_s.json
@@ -0,0 +1,587 @@
+{
+
+	"__comment": "Tis is css class name. Use `propertypage-name-label-nocap` if each word should not be capitalized. Or use `propertypage-name-label` if should.",
+	"propertypage-name-label_css_class": "propertypage-name-label-nocap",
+
+	"Script Editor": "脚本编辑器",
+	" Published Charts Timeline": " 发行时间",
+	"SMA": "SMA",
+	"Bar's Style": "柱形图样式",
+	"Chart Properties": "图表设定",
+	"Compare": "比较目标",
+	"Compare...": "比较目标...",
+	"Compare or Add Symbol...": "比较或新增商品...",
+	"Compare or Add Symbol": "比较或新增商品",
+	"Add Symbol": "增加目标",
+	"Scales Properties...": "缩放属性...",
+	"Add": "新增",
+	"Company Comparison": "请输入商品代码",
+	"Indicators, Fundamentals, Economy and Add-ons": "技术指标",
+	"Economy & Symbols": "目标代码",
+	"Show Countdown": "显示倒数计时",
+	"Technical Analysis": "技术分析",
+
+	"Bars": "美国线",
+	"Candles": "K线图",
+	"Hollow Candles": "空心K线图",
+	"Line": "线形图",
+	"Area": "山形图",
+	"Heiken Ashi": "Heiken-Ashi烛图",
+	"Histogram": "直方图",
+	"Cross_chart_type": "交叉图",
+	"Columns": "柱状图",
+	"Circles": "饼图",
+
+	"Renko": "砖形图",
+	"Line Break": "价线图",
+	"Kagi": "Kagi图",
+	"Point & Figure": "点数图",
+
+
+	"Indicators": "技术指标",
+	"Favorites": "我的最爱",
+	"Technical Analysis": "技术分析",
+	"No indicators matched your criteria.": "没有技术指标符合您的搜寻条件.",
+	"Add to favorites": "新增至我的最爱",
+	"No symbols matched your criteria": "没有商品代码符合您的搜寻条件",
+	"Company Comparison": "请输入商品代码",
+	"Add any symbol from the list": "自清单上新增商品代码",
+	"Overlay the main chart": "覆盖主要绘图区",
+	"Symbols to be added on the chart": "新增商品代码至图表",
+	"Symbol": "请输入商品代码",
+
+	"Default": "预设",
+	"Defaults": "默认值",
+	"OK": "确认",
+	"Cancel": "取消",
+
+	" color": " 颜色",
+	" transparency": " 透明度",
+	" visibility": " 可见度",
+	"Add To Watchlist": "新增至期望清单",
+	"Apply": "应用",
+	"Arguments in Header": "表头参数",
+	"Arrow": "箭头",
+	"Auto Scale": "自动缩放",
+	"Background": "背景",
+	"bars": "根",
+	"bars_margin": "根",
+	"{0} bars": "{0} 根",
+	"Bottom Margin": "下边距",
+	"Bring Forward": "向上移动",
+	"Bring to Front": "置于顶层",
+	"Clone": "克隆",
+	"Color Theme": "色彩主题",
+	"Copy": "复制",
+	"Extended Hours": "延长交易时间",
+	"Format...": "格式...",
+	"Full Screen": "全屏幕",
+	"Grid Lines": "网网格线",
+	"Hide All Drawing Tools": "隐藏所有绘图工具",
+	"Hide": "隐藏",
+	"Insert Drawing Tool": "新增绘图工具",
+	"Insert Indicator...": "新增技术指标...",
+	"Last Value on Price Scale": "显示最后收盘价",
+	"Link To": "连结至",
+	"Load New Bars": "加载新数据",
+	"Lock All Drawing Tools": "锁定所有绘图工具",
+	"Lock Scale": "锁定缩放功能",
+	"Lock scale": "锁定缩放功能",
+	"Log Scale": "对数缩放",
+	"Magnet Mode": "磁铁模式",
+	"Merge Down": "向下合并",
+	"Merge Up": "向上合并",
+	"Objects Tree...": "排列顺序...",
+	"Offset": "位移",
+	"Override Min Tick": "覆写最小刻度",
+	"Percentage": "百分比",
+	"Precision": "精确度",
+	"Price Line": "价格标线",
+	"Properties...": "属性...",
+	"Redo": "重做",
+	"Remove All Drawing Tools": "移除所有绘图工具",
+	"Remove All Studies": "移除所有学习",
+	"Remove All Indicators": "移除所有技术指标",
+	"Remove": "移除",
+	"Reset Chart": "重设图表",
+	"Reset Scale": "重设比例",
+	"Reset": "重设",
+	"Right Margin": "右边距",
+	"Save As...": "储存为...",
+	"Scale Left": "左边缩放",
+	"Scale Percentage": "缩放百分比",
+	"Scale Right": "右边缩放",
+	"Scale Series Only": "只缩放数据",
+	"Scale series only": "只缩放数据",
+	"Scales Lines": "缩放线条",
+	"Scales Text": "缩放文字",
+	"Scaling": "缩放",
+	"Screen (No Scale)": "屏幕(无缩放)",
+	"Send Backward": "下移一层",
+	"Send to Back": "移至底层",
+	"Session Breaks": "中断会话",
+	"Show Arguments in Header": "在表头上显示参数",
+	"Show Last Value on Price Scale": "在价格比例尺上显示最终值",
+	"Last Value on Price Scale": "价格比例尺上的最终值",
+	"Show Left Axis": "显示左轴",
+	"Show Right Axis": "显示右轴",
+	"Show": "显示",
+	"Stay In Drawing Mode": "停留在绘图模式",
+	"Symbol Search...": "搜寻商品代码...",
+	"Change Symbol": "更换商品代码",
+	"Change Symbol...": "更换商品代码...",
+	"Time Zone": "时区",
+	"TimeZone": "时区",
+	"Top Margin": "上边距",
+	"Transparency": "透明度",
+	"Undo {0}": "复原 {0}",
+	"Undo": "复原",
+	"Unmerge Down": "取消向下合并",
+	"Unmerge Up": "取消向上合并",
+	"Visual Order": "显示顺序",
+	"Watermark": "水印",
+	"Show Objects Tree": "显示排列顺序",
+
+
+	"cursors-group-css-class": "",
+
+	"ABCD Pattern":"ABCD 型态",
+	"Anchored Text": "锚点文字",
+	"Arc": "弧形",
+	"Arrow Mark Down": "下箭头",
+	"Arrow Mark Left": "左箭头",
+	"Arrow Mark Right": "右箭图",
+	"Arrow Mark Up": "上箭头",
+	"Arrow": "箭头",
+	"Balloon": "泡泡",
+	"Bars Pattern": "直方图",
+	"Brush": "笔刷",
+	"Callout": "标注",
+	"Circle Lines": "周期线",
+	"Cross": "十字线",
+	"Cyclic Lines": "循环线",
+	"Date Range": "日期范围",
+	"Disjoint Angle": " 不相交角",
+	"Dot": "圆点",
+	"Elliott Labels": "艾略特标签",
+	"Elliott Major Retracement": "艾略特主波浪回测",
+	"Elliott Minor Retracement": "艾略特小波浪回测",
+	"Elliott Wave Circle": "艾略特圆型波",
+	"Elliott Wave Cycle": "艾略特循环波",
+	"Elliott Wave Minor": "艾略特小型波",
+	"Elliott Wave Subminuette": "艾略特次微波",
+	"Ellipse": "椭圆",
+	"Eraser": "橡皮擦",
+	"Extended": "延伸",
+	"Extended Line": "延伸线",
+	"Fib Channel": "通道黄金分割率",
+	"Fib Circles": "圆周黄金分割率",
+	"Fib Retracement": "费波南兹回测",
+	"Fib Speed Resistance Arcs": "半圆周黄金分割率",
+	"Fib Speed Resistance Fan": "扇形黄金分割率",
+	"Fib Spiral": "费波南兹螺旋",
+	"Fib Time Zone": "费波南兹系数",
+	"Fib Wedge": "楔形黄金分割率",
+	"Flag Mark": "旗标",
+	"Flat Top/Bottom": "旗顶/旗底",
+	"Flat Bottom": "旗底",
+	"Forecast": "预测",
+	"Gann Box": "箱型甘氏线",
+	"Gann Fan": "扇形甘氏线",
+	"Gann Square": "方形甘氏线",
+	"Head & Shoulders": "头肩顶",
+	"Horizontal Line": "垂直线",
+	"Horizontal Ray": "垂直射线",
+	"Icon": "图标",
+	"Inside Pitchfork": "内侧蝴蝶指标",
+	"Long Position": "做多部位",
+	"Risk/Reward long": "长期风险/回报",
+	"Modified Schiff Pitchfork": "改良式希夫蝴蝶指标",
+	"Parallel Channel": "并行通道",
+	"Pitchfan": "扇形角度线",
+	"Pitchfork": "基本蝴蝶指标",
+	"Polyline": "多边形",
+	"Price Label": "价位卷标",
+	"Price Range": "价位区间",
+	"Projection": "投影指标",
+	"Ray": "射线",
+	"Rectangle": "矩形",
+	"Regression Trend": "回归趋势",
+	"Rotated Rectangle": "旋转矩形",
+	"Schiff Pitchfork": "希夫蝴蝶指标",
+	"Schiff": "希夫",
+	"Original": "原始",
+	"Modified Schiff": "改良式希夫",
+	"Inside": "内部",
+	"Short Position": "做空部位",
+	"Risk/Reward short": "短期风险/回报",
+	"Text": "文字",
+	"Comment": "批注",
+	"Three Drivers Pattern": "下降旗形",
+	"Thumb Down": "失望",
+	"Thumb Up": "满意",
+	"Trend Angle": "趋势角度",
+	"Trend Line": "趋势线",
+
+	"Trend-Based Fib Extension": "趋势黄金分割率",
+	"Trend-Based Fib Time": "趋势费波南兹系数",
+
+	"Triangle Pattern": "收敛三角形",
+	"Triangle": "三角形",
+	"Vertical Line": "水平线",
+	"XABCD Pattern": "XABCD 蝴蝶",
+
+
+	"Angle:": "角度:",
+	"Arcs": "弧形",
+	"Background color 1": "背景颜色 #1",
+	"Background color 2": "背景颜色 #2",
+	"Background Color": "背景颜色",
+	"Bar #": "长条 #",
+	"Border color": "边框颜色",
+	"Border Color": "边框颜色",
+	"Border": "边框",
+	"Bottom Lables": "底部标签",
+	"bottom": "底部",
+	"center": "中间",
+	"Channel": "频道",
+	"Coeffs As Percents": "以系数作为百分比",
+	"Color bars based on previous close": "前次关闭时使用的调色",
+	"Color": "颜色",
+	"Color:": "颜色:",
+	"Source_compare": "来源比较",
+	"Coordinates": "坐标",
+	"Delete": "删除",
+	"Down Color": "向下颜色",
+	"Drawings": "绘图",
+	"Entry price:": "输入价格:",
+	"Events": "事件",
+	"Extend Left End": "向左延长至左端",
+	"Extend Left": "向左延长",
+	"Extend Lines": "延长线条",
+	"Extend Right End": "向右延长至右端",
+	"Extend Right": "向右延长",
+	"Extend": "延伸",
+	"Failure back color": "错误的背景颜色",
+	"Failure text color": "错误的文字颜色",
+	"Fans": "Линии",
+	"Fill": "填满",
+	"Format": "格式",
+	"Graphics": "图形",
+	"Grid": "网格线",
+	"Help": "协助",
+	"HLC Bars": "HLC长条",
+	"Inputs": "输入",
+	"Label Background": "标签背景",
+	"Label": "标签",
+	"Labels": "标签",
+	"Left End": "左端",
+	"Left Labels": "左方标签",
+	"left": "左",
+	"Level {0}": "等级 {0}",
+	"Levels": "等级",
+	"Line": "线形图",
+	"Lines": "线",
+	"Major": "主要",
+	"Measure (Shift + Click on the chart)": "测量 (在图表上按着键盘Shift键，同时点击鼠标左键)",
+	"Median": "中位",
+	"middle": "中间",
+	"Middle": "中轴慢线",
+	"Minor": "主要",
+	"Mode": "模式",
+	"Normal": "一般",
+	"Plot": "绘图",
+	"Price Levels": "价格等级",
+	"Price Source": "价格来源",
+	"Price": "价格",
+	"Price:": "价格:",
+	"Prices": "价格",
+	"Profit Background Color": "有效背景颜色",
+	"Profit Level. Ticks:": "有效等级刻度:",
+	"Properties": "图表设定",
+	"Reverse": "反向",
+	"Right End": "右端",
+	"Right Lables": "右方标签",
+	"right": "右",
+	"Log Scale_scale_menu": "对数比例选单",
+	"Percentage_scale_menu": "百分比比例选单",
+	"Scales": "比例",
+	"Settings": "设定",
+	"Show Background": "显示背景",
+	"Show Bars Range": "显示bars区间",
+	"Show Date/Time Range": "显示时间/日期区间",
+	"Show Distance": "显示距离",
+	"Show Labels": "显示卷标",
+	"Show Price Range": "显示价格区间",
+	"Show Price": "显示价格",
+	"Show Prices": "显示价格",
+	"Show Text": "显示文字",
+	"Show Time": "显示时间",
+	"Show Wave": "显示波浪",
+	"Show/Hide": "显示/隐藏",
+	"Source back color": "来源背景颜色",
+	"Source border color": "来源边框颜色",
+	"Source text color": "来源文字颜色",
+	"Stay in Drawing Mode": "停留在绘图模式",
+	"Stop Background Color": "停损背景颜色",
+	"Stop Color:": "停损颜色:",
+	"Stop Level. Ticks:": "停损等级刻度:",
+	"Style": "样式",
+	"Success back color": "正确背景颜色",
+	"Success text color": "正确文字颜色",
+	"Target back color": "目标背景颜色",
+	"Target border color": "目标边框颜色",
+	"Target Color:": "目标颜色:",
+	"Target text color": "目标文字颜色",
+	"Text Alignment:": "文字参数:",
+	"Text color": "文字颜色",
+	"Text Color": "文字颜色",
+	"Text Font": "文字字型",
+	"Text Wrap": "文字换行",
+	"Text": "文字",
+	"Text:": "文字:",
+	"Time Levels": "时间等级",
+	"Timezone/Sessions": "时区/会话",
+	"Top Labels": "顶端标签",
+	"top": "顶端",
+	"Up Color": "向上颜色",
+	"Wave Size": "波浪大小",
+	"Wick": "烛心",
+	"Zoom In": "放大",
+	"Zoom Out": "缩小",
+	"Borders": "边框",
+	"Level": "等级",
+	"Hlines Background": "盘整区背景色",
+	"Plots Background": "绘图区背景色",
+
+	"Open_line_tool_position": "开启画线工具位置",
+	"Closed_line_tool_position": "关闭画线工具位置",
+	"{0} P&L: {1}": "{0} 获利与损失: {1}",
+	"Risk/Reward Ratio: {0}": "风险/回报比率: {0}",
+	"Stop: {0} ({1}%)": "停损: {0} ({1}%)",
+	"Target: {0} ({1}%)": "目标: {0} ({1}%)",
+	"SUCCESS": "成功",
+	"FAILURE": "失败",
+	"Left Shoulder": "左肩",
+	"Head": "头部",
+	"Right Shoulder": "右肩",
+	"Mirrored": "镜像",
+	"Flipped": "翻转",
+	"distance: {0}": "距离: {0}",
+
+	"day": "日",
+	"day_plural_1": "day_plural_1",
+	"day_plural_2": "day_plural_2",
+	"day_plural_5": "day_plural_5",
+
+	"week": "周",
+	"week_plural_1": "week_plural_1",
+	"week_plural_2": "week_plural_2",
+	"week_plural_5": "week_plural_5",
+
+	"month": "月",
+	"month_plural_1": "month_plural_1",
+	"month_plural_2": "month_plural_2",
+	"month_plural_5": "month_plural_5",
+
+	"minute": "分",
+	"minute_plural_1": "minute_plural_1",
+	"minute_plural_2": "minute_plural_2",
+	"minute_plural_5": "minute_plural_3",
+
+	"hour": "时",
+	"hour_plural_1": "hour_plural_1",
+	"hour_plural_2": "hour_plural_2",
+	"hour_plural_5": "hour_plural_5",
+
+	"d_dates": "日",
+	"h_dates": "小时",
+	"m_dates": "月",
+	"s_dates": "秒",
+	"in_dates": "in_dates",
+
+	"Jan": "1月",
+	"Feb": "2月",
+	"Mar": "3月",
+	"Apr": "4月",
+	"May": "5月",
+	"Jun": "6月",
+	"Jul": "7月",
+	"Aug": "8月",
+	"Sep": "9月",
+	"Oct": "10月",
+	"Nov": "11月",
+	"Dec": "12月",
+	
+	"Sun": "周日", 
+	"Mon": "周一", 
+	"Tue": "周二", 
+	"Wed": "周三", 
+	"Thu": "周四", 
+	"Fri": "周五", 
+	"Sat": "周六", 
+	
+	"Sunday": "周日", 
+	"Monday": "周一", 
+	"Tuesday": "周二", 
+	"Wednesday": "周三", 
+	"Thursday": "周四", 
+	"Friday": "周五", 
+	"Saturday": "周六", 
+      
+	"Objects Tree": "排列顺序",
+	"Manage Drawings": "管理绘图工具",
+	"TOOL": "工具",
+	"SYMBOL": "商品代码",
+	"Move Up": "向上移动",
+	"Move Down": "向下移动",
+
+
+	"All Exchanges": "所有交易所",
+	"All types": "所有类型",
+	"Stock": "股票",
+	"stock": "股票",
+	"Index": "指数",
+	"index": "指数",
+	"Futures": "期货",
+	"futures": "期货",
+	"commodity": "商品",
+    "Commodity": "商品",
+
+	"Image URL": "图文件路径",
+	"Save image": "储存图档",
+	"or copy url:": "或复制图文件路径:",
+
+	"Undo {0}": "复原 {0}",
+	"Redo {0}": "重做 {0}",
+
+	"Custom color...": "自定义颜色...",
+	"Search": "搜寻",
+
+	"Open_in_legend": "开盘",
+	"High_in_legend": "最高",
+	"Low_in_legend": "最低",
+	"Close_in_legend": "收盘",
+
+	"Open": "开盘",
+	"High": "最高",
+	"Low": "最低",
+	"Close": "收盘",
+	"(H + L)/2": "(最高+最低)/2",
+	"(H + L + C)/3": "(最高+最低+收盘)/3",
+	"(O + H + L + C)/4": "(开盘+最高+最低+收盘)/4",
+
+
+	"UTC": "国家标准时间",
+	"Exchange": "交易所",
+"Athens": "欧洲/雅典",
+"Berlin": "欧洲/柏林",
+"Bogota": "南美洲/波哥大",
+"Buenos Aires": "南美洲/布宜诺斯艾利斯",
+"Chicago": "北美洲/芝加哥",
+"Hong Kong": "亚洲/香港",
+"Kolkata": "亚洲/加尔各答",
+"London": "欧洲/伦敦",
+"Los Angeles": "北美洲/洛杉矶",
+"Madrid": "欧洲/马德里",
+"Moscow": "欧洲/莫斯科",
+"New York": "北美洲/纽约",
+"Paris": "欧洲/巴黎",
+"Seoul": "亚洲/首尔",
+"Shanghai": "亚洲/上海",
+"Singapore": "亚洲/新加坡",
+"Sydney": "大洋洲/悉尼",
+"Taipei": "亚洲/台北",
+"Tokyo": "亚洲/东京",
+"Toronto": "北美洲/多伦多",
+"Vancouver": "北美洲/温哥华",
+"Warsaw": "欧洲/华沙",
+
+	"n/a": "n/a",
+
+	"Long_input": "长轴慢线",
+	"long_input": "长轴慢线",
+	"longlen_input": "长轴慢线",
+	"Window Size_input": "窗口大小",
+	"Length_input": "天数长度",
+	"length_input": "天数长度",
+	"len_input": "天数长度",
+	"Short_input": "短轴快线",
+	"short_input": "短轴快线",
+	"shortlen_input": "短轴快线",
+	"Mult_input": "多重因素",
+	"mult_input": "多重因素",
+	"divisor_input": "除数",
+	"Divisor_input": "除数",
+	"Upper": "上方",
+	"Lower": "下方",
+	"Long": "长期",
+	"Short": "短期",
+	"Signal": "讯号",
+	"Jaw": "下颚",
+	"Teeth": "牙齿",
+	"Lips": "嘴唇",
+	"Zero": "零轴",
+	"WMA Length_input": "WMA长度",
+	"Long RoC Length_input": "长期RoC天数",
+	"Short RoC Length_input": "短期RoC天数",
+	"jawLength_input": "下颚长度",
+	"teethLength_input": "牙齿长度",
+	"lipsLength_input": "嘴唇长度",
+	"percent_input": "百分比",
+	"exponential_input": "指数平均",
+	"smoothD_input": "平滑 %D",
+	"smoothK_input": "平滑 %K",
+	"Color 0": "颜色 0",
+	"Color 1": "颜色 1",
+	"Color 2": "颜色 2",
+	"Color 3": "颜色 3",
+	"Color 4": "颜色 4",
+	"sym_input": "工具",
+	"symbol_input": "工具",
+	"Sym_input": "工具",
+	"DI Length_input": "DI长度",
+	"ADX Smoothing_input": "平滑ADX",
+	"displacement_input": "云带",
+
+	"Tenkan-sen": "转换线",
+	"Kijun-sen": "基线",
+	"Chikou span": "延迟线",
+	"Senkou A": "前行带 A",
+	"Senkou B": "前行带 B",
+
+	"useTrueRange_input": "使用真实区间",
+	"roclen1_input": "长度 RoC 1",
+	"roclen2_input": "长度 RoC 2",
+	"roclen3_input": "长度 RoC 3",
+	"roclen4_input": "长度 RoC 4",
+	"smalen1_input": "长度 MA 1",
+	"smalen2_input": "长度 MA 2",
+	"smalen3_input": "长度 MA 3",
+	"smalen4_input": "长度 MA 4",
+	"siglen_input": "讯号长度",
+
+	"UpperLimit": "上方极限值",
+	"LowerLimit": "下方极限值",
+
+	"fastLength_input": "快速指标天数",
+	"slowLength_input": "慢速指标天数",
+	"signalLength_input": "讯号产生天数",
+
+	"start_input": "开始",
+	"increment_input": "增量",
+	"maximum_input": "最大值",
+	"showMA_input": "显示移动平均",
+	"Volume": "成交量",
+	"Volume MA": "成交量移动平均",
+	"Indicator": "技术指标",
+	"Oscillator": "摆荡指标",
+	"lengthStoch_input": "随机指标天数",
+	"lengthRSI_input": "随机RSI天数",
+
+	"sigma_input": "Sigma",
+	"Sigma_input": "Sigma",
+
+	"Crosses": "交错"
+
+}
--- a/charting_library/static/localization/translations/cn_tr.json
+++ b/charting_library/static/localization/translations/cn_tr.json
@@ -0,0 +1,587 @@
+{
+
+	"__comment": "Tis is css class name. Use `propertypage-name-label-nocap` if each word should not be capitalized. Or use `propertypage-name-label` if should.",
+	"propertypage-name-label_css_class": "propertypage-name-label-nocap",
+
+	"Script Editor": "腳本編輯器",
+	" Published Charts Timeline": " 發行時間",
+	"SMA": "SMA",
+	"Bar's Style": "直條圖樣式",
+	"Chart Properties": "圖表設定",
+	"Compare": "比較標的",
+	"Compare...": "比較標的...",
+	"Compare or Add Symbol...": "比較或新增商品...",
+	"Compare or Add Symbol": "比較或新增商品",
+	"Add Symbol": "增加標的",
+	"Scales Properties...": "縮放屬性...",
+	"Add": "新增",
+	"Company Comparison": "請輸入商品代碼",
+	"Indicators, Fundamentals, Economy and Add-ons": "技術指標",
+	"Economy & Symbols": "標的代碼",
+	"Show Countdown": "顯示倒數計時",
+	"Technical Analysis": "技術分析",
+
+	"Bars": "美國線",
+	"Candles": "K線圖",
+	"Hollow Candles": "空心K線圖",
+	"Line": "線形圖",
+	"Area": "山形圖",
+	"Heiken Ashi": "Heiken-Ashi燭圖",
+	"Histogram": "直方圖",
+	"Cross_chart_type": "交叉圖",
+	"Columns": "柱狀圖",
+	"Circles": "圓形圖",
+
+	"Renko": "磚形圖",
+	"Line Break": "價線圖",
+	"Kagi": "Kagi圖",
+	"Point & Figure": "點數圖",
+
+
+	"Indicators": "技術指標",
+	"Favorites": "我的最愛",
+	"Technical Analysis": "技術分析",
+	"No indicators matched your criteria.": "沒有技術指標符合您的搜尋條件.",
+	"Add to favorites": "新增至我的最愛",
+	"No symbols matched your criteria": "沒有商品代碼符合您的搜尋條件",
+	"Company Comparison": "請輸入商品代碼",
+	"Add any symbol from the list": "自清單上新增商品代碼",
+	"Overlay the main chart": "覆蓋主要繪圖區",
+	"Symbols to be added on the chart": "新增商品代碼至圖表",
+	"Symbol": "請輸入商品代碼",
+
+	"Default": "預設",
+	"Defaults": "預設值",
+	"OK": "確認",
+	"Cancel": "取消",
+
+	" color": " 顏色",
+	" transparency": " 透明度",
+	" visibility": " 可見度",
+	"Add To Watchlist": "新增至期望清單",
+	"Apply": "應用",
+	"Arguments in Header": "表頭參數",
+	"Arrow": "箭頭",
+	"Auto Scale": "自動縮放",
+	"Background": "背景",
+	"bars": "根",
+	"bars_margin": "根",
+	"{0} bars": "{0} 根",
+	"Bottom Margin": "下邊距",
+	"Bring Forward": "向上移動",
+	"Bring to Front": "置於頂層",
+	"Clone": "克隆",
+	"Color Theme": "色彩主題",
+	"Copy": "複製",
+	"Extended Hours": "延長交易時間",
+	"Format...": "格式...",
+	"Full Screen": "全螢幕",
+	"Grid Lines": "網格線",
+	"Hide All Drawing Tools": "隱藏所有繪圖工具",
+	"Hide": "隱藏",
+	"Insert Drawing Tool": "新增繪圖工具",
+	"Insert Indicator...": "新增技術指標...",
+	"Last Value on Price Scale": "顯示最後收盤價",
+	"Link To": "連結至",
+	"Load New Bars": "載入新數據",
+	"Lock All Drawing Tools": "鎖定所有繪圖工具",
+	"Lock Scale": "鎖定縮放功能",
+	"Lock scale": "鎖定縮放功能",
+	"Log Scale": "對數縮放",
+	"Magnet Mode": "磁鐵模式",
+	"Merge Down": "向下合併",
+	"Merge Up": "向上合併",
+	"Objects Tree...": "排列順序...",
+	"Offset": "位移",
+	"Override Min Tick": "覆寫最小刻度",
+	"Percentage": "百分比",
+	"Precision": "精確度",
+	"Price Line": "價格標線",
+	"Properties...": "屬性...",
+	"Redo": "重做",
+	"Remove All Drawing Tools": "移除所有繪圖工具",
+	"Remove All Studies": "移除所有學習",
+	"Remove All Indicators": "移除所有技術指標",
+	"Remove": "移除",
+	"Reset Chart": "重設圖表",
+	"Reset Scale": "重設比例",
+	"Reset": "重設",
+	"Right Margin": "右邊距",
+	"Save As...": "儲存為...",
+	"Scale Left": "左邊縮放",
+	"Scale Percentage": "縮放百分比",
+	"Scale Right": "右邊縮放",
+	"Scale Series Only": "只縮放數據",
+	"Scale series only": "只縮放數據",
+	"Scales Lines": "縮放線條",
+	"Scales Text": "縮放文字",
+	"Scaling": "縮放",
+	"Screen (No Scale)": "螢幕(無縮放)",
+	"Send Backward": "下移一層",
+	"Send to Back": "移至底層",
+	"Session Breaks": "中斷工作階段",
+	"Show Arguments in Header": "在表頭上顯示參數",
+	"Show Last Value on Price Scale": "在價格比例尺上顯示最終值",
+	"Last Value on Price Scale": "價格比例尺上的最終值",
+	"Show Left Axis": "顯示左軸",
+	"Show Right Axis": "顯示右軸",
+	"Show": "顯示",
+	"Stay In Drawing Mode": "停留在繪圖模式",
+	"Symbol Search...": "搜尋商品代碼...",
+	"Change Symbol": "更換商品代碼",
+	"Change Symbol...": "更換商品代碼...",
+	"Time Zone": "時區",
+	"TimeZone": "時區",
+	"Top Margin": "上邊距",
+	"Transparency": "透明度",
+	"Undo {0}": "復原 {0}",
+	"Undo": "復原",
+	"Unmerge Down": "取消向下合併",
+	"Unmerge Up": "取消向上合併",
+	"Visual Order": "顯示順序",
+	"Watermark": "浮水印",
+	"Show Objects Tree": "顯示排列順序",
+
+
+	"cursors-group-css-class": "",
+
+	"ABCD Pattern":"ABCD 型態",
+	"Anchored Text": "錨點文字",
+	"Arc": "弧形",
+	"Arrow Mark Down": "下箭頭",
+	"Arrow Mark Left": "左箭頭",
+	"Arrow Mark Right": "右箭圖",
+	"Arrow Mark Up": "上箭頭",
+	"Arrow": "箭頭",
+	"Balloon": "泡泡",
+	"Bars Pattern": "長條圖",
+	"Brush": "筆刷",
+	"Callout": "標註",
+	"Circle Lines": "週期線",
+	"Cross": "十字線",
+	"Cyclic Lines": "循環線",
+	"Date Range": "日期範圍",
+	"Disjoint Angle": " 不相交角",
+	"Dot": "圓點",
+	"Elliott Labels": "艾略特標籤",
+	"Elliott Major Retracement": "艾略特主波浪回測",
+	"Elliott Minor Retracement": "艾略特小波浪回測",
+	"Elliott Wave Circle": "艾略特圓型波",
+	"Elliott Wave Cycle": "艾略特循環波",
+	"Elliott Wave Minor": "艾略特小型波",
+	"Elliott Wave Subminuette": "艾略特次微波",
+	"Ellipse": "橢圓",
+	"Eraser": "橡皮擦",
+	"Extended": "延伸",
+	"Extended Line": "延伸線",
+	"Fib Channel": "通道黃金分割率",
+	"Fib Circles": "圓周黃金分割率",
+	"Fib Retracement": "費波南茲回測",
+	"Fib Speed Resistance Arcs": "半圓周黃金分割率",
+	"Fib Speed Resistance Fan": "扇形黃金分割率",
+	"Fib Spiral": "費波南茲螺旋",
+	"Fib Time Zone": "費波南茲係數",
+	"Fib Wedge": "楔形黃金分割率",
+	"Flag Mark": "旗標",
+	"Flat Top/Bottom": "旗頂/旗底",
+	"Flat Bottom": "旗底",
+	"Forecast": "預測",
+	"Gann Box": "箱型甘氏線",
+	"Gann Fan": "扇形甘氏線",
+	"Gann Square": "方形甘氏線",
+	"Head & Shoulders": "頭肩頂",
+	"Horizontal Line": "垂直線",
+	"Horizontal Ray": "垂直射線",
+	"Icon": "圖標",
+	"Inside Pitchfork": "內側蝴蝶指標",
+	"Long Position": "做多部位",
+	"Risk/Reward long": "長期風險/回報",
+	"Modified Schiff Pitchfork": "改良式希夫蝴蝶指標",
+	"Parallel Channel": "併行通道",
+	"Pitchfan": "扇形角度線",
+	"Pitchfork": "基本蝴蝶指標",
+	"Polyline": "多邊形",
+	"Price Label": "價位標籤",
+	"Price Range": "價位區間",
+	"Projection": "投影指標",
+	"Ray": "射線",
+	"Rectangle": "矩形",
+	"Regression Trend": "迴歸趨勢",
+	"Rotated Rectangle": "旋轉矩形",
+	"Schiff Pitchfork": "希夫蝴蝶指標",
+	"Schiff": "希夫",
+	"Original": "原始",
+	"Modified Schiff": "改良式希夫",
+	"Inside": "內部",
+	"Short Position": "做空部位",
+	"Risk/Reward short": "短期風險/回報",
+	"Text": "文字",
+	"Comment": "註解",
+	"Three Drivers Pattern": "下降旗形",
+	"Thumb Down": "失望",
+	"Thumb Up": "滿意",
+	"Trend Angle": "趨勢角度",
+	"Trend Line": "趨勢線",
+
+	"Trend-Based Fib Extension": "趨勢黃金分割率",
+	"Trend-Based Fib Time": "趨勢費波南茲係數",
+
+	"Triangle Pattern": "收斂三角形",
+	"Triangle": "三角形",
+	"Vertical Line": "水平線",
+	"XABCD Pattern": "XABCD 蝴蝶",
+
+
+	"Angle:": "角度:",
+	"Arcs": "弧形",
+	"Background color 1": "背景顏色 #1",
+	"Background color 2": "背景顏色 #2",
+	"Background Color": "背景顏色",
+	"Bar #": "長條 #",
+	"Border color": "邊框顏色",
+	"Border Color": "邊框顏色",
+	"Border": "邊框",
+	"Bottom Lables": "底部標籤",
+	"bottom": "底部",
+	"center": "中間",
+	"Channel": "頻道",
+	"Coeffs As Percents": "以係數作為百分比",
+	"Color bars based on previous close": "前次關閉時使用的調色",
+	"Color": "顏色",
+	"Color:": "顏色:",
+	"Source_compare": "來源比較",
+	"Coordinates": "座標",
+	"Delete": "刪除",
+	"Down Color": "向下顏色",
+	"Drawings": "繪圖",
+	"Entry price:": "輸入價格:",
+	"Events": "事件",
+	"Extend Left End": "向左延長至左端",
+	"Extend Left": "向左延長",
+	"Extend Lines": "延長線條",
+	"Extend Right End": "向右延長至右端",
+	"Extend Right": "向右延長",
+	"Extend": "延伸",
+	"Failure back color": "錯誤的背景顏色",
+	"Failure text color": "錯誤的文字顏色",
+	"Fans": "Линии",
+	"Fill": "填滿",
+	"Format": "格式",
+	"Graphics": "圖形",
+	"Grid": "格線",
+	"Help": "協助",
+	"HLC Bars": "HLC長條",
+	"Inputs": "輸入",
+	"Label Background": "標籤背景",
+	"Label": "標籤",
+	"Labels": "標籤",
+	"Left End": "左端",
+	"Left Labels": "左方標籤",
+	"left": "左",
+	"Level {0}": "等級 {0}",
+	"Levels": "等級",
+	"Line": "線形圖",
+	"Lines": "線",
+	"Major": "主要",
+	"Measure (Shift + Click on the chart)": "測量 (在圖表上按著鍵盤Shift鍵，同時點擊滑鼠左鍵)",
+	"Median": "中位",
+	"middle": "中間",
+	"Middle": "中軸慢線",
+	"Minor": "主要",
+	"Mode": "模式",
+	"Normal": "一般",
+	"Plot": "繪圖",
+	"Price Levels": "價格等級",
+	"Price Source": "價格來源",
+	"Price": "價格",
+	"Price:": "價格:",
+	"Prices": "價格",
+	"Profit Background Color": "有效背景顏色",
+	"Profit Level. Ticks:": "有效等級刻度:",
+	"Properties": "圖表設定",
+	"Reverse": "反向",
+	"Right End": "右端",
+	"Right Lables": "右方標籤",
+	"right": "右",
+	"Log Scale_scale_menu": "對數比例選單",
+	"Percentage_scale_menu": "百分比比例選單",
+	"Scales": "比例",
+	"Settings": "設定",
+	"Show Background": "顯示背景",
+	"Show Bars Range": "顯示bars區間",
+	"Show Date/Time Range": "顯示時間/日期區間",
+	"Show Distance": "顯示距離",
+	"Show Labels": "顯示標籤",
+	"Show Price Range": "顯示價格區間",
+	"Show Price": "顯示價格",
+	"Show Prices": "顯示價格",
+	"Show Text": "顯示文字",
+	"Show Time": "顯示時間",
+	"Show Wave": "顯示波浪",
+	"Show/Hide": "顯示/隱藏",
+	"Source back color": "來源背景顏色",
+	"Source border color": "來源邊框顏色",
+	"Source text color": "來源文字顏色",
+	"Stay in Drawing Mode": "停留在繪圖模式",
+	"Stop Background Color": "停損背景顏色",
+	"Stop Color:": "停損顏色:",
+	"Stop Level. Ticks:": "停損等級刻度:",
+	"Style": "樣式",
+	"Success back color": "正確背景顏色",
+	"Success text color": "正確文字顏色",
+	"Target back color": "目標背景顏色",
+	"Target border color": "目標邊框顏色",
+	"Target Color:": "目標顏色:",
+	"Target text color": "目標文字顏色",
+	"Text Alignment:": "文字參數:",
+	"Text color": "文字顏色",
+	"Text Color": "文字顏色",
+	"Text Font": "文字字型",
+	"Text Wrap": "文字換行",
+	"Text": "文字",
+	"Text:": "文字:",
+	"Time Levels": "時間等級",
+	"Timezone/Sessions": "時區/工作階段",
+	"Top Labels": "頂端標籤",
+	"top": "頂端",
+	"Up Color": "向上顏色",
+	"Wave Size": "波浪大小",
+	"Wick": "燭心",
+	"Zoom In": "放大",
+	"Zoom Out": "縮小",
+	"Borders": "邊框",
+	"Level": "等級",
+	"Hlines Background": "盤整區背景色",
+	"Plots Background": "繪圖區背景色",
+
+	"Open_line_tool_position": "開啟畫線工具位置",
+	"Closed_line_tool_position": "關閉畫線工具位置",
+	"{0} P&L: {1}": "{0} 獲利與損失: {1}",
+	"Risk/Reward Ratio: {0}": "風險/回報比率: {0}",
+	"Stop: {0} ({1}%)": "停損: {0} ({1}%)",
+	"Target: {0} ({1}%)": "目標: {0} ({1}%)",
+	"SUCCESS": "成功",
+	"FAILURE": "失敗",
+	"Left Shoulder": "左肩",
+	"Head": "頭部",
+	"Right Shoulder": "右肩",
+	"Mirrored": "鏡像",
+	"Flipped": "翻轉",
+	"distance: {0}": "距離: {0}",
+
+	"day": "日",
+	"day_plural_1": "day_plural_1",
+	"day_plural_2": "day_plural_2",
+	"day_plural_5": "day_plural_5",
+
+	"week": "週",
+	"week_plural_1": "week_plural_1",
+	"week_plural_2": "week_plural_2",
+	"week_plural_5": "week_plural_5",
+
+	"month": "月",
+	"month_plural_1": "month_plural_1",
+	"month_plural_2": "month_plural_2",
+	"month_plural_5": "month_plural_5",
+
+	"minute": "分",
+	"minute_plural_1": "minute_plural_1",
+	"minute_plural_2": "minute_plural_2",
+	"minute_plural_5": "minute_plural_3",
+
+	"hour": "時",
+	"hour_plural_1": "hour_plural_1",
+	"hour_plural_2": "hour_plural_2",
+	"hour_plural_5": "hour_plural_5",
+
+	"d_dates": "日",
+	"h_dates": "小時",
+	"m_dates": "月",
+	"s_dates": "秒",
+	"in_dates": "in_dates",
+
+	"Jan": "1月",
+	"Feb": "2月",
+	"Mar": "3月",
+	"Apr": "4月",
+	"May": "5月",
+	"Jun": "6月",
+	"Jul": "7月",
+	"Aug": "8月",
+	"Sep": "9月",
+	"Oct": "10月",
+	"Nov": "11月",
+	"Dec": "12月",
+	
+	"Sun": "週日", 
+	"Mon": "週一", 
+	"Tue": "週二", 
+	"Wed": "週三", 
+	"Thu": "週四", 
+	"Fri": "週五", 
+	"Sat": "週六", 
+	
+	"Sunday": "週日", 
+	"Monday": "週一", 
+	"Tuesday": "週二", 
+	"Wednesday": "週三", 
+	"Thursday": "週四", 
+	"Friday": "週五", 
+	"Saturday": "週六", 
+      
+	"Objects Tree": "排列順序",
+	"Manage Drawings": "管理繪圖工具",
+	"TOOL": "工具",
+	"SYMBOL": "商品代碼",
+	"Move Up": "向上移動",
+	"Move Down": "向下移動",
+
+
+	"All Exchanges": "所有交易所",
+	"All types": "所有類型",
+	"Stock": "股票",
+	"stock": "股票",
+	"Index": "指數",
+	"index": "指數",
+	"Futures": "期貨",
+	"futures": "期貨",
+	"commodity": "商品",
+    "Commodity": "商品",
+
+	"Image URL": "圖檔路徑",
+	"Save image": "儲存圖檔",
+	"or copy url:": "或複製圖檔路徑:",
+
+	"Undo {0}": "復原 {0}",
+	"Redo {0}": "重做 {0}",
+
+	"Custom color...": "自定義顏色...",
+	"Search": "搜尋",
+
+	"Open_in_legend": "開盤",
+	"High_in_legend": "最高",
+	"Low_in_legend": "最低",
+	"Close_in_legend": "收盤",
+
+	"Open": "開盤",
+	"High": "最高",
+	"Low": "最低",
+	"Close": "收盤",
+	"(H + L)/2": "(最高+最低)/2",
+	"(H + L + C)/3": "(最高+最低+收盤)/3",
+	"(O + H + L + C)/4": "(開盤+最高+最低+收盤)/4",
+
+
+	"UTC": "國家標準時間",
+	"Exchange": "交易所",
+"Athens": "歐洲/雅典",
+"Berlin": "歐洲/柏林",
+"Bogota": "南美洲/波哥大",
+"Buenos Aires": "南美洲/布宜諾斯艾利斯",
+"Chicago": "北美洲/芝加哥",
+"Hong Kong": "亞洲/香港",
+"Kolkata": "亞洲/加爾各答",
+"London": "歐洲/倫敦",
+"Los Angeles": "北美洲/洛杉磯",
+"Madrid": "歐洲/馬德里",
+"Moscow": "歐洲/莫斯科",
+"New York": "北美洲/紐約",
+"Paris": "歐洲/巴黎",
+"Seoul": "亞洲/首爾",
+"Shanghai": "亞洲/上海",
+"Singapore": "亞洲/新加坡",
+"Sydney": "大洋洲/雪梨",
+"Taipei": "亞洲/台北",
+"Tokyo": "亞洲/東京",
+"Toronto": "北美洲/多倫多",
+"Vancouver": "北美洲/溫哥華",
+"Warsaw": "歐洲/華沙",
+
+	"n/a": "n/a",
+
+	"Long_input": "長軸慢線",
+	"long_input": "長軸慢線",
+	"longlen_input": "長軸慢線",
+	"Window Size_input": "視窗大小",
+	"Length_input": "天數長度",
+	"length_input": "天數長度",
+	"len_input": "天數長度",
+	"Short_input": "短軸快線",
+	"short_input": "短軸快線",
+	"shortlen_input": "短軸快線",
+	"Mult_input": "多重因素",
+	"mult_input": "多重因素",
+	"divisor_input": "除數",
+	"Divisor_input": "除數",
+	"Upper": "上方",
+	"Lower": "下方",
+	"Long": "長期",
+	"Short": "短期",
+	"Signal": "訊號",
+	"Jaw": "下顎",
+	"Teeth": "牙齒",
+	"Lips": "嘴唇",
+	"Zero": "零軸",
+	"WMA Length_input": "WMA長度",
+	"Long RoC Length_input": "長期RoC天數",
+	"Short RoC Length_input": "短期RoC天數",
+	"jawLength_input": "下顎長度",
+	"teethLength_input": "牙齒長度",
+	"lipsLength_input": "嘴唇長度",
+	"percent_input": "百分比",
+	"exponential_input": "指數平均",
+	"smoothD_input": "平滑 %D",
+	"smoothK_input": "平滑 %K",
+	"Color 0": "顏色 0",
+	"Color 1": "顏色 1",
+	"Color 2": "顏色 2",
+	"Color 3": "顏色 3",
+	"Color 4": "顏色 4",
+	"sym_input": "工具",
+	"symbol_input": "工具",
+	"Sym_input": "工具",
+	"DI Length_input": "DI長度",
+	"ADX Smoothing_input": "平滑ADX",
+	"displacement_input": "雲帶",
+
+	"Tenkan-sen": "轉換線",
+	"Kijun-sen": "基準線",
+	"Chikou span": "延遲線",
+	"Senkou A": "前行帶 A",
+	"Senkou B": "前行帶 B",
+
+	"useTrueRange_input": "使用真實區間",
+	"roclen1_input": "長度 RoC 1",
+	"roclen2_input": "長度 RoC 2",
+	"roclen3_input": "長度 RoC 3",
+	"roclen4_input": "長度 RoC 4",
+	"smalen1_input": "長度 MA 1",
+	"smalen2_input": "長度 MA 2",
+	"smalen3_input": "長度 MA 3",
+	"smalen4_input": "長度 MA 4",
+	"siglen_input": "訊號長度",
+
+	"UpperLimit": "上方極限值",
+	"LowerLimit": "下方極限值",
+
+	"fastLength_input": "快速指標天數",
+	"slowLength_input": "慢速指標天數",
+	"signalLength_input": "訊號產生天數",
+
+	"start_input": "開始",
+	"increment_input": "增量",
+	"maximum_input": "最大值",
+	"showMA_input": "顯示移動平均",
+	"Volume": "成交量",
+	"Volume MA": "成交量移動平均",
+	"Indicator": "技術指標",
+	"Oscillator": "擺盪指標",
+	"lengthStoch_input": "隨機指標天數",
+	"lengthRSI_input": "隨機RSI天數",
+
+	"sigma_input": "Sigma",
+	"Sigma_input": "Sigma",
+
+	"Crosses": "交錯"
+
+}
--- a/charting_library/static/localization/translations/ru.json
+++ b/charting_library/static/localization/translations/ru.json
@@ -563,6 +563,10 @@
 	"sigma_input": "Сигма",
 	"Sigma_input": "Сигма",

-	"Crosses": "Пересечение"
+	"Crosses": "Пересечение",
+
+	"Click to set a point": "Кликните, чтобы установить точку",
+	"1. Slide your finger to select location for first anchor<br>2. Tap anywhere to place the first anchor": "1. Определите первую точку, перетаскивая перекрестие пальцем.<br/>2. После этого, сделайте тап в произвольном месте, чтобы установить её.",
+	"1. Slide your finger to select location for next anchor<br>2. Tap anywhere to place the next anchor": "1. Определите точку, перетаскивая перекрестие пальцем.<br/>2. После этого, сделайте тап в произвольном месте, чтобы установить её."

 }
--- a/charting_library/static/tv-chart.html
+++ b/charting_library/static/tv-chart.html
@@ -61,6 +61,7 @@ function createChart() {
 		ChartApiInstance.setEnabledStudiesList(JSON.parse(urlParams.enabledStudies));
 	}

+	__defaultsOverrides = JSON.parse(urlParams.overrides);

 	var savedContent = !!window.parent.__TVSavedChart
 		? window.parent.__TVSavedChart
@@ -373,6 +374,10 @@ function createChart() {
 			pm.post(window.parent, 'onAutoSaveNeeded', tick);
 		});

+		GlobalEventsStorage.subscribe("onMarkClick", function(markID) {
+			pm.post(window.parent, 'onMarkClick', markID);
+		});
+

 	})();
 };
--- a/charting_library/static/tv-chart.min.js
+++ b/charting_library/static/tv-chart.min.js
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@

 		<title>TradingView Charting Library demo</title>

-		<script type="text/javascript" src="charting_library/charting_library.js"></script>
+		<script type="text/javascript" src="charting_library/charting_library.min.js"></script>
 		<script type="text/javascript" src="charting_library/datafeed/udf/datafeed.js"></script>

 		<script type="text/javascript" src="//code.jquery.com/jquery-2.1.0.min.js"></script>