1385. Araxis Merge File Comparison Report

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

1385.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	af.js	Tue Dec 20 19:50:47 2016 UTC
2			Wed Feb 1 19:57:52 2017 UTC

1385.2 Comparison summary

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

1385.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

1385.4 Active regular expressions

No regular expressions were active.

1385.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"," af",{euro: "Euroteken ",lsquo:"L inker enke lkwotasie" ,rsquo:"Re gter enkel kwotasie", ldquo:"Lin ker dubbel kwotasie", rdquo:"Reg ter dubbel kwotasie", ndash:"Kor tkoppeltek en",mdash: "Langkoppe lteken",ie xcl:"Omgek eerdeuitro epteken",c ent:"Centt eken",poun d:"Pondtek en",curren :"Geldeenh eidteken", yen:"Yente ken",brvba r:"Gebreek te balk",s ect:"Afdee lingsteken ",uml:"Dee lteken",co py:"Kopier egteken",o rdf:"Vroul ikekenteke n",laquo:" Linkgeoori enteerde a anhaalings teken",not :"Verbodet eken",
6		reg:"Reges trasieteke n",macr:"L engteteken ",deg:"Gra deteken",s up2:"Kwadr aatteken", sup3:"Kubi ekteken",a cute:"Akuu taksenttek en",micro: "Mikroteke n",para:"P ilcrow sig n",middot: "Middle do t",cedil:" Cedilla",s up1:"Super script one ",ordm:"Ma sculine or dinal indi cator",raq uo:"Right- pointing d ouble angl e quotatio n mark",fr ac14:"Vulg ar fractio n one quar ter",frac1 2:"Vulgar fraction o ne half",f rac34:"Vul gar fracti on three q uarters",i quest:"Inv erted ques tion mark" ,Agrave:"L atin capit al letter A with gra ve accent" ,
7		Aacute:"La tin capita l letter A with acut e accent", Acirc:"Lat in capital letter A with circu mflex",Ati lde:"Latin capital l etter A wi th tilde", Auml:"Lati n capital letter A w ith diaere sis",Aring :"Latin ca pital lett er A with ring above ",AElig:"L atin Capit al letter Æ",Ccedil: "Latin cap ital lette r C with c edilla",Eg rave:"Lati n capital letter E w ith grave accent",Ea cute:"Lati n capital letter E w ith acute accent",Ec irc:"Latin capital l etter E wi th circumf lex",Euml: "Latin cap ital lette r E with d iaeresis", Igrave:"La tin capita l letter I with grav e accent",
8		Iacute:"La tin capita l letter I with acut e accent", Icirc:"Lat in capital letter I with circu mflex",Ium l:"Latin c apital let ter I with diaeresis ",ETH:"Lat in capital letter Et h",Ntilde: "Latin cap ital lette r N with t ilde",Ogra ve:"Latin capital le tter O wit h grave ac cent",Oacu te:"Latin capital le tter O wit h acute ac cent",Ocir c:"Latin c apital let ter O with circumfle x",Otilde: "Latin cap ital lette r O with t ilde",Ouml :"Latin ca pital lett er O with diaeresis" ,times:"Mu ltiplicati on sign",O slash:"Lat in capital letter O with strok e",
9		Ugrave:"La tin capita l letter U with grav e accent", Uacute:"La tin capita l letter U with acut e accent", Ucirc:"Lat in capital letter U with circu mflex",Uum l:"Latin c apital let ter U with diaeresis ",Yacute:" Latin capi tal letter Y with ac ute accent ",THORN:"L atin capit al letter Thorn",szl ig:"Latin small lett er sharp s ",agrave:" Latin smal l letter a with grav e accent", aacute:"La tin small letter a w ith acute accent",ac irc:"Latin small let ter a with circumfle x",atilde: "Latin sma ll letter a with til de",auml:" Latin smal l letter a with diae resis",
10		aring:"Lat in small l etter a wi th ring ab ove",aelig :"Latin sm all letter æ",ccedil :"Latin sm all letter c with ce dilla",egr ave:"Latin small let ter e with grave acc ent",eacut e:"Latin s mall lette r e with a cute accen t",ecirc:" Latin smal l letter e with circ umflex",eu ml:"Latin small lett er e with diaeresis" ,igrave:"L atin small letter i with grave accent",i acute:"Lat in small l etter i wi th acute a ccent",ici rc:"Latin small lett er i with circumflex ",iuml:"La tin small letter i w ith diaere sis",eth:" Latin smal l letter e th",
11		ntilde:"La tin small letter n w ith tilde" ,ograve:"L atin small letter o with grave accent",o acute:"Lat in small l etter o wi th acute a ccent",oci rc:"Latin small lett er o with circumflex ",otilde:" Latin smal l letter o with tild e",ouml:"L atin small letter o with diaer esis",divi de:"Divisi on sign",o slash:"Lat in small l etter o wi th stroke" ,ugrave:"L atin small letter u with grave accent",u acute:"Lat in small l etter u wi th acute a ccent",uci rc:"Latin small lett er u with circumflex ",uuml:"La tin small letter u w ith diaere sis",
12		yacute:"La tin small letter y w ith acute accent",th orn:"Latin small let ter thorn" ,yuml:"Lat in small l etter y wi th diaeres is",OElig: "Latin cap ital ligat ure OE",oe lig:"Latin small lig ature oe", 372:"Latin capital l etter W wi th circumf lex",374:" Latin capi tal letter Y with ci rcumflex", 373:"Latin small let ter w with circumfle x",375:"La tin small letter y w ith circum flex",sbqu o:"Single low-9 quot ation mark ",8219:"Si ngle high- reversed-9 quotation mark",bdq uo:"Double low-9 quo tation mar k",hellip: "Horizonta l ellipsis ",
13		trade:"Tra de mark si gn",9658:" Black righ t-pointing pointer", bull:"Bull et",rarr:" Rightwards arrow",rA rr:"Rightw ards doubl e arrow",h Arr:"Left right doub le arrow", diams:"Bla ck diamond suit",asy mp:"Almost equal to" });