1 files changed, 93 insertions, 69 deletions
diff --git a/program/js/tiny_mce/langs/zh.js b/program/js/tiny_mce/langs/zh.js
index 21994452b..c8c4be8d5 100755
--- a/program/js/tiny_mce/langs/zh.js
+++ b/program/js/tiny_mce/langs/zh.js
@@ -1,32 +1,32 @@
 tinyMCE.addI18n({zh:{
 common:{
-edit_confirm:"\u4F60\u8981\u5728\u6B64\u6587\u5B57\u7F16\u8F91\u533A\u542F\u7528\u6240\u89C1\u5373\u6240\u5F97(WYSIWYG)\u6A21\u5F0F\uFF1F ",
+edit_confirm:"\u662F\u5426\u9700\u8981\u5F00\u542F\u6587\u5B57\u7F16\u8F91\u5668? ",
 apply:"\u5E94\u7528",
 insert:"\u63D2\u5165",
 update:"\u66F4\u65B0",
 cancel:"\u53D6\u6D88",
 close:"\u5173\u95ED",
 browse:"\u9884\u89C8",
-class_name:"\u7C7B\u522B",
+class_name:"\u6837\u5F0F",
 not_set:"--\u672A\u8BBE\u5B9A--",
-clipboard_msg:"\u7C98\u8D34\u590D\u5236\u3001\u526A\u4E0B\u548C\u8D34\u4E0A\u529F\u80FD\u5728Mozilla\u548CFirefox\u4E2D\u65E0\u6CD5\u4F7F\u7528\u3002 \n\u4F60\u9700\u8981\u4E86\u89E3\u66F4\u591A\u76F8\u5173\u4FE1\u606F\u5417\uFF1F ",
-clipboard_no_support:"\u76EE\u524D\u4F60\u7684\u6D4F\u89C8\u5668\u65E0\u6CD5\u652F\u6301\uFF0C\u8BF7\u7528\u952E\u76D8\u5FEB\u6377\u952E\u3002 ",
-popup_blocked:"\u62B1\u6B49\uFF0C\u5FEB\u6377\u529F\u80FD\u5728\u4F60\u7684\u7CFB\u7EDF\u4E0A\u88AB\u5C01\u9501\uFF0C\u4F7F\u7A0B\u5E8F\u65E0\u6CD5\u6B63\u5E38\u4F7F\u7528\uFF0C\u4F60\u9700\u8981\u6682\u65F6\u89E3\u9664\u5FEB\u6377\u5C01\u9501\uFF0C\u4F7F\u5DE5\u5177\u80FD\u6B63\u5E38\u4F7F\u7528\u3002 ",
-invalid_data:"\u9519\u8BEF\uFF1A\u8F93\u5165\u65E0\u6548\u7684\u503C\uFF0C\u4EE5\u7EA2\u8272\u5B57\u8868\u793A\u3002 ",
+clipboard_msg:"\u5F88\u62B1\u6B49\uFF0C\u60A8\u7684\u6D4F\u89C8\u5668\u4E0D\u652F\u63F4\u8907\u5236\u529F\u80FD\u3002 ",
+clipboard_no_support:"\u60A8\u7684\u6D4F\u89C8\u5668\u5F53\u524D\u4E0D\u652F\u63F4\u6B64\u529F\u80FD\uFF0C\u8BF7\u6309Ctrl + C\u5FEB\u6377\u952E\u4EE3\u66FF",
+popup_blocked:"\u60A8\u7684\u6D4F\u89C8\u5668\u963B\u6B62\u4E86\u6253\u5F00\u65B0\u89C6\u7A97\u3002\u60A8\u9700\u8981\u53D6\u6D88\u6D4F\u89C8\u5668\u6B64\u529F\u80FD\u4EE5\u66F4\u597D\u5730\u4F7F\u7528\u6B64\u5916\u6302\u7A0B\u5F0F\u3002 ",
+invalid_data:"\u60A8\u8F93\u5165\u7684\u8D44\u8BAF\u6709\u9519\u8BEF\u3002 (\u8BF7\u89C1\u7EA2\u8272\u90E8\u5206)",
 more_colors:"\u66F4\u591A\u989C\u8272"
 },
 contextmenu:{
 align:"\u5BF9\u9F50\u65B9\u5F0F",
 left:"\u9760\u5DE6\u5BF9\u9F50",
-center:"\u7F6E\u4E2D",
+center:"\u7F6E\u4E2D\u5BF9\u9F50",
 right:"\u9760\u53F3\u5BF9\u9F50",
 full:"\u5DE6\u53F3\u5BF9\u9F50"
 },
 insertdatetime:{
 date_fmt:"%Y-%m-%d",
 time_fmt:"%H:%M:%S",
-insertdate_desc:"\u63D2\u5165\u4ECA\u5929\u65E5\u671F",
-inserttime_desc:"\u63D2\u5165\u73B0\u5728\u65F6\u95F4",
+insertdate_desc:"\u63D2\u5165\u65E5\u671F",
+inserttime_desc:"\u63D2\u5165\u65F6\u95F4",
 months_long:"\u4E00\u6708,\u4E8C\u6708,\u4E09\u6708,\u56DB\u6708,\u4E94\u6708,\u516D\u6708,\u4E03\u6708,\u516B\u6708,\u4E5D\u6708,\u5341\u6708,\u5341\u4E00\u6708,\u5341\u4E8C\u6708",
 months_short:"1\u6708,2\u6708,3\u6708,4\u6708,5\u6708,6\u6708,7\u6708,8\u6708,9\u6708,10\u6708,11\u6708,12\u6708",
 day_long:"\u661F\u671F\u65E5,\u661F\u671F\u4E00,\u661F\u671F\u4E8C,\u661F\u671F\u4E09,\u661F\u671F\u56DB,\u661F\u671F\u4E94,\u661F\u671F\u516D,\u661F\u671F\u65E5",
@@ -39,116 +39,140 @@ preview:{
 preview_desc:"\u9884\u89C8"
 },
 directionality:{
-ltr_desc:"\u6587\u5B57\u4ECE\u5DE6\u5230\u53F3",
-rtl_desc:"\u6587\u5B57\u4ECE\u53F3\u5230\u5DE6"
+ltr_desc:"\u7531\u5DE6\u5230\u53F3",
+rtl_desc:"\u7531\u53F3\u5230\u5DE6"
 },
 layer:{
-insertlayer_desc:"\u63D2\u5165\u56FE\u5C42",
-forward_desc:"\u524D\u79FB",
-backward_desc:"\u540E\u79FB",
-absolute_desc:"\u5207\u6362\u7EDD\u5BF9\u5BFB\u5740",
-content:"\u65B0\u589E\u56FE\u5C42..."
+insertlayer_desc:"\u63D2\u5165DIV\u56FE\u5C42",
+forward_desc:"\u7F6E\u524D",
+backward_desc:"\u7F6E\u540E",
+absolute_desc:"\u6539\u53D8\u5C42\u7EDD\u5BF9\u4F4D\u7F6E",
+content:"\u65B0\u589EDIV\u56FE\u5C42"
 },
 save:{
-save_desc:"\u4FDD\u5B58",
-cancel_desc:"\u53D6\u6D88\u6240\u6709\u53D8\u66F4"
+save_desc:"\u50A8\u5B58",
+cancel_desc:"\u53D6\u6D88\u6240\u6709\u66F4\u6539"
 },
 nonbreaking:{
-nonbreaking_desc:"\u63D2\u5165\u975E\u622A\u65AD\u7684\u7A7A\u683C\u7B26"
+nonbreaking_desc:"\u63D2\u5165\u7A7A\u767D\u683C"
 },
 iespell:{
-iespell_desc:"\u6267\u884C\u62FC\u5B57\u68C0\u67E5",
-download:"\u4FA6\u6D4B\u4E0D\u5230ieSpell\u5957\u4EF6\uFF0C\u662F\u5426\u7ACB\u5373\u5B89\u88C5\uFF1F "
+iespell_desc:"\u62FC\u5B57\u4E0E\u8BED\u6CD5\u68C0\u67E5",
+download:"\u5916\u6302\u7A0B\u5F0F\u5C1A\u672A\u5B89\u88C5\uFF0C\u662F\u5426\u9700\u8981\u7ACB\u5373\u5B89\u88C5\uFF1F "
 },
 advhr:{
-advhr_desc:"\u6C34\u5E73\u5206\u9694\u7EBF"
+advhr_desc:"\u6C34\u5E73\u7EBF"
 },
 emotions:{
 emotions_desc:"\u8868\u60C5"
 },
 searchreplace:{
-search_desc:"\u641C\u5BFB",
-replace_desc:"\u641C\u5BFB/\u53D6\u4EE3"
+search_desc:"\u5BFB\u627E",
+replace_desc:"\u5BFB\u627E/\u53D6\u4EE3"
 },
 advimage:{
-image_desc:"\u63D2\u5165/\u7F16\u8F91\u56FE\u6863"
+image_desc:"\u63D2\u5165/\u7F16\u8F91\u56FE\u7247"
 },
 advlink:{
-link_desc:"\u63D2\u5165/\u7F16\u8F91\u94FE\u63A5"
+link_desc:"\u63D2\u5165/\u7F16\u8F91\u8FDE\u7ED3"
 },
 xhtmlxtras:{
 cite_desc:"\u5F15\u7528",
-abbr_desc:"\u7F29\u5199",
-acronym_desc:"\u9996\u5B57\u6BCD\u7F29\u5199",
+abbr_desc:"\u7F29\u7565\u8BCD ",
+acronym_desc:"\u9996\u5B57\u7F29\u7565\u8BCD",
 del_desc:"\u5220\u9664",
 ins_desc:"\u63D2\u5165",
-attribs_desc:"\u63D2\u5165/\u7F16\u8F91\u5C5E\u6027"
+attribs_desc:"\u63D2\u5165/\u7F16\u8F91\u5C5E\u6027",
+attribs_delta_width:"40",
+attribs_delta_height:"60"
 },
 style:{
-desc:"\u7F16\u8F91CSS\u6837\u5F0F\u8868\u5355"
+desc:"\u7F16\u8F91 CSS"
 },
 paste:{
-paste_text_desc:"\u8D34\u4E0A\u4E3A\u7EAF\u6587\u672C",
-paste_word_desc:"\u8D34\u4E0A\u4E3AWord\u683C\u5F0F",
-selectall_desc:"\u5168\u9009"
+paste_text_desc:"\u4EE5\u7EAF\u6587\u5B57\u8D34\u4E0A\u8D44\u6599",
+paste_word_desc:"\u4ECEWord \u8D34\u4E0A\u8D44\u6599",
+selectall_desc:"\u5168\u9009",
+plaintext_mode_sticky:"\u5F53\u524D\u4E3A\u7B80\u5355\u6587\u5B57\u8D34\u4E0A\u6A21\u5F0F\uFF0C\u518D\u70B9\u9605\u4E00\u6B21\u5207\u6362\u56DE\u4E00\u822C\u8D34\u4E0A\u6A21\u5F0F\u3002\u5728\u4F60\u8D34\u4E0A\u540E\u4F1A\u56DE\u5230\u4E00\u822C\u8D34\u4E0A\u6A21\u5F0F\u3002 ",
+plaintext_mode:"\u5F53\u524D\u4E3A\u7B80\u5355\u6587\u5B57\u8D34\u4E0A\u6A21\u5F0F\uFF0C\u518D\u70B9\u9605\u4E00\u6B21\u5207\u6362\u56DE\u4E00\u822C\u8D34\u4E0A\u6A21\u5F0F\u3002 "
 },
 paste_dlg:{
-text_title:"\u7528Ctrl+V\u7EC4\u5408\u952E\u5C06\u6587\u5B57\u8D34\u5165\u7A97\u53E3\u4E2D\u3002 ",
-text_linebreaks:"\u4FDD\u7559\u6362\u884C\u7B26\u53F7",
-word_title:"\u7528Ctrl+V\u7EC4\u5408\u952E\u5C06\u6587\u5B57\u8D34\u5165\u7A97\u53E3\u4E2D\u3002 "
+text_title:"\u5728\u952E\u76D8\u4E0A\u540C\u65F6\u6309\u4E0BCtrl \u548CV \u952E\uFF0C\u5C06\u6587\u5B57\u8D34\u4E0A\u5230\u6B64\u89C6\u7A97\u3002 ",
+text_linebreaks:"\u4FDD\u7559\u6362\u884C\u7B26",
+word_title:"\u5728\u952E\u76D8\u4E0A\u540C\u65F6\u6309\u4E0BCtrl \u548CV \u952E\uFF0C\u5C06\u6587\u5B57\u8D34\u4E0A\u5230\u6B64\u89C6\u7A97\u3002 "
 },
 table:{
-desc:"\u63D2\u5165\u65B0\u8868\u683C",
-row_before_desc:"\u63D2\u5165\u5217\u4E8E\u524D",
-row_after_desc:"\u63D2\u5165\u5217\u4E8E\u540E",
-delete_row_desc:"\u5220\u9664\u672C\u5217",
-col_before_desc:"\u63D2\u5165\u680F\u4E8E\u524D",
-col_after_desc:"\u63D2\u5165\u680F\u4E8E\u540E",
-delete_col_desc:"\u5220\u9664\u672C\u680F",
-split_cells_desc:"\u5206\u5272\u5355\u5143\u683C",
-merge_cells_desc:"\u5408\u5E76\u5355\u5143\u683C",
-row_desc:"\u8868\u683C\u5217\u5C5E\u6027",
-cell_desc:"\u5355\u5143\u683C\u5C5E\u6027",
-props_desc:"\u8868\u683C\u5C5E\u6027",
-paste_row_before_desc:"\u8D34\u5165\u5217\u4E8E\u524D",
-paste_row_after_desc:"\u8D34\u5165\u5217\u4E8E\u540E",
-cut_row_desc:"\u526A\u4E0B\u6B64\u5217",
-copy_row_desc:"\u590D\u5236\u6B64\u5217",
+desc:"\u63D2\u5165\u8868\u683C",
+row_before_desc:"\u4E0A\u65B9\u63D2\u5165\u4E00\u680F",
+row_after_desc:"\u4E0B\u65B9\u63D2\u5165\u4E00\u680F",
+delete_row_desc:"\u5220\u9664\u4E00\u680F",
+col_before_desc:"\u5DE6\u65B9\u63D2\u5165\u4E00\u5217",
+col_after_desc:"\u53F3\u65B9\u63D2\u5165\u4E00\u5217",
+delete_col_desc:"\u5220\u9664\u4E00\u5217",
+split_cells_desc:"\u5206\u5272\u8868\u683C",
+merge_cells_desc:"\u5408\u5E76\u8868\u683C",
+row_desc:"\u5217\u5C5E\u6027",
+cell_desc:"\u8868\u683C\u5C5E\u6027",
+props_desc:"\u680F\u5C5E\u6027",
+paste_row_before_desc:"\u7C98\u8D34\u5230\u4E0A\u65B9",
+paste_row_after_desc:"\u7C98\u8D34\u5230\u4E0B\u65B9",
+cut_row_desc:"\u526A\u5207\u5F53\u524D\u8868\u683C",
+copy_row_desc:"\u8907\u5236\u5F53\u524D\u8868\u683C",
 del:"\u5220\u9664\u8868\u683C",
-row:"\u5217",
-col:"\u680F",
-cell:"\u5355\u5143\u683C"
+row:"\u680F",
+col:"\u5217",
+cell:"\u8868\u683C",
+cellprops_delta_width:"10",
+cellprops_delta_height:"10",
+table_delta_width:"40",
+table_delta_height:"60",
+merge_cells_delta_width:"40",
+merge_cells_delta_height:"40"
 },
 autosave:{
-unload_msg:"\u5982\u679C\u79BB\u5F00\u8BE5\u9875\uFF0C\u5C06\u5BFC\u81F4\u6240\u6709\u4FEE\u6539\u5168\u90E8\u9057\u5931\u3002 "
+unload_msg:"\u60A8\u5C1A\u672A\u50A8\u5B58\u8D44\u6599\uFF0C\u60A8\u8F93\u5165\u7684\u8D44\u6599\u6709\u53EF\u80FD\u4F1A\u6D88\u5931\u2026",
+restore_content:"\u6062\u8907\u81EA\u52A8\u50A8\u5B58\u7684\u5185\u5BB9\u3002 ",
+warning_message:"\u5982\u679C\u6062\u8907\u5148\u524D\u50A8\u5B58\u7684\u5185\u5BB9\uFF0C\u4F60\u5C06\u5931\u53BB\u7F16\u8F91\u5668\u4E2D\u73B0\u6709\u7684\u5185\u5BB9\u3002 \n\n\u4F60\u786E\u5B9A\u8981\u6062\u8907\u5148\u524D\u50A8\u5B58\u7684\u5185\u5BB9\u5417\uFF1F "
 },
 fullscreen:{
-desc:"\u5207\u6362\u5168\u5C4F\u5E55\u6A21\u5F0F"
+desc:"\u5168\u5C4F\u663E\u793A"
 },
 media:{
-desc:"\u63D2\u5165/\u7F16\u8F91\u5F71\u7247",
-edit:"\u7F16\u8F91\u5F71\u7247"
+desc:"\u63D2\u5165/\u7F16\u8F91\u591A\u5A92\u4F53",
+edit:"\u7F16\u8F91\u591A\u5A92\u4F53"
 },
 fullpage:{
-desc:"\u6587\u4EF6\u5C5E\u6027"
+desc:"\u6863\u5C5E\u6027"
 },
 template:{
-desc:"\u63D2\u5165\u9884\u5148\u5B9A\u4E49\u7684\u6A21\u677F\u5185\u5BB9"
+desc:"\u4F7F\u7528\u8303\u672C"
 },
 visualchars:{
-desc:"\u53EF\u89C1\u63A7\u5236\u5B57\u7B26\u5F00/\u5173\u3002 "
+desc:"\u663E\u793A\u63A7\u5236\u7B26\u53F7"
 },
 spellchecker:{
-desc:"\u5207\u6362\u62FC\u5199\u68C0\u67E5",
-menu:"\u62FC\u5199\u68C0\u67E5\u8BBE\u5B9A",
-ignore_word:"\u5FFD\u7565\u5B57",
+desc:"\u82F1\u6587\u62FC\u5B57\u68C0\u67E5",
+menu:"\u8BBE\u5B9A",
+ignore_word:"\u5FFD\u7565",
 ignore_words:"\u5168\u90E8\u5FFD\u7565",
 langs:"\u8BED\u8A00",
-wait:"\u8BF7\u7A0D\u540E...",
+wait:"\u8BF7\u7A0D\u5019\u3002 ",
 sug:"\u5EFA\u8BAE",
-no_sug:"\u65E0\u5EFA\u8BAE",
-no_mpell:"\u65E0\u62FC\u5199\u9519\u8BEF\u3002 "
+no_sug:"\u6CA1\u6709\u5EFA\u8BAE\u2026",
+no_mpell:"\u672A\u53D1\u73B0\u9519\u8BEF"
 },
 pagebreak:{
-desc:"\u63D2\u5165\u5206\u9875\u7B26\u3002 "
+desc:"\u63D2\u5165\u5206\u9875\u7B26\u53F7"
+},
+advlist:{
+types:"\u6837\u5F0F",
+def:"\u9884\u8BBE",
+lower_alpha:"\u5C0F\u5199\u7684\u82F1\u6587\u5B57",
+lower_greek:"\u5C0F\u5199\u7684\u5E0C\u814A\u6587",
+lower_roman:"\u5C0F\u5199\u7684\u7F57\u9A6C\u6570\u5B57",
+upper_alpha:"\u5927\u5199\u7684\u82F1\u6587\u5B57",
+upper_roman:"\u5927\u5199\u7684\u7F57\u9A6C\u6570\u5B57",
+circle:"\u5706\u5708",
+disc:"\u9ED1\u70B9",
+square:"\u65B9\u5757"
 }}});
 \ No newline at end of file