1433. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2/1/2017 2:57:53 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.

1433.1 Files compared

#	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\plugins\specialchar\dialogs\lang	zh-cn.js	Tue Dec 20 19:50:47 2016 UTC
2			Wed Feb 1 19:57:53 2017 UTC

1433.2 Comparison summary

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

1433.3 Comparison options

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

1433.4 Active regular expressions

No regular expressions were active.

1433.5 Comparison detail

1		/*
2		Copyright (c) 2003- 2015, CKSo urce - Fre derico Kna bben. All rights res erved.
3		This soft ware is co vered by C KEditor Co mmercial L icense. Us age withou t proper l icense is prohibited .
4		*/
5		CKEDITOR.p lugins.set Lang("spec ialchar"," zh-cn",{eu ro:"欧元符号", lsquo:"左单引号",rsquo:" 右单引号",ldqu o:"左双引号",r dquo:"右双引号 ",ndash:"短划线",mdash: "长划线",iexc l:"竖翻叹号",c ent:"分币符号" ,pound:"英镑符号",curren :"货币符号",ye n:"日元符号",b rvbar:"间断条 ",sect:"节标记",uml:"分音符",copy:"版权所有标记",ord f:"阴性顺序指示符 ",laquo:"左指双尖引号",not :"非标记",reg :"注册标记",ma cr:"长音符",d eg:"度标记",s up2:"上标二", sup3:"上标三" ,acute:"锐音符",micro:" 微符",para:" 段落标记",midd ot:"中间点",c edil:"下加符" ,sup1:"上标一 ",ordm:"阳性顺序指示符",raq uo:"右指双尖引号 ",frac14:" 普通分数四分之一", frac12:"普通分数二分之一",fr ac34:"普通分数四分之三",ique st:"竖翻问号",
6		Agrave:"带抑音符的拉丁文大写字母 A",Aacute :"带锐音符的拉丁文大写字母 A",Ac irc:"带扬抑符的拉丁文大写字母 A" ,Atilde:"带颚化符的拉丁文大写字母 A",Auml: "带分音符的拉丁文大写字母 A",Ari ng:"带上圆圈的拉丁文大写字母 A", AElig:"拉丁文大写字母 Ae",C cedil:"带下加符的拉丁文大写字母 C",Egrave: "带抑音符的拉丁文大写字母 E",Eac ute:"带锐音符的拉丁文大写字母 E" ,Ecirc:"带扬抑符的拉丁文大写字母 E",Euml:" 带分音符的拉丁文大写字母 E",Igra ve:"带抑音符的拉丁文大写字母 I", Iacute:"带锐音符的拉丁文大写字母 I",Icirc: "带扬抑符的拉丁文大写字母 I",Ium l:"带分音符的拉丁文大写字母 I",E TH:"拉丁文大写字母 Eth",Nti lde:"带颚化符的拉丁文大写字母 N" ,Ograve:"带抑音符的拉丁文大写字母 O",Oacut e:"带锐音符的拉丁文大写字母 O",O circ:"带扬抑符的拉丁文大写字母 O ",Otilde:" 带颚化符的拉丁文大写字母 O",
7		Ouml:"带分音符的拉丁文大写字母 O ",times:"乘号",Oslash: "带粗线的拉丁文大写字母 O",Ugra ve:"带抑音符的拉丁文大写字母 U", Uacute:"带锐音符的拉丁文大写字母 U",Ucirc: "带扬抑符的拉丁文大写字母 U",Uum l:"带分音符的拉丁文大写字母 U",Y acute:"带抑音符的拉丁文大写字母 Y",THORN:" 拉丁文大写字母 Th orn",szlig :"拉丁文小写字母清音 S",agrav e:"带抑音符的拉丁文小写字母 A",a acute:"带锐音符的拉丁文小写字母 A",acirc:" 带扬抑符的拉丁文小写字母 A",atil de:"带颚化符的拉丁文小写字母 A", auml:"带分音符的拉丁文小写字母 A ",aring:"带上圆圈的拉丁文小写字母 A",aelig :"拉丁文小写字母 Ae",ccedil :"带下加符的拉丁文小写字母 C",eg rave:"带抑音符的拉丁文小写字母 E ",eacute:" 带锐音符的拉丁文小写字母 E",ecir c:"带扬抑符的拉丁文小写字母 E",e uml:"带分音符的拉丁文小写字母 E" ,igrave:"带抑音符的拉丁文小写字母 I",
8		iacute:"带锐音符的拉丁文小写字母 I",icirc: "带扬抑符的拉丁文小写字母 I",ium l:"带分音符的拉丁文小写字母 I",e th:"拉丁文小写字母 Eth",nti lde:"带颚化符的拉丁文小写字母 N" ,ograve:"带抑音符的拉丁文小写字母 O",oacut e:"带锐音符的拉丁文小写字母 O",o circ:"带扬抑符的拉丁文小写字母 O ",otilde:" 带颚化符的拉丁文小写字母 O",ouml :"带分音符的拉丁文小写字母 O",di vide:"除号", oslash:"带粗线的拉丁文小写字母 O",ugrave: "带抑音符的拉丁文小写字母 U",uac ute:"带锐音符的拉丁文小写字母 U" ,ucirc:"带扬抑符的拉丁文小写字母 U",uuml:" 带分音符的拉丁文小写字母 U",yacu te:"带抑音符的拉丁文小写字母 Y", thorn:"拉丁文小写字母 Thorn ",yuml:"带分音符的拉丁文小写字母 Y",OElig: "拉丁文大写连字 O e",oelig:" 拉丁文小写连字 Oe ",372:"带扬抑符的拉丁文大写字母 W",374:"带扬抑符的拉丁文大写字母 Y",
9		373:"带扬抑符的拉丁文小写字母 W" ,375:"带扬抑符的拉丁文小写字母 Y ",sbquo:"单下 9 形引号",8 219:"单高横翻 9 形引号",bdq uo:"双下 9 形引号",hellip :"水平省略号",t rade:"商标标志 ",9658:"实心右指指针",bull :"加重号",rar r:"向右箭头",r Arr:"向右双线箭头",hArr:"左右双线箭头",dia ms:"实心方块纸牌 ",asymp:"约等于"});