sync 1.7

vnpy/trader/language/__init__.py

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 
+print 'load trader/language/*'
 # 默认设置
 from chinese import text, constant
 

vnpy/trader/language/chinese/text.py

@@ -105,6 +105,7 @@ TRADE = u'成交'
 ORDER = u'委托'
 POSITION = u'持仓'
 ACCOUNT = u'账户'
+WORKING_ORDER = u'可撤'
 
 SYSTEM = u'系统'
 CONNECT_DATABASE = u'连接数据库'
@@ -117,10 +118,13 @@ STRATEGY = u'策略'
 CTA_STRATEGY = u'CTA策略'
 
 HELP = u'帮助'
-RESTORE = u'还原'
+RESTORE = u'还原窗口'
 ABOUT = u'关于'
 TEST = u'测试'
 CONNECT = u'连接'
+EDIT_SETTING = u'编辑配置'
+LOAD = u'读取'
+SAVE = u'保存'
 
 CPU_MEMORY_INFO = u'CPU使用率：{cpu}%   内存使用率：{memory}%'
 CONFIRM_EXIT = u'确认退出？'

vnpy/trader/language/english/text.py

@@ -59,12 +59,14 @@ PRICE_TICK = u'Price Tick'
 STRIKE_PRICE = u'Strike Price'
 UNDERLYING_SYMBOL = u'Underlying Symbol'
 OPTION_TYPE = u'Option Type'
+EXPIRY_DATE = u'Expiry Date'
 
 REFRESH = u'Refresh'
 SEARCH = u'Search'
 CONTRACT_SEARCH = u'Contract Search'
 
 
+
 BID_1 = u'Bid1'
 BID_2 = u'Bid2'
 BID_3 = u'Bid3'
@@ -105,6 +107,7 @@ TRADE = u'Fill'
 ORDER = u'Order'
 POSITION = u'Position'
 ACCOUNT = u'Account'
+WORKING_ORDER = u'Working Order'
 
 SYSTEM = u'System'
 CONNECT_DATABASE = u'Connect Database'
@@ -117,10 +120,13 @@ STRATEGY = u'Strategy'
 CTA_STRATEGY = u'CTA Strategy'
 
 HELP = u'Help'
-RESTORE = u'Restore'
+RESTORE = u'Restore Window'
 ABOUT = u'About'
 TEST = u'Test'
 CONNECT = u'Connect '
+EDIT_SETTING = 'Edit Setting'
+LOAD = 'Load'
+SAVE = 'Save'
 
 CPU_MEMORY_INFO = u'CPU Usage：{cpu}%   Memory Usage：{memory}%'
 CONFIRM_EXIT = u'Confirm Exit？'