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

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

1402.2 Comparison summary

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

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

1402.4 Active regular expressions

No regular expressions were active.

1402.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",{euro: "Symbole E uro",lsquo :"Guilleme t simple o uvrant",rs quo:"Guill emet simpl e fermant" ,ldquo:"Gu illemet do uble ouvra nt",rdquo: "Guillemet double fe rmant",nda sh:"Tiret haut",mdas h:"Tiret c adratin",i excl:"Poin t d'exclam ation inve rsé",cent: "Symbole C ent",pound :"Symbole Livre Ster ling",curr en:"Symbol e monétair e",yen:"Sy mbole Yen" ,brvbar:"B arre verti cale scind ée",sect:" Section",u ml:"Tréma" ,copy:"Sym bole Copyr ight",ordf :"Indicate ur ordinal féminin", laquo:"Gui llemet fra nçais ouvr ant",
6		not:"Croch et de néga tion",reg: "Marque dé posée",mac r:"Macron" ,deg:"Degr é",sup2:"E xposant 2" ,sup3:"\\t Exposant 3 ",acute:"A ccent aigu ",micro:"O micron",pa ra:"Paragr aphe",midd ot:"Point médian",ce dil:"Cédil le",sup1:" \\tExposan t 1",ordm: "Indicateu r ordinal masculin", raquo:"Gui llemet fra nçais ferm ant",frac1 4:"Un quar t",frac12: "Un demi", frac34:"Tr ois quarts ",iquest:" Point d'in terrogatio n inversé" ,Agrave:"A majuscule accent gr ave",Aacut e:"A majus cule accen t aigu",Ac irc:"A maj uscule acc ent circon flexe",Ati lde:"A maj uscule ave c caron",
7		Auml:"A ma juscule tr éma",Aring :"A majusc ule avec u n rond au- dessus",AE lig:"Æ maj uscule lig aturés",Cc edil:"C ma juscule cé dille",Egr ave:"E maj uscule acc ent grave" ,Eacute:"E majuscule accent ai gu",Ecirc: "E majuscu le accent circonflex e",Euml:"E majuscule tréma",Ig rave:"I ma juscule ac cent grave ",Iacute:" I majuscul e accent a igu",Icirc :"I majusc ule accent circonfle xe",Iuml:" I majuscul e tréma",E TH:"Lettre majuscule islandais e ED",Ntil de:"N maju scule avec caron",Og rave:"O ma juscule ac cent grave ",Oacute:" O majuscul e accent a igu",
8		Ocirc:"O m ajuscule a ccent circ onflexe",O tilde:"O m ajuscule a vec caron" ,Ouml:"O m ajuscule t réma",time s:"Multipl ication",O slash:"O m ajuscule b arré",Ugra ve:"U maju scule acce nt grave", Uacute:"U majuscule accent aig u",Ucirc:" U majuscul e accent c irconflexe ",Uuml:"U majuscule tréma",Yac ute:"Y maj uscule acc ent aigu", THORN:"Let tre island aise Thorn majuscule ",szlig:"L ettre minu scule alle mande s du r",agrave: "a minuscu le accent grave",aac ute:"a min uscule acc ent aigu", acirc:"a m inuscule a ccent circ onflexe",a tilde:"a m inuscule a vec caron" ,
9		auml:"a mi nuscule tr éma",aring :"a minusc ule avec u n rond au- dessus",ae lig:"æ min uscule lig aturés",cc edil:"c mi nuscule cé dille",egr ave:"e min uscule acc ent grave" ,eacute:"e minuscule accent ai gu",ecirc: "e minuscu le accent circonflex e",euml:"e minuscule tréma",ig rave:"i mi nuscule ac cent grave ",iacute:" i minuscul e accent a igu",icirc :"i minusc ule accent circonfle xe",iuml:" i minuscul e tréma",e th:"Lettre minuscule islandais e ED",ntil de:"n minu scule avec caron",og rave:"o mi nuscule ac cent grave ",oacute:" o minuscul e accent a igu",
10		ocirc:"o m inuscule a ccent circ onflexe",o tilde:"o m inuscule a vec caron" ,ouml:"o m inuscule t réma",divi de:"Divisi on",oslash :"o minusc ule barré" ,ugrave:"u minuscule accent gr ave",uacut e:"u minus cule accen t aigu",uc irc:"u min uscule acc ent circon flexe",uum l:"u minus cule tréma ",yacute:" y minuscul e accent a igu",thorn :"Lettre i slandaise thorn minu scule",yum l:"y minus cule tréma ",OElig:"l igature ma juscule la tine Œ",oe lig:"ligat ure minusc ule latine œ",372:"W majuscule accent ci rconflexe" ,374:"Y ma juscule ac cent circo nflexe",
11		373:"w min uscule acc ent circon flexe",375 :"y minusc ule accent circonfle xe",sbquo: "Guillemet simple fe rmant (ang lais)",821 9:"Guillem et-virgule supérieur culbuté", bdquo:"Gui llemet-vir gule doubl e inférieu r",hellip: "Points de suspensio n",trade:" Marque com merciale ( trade mark )",9658:"F lèche noir e pointant vers la d roite",bul l:"Gros po int médian ",rarr:"Fl èche vers la droite" ,rArr:"Dou ble flèche vers la d roite",hAr r:"Double flèche ver s la gauch e",diams:" Carreau no ir",asymp: "Presque é gal"});