1061. Araxis Merge File Comparison Report

1061.1 Files compared

1061.2 Comparison summary

1061.3 Comparison options

1061.4 Active regular expressions

1061.5 Comparison detail

Produced by Araxis Merge on 2/1/2017 2:57:45 PM Eastern Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

#	Location	File	Last Modified
1	C:\Araxis_Merge_Comprasion\Pub_un\BTSSS_CIF_122016.zip\BTSSS_CIF_12_20_16\clean\CRM Portal\trunk\BTSSSPortal\js\ckeditor\lang	zh-cn.js	Tue Dec 20 19:50:42 2016 UTC
2			Wed Feb 1 19:57:45 2017 UTC

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	0	0
Changed	0	0
Inserted	0	0
Removed	1	5

Whitespace
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

No regular expressions were active.

This softw are is cov ered by CK Editor Com mercial Li cense. Usa ge without proper li cense is p rohibited.

Copyright (c) 2003-2 015, CKSou rce - Fred erico Knab ben. All r ights rese rved.

CKEDITOR.l ang['zh-cn ']={"undo" :{"redo":" 重做","undo" :"撤消"},"to olbar":{"t oolbarColl apse":"折叠工具栏","toolb arExpand": "展开工具栏","t oolbarGrou ps":{"docu ment":"文档" ,"clipboar d":"剪贴板/撤销 ","editing ":"编辑","fo rms":"表单", "basicstyl es":"基本格式" ,"paragrap h":"段落","l inks":"链接" ,"insert": "插入","styl es":"样式"," colors":"颜色","tools" :"工具"},"to olbars":"工具栏"},"temp lates":{"b utton":"模板 ","emptyLi stMsg":"(没有模板)","ins ertOption" :"替换当前内容", "options": "模板选项","se lectPrompt Msg":"请选择要在编辑器中使用的模板：","title" :"内容模板"}," table":{"b order":"边框 ","caption ":"标题","ce ll":{"menu ":"单元格","i nsertBefor e":"在左侧插入单元格","inser tAfter":"在右侧插入单元格"," deleteCell ":"删除单元格", "merge":"合并单元格","mer geRight":" 向右合并单元格"," mergeDown" :"向下合并单元格" ,"splitHor izontal":" 水平拆分单元格"," splitVerti cal":"垂直拆分单元格","titl e":"单元格属性" ,"cellType ":"单元格类型", "rowSpan": "纵跨行数","co lSpan":"横跨列数","wordW rap":"自动换行 ","hAlign" :"水平对齐","v Align":"垂直对齐","align Baseline": "基线","bgCo lor":"背景颜色 ","borderC olor":"边框颜色","data": "数据","head er":"表头"," yes":"是"," no":"否","i nvalidWidt h":"单元格宽度必须为数字格式","i nvalidHeig ht":"单元格高度必须为数字格式"," invalidRow Span":"行跨度必须为整数格式"," invalidCol Span":"列跨度必须为整数格式"," chooseColo r":"选择"}," cellPad":" 边距","cellS pace":"间距" ,"column": {"menu":"列 ","insertB efore":"在左侧插入列","ins ertAfter": "在右侧插入列"," deleteColu mn":"删除列"} ,"columns" :"列数","del eteTable": "删除表格","he aders":"标题单元格","head ersBoth":" 第一列和第一行"," headersCol umn":"第一列" ,"headersN one":"无"," headersRow ":"第一行","i nvalidBord er":"边框粗细必须为数字格式","i nvalidCell Padding":" 单元格填充必须为数字格式","inval idCellSpac ing":"单元格间距必须为数字格式", "invalidCo ls":"指定的行数必须大于零","in validHeigh t":"表格高度必须为数字格式","in validRows" :"指定的列数必须大于零","inval idWidth":" 表格宽度必须为数字格式","menu": "表格属性","ro w":{"menu" :"行","inse rtBefore": "在上方插入行"," insertAfte r":"在下方插入行 ","deleteR ow":"删除行"} ,"rows":"行数","summar y":"摘要","t itle":"表格属性","toolba r":"表格","w idthPc":"百分比","width Px":"像素"," widthUnit" :"宽度单位"}," stylescomb o":{"label ":"样式","pa nelTitle": "样式","pane lTitle1":" 块级元素样式","p anelTitle2 ":"内联元素样式" ,"panelTit le3":"对象元素样式"},"spec ialchar":{ "options": "特殊符号选项"," title":"选择特殊符号","too lbar":"插入特殊符号"},"sou rcearea":{ "toolbar": "源码"},"smi ley":{"opt ions":"表情图标选项","titl e":"插入表情图标 ","toolbar ":"表情符"}," showblocks ":{"toolba r":"显示区块"} ,"selectal l":{"toolb ar":"全选"}, "save":{"t oolbar":"保存"},"remov eformat":{ "toolbar": "清除格式"},"p rint":{"to olbar":"打印 "},"previe w":{"previ ew":"预览"}, "pastetext ":{"button ":"粘贴为无格式文本","title" :"粘贴为无格式文本 "},"pastef romword":{ "confirmCl eanup":"您要粘贴的内容好像是来自 MS Word，是否要清除 MS Wo rd 格式后再粘贴？ ","error": "由于内部错误无法清理要粘贴的数据"," title":"从 MS Word 粘贴 ","toolbar ":"从 MS Wo rd 粘贴"},"p agebreak": {"alt":"分页符","toolba r":"插入打印分页符"},"newpa ge":{"tool bar":"新建"} ,"maximize ":{"maximi ze":"全屏"," minimize": "最小化"},"ma gicline":{ "title":"在这插入段落"},"l iststyle": {"armenian ":"传统的亚美尼亚编号方式","bul letedTitle ":"项目列表属性" ,"circle": "空心圆","dec imal":"数字 (1, 2, 3, 等)","decim alLeadingZ ero":"0开头的数字标记(01, 0 2, 03, 等)" ,"disc":"实心圆","georg ian":"传统的乔治亚编号方式(an, ban, gan, 等)","lowe rAlpha":"小写英文字母(a, b , c, d, e, 等)","lowe rGreek":"小写希腊字母(alph a, beta, g amma, 等)", "lowerRoma n":"小写罗马数字 (i, ii, ii i, iv, v, 等)","none" :"无标记","no tset":"<没有设置>","numb eredTitle" :"编号列表属性", "square":" 实心方块","sta rt":"开始序号" ,"type":"标记类型","uppe rAlpha":"大写英文字母(A, B , C, D, E, 等)","uppe rRoman":"大写罗马数字(I, I I, III, IV , V, 等)"," validateSt artNumber" :"列表开始序号必须为整数格式"},"l ist":{"bul letedlist" :"项目列表","n umberedlis t":"编号列表"} ,"link":{" acccessKey ":"访问键","a dvanced":" 高级","advis oryContent Type":"内容类型","adviso ryTitle":" 标题","ancho r":{"toolb ar":"插入/编辑锚点链接","men u":"锚点链接属性 ","title": "锚点链接属性"," name":"锚点名称","errorN ame":"请输入锚点名称","remo ve":"删除锚点" },"anchorI d":"按锚点 ID ","anchorN ame":"按锚点名称","charse t":"字符编码", "cssClasse s":"样式类名称" ,"emailAdd ress":"地址" ,"emailBod y":"内容","e mailSubjec t":"主题","i d":"ID","i nfo":"超链接信息","langCo de":"语言代码" ,"langDir" :"语言方向","l angDirLTR" :"从左到右 (LT R)","langD irRTL":"从右到左 (RTL)", "menu":"编辑超链接","name ":"名称","no Anchors":" (此文档没有可用的锚点)","noEma il":"请输入电子邮件地址","noU rl":"请输入超链接地址","othe r":"<其他>", "popupDepe ndent":"依附 (NS)","po pupFeature s":"弹出窗口属性 ","popupFu llScreen": "全屏 (IE)", "popupLeft ":"左","pop upLocation Bar":"地址栏" ,"popupMen uBar":"菜单栏 ","popupRe sizable":" 可缩放","popu pScrollBar s":"滚动条"," popupStatu sBar":"状态栏 ","popupTo olbar":"工具栏","popupT op":"右","r el":"关联"," selectAnch or":"选择一个锚点","styles ":"行内样式"," tabIndex": "Tab 键次序", "target":" 目标","targe tFrame":"< 框架>","targ etFrameNam e":"目标框架名称 ","targetP opup":"<弹出窗口>","targ etPopupNam e":"弹出窗口名称 ","title": "超链接","toA nchor":"页内锚点链接","toE mail":"电子邮件","toUrl" :"地址","too lbar":"插入/ 编辑超链接","ty pe":"超链接类型 ","unlink" :"取消超链接"," upload":"上传"},"justi fy":{"bloc k":"两端对齐", "center":" 居中","left" :"左对齐","ri ght":"右对齐" },"indent" :{"indent" :"增加缩进量"," outdent":" 减少缩进量"},"i mage":{"al t":"替换文本", "border":" 边框大小","btn Upload":"上传到服务器","bu tton2Img": "确定要把当前图像按钮转换为普通图像吗？ ","hSpace" :"水平间距","i mg2Button" :"确定要把当前图像改变为图像按钮吗？" ,"infoTab" :"图像信息","l inkTab":"链接","lockRa tio":"锁定比例 ","menu":" 图像属性","res etSize":"原始尺寸","titl e":"图像属性", "titleButt on":"图像域属性 ","upload" :"上传","url Missing":" 缺少图像源文件地址" ,"vSpace": "垂直间距","va lidateBord er":"边框大小必须为整数格式","v alidateHSp ace":"水平间距必须为整数格式"," validateVS pace":"垂直间距必须为整数格式"} ,"iframe": {"border": "显示框架边框"," noUrl":"请输入框架的 URL", "scrolling ":"允许滚动条", "title":"I Frame 属性", "toolbar": "IFrame"}, "horizonta lrule":{"t oolbar":"插入水平线"},"fo rms":{"but ton":{"tit le":"按钮属性" ,"text":"标签(值)","typ e":"类型","t ypeBtn":"按钮","typeSb m":"提交","t ypeRst":"重设"},"check boxAndRadi o":{"check boxTitle": "复选框属性","r adioTitle" :"单选按钮属性", "value":"选定值","selec ted":"已勾选" ,"required ":"必选"},"f orm":{"tit le":"表单属性" ,"menu":"表单属性","acti on":"动作"," method":"方法","encodi ng":"表单编码" },"hidden" :{"title": "隐藏域属性","n ame":"名称", "value":"初始值"},"sele ct":{"titl e":"菜单/列表属性","select Info":"选择信息","opAvai l":"可选项"," value":"值" ,"size":"高度","lines" :"行","chkM ulti":"允许多选","requir ed":"必选"," opText":"选项文本","opVa lue":"选项值" ,"btnAdd": "添加","btnM odify":"修改 ","btnUp": "上移","btnD own":"下移", "btnSetVal ue":"设为初始选定","btnDel ete":"删除"} ,"textarea ":{"title" :"多行文本属性", "cols":"字符宽度","rows" :"行数"},"te xtfield":{ "title":"单行文本属性","na me":"名称"," value":"初始值","charWi dth":"字符宽度 ","maxChar s":"最多字符数" ,"required ":"必填","ty pe":"类型"," typeText": "文本","type Pass":"密码" ,"typeEmai l":"Email" ,"typeSear ch":"搜索"," typeTel":" 电话号码","typ eUrl":"地址" }},"format ":{"label" :"格式","pan elTitle":" 格式","tag_a ddress":"地址","tag_di v":"段落(DIV )","tag_h1 ":"标题 1"," tag_h2":"标题 2","tag_ h3":"标题 3" ,"tag_h4": "标题 4","ta g_h5":"标题 5","tag_h6 ":"标题 6"," tag_p":"普通 ","tag_pre ":"已编排格式"} ,"font":{" fontSize": {"label":" 大小","voice Label":"文字大小","panel Title":"大小 "},"label" :"字体","pan elTitle":" 字体","voice Label":"字体 "},"flash" :{"access" :"允许脚本访问", "accessAlw ays":"总是", "accessNev er":"从不"," accessSame Domain":"同域","alignA bsBottom": "绝对底部","al ignAbsMidd le":"绝对居中" ,"alignBas eline":"基线 ","alignTe xtTop":"文本上方","bgcol or":"背景颜色" ,"chkFull" :"启用全屏","c hkLoop":"循环","chkMen u":"启用 Fla sh 菜单","ch kPlay":"自动播放","flash vars":"Fla sh 变量","hS pace":"水平间距","proper ties":"Fla sh 属性","pr opertiesTa b":"属性","q uality":"质量","qualit yAutoHigh" :"高(自动)"," qualityAut oLow":"低(自动)","quali tyBest":"最好","qualit yHigh":"高" ,"qualityL ow":"低","q ualityMedi um":"中(自动) ","scale": "缩放","scal eAll":"全部显示","scaleF it":"严格匹配" ,"scaleNoB order":"无边框","title" :"标题","vSp ace":"垂直间距 ","validat eHSpace":" 水平间距必须为数字格式","valida teSrc":"请输入源文件地址","v alidateVSp ace":"垂直间距必须为数字格式"," windowMode ":"窗体模式"," windowMode Opaque":"不透明","windo wModeTrans parent":"透明","window ModeWindow ":"窗体"},"f ind":{"fin d":"查找","f indOptions ":"查找选项"," findWhat": "查找:","mat chCase":"区分大小写","mat chCyclic": "循环匹配","ma tchWord":" 全字匹配","not FoundMsg": "指定的文本没有找到。","replac e":"替换","r eplaceAll" :"全部替换","r eplaceSucc essMsg":"共完成 %1 处替换。 ","replace With":"替换: ","title": "查找和替换"}," fakeobject s":{"ancho r":"锚点","f lash":"Fla sh 动画","hi ddenfield" :"隐藏域","if rame":"IFr ame","unkn own":"未知对象 "},"elemen tspath":{" eleLabel": "元素路径","el eTitle":"% 1 元素"},"di v":{"IdInp utLabel":" ID","advis oryTitleIn putLabel": "标题","cssC lassInputL abel":"样式类名称","edit" :"编辑 DIV", "inlineSty leInputLab el":"行内样式" ,"langDirL TRLabel":" 从左到右 (LTR) ","langDir Label":"语言方向","langD irRTLLabel ":"从右到左 (R TL)","lang uageCodeIn putLabel": "语言代码","re move":"移除 DIV","styl eSelectLab el":"样式"," title":"创建 DIV 容器"," toolbar":" 创建 DIV 容器" },"context menu":{"op tions":"快捷菜单选项"},"co lordialog" :{"clear": "清除","high light":"高亮 ","options ":"颜色选项"," selected": "选择颜色","ti tle":"选择颜色 "},"colorb utton":{"a uto":"自动", "bgColorTi tle":"背景颜色 ","colors" :{"000":"黑 ","800000" :"褐红","8B4 513":"深褐", "2F4F4F":" 墨绿","00808 0":"绿松石"," 000080":"海军蓝","4B008 2":"靛蓝","6 96969":"暗灰 ","B22222" :"砖红","A52 A2A":"褐"," DAA520":"金黄","006400 ":"深绿","40 E0D0":"蓝绿" ,"0000CD": "中蓝","8000 80":"紫","8 08080":"灰" ,"F00":"红" ,"FF8C00": "深橙","FFD7 00":"金","0 08000":"绿" ,"0FF":"青" ,"00F":"蓝" ,"EE82EE": "紫罗兰","A9A 9A9":"深灰", "FFA07A":" 亮橙","FFA50 0":"橙","FF FF00":"黄", "00FF00":" 水绿","AFEEE E":"粉蓝","A DD8E6":"亮蓝 ","DDA0DD" :"梅红","D3D 3D3":"淡灰", "FFF0F5":" 淡紫红","FAEB D7":"古董白", "FFFFE0":" 淡黄","F0FFF 0":"蜜白","F 0FFFF":"天蓝 ","F0F8FF" :"淡蓝","E6E 6FA":"淡紫", "FFF":"白"} ,"more":"其它颜色...","p anelTitle" :"颜色","tex tColorTitl e":"文本颜色"} ,"clipboar d":{"copy" :"复制","cop yError":"您的浏览器安全设置不允许编辑器自动执行复制操作，请使用键盘快捷键(Ctrl/Cmd +C)来完成。"," cut":"剪切", "cutError" :"您的浏览器安全设置不允许编辑器自动执行剪切操作，请使用键盘快捷键(Ctrl/ Cmd+X)来完成。 ","paste": "粘贴","past eArea":"粘贴区域","paste Msg":"请使用键盘快捷键(<STRO NG>Ctrl/Cm d+V</STRON G>)把内容粘贴到下面的方框里，再按 < STRONG>确定< /STRONG>", "securityM sg":"因为您的浏览器的安全设置原因，本编辑器不能直接访问您的剪贴板内容，你需要在本窗口重新粘贴一次。","title ":"粘贴"},"b utton":{"s electedLab el":"已选中 % 1 项"},"blo ckquote":{ "toolbar": "块引用"},"bi di":{"ltr" :"文字方向为从左至右","rtl":" 文字方向为从右至左" },"basicst yles":{"bo ld":"加粗"," italic":"倾斜","strike ":"删除线","s ubscript": "下标","supe rscript":" 上标","under line":"下划线 "},"about" :{"copy":" 版权所有 &copy ; $1。<br / >保留所有权利。", "dlgTitle" :"关于 CKEdi tor","help ":"访问 $1 以获取帮助。","mo reInfo":"相关授权许可信息请访问我们的网站：","t itle":"关于 CKEditor", "userGuide ":"CKEdito r 用户向导"}," editor":"所见即所得编辑器"," editorPane l":"所见即所得编辑器面板","com mon":{"edi torHelp":" 按 ALT+0 获得帮助","brows eServer":" 浏览服务器","ur l":"URL"," protocol": "协议","uplo ad":"上传"," uploadSubm it":"上传到服务器","image" :"图像","fla sh":"Flash ","form":" 表单","check box":"复选框" ,"radio":" 单选按钮","tex tField":"单行文本","text area":"多行文本","hidden Field":"隐藏域","button ":"按钮","se lect":"列表/ 菜单","image Button":"图像按钮","notS et":"<没有设置 >","id":"I D","name": "名称","lang Dir":"语言方向 ","langDir Ltr":"从左到右 (LTR)","l angDirRtl" :"从右到左 (RT L)","langC ode":"语言代码 ","longDes cr":"详细说明 URL","cssC lass":"样式类名称","advis oryTitle": "标题","cssS tyle":"行内样式","ok":"确定","cancel ":"取消","cl ose":"关闭", "preview": "预览","resi ze":"拖拽以改变大小","gener alTab":"常规 ","advance dTab":"高级" ,"validate NumberFail ed":"需要输入数字格式","conf irmNewPage ":"当前文档内容未保存，是否确认新建文档？","confi rmCancel": "部分修改尚未保存，是否确认关闭对话框？ ","options ":"选项","ta rget":"目标窗口","target New":"新窗口 (_blank)", "targetTop ":"整页 (_to p)","targe tSelf":"本窗口 (_self)" ,"targetPa rent":"父窗口 (_parent) ","langDir LTR":"从左到右 (LTR)","l angDirRTL" :"从右到左 (RT L)","style s":"样式","c ssClasses" :"样式类","wi dth":"宽度", "height":" 高度","align ":"对齐方式"," alignLeft" :"左对齐","al ignRight": "右对齐","ali gnCenter": "居中","alig nJustify": "两端对齐","al ignTop":"顶端","alignM iddle":"居中 ","alignBo ttom":"底部" ,"alignNon e":"无","in validValue ":"无效的值。", "invalidHe ight":"高度必须为数字格式","i nvalidWidt h":"宽度必须为数字格式","inva lidCssLeng th":"此“%1” 字段的值必须为正数，可以包含或不包含一个有效的 CSS 长度单位(px, %, in, cm, mm , em, ex, pt 或 pc)", "invalidHt mlLength": "此“%1”字段的值必须为正数，可以包含或不包含一个有效的 HTML 长度单位( px 或 %)"," invalidInl ineStyle": "内联样式必须为格式是以分号分隔的一个或多个“属性名 : 属性值”。","css LengthTool tip":"输入一个表示像素值的数字，或加上一个有效的 CS S 长度单位(px, %, in, cm , mm, em, ex, pt 或 p c)。","unav ailable":" %1<span cl ass=\"cke_ accessibil ity\">，不可用 </span>"}} ;