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

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

1405.2 Comparison summary

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

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

1405.4 Active regular expressions

No regular expressions were active.

1405.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"," hr",{euro: "Euro znak ",lsquo:"L ijevi jedn ostruki na vodnik",rs quo:"Desni  jednostru ki navodni k",ldquo:" Lijevi dvo struki nav odnik",rdq uo:"Desni  dvostruki  navodnik", ndash:"En  crtica",md ash:"Em cr tica",iexc l:"Naopaki  uskličnik ",cent:"Ce nt znak",p ound:"Funt a znak",cu rren:"Znak  valute",y en:"Yen zn ak",brvbar :"Potrgana  prečka",s ect:"Znak  odjeljka", uml:"Prije glasi",cop y:"Copyrig ht znak",o rdf:"Femin ine ordina l indicato r",laquo:" Lijevi dvo struki ugl ati navodn ik",not:"N ot znak",        
6   reg:"Regis tered znak ",macr:"Ma cron",deg: "Stupanj z nak",sup2: "Superscri pt two",su p3:"Supers cript thre e",acute:" Acute acce nt",micro: "Mikro zna k",para:"P ilcrow sig n",middot: "Srednja t očka",cedi l:"Cedilla ",sup1:"Su perscript  one",ordm: "Masculine  ordinal i ndicator", raquo:"Des ni dvostru ku uglati  navodnik", frac14:"Vu lgar fract ion one qu arter",fra c12:"Vulga r fraction  one half" ,frac34:"V ulgar frac tion three  quarters" ,iquest:"N aopaki upi tnik",Agra ve:"Veliko  latinsko  slovo A s  akcentom", Aacute:"La tinično ve liko slovo  A sa oštr im naglask om",        
7   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", Iacute:"La tin capita l letter I  with acut e accent",        
8   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",Ugrave: "Latin cap ital lette r U with g rave accen t",        
9   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",ari ng:"Latin  small lett er a with  ring above ",        
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:"Divisio n sign",os lash:"Lati n small le tter o wit h stroke", ugrave:"La tin small  letter u w ith grave  accent",ua cute:"Lati n small le tter u wit h acute ac cent",ucir c:"Latin s mall lette r u with c ircumflex" ,uuml:"Lat in small l etter u wi th diaeres is",yacute :"Latin sm all letter  y with ac ute 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: "Trade mar k sign",96 58:"Black  right-poin ting point er",        
13   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" });