1010. Araxis Merge File Comparison Report

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

1010.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\lang en-gb.js Tue Dec 20 19:50:42 2016 UTC
2 Wed Feb 1 19:57:43 2017 UTC

1010.2 Comparison summary

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

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

1010.4 Active regular expressions

No regular expressions were active.

1010.5 Comparison detail

1   /*        
2   This softw are is cov ered by CK Editor Com mercial Li cense. Usa ge without  proper li cense is p rohibited.        
3   Copyright  (c) 2003-2 015, CKSou rce - Fred erico Knab ben. All r ights rese rved.        
4   */        
5   CKEDITOR.l ang['en-gb ']={"undo" :{"redo":" Redo","und o":"Undo"} ,"toolbar" :{"toolbar Collapse": "Collapse  Toolbar"," toolbarExp and":"Expa nd Toolbar ","toolbar Groups":{" document": "Document" ,"clipboar d":"Clipbo ard/Undo", "editing": "Editing", "forms":"F orms","bas icstyles": "Basic Sty les","para graph":"Pa ragraph"," links":"Li nks","inse rt":"Inser t","styles ":"Styles" ,"colors": "Colors"," tools":"To ols"},"too lbars":"Ed itor toolb ars"},"tem plates":{" button":"T emplates", "emptyList Msg":"(No  templates  defined)", "insertOpt ion":"Repl ace actual  contents" ,"options" :"Template  Options", "selectPro mptMsg":"P lease sele ct the tem plate to o pen in the  editor"," title":"Co ntent Temp lates"},"t able":{"bo rder":"Bor der size", "caption": "Caption", "cell":{"m enu":"Cell ","insertB efore":"In sert Cell  Before","i nsertAfter ":"Insert  Cell After ","deleteC ell":"Dele te Cells", "merge":"M erge Cells ","mergeRi ght":"Merg e Right"," mergeDown" :"Merge Do wn","split Horizontal ":"Split C ell Horizo ntally","s plitVertic al":"Split  Cell Vert ically","t itle":"Cel l Properti es","cellT ype":"Cell  Type","ro wSpan":"Ro ws Span"," colSpan":" Columns Sp an","wordW rap":"Word  Wrap","hA lign":"Hor izontal Al ignment"," vAlign":"V ertical Al ignment"," alignBasel ine":"Base line","bgC olor":"Bac kground Co lor","bord erColor":" Border Col or","data" :"Data","h eader":"He ader","yes ":"Yes","n o":"No","i nvalidWidt h":"Cell w idth must  be a numbe r.","inval idHeight": "Cell heig ht must be  a number. ","invalid RowSpan":" Rows span  must be a  whole numb er.","inva lidColSpan ":"Columns  span must  be a whol e number." ,"chooseCo lor":"Choo se"},"cell Pad":"Cell  padding", "cellSpace ":"Cell sp acing","co lumn":{"me nu":"Colum n","insert Before":"I nsert Colu mn Before" ,"insertAf ter":"Inse rt Column  After","de leteColumn ":"Delete  Columns"}, "columns": "Columns", "deleteTab le":"Delet e Table"," headers":" Headers"," headersBot h":"Both", "headersCo lumn":"Fir st column" ,"headersN one":"None ","headers Row":"Firs t Row","in validBorde r":"Border  size must  be a numb er.","inva lidCellPad ding":"Cel l padding  must be a  number."," invalidCel lSpacing": "Cell spac ing must b e a number .","invali dCols":"Nu mber of co lumns must  be a numb er greater  than 0.", "invalidHe ight":"Tab le height  must be a  number."," invalidRow s":"Number  of rows m ust be a n umber grea ter than 0 .","invali dWidth":"T able width  must be a  number.", "menu":"Ta ble Proper ties","row ":{"menu": "Row","ins ertBefore" :"Insert R ow Before" ,"insertAf ter":"Inse rt Row Aft er","delet eRow":"Del ete Rows"} ,"rows":"R ows","summ ary":"Summ ary","titl e":"Table  Properties ","toolbar ":"Table", "widthPc": "percent", "widthPx": "pixels"," widthUnit" :"width un it"},"styl escombo":{ "label":"S tyles","pa nelTitle": "Formattin g Styles", "panelTitl e1":"Block  Styles"," panelTitle 2":"Inline  Styles"," panelTitle 3":"Object  Styles"}, "specialch ar":{"opti ons":"Spec ial Charac ter Option s","title" :"Select S pecial Cha racter","t oolbar":"I nsert Spec ial Charac ter"},"sou rcearea":{ "toolbar": "Source"}, "smiley":{ "options": "Smiley Op tions","ti tle":"Inse rt a Smile y","toolba r":"Smiley "},"showbl ocks":{"to olbar":"Sh ow Blocks" },"selecta ll":{"tool bar":"Sele ct All"}," save":{"to olbar":"Sa ve"},"remo veformat": {"toolbar" :"Remove F ormat"},"p rint":{"to olbar":"Pr int"},"pre view":{"pr eview":"Pr eview"},"p astetext": {"button": "Paste as  plain text ","title": "Paste as  Plain Text "},"pastef romword":{ "confirmCl eanup":"Th e text you  want to p aste seems  to be cop ied from W ord. Do yo u want to  clean it b efore past ing?","err or":"It wa s not poss ible to cl ean up the  pasted da ta due to  an interna l error"," title":"Pa ste from W ord","tool bar":"Past e from Wor d"},"pageb reak":{"al t":"Page B reak","too lbar":"Ins ert Page B reak for P rinting"}, "newpage": {"toolbar" :"New Page "},"maximi ze":{"maxi mize":"Max imise","mi nimize":"M inimise"}, "magicline ":{"title" :"Insert p aragraph h ere"},"lis tstyle":{" armenian": "Armenian  numbering" ,"bulleted Title":"Bu lleted Lis t Properti es","circl e":"Circle ","decimal ":"Decimal  (1, 2, 3,  etc.)","d ecimalLead ingZero":" Decimal le ading zero  (01, 02,  03, etc.)" ,"disc":"D isc","geor gian":"Geo rgian numb ering (an,  ban, gan,  etc.)","l owerAlpha" :"Lower Al pha (a, b,  c, d, e,  etc.)","lo werGreek": "Lower Gre ek (alpha,  beta, gam ma, etc.)" ,"lowerRom an":"Lower  Roman (i,  ii, iii,  iv, v, etc .)","none" :"None","n otset":"<n ot set>"," numberedTi tle":"Numb ered List  Properties ","square" :"Square", "start":"S tart","typ e":"Type", "upperAlph a":"Upper  Alpha (A,  B, C, D, E , etc.)"," upperRoman ":"Upper R oman (I, I I, III, IV , V, etc.) ","validat eStartNumb er":"List  start numb er must be  a whole n umber."}," list":{"bu lletedlist ":"Insert/ Remove Bul leted List ","numbere dlist":"In sert/Remov e Numbered  List"},"l ink":{"acc cessKey":" Access Key ","advance d":"Advanc ed","advis oryContent Type":"Adv isory Cont ent Type", "advisoryT itle":"Adv isory Titl e","anchor ":{"toolba r":"Anchor ","menu":" Edit Ancho r","title" :"Anchor P roperties" ,"name":"A nchor Name ","errorNa me":"Pleas e type the  anchor na me","remov e":"Remove  Anchor"}, "anchorId" :"By Eleme nt Id","an chorName": "By Anchor  Name","ch arset":"Li nked Resou rce Charse t","cssCla sses":"Sty lesheet Cl asses","em ailAddress ":"E-Mail  Address"," emailBody" :"Message  Body","ema ilSubject" :"Message  Subject"," id":"Id"," info":"Lin k Info","l angCode":" Language C ode","lang Dir":"Lang uage Direc tion","lan gDirLTR":" Left to Ri ght (LTR)" ,"langDirR TL":"Right  to Left ( RTL)","men u":"Edit L ink","name ":"Name"," noAnchors" :"(No anch ors availa ble in the  document) ","noEmail ":"Please  type the e -mail addr ess","noUr l":"Please  type the  link URL", "other":"< other>","p opupDepend ent":"Depe ndent (Net scape)","p opupFeatur es":"Popup  Window Fe atures","p opupFullSc reen":"Ful l Screen ( IE)","popu pLeft":"Le ft Positio n","popupL ocationBar ":"Locatio n Bar","po pupMenuBar ":"Menu Ba r","popupR esizable": "Resizable ","popupSc rollBars": "Scroll Ba rs","popup StatusBar" :"Status B ar","popup Toolbar":" Toolbar"," popupTop": "Top Posit ion","rel" :"Relation ship","sel ectAnchor" :"Select a n Anchor", "styles":" Style","ta bIndex":"T ab Index", "target":" Target","t argetFrame ":"<frame> ","targetF rameName": "Target Fr ame Name", "targetPop up":"<popu p window>" ,"targetPo pupName":" Popup Wind ow Name"," title":"Li nk","toAnc hor":"Link  to anchor  in the te xt","toEma il":"E-mai l","toUrl" :"URL","to olbar":"Li nk","type" :"Link Typ e","unlink ":"Unlink" ,"upload": "Upload"}, "justify": {"block":" Justify"," center":"C entre","le ft":"Align  Left","ri ght":"Alig n Right"}, "indent":{ "indent":" Increase I ndent","ou tdent":"De crease Ind ent"},"ima ge":{"alt" :"Alternat ive Text", "border":" Border","b tnUpload": "Send it t o the Serv er","butto n2Img":"Do  you want  to transfo rm the sel ected imag e button o n a simple  image?"," hSpace":"H Space","im g2Button": "Do you wa nt to tran sform the  selected i mage on a  image butt on?","info Tab":"Imag e Info","l inkTab":"L ink","lock Ratio":"Lo ck Ratio", "menu":"Im age Proper ties","res etSize":"R eset Size" ,"title":" Image Prop erties","t itleButton ":"Image B utton Prop erties","u pload":"Up load","url Missing":" Image sour ce URL is  missing.", "vSpace":" VSpace","v alidateBor der":"Bord er must be  a whole n umber.","v alidateHSp ace":"HSpa ce must be  a whole n umber.","v alidateVSp ace":"VSpa ce must be  a whole n umber."}," iframe":{" border":"S how frame  border","n oUrl":"Ple ase type t he iframe  URL","scro lling":"En able scrol lbars","ti tle":"IFra me Propert ies","tool bar":"IFra me"},"hori zontalrule ":{"toolba r":"Insert  Horizonta l Line"}," forms":{"b utton":{"t itle":"But ton Proper ties","tex t":"Text ( Value)","t ype":"Type ","typeBtn ":"Button" ,"typeSbm" :"Submit", "typeRst": "Reset"}," checkboxAn dRadio":{" checkboxTi tle":"Chec kbox Prope rties","ra dioTitle": "Radio But ton Proper ties","val ue":"Value ","selecte d":"Select ed","requi red":"Requ ired"},"fo rm":{"titl e":"Form P roperties" ,"menu":"F orm Proper ties","act ion":"Acti on","metho d":"Method ","encodin g":"Encodi ng"},"hidd en":{"titl e":"Hidden  Field Pro perties"," name":"Nam e","value" :"Value"}, "select":{ "title":"S election F ield Prope rties","se lectInfo": "Select In fo","opAva il":"Avail able Optio ns","value ":"Value", "size":"Si ze","lines ":"lines", "chkMulti" :"Allow mu ltiple sel ections"," required": "Required" ,"opText": "Text","op Value":"Va lue","btnA dd":"Add", "btnModify ":"Modify" ,"btnUp":" Up","btnDo wn":"Down" ,"btnSetVa lue":"Set  as selecte d value"," btnDelete" :"Delete"} ,"textarea ":{"title" :"Textarea  Propertie s","cols": "Columns", "rows":"Ro ws"},"text field":{"t itle":"Tex t Field Pr operties", "name":"Na me","value ":"Value", "charWidth ":"Charact er Width", "maxChars" :"Maximum  Characters ","require d":"Requir ed","type" :"Type","t ypeText":" Text","typ ePass":"Pa ssword","t ypeEmail": "E-mail"," typeSearch ":"Search" ,"typeTel" :"Telephon e Number", "typeUrl": "URL"}},"f ormat":{"l abel":"For mat","pane lTitle":"P aragraph F ormat","ta g_address" :"Address" ,"tag_div" :"Normal ( DIV)","tag _h1":"Head ing 1","ta g_h2":"Hea ding 2","t ag_h3":"He ading 3"," tag_h4":"H eading 4", "tag_h5":" Heading 5" ,"tag_h6": "Heading 6 ","tag_p": "Normal"," tag_pre":" Formatted" },"font":{ "fontSize" :{"label": "Size","vo iceLabel": "Font Size ","panelTi tle":"Font  Size"},"l abel":"Fon t","panelT itle":"Fon t Name","v oiceLabel" :"Font"}," flash":{"a ccess":"Sc ript Acces s","access Always":"A lways","ac cessNever" :"Never"," accessSame Domain":"S ame domain ","alignAb sBottom":" Abs Bottom ","alignAb sMiddle":" Abs Middle ","alignBa seline":"B aseline"," alignTextT op":"Text  Top","bgco lor":"Back ground col our","chkF ull":"Allo w Fullscre en","chkLo op":"Loop" ,"chkMenu" :"Enable F lash Menu" ,"chkPlay" :"Auto Pla y","flashv ars":"Vari ables for  Flash","hS pace":"HSp ace","prop erties":"F lash Prope rties","pr opertiesTa b":"Proper ties","qua lity":"Qua lity","qua lityAutoHi gh":"Auto  High","qua lityAutoLo w":"Auto L ow","quali tyBest":"B est","qual ityHigh":" High","qua lityLow":" Low","qual ityMedium" :"Medium", "scale":"S cale","sca leAll":"Sh ow all","s caleFit":" Exact Fit" ,"scaleNoB order":"No  Border"," title":"Fl ash Proper ties","vSp ace":"VSpa ce","valid ateHSpace" :"HSpace m ust be a n umber.","v alidateSrc ":"URL mus t not be e mpty.","va lidateVSpa ce":"VSpac e must be  a number." ,"windowMo de":"Windo w mode","w indowModeO paque":"Op aque","win dowModeTra nsparent": "Transpare nt","windo wModeWindo w":"Window "},"find": {"find":"F ind","find Options":" Find Optio ns","findW hat":"Find  what:","m atchCase": "Match cas e","matchC yclic":"Ma tch cyclic ","matchWo rd":"Match  whole wor d","notFou ndMsg":"Th e specifie d text was  not found .","replac e":"Replac e","replac eAll":"Rep lace All", "replaceSu ccessMsg": "%1 occurr ence(s) re placed."," replaceWit h":"Replac e with:"," title":"Fi nd and Rep lace"},"fa keobjects" :{"anchor" :"Anchor", "flash":"F lash Anima tion","hid denfield": "Hidden Fi eld","ifra me":"IFram e","unknow n":"Unknow n Object"} ,"elements path":{"el eLabel":"E lements pa th","eleTi tle":"%1 e lement"}," div":{"IdI nputLabel" :"Id","adv isoryTitle InputLabel ":"Advisor y Title"," cssClassIn putLabel": "Styleshee t Classes" ,"edit":"E dit Div"," inlineStyl eInputLabe l":"Inline  Style","l angDirLTRL abel":"Lef t to Right  (LTR)","l angDirLabe l":"Langua ge Directi on","langD irRTLLabel ":"Right t o Left (RT L)","langu ageCodeInp utLabel":"  Language  Code","rem ove":"Remo ve Div","s tyleSelect Label":"St yle","titl e":"Create  Div Conta iner","too lbar":"Cre ate Div Co ntainer"}, "contextme nu":{"opti ons":"Cont ext Menu O ptions"}," colordialo g":{"clear ":"Clear", "highlight ":"Highlig ht","optio ns":"Colou r Options" ,"selected ":"Selecte d Colour", "title":"S elect colo ur"},"colo rbutton":{ "auto":"Au tomatic"," bgColorTit le":"Backg round Colo ur","color s":{"000": "Black","8 00000":"Ma roon","8B4 513":"Sadd le Brown", "2F4F4F":" Dark Slate  Grey","00 8080":"Tea l","000080 ":"Navy"," 4B0082":"I ndigo","69 6969":"Dar k Grey","B 22222":"Fi re Brick", "A52A2A":" Brown","DA A520":"Gol den Rod"," 006400":"D ark Green" ,"40E0D0": "Turquoise ","0000CD" :"Medium B lue","8000 80":"Purpl e","808080 ":"Grey"," F00":"Red" ,"FF8C00": "Dark Oran ge","FFD70 0":"Gold", "008000":" Green","0F F":"Cyan", "00F":"Blu e","EE82EE ":"Violet" ,"A9A9A9": "Dim Grey" ,"FFA07A": "Light Sal mon","FFA5 00":"Orang e","FFFF00 ":"Yellow" ,"00FF00": "Lime","AF EEEE":"Pal e Turquois e","ADD8E6 ":"Light B lue","DDA0 DD":"Plum" ,"D3D3D3": "Light Gre y","FFF0F5 ":"Lavende r Blush"," FAEBD7":"A ntique Whi te","FFFFE 0":"Light  Yellow","F 0FFF0":"Ho neydew","F 0FFFF":"Az ure","F0F8 FF":"Alice  Blue","E6 E6FA":"Lav ender","FF F":"White" },"more":" More Colou rs...","pa nelTitle": "Colours", "textColor Title":"Te xt Colour" },"clipboa rd":{"copy ":"Copy"," copyError" :"Your bro wser secur ity settin gs don't p ermit the  editor to  automatica lly execut e copying  operations . Please u se the key board for  that (Ctrl /Cmd+C).", "cut":"Cut ","cutErro r":"Your b rowser sec urity sett ings don't  permit th e editor t o automati cally exec ute cuttin g operatio ns. Please  use the k eyboard fo r that (Ct rl/Cmd+X). ","paste": "Paste","p asteArea": "Paste Are a","pasteM sg":"Pleas e paste in side the f ollowing b ox using t he keyboar d (<strong >Ctrl/Cmd+ V</strong> ) and hit  OK","secur ityMsg":"B ecause of  your brows er securit y settings , the edit or is not  able to ac cess your  clipboard  data direc tly. You a re require d to paste  it again  in this wi ndow.","ti tle":"Past e"},"butto n":{"selec tedLabel": "%1 (Selec ted)"},"bl ockquote": {"toolbar" :"Block Qu ote"},"bid i":{"ltr": "Text dire ction from  left to r ight","rtl ":"Text di rection fr om right t o left"}," basicstyle s":{"bold" :"Bold","i talic":"It alic","str ike":"Stri ke Through ","subscri pt":"Subsc ript","sup erscript": "Superscri pt","under line":"Und erline"}," about":{"c opy":"Copy right &cop y; $1. All  rights re served."," dlgTitle": "About CKE ditor","he lp":"Check  $1 for he lp.","more Info":"For  licensing  informati on please  visit our  web site:" ,"title":" About CKEd itor","use rGuide":"C KEditor Us er's Guide "},"editor ":"Rich Te xt Editor" ,"editorPa nel":"Rich  Text Edit or panel", "common":{ "editorHel p":"Press  ALT 0 for  help","bro wseServer" :"Browse S erver","ur l":"URL"," protocol": "Protocol" ,"upload": "Upload"," uploadSubm it":"Send  it to the  Server","i mage":"Ima ge","flash ":"Flash", "form":"Fo rm","check box":"Chec kbox","rad io":"Radio  Button"," textField" :"Text Fie ld","texta rea":"Text area","hid denField": "Hidden Fi eld","butt on":"Butto n","select ":"Selecti on Field", "imageButt on":"Image  Button"," notSet":"< not set>", "id":"Id", "name":"Na me","langD ir":"Langu age Direct ion","lang DirLtr":"L eft to Rig ht (LTR)", "langDirRt l":"Right  to Left (R TL)","lang Code":"Lan guage Code ","longDes cr":"Long  Descriptio n URL","cs sClass":"S tylesheet  Classes"," advisoryTi tle":"Advi sory Title ","cssStyl e":"Style" ,"ok":"OK" ,"cancel": "Cancel"," close":"Cl ose","prev iew":"Prev iew","resi ze":"Drag  to resize" ,"generalT ab":"Gener al","advan cedTab":"A dvanced"," validateNu mberFailed ":"This va lue is not  a number. ","confirm NewPage":" Any unsave d changes  to this co ntent will  be lost.  Are you su re you wan t to load  new page?" ,"confirmC ancel":"Yo u have cha nged some  options. A re you sur e you want  to close  the dialog ue window? ","options ":"Options ","target" :"Target", "targetNew ":"New Win dow (_blan k)","targe tTop":"Top most Windo w (_top)", "targetSel f":"Same W indow (_se lf)","targ etParent": "Parent Wi ndow (_par ent)","lan gDirLTR":" Left to Ri ght (LTR)" ,"langDirR TL":"Right  to Left ( RTL)","sty les":"Styl e","cssCla sses":"Sty lesheet Cl asses","wi dth":"Widt h","height ":"Height" ,"align":" Align","al ignLeft":" Left","ali gnRight":" Right","al ignCenter" :"Centre", "alignJust ify":"Just ify","alig nTop":"Top ","alignMi ddle":"Mid dle","alig nBottom":" Bottom","a lignNone": "None","in validValue ":"Invalid  value."," invalidHei ght":"Heig ht must be  a number. ","invalid Width":"Wi dth must b e a number .","invali dCssLength ":"Value s pecified f or the \"% 1\" field  must be a  positive n umber with  or withou t a valid  CSS measur ement unit  (px, %, i n, cm, mm,  em, ex, p t, or pc). ","invalid HtmlLength ":"Value s pecified f or the \"% 1\" field  must be a  positive n umber with  or withou t a valid  HTML measu rement uni t (px or % ).","inval idInlineSt yle":"Valu e specifie d for the  inline sty le must co nsist of o ne or more  tuples wi th the for mat of \"n ame : valu e\", separ ated by se mi-colons. ","cssLeng thTooltip" :"Enter a  number for  a value i n pixels o r a number  with a va lid CSS un it (px, %,  in, cm, m m, em, ex,  pt, or pc ).","unava ilable":"% 1<span cla ss=\"cke_a ccessibili ty\">, una vailable</ span>"}};