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

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

1401.2 Comparison summary

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

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

1401.4 Active regular expressions

No regular expressions were active.

1401.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"," fr-ca",{eu ro:"Symbol e Euro",ls quo:"Guill emet simpl e ouvrant" ,rsquo:"Gu illemet si mple ferma nt",ldquo: "Guillemet double ou vrant",rdq uo:"Guille met double fermant", ndash:"Tir et haut",m dash:"Tire t",iexcl:" Point d'ex clamation inversé",c ent:"Symbo le de cent ",pound:"S ymbole de Livre Ster ling",curr en:"Symbol e monétair e",yen:"Sy mbole du Y en",brvbar :"Barre sc indée",sec t:"Symbole de sectio n",uml:"Tr éma",copy: "Symbole d e copyrigh t",ordf:"I ndicateur ordinal fé minin",laq uo:"Guille met frança is ouvrant ",
6		not:"Indic ateur de n égation",r eg:"Symbol e de marqu e déposée" ,macr:"Mac ron",deg:" Degré",sup 2:"Exposan t 2",sup3: "Exposant 3",acute:" Accent aig üe",micro: "Symbole m icro",para :"Paragrap he",middot :"Point mé dian",cedi l:"Cédille ",sup1:"Ex posant 1", ordm:"Indi cateur ord inal mascu lin",raquo :"Guilleme t français fermant", frac14:"Un quart",fr ac12:"Une demi",frac 34:"Trois quart",iqu est:"Point d'interro gation inv ersé",Agra ve:"A acce nt grave", Aacute:"A accent aig üe",Acirc: "A circonf lexe",Atil de:"A tild e",Auml:"A tréma",
7		Aring:"A a vec un ron d au dessu s",AElig:" Æ majuscul e",Ccedil: "C cédille ",Egrave:" E accent g rave",Eacu te:"E acce nt aigüe", Ecirc:"E a ccent circ onflexe",E uml:"E tré ma",Igrave :"I accent grave",Ia cute:"I ac cent aigüe ",Icirc:"I accent ci rconflexe" ,Iuml:"I t réma",ETH: "Lettre ma juscule is landaise E D",Ntilde: "N tilde", Ograve:"O accent gra ve",Oacute :"O accent aigüe",Oc irc:"O acc ent circon flexe",Oti lde:"O til de",Ouml:" O tréma",t imes:"Symb ole de mul tiplicatio n",Oslash: "O barré", Ugrave:"U accent gra ve",Uacute :"U accent aigüe",
8		Ucirc:"U a ccent circ onflexe",U uml:"U tré ma",Yacute :"Y accent aigüe",TH ORN:"Lettr e islandai se Thorn m ajuscule", szlig:"Let tre minusc ule allema nde s dur" ,agrave:"a accent gr ave",aacut e:"a accen t aigüe",a circ:"a ac cent circo nflexe",at ilde:"a ti lde",auml: "a tréma", aring:"a a vec un cer cle au des sus",aelig :"æ",ccedi l:"c cédil le",egrave :"e accent grave",ea cute:"e ac cent aigüe ",ecirc:"e accent ci rconflexe" ,euml:"e t réma",igra ve:"i acce nt grave", iacute:"i accent aig üe",icirc: "i accent circonflex e",iuml:"i tréma",
9		eth:"Lettr e minuscul e islandai se ED",nti lde:"n til de",ograve :"o accent grave",oa cute:"o ac cent aigüe ",ocirc:"O accent ci rconflexe" ,otilde:"O tilde",ou ml:"O trém a",divide: "Symbole d e division ",oslash:" o barré",u grave:"u a ccent grav e",uacute: "u accent aigüe",uci rc:"u acce nt circonf lexe",uuml :"u tréma" ,yacute:"y accent ai güe",thorn :"Lettre i slandaise thorn minu scule",yum l:"y tréma ",OElig:"l igature ma juscule la tine Œ",oe lig:"ligat ure minusc ule latine œ",372:"W accent ci rconflexe" ,374:"Y ac cent circo nflexe",
10		373:"w acc ent circon flexe",375 :"y accent circonfle xe",sbquo: "Guillemet simple fe rmant",821 9:"Guillem et-virgule supérieur culbuté", bdquo:"Gui llemet-vir gule doubl e inférieu r",hellip: "Points de suspensio n",trade:" Symbole de marque dé posée",965 8:"Flèche noire poin tant vers la droite" ,bull:"Puc e",rarr:"F lèche vers la droite ",rArr:"Fl èche doubl e vers la droite",hA rr:"Flèche double ve rs la gauc he",diams: "Carreau", asymp:"Pre sque égal" });