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

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

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

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

1398.4 Active regular expressions

No regular expressions were active.

1398.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"," et",{euro: "Euromärk" ,lsquo:"Al ustav ühek ordne jutu märk",rsqu o:"Lõpetav ühekordne jutumärk" ,ldquo:"Al ustav kahe kordne jut umärk",rdq uo:"Lõpeta v kahekord ne jutumär k",ndash:" Enn-kriips ",mdash:"E mm-kriips" ,iexcl:"Pö öratud hüü umärk",cen t:"Sendimä rk",pound: "Naela mär k",curren: "Valuutamä rk",yen:"J eeni märk" ,brvbar:"K atkestatud kriips",s ect:"Lõigu märk",uml :"Täpid",c opy:"Autor iõiguse mä rk",ordf:" Feminine o rdinal ind icator",la quo:"Left- pointing d ouble angl e quotatio n mark",
6		not:"Ei-mä rk",reg:"R egistered sign",macr :"Macron", deg:"Kraad imärk",sup 2:"Ülainde ks kaks",s up3:"Ülain deks kolm" ,acute:"Ac ute accent ",micro:"M ikro-märk" ,para:"Pil crow sign" ,middot:"K eskpunkt", cedil:"Ced illa",sup1 :"Ülaindek s üks",ord m:"Masculi ne ordinal indicator ",raquo:"R ight-point ing double angle quo tation mar k",frac14: "Vulgar fr action one quarter", frac12:"Vu lgar fract ion one ha lf",frac34 :"Vulgar f raction th ree quarte rs",iquest :"Inverted question mark",Agra ve:"Latin capital le tter A wit h grave ac cent",
7		Aacute:"La tin capita l letter A with acut e accent", Acirc:"Lat in capital letter A with circu mflex",Ati lde:"Ladin a suur A t ildega",Au ml:"Latin capital le tter A wit h diaeresi s",Aring:" Latin capi tal letter A with ri ng above", AElig:"Lat in Capital letter Æ" ,Ccedil:"L atin capit al letter C with ced illa",Egra ve:"Latin capital le tter E wit h grave ac cent",Eacu te:"Latin capital le tter E wit h acute ac cent",Ecir c:"Latin c apital let ter E with circumfle x",Euml:"L atin capit al letter E with dia eresis",Ig rave:"Lati n capital letter I w ith grave 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 :"Täppideg a ladina s uur O",tim es:"Multip lication s ign",Oslas h:"Latin c apital let ter O with stroke",
9		Ugrave:"La tin capita l letter U with grav e accent", Uacute:"La tin capita l letter U with acut e accent", Ucirc:"Kan dilise kat usega suur ladina U" ,Uuml:"Täp pidega lad ina suur U ",Yacute:" Latin capi tal letter Y with ac ute accent ",THORN:"L atin capit al letter Thorn",szl ig:"Ladina väike ter av s",agra ve:"Latin small lett er a with grave acce nt",aacute :"Latin sm all letter a with ac ute accent ",acirc:"K andilise k atusega la dina väike a",atilde :"Tildega ladina väi ke a",auml :"Täppideg a ladina v äike a",ar ing:"Latin small let ter a with ring abov e",
10		aelig:"Lat in small l etter æ",c cedil:"Lat in small l etter c wi th cedilla ",egrave:" Latin smal l letter e with grav e accent", eacute:"La tin small letter e w ith acute accent",ec irc:"Latin small let ter e with circumfle x",euml:"L atin small letter e with diaer esis",igra ve:"Latin small lett er i with grave acce nt",iacute :"Latin sm all letter i with ac ute accent ",icirc:"L atin small letter i with circu mflex",ium l:"Latin s mall lette r i with d iaeresis", eth:"Latin small let ter eth",n tilde:"Lat in small l etter n wi th tilde",
11		ograve:"La tin small letter o w ith grave accent",oa cute:"Lati n small le tter o wit h acute ac cent",ocir c:"Latin s mall lette r o with c ircumflex" ,otilde:"L atin small letter o with tilde ",ouml:"La tin small letter o w ith diaere sis",divid e:"Jagamis märk",osla sh:"Latin small lett er o with stroke",ug rave:"Lati n small le tter u wit h grave ac cent",uacu te:"Latin small lett er u with acute acce nt",ucirc: "Latin sma ll letter u with cir cumflex",u uml:"Latin small let ter u with diaeresis ",yacute:" Latin smal l letter y with acut e accent",
12		thorn:"Lat in small l etter thor n",yuml:"L atin small letter y with diaer esis",OEli g:"Latin c apital lig ature OE", oelig:"Lat in small l igature oe ",372:"Lat in capital letter W with circu mflex",374 :"Latin ca pital lett er Y with circumflex ",373:"Lat in small l etter w wi th circumf lex",375:" Latin smal l letter y with circ umflex",sb quo:"Singl e low-9 qu otation ma rk",8219:" Single hig h-reversed -9 quotati on mark",b dquo:"Doub le low-9 q uotation m ark",helli p:"Horizon tal ellips is",trade: "Kaubamärg i märk",96 58:"Black right-poin ting point er",
13		bull:"Kuul ",rarr:"No ol paremal e",rArr:"T opeltnool paremale", hArr:"Tope ltnool vas akule",dia ms:"Black diamond su it",asymp: "Ligikaudu võrdne"}) ;