Produced by Araxis Merge on 2/1/2017 2:57:44 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.
| # | 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 | mk.js | Tue Dec 20 19:50:43 2016 UTC |
| 2 | Wed Feb 1 19:57:44 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 1 | 5 |
| 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 |
No regular expressions were active.
| 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['mk']= {"undo":{" redo":"Red o","undo": "Undo"},"t oolbar":{" toolbarCol lapse":"Co llapse Too lbar","too lbarExpand ":"Expand Toolbar"," toolbarGro ups":{"doc ument":"Do cument","c lipboard": "Clipboard /Undo","ed iting":"Ed iting","fo rms":"Form s","basics tyles":"Ba sic Styles ","paragra ph":"Parag raph","lin ks":"Links ","insert" :"Insert", "styles":" Styles","c olors":"Co lors","too ls":"Tools "},"toolba rs":"Edito r toolbars "},"templa tes":{"but ton":"Temp lates","em ptyListMsg ":"(No tem plates def ined)","in sertOption ":"Replace actual co ntents","o ptions":"T emplate Op tions","se lectPrompt Msg":"Plea se select the templa te to open in the ed itor","tit le":"Conte nt Templat es"},"tabl e":{"borde r":"Border size","ca ption":"Ca ption","ce ll":{"menu ":"Cell"," insertBefo re":"Inser t Cell Bef ore","inse rtAfter":" Insert Cel l After"," deleteCell ":"Delete Cells","me rge":"Merg e Cells"," mergeRight ":"Merge R ight","mer geDown":"M erge Down" ,"splitHor izontal":" Split Cell Horizonta lly","spli tVertical" :"Split Ce ll Vertica lly","titl e":"Cell P roperties" ,"cellType ":"Cell Ty pe","rowSp an":"Rows Span","col Span":"Col umns Span" ,"wordWrap ":"Word Wr ap","hAlig n":"Horizo ntal Align ment","vAl ign":"Vert ical Align ment","ali gnBaseline ":"Baselin e","bgColo r":"Backgr ound Color ","borderC olor":"Bor der Color" ,"data":"D ata","head er":"Heade r","yes":" Yes","no": "No","inva lidWidth": "Cell widt h must be a number." ,"invalidH eight":"Ce ll height must be a number."," invalidRow Span":"Row s span mus t be a who le number. ","invalid ColSpan":" Columns sp an must be a whole n umber.","c hooseColor ":"Choose" },"cellPad ":"Cell pa dding","ce llSpace":" Cell spaci ng","colum n":{"menu" :"Column", "insertBef ore":"Inse rt Column Before","i nsertAfter ":"Insert Column Aft er","delet eColumn":" Delete Col umns"},"co lumns":"Co lumns","de leteTable" :"Delete T able","hea ders":"Hea ders","hea dersBoth": "Both","he adersColum n":"First column","h eadersNone ":"None"," headersRow ":"First R ow","inval idBorder": "Border si ze must be a number. ","invalid CellPaddin g":"Cell p adding mus t be a pos itive numb er.","inva lidCellSpa cing":"Cel l spacing must be a positive n umber.","i nvalidCols ":"Number of columns must be a number gr eater than 0.","inva lidHeight" :"Table he ight must be a numbe r.","inval idRows":"N umber of r ows must b e a number greater t han 0.","i nvalidWidt h":"Table width must be a numb er.","menu ":"Table P roperties" ,"row":{"m enu":"Row" ,"insertBe fore":"Ins ert Row Be fore","ins ertAfter": "Insert Ro w After"," deleteRow" :"Delete R ows"},"row s":"Rows", "summary": "Summary", "title":"T able Prope rties","to olbar":"Ta ble","widt hPc":"perc ent","widt hPx":"pixe ls","width Unit":"wid th unit"}, "stylescom bo":{"labe l":"Styles ","panelTi tle":"Form atting Sty les","pane lTitle1":" Block Styl es","panel Title2":"I nline Styl es","panel Title3":"O bject Styl es"},"spec ialchar":{ "options": "Special C haracter O ptions","t itle":"Sel ect Specia l Characte r","toolba r":"Insert Special C haracter"} ,"sourcear ea":{"tool bar":"Sour ce"},"smil ey":{"opti ons":"Smil ey Options ","title": "Insert a Smiley","t oolbar":"S miley"},"s howblocks" :{"toolbar ":"Show Bl ocks"},"se lectall":{ "toolbar": "Select Al l"},"save" :{"toolbar ":"Save"}, "removefor mat":{"too lbar":"Rem ove Format "},"print" :{"toolbar ":"Print"} ,"preview" :{"preview ":"Preview "},"pastet ext":{"but ton":"Past e as plain text","ti tle":"Past e as Plain Text"},"p astefromwo rd":{"conf irmCleanup ":"The tex t you want to paste seems to b e copied f rom Word. Do you wan t to clean it before pasting?" ,"error":" It was not possible to clean u p the past ed data du e to an in ternal err or","title ":"Paste f rom Word", "toolbar": "Paste fro m Word"}," pagebreak" :{"alt":"P age Break" ,"toolbar" :"Insert P age Break for Printi ng"},"newp age":{"too lbar":"New Page"},"m aximize":{ "maximize" :"Maximize ","minimiz e":"Minimi ze"},"magi cline":{"t itle":"Ins ert paragr aph here"} ,"liststyl e":{"armen ian":"Arme nian numbe ring","bul letedTitle ":"Bullete d List Pro perties"," circle":"C ircle","de cimal":"De cimal (1, 2, 3, etc. )","decima lLeadingZe ro":"Decim al leading zero (01, 02, 03, e tc.)","dis c":"Disc", "georgian" :"Georgian numbering (an, ban, gan, etc. )","lowerA lpha":"Low er Alpha ( a, b, c, d , e, etc.) ","lowerGr eek":"Lowe r Greek (a lpha, beta , gamma, e tc.)","low erRoman":" Lower Roma n (i, ii, iii, iv, v , etc.)"," none":"Non e","notset ":"<not se t>","numbe redTitle": "Numbered List Prope rties","sq uare":"Squ are","star t":"Start" ,"type":"T ype","uppe rAlpha":"U pper Alpha (A, B, C, D, E, etc .)","upper Roman":"Up per Roman (I, II, II I, IV, V, etc.)","va lidateStar tNumber":" List start number mu st be a wh ole number ."},"list" :{"bullete dlist":"In sert/Remov e Bulleted List","nu mberedlist ":"Insert/ Remove Num bered List "},"link": {"acccessK ey":"Acces s Key","ad vanced":"A dvanced"," advisoryCo ntentType" :"Advisory Content T ype","advi soryTitle" :"Advisory Title","a nchor":{"t oolbar":"A nchor","me nu":"Edit Anchor","t itle":"Anc hor Proper ties","nam e":"Anchor Name","er rorName":" Please typ e the anch or name"," remove":"R emove Anch or"},"anch orId":"By Element Id ","anchorN ame":"By A nchor Name ","charset ":"Linked Resource C harset","c ssClasses" :"Styleshe et Classes ","emailAd dress":"E- Mail Addre ss","email Body":"Mes sage Body" ,"emailSub ject":"Mes sage Subje ct","id":" Id","info" :"Link Inf o","langCo de":"Langu age Code", "langDir": "Language Direction" ,"langDirL TR":"Left to Right ( LTR)","lan gDirRTL":" Right to L eft (RTL)" ,"menu":"E dit Link", "name":"Na me","noAnc hors":"(No anchors a vailable i n the docu ment)","no Email":"Pl ease type the e-mail address", "noUrl":"P lease type the link URL","othe r":"<other >","popupD ependent": "Dependent (Netscape )","popupF eatures":" Popup Wind ow Feature s","popupF ullScreen" :"Full Scr een (IE)", "popupLeft ":"Left Po sition","p opupLocati onBar":"Lo cation Bar ","popupMe nuBar":"Me nu Bar","p opupResiza ble":"Resi zable","po pupScrollB ars":"Scro ll Bars"," popupStatu sBar":"Sta tus Bar"," popupToolb ar":"Toolb ar","popup Top":"Top Position", "rel":"Rel ationship" ,"selectAn chor":"Sel ect an Anc hor","styl es":"Style ","tabInde x":"Tab In dex","targ et":"Targe t","target Frame":"<f rame>","ta rgetFrameN ame":"Targ et Frame N ame","targ etPopup":" <popup win dow>","tar getPopupNa me":"Popup Window Na me","title ":"Link"," toAnchor": "Link to a nchor in t he text"," toEmail":" E-mail","t oUrl":"URL ","toolbar ":"Link"," type":"Lin k Type","u nlink":"Un link","upl oad":"Uplo ad"},"just ify":{"blo ck":"Justi fy","cente r":"Center ","left":" Align Left ","right": "Align Rig ht"},"inde nt":{"inde nt":"Incre ase Indent ","outdent ":"Decreas e Indent"} ,"image":{ "alt":"Alt ernative T ext","bord er":"Borde r","btnUpl oad":"Send it to the Server"," button2Img ":"Do you want to tr ansform th e selected image but ton on a s imple imag e?","hSpac e":"HSpace ","img2But ton":"Do y ou want to transform the selec ted image on a image button?", "infoTab": "Image Inf o","linkTa b":"Link", "lockRatio ":"Lock Ra tio","menu ":"Image P roperties" ,"resetSiz e":"Reset Size","tit le":"Image Propertie s","titleB utton":"Im age Button Propertie s","upload ":"Upload" ,"urlMissi ng":"Image source UR L is missi ng.","vSpa ce":"VSpac e","valida teBorder": "Border mu st be a wh ole number .","valida teHSpace": "HSpace mu st be a wh ole number .","valida teVSpace": "VSpace mu st be a wh ole number ."},"ifram e":{"borde r":"Show f rame borde r","noUrl" :"Please t ype the if rame URL", "scrolling ":"Enable scrollbars ","title": "IFrame Pr operties", "toolbar": "IFrame"}, "horizonta lrule":{"t oolbar":"I nsert Hori zontal Lin e"},"forms ":{"button ":{"title" :"Button P roperties" ,"text":"T ext (Value )","type": "Type","ty peBtn":"Bu tton","typ eSbm":"Sub mit","type Rst":"Rese t"},"check boxAndRadi o":{"check boxTitle": "Checkbox Properties ","radioTi tle":"Radi o Button P roperties" ,"value":" Value","se lected":"S elected"," required": "Required" },"form":{ "title":"F orm Proper ties","men u":"Form P roperties" ,"action": "Action"," method":"M ethod","en coding":"E ncoding"}, "hidden":{ "title":"H idden Fiel d Properti es","name" :"Name","v alue":"Val ue"},"sele ct":{"titl e":"Select ion Field Properties ","selectI nfo":"Sele ct Info"," opAvail":" Available Options"," value":"Va lue","size ":"Size"," lines":"li nes","chkM ulti":"All ow multipl e selectio ns","requi red":"Requ ired","opT ext":"Text ","opValue ":"Value", "btnAdd":" Add","btnM odify":"Mo dify","btn Up":"Up"," btnDown":" Down","btn SetValue": "Set as se lected val ue","btnDe lete":"Del ete"},"tex tarea":{"t itle":"Tex tarea Prop erties","c ols":"Colu mns","rows ":"Rows"}, "textfield ":{"title" :"Text Fie ld Propert ies","name ":"Name"," value":"Va lue","char Width":"Ch aracter Wi dth","maxC hars":"Max imum Chara cters","re quired":"R equired"," type":"Typ e","typeTe xt":"Text" ,"typePass ":"Passwor d","typeEm ail":"Emai l","typeSe arch":"Sea rch","type Tel":"Tele phone Numb er","typeU rl":"URL"} },"format" :{"label": "Format"," panelTitle ":"Paragra ph Format" ,"tag_addr ess":"Addr ess","tag_ div":"Norm al (DIV)", "tag_h1":" Heading 1" ,"tag_h2": "Heading 2 ","tag_h3" :"Heading 3","tag_h4 ":"Heading 4","tag_h 5":"Headin g 5","tag_ h6":"Headi ng 6","tag _p":"Norma l","tag_pr e":"Format ted"},"fon t":{"fontS ize":{"lab el":"Size" ,"voiceLab el":"Font Size","pan elTitle":" Font Size" },"label": "Font","pa nelTitle": "Font Name ","voiceLa bel":"Font "},"flash" :{"access" :"Script A ccess","ac cessAlways ":"Always" ,"accessNe ver":"Neve r","access SameDomain ":"Same do main","ali gnAbsBotto m":"Abs Bo ttom","ali gnAbsMiddl e":"Abs Mi ddle","ali gnBaseline ":"Baselin e","alignT extTop":"T ext Top"," bgcolor":" Background color","c hkFull":"A llow Fulls creen","ch kLoop":"Lo op","chkMe nu":"Enabl e Flash Me nu","chkPl ay":"Auto Play","fla shvars":"V ariables f or Flash", "hSpace":" HSpace","p roperties" :"Flash Pr operties", "propertie sTab":"Pro perties"," quality":" Quality"," qualityAut oHigh":"Au to High"," qualityAut oLow":"Aut o Low","qu alityBest" :"Best","q ualityHigh ":"High"," qualityLow ":"Low","q ualityMedi um":"Mediu m","scale" :"Scale"," scaleAll": "Show all" ,"scaleFit ":"Exact F it","scale NoBorder": "No Border ","title": "Flash Pro perties"," vSpace":"V Space","va lidateHSpa ce":"HSpac e must be a number." ,"validate Src":"URL must not b e empty.", "validateV Space":"VS pace must be a numbe r.","windo wMode":"Wi ndow mode" ,"windowMo deOpaque": "Opaque"," windowMode Transparen t":"Transp arent","wi ndowModeWi ndow":"Win dow"},"fin d":{"find" :"Find","f indOptions ":"Find Op tions","fi ndWhat":"F ind what:" ,"matchCas e":"Match case","mat chCyclic": "Match cyc lic","matc hWord":"Ma tch whole word","not FoundMsg": "The speci fied text was not fo und.","rep lace":"Rep lace","rep laceAll":" Replace Al l","replac eSuccessMs g":"%1 occ urrence(s) replaced. ","replace With":"Rep lace with: ","title": "Find and Replace"}, "fakeobjec ts":{"anch or":"Ancho r","flash" :"Flash An imation"," hiddenfiel d":"Hidden Field","i frame":"IF rame","unk nown":"Unk nown Objec t"},"eleme ntspath":{ "eleLabel" :"Elements path","el eTitle":"% 1 element" },"div":{" IdInputLab el":"Id"," advisoryTi tleInputLa bel":"Advi sory Title ","cssClas sInputLabe l":"Styles heet Class es","edit" :"Edit Div ","inlineS tyleInputL abel":"Inl ine Style" ,"langDirL TRLabel":" Left to Ri ght (LTR)" ,"langDirL abel":"Lan guage Dire ction","la ngDirRTLLa bel":"Righ t to Left (RTL)","la nguageCode InputLabel ":" Langua ge Code"," remove":"R emove Div" ,"styleSel ectLabel": "Style","t itle":"Cre ate Div Co ntainer"," toolbar":" Create Div Container "},"contex tmenu":{"o ptions":"C ontext Men u Options" },"colordi alog":{"cl ear":"Clea r","highli ght":"High light","op tions":"Co lor Option s","select ed":"Selec ted Color" ,"title":" Select col or"},"colo rbutton":{ "auto":"Au tomatic"," bgColorTit le":"Backg round Colo r","colors ":{"000":" Black","80 0000":"Mar oon","8B45 13":"Saddl e Brown"," 2F4F4F":"D ark Slate Gray","008 080":"Teal ","000080" :"Navy","4 B0082":"In digo","696 969":"Dark Gray","B2 2222":"Fir e Brick"," A52A2A":"B rown","DAA 520":"Gold en Rod","0 06400":"Da rk Green", "40E0D0":" Turquoise" ,"0000CD": "Medium Bl ue","80008 0":"Purple ","808080" :"Gray","F 00":"Red", "FF8C00":" Dark Orang e","FFD700 ":"Gold"," 008000":"G reen","0FF ":"Cyan"," 00F":"Blue ","EE82EE" :"Violet", "A9A9A9":" Dim Gray", "FFA07A":" Light Salm on","FFA50 0":"Orange ","FFFF00" :"Yellow", "00FF00":" Lime","AFE EEE":"Pale Turquoise ","ADD8E6" :"Light Bl ue","DDA0D D":"Plum", "D3D3D3":" Light Grey ","FFF0F5" :"Lavender Blush","F AEBD7":"An tique Whit e","FFFFE0 ":"Light Y ellow","F0 FFF0":"Hon eydew","F0 FFFF":"Azu re","F0F8F F":"Alice Blue","E6E 6FA":"Lave nder","FFF ":"White"} ,"more":"M ore Colors ...","pane lTitle":"C olors","te xtColorTit le":"Text Color"},"c lipboard": {"copy":"C opy","copy Error":"Yo ur browser security settings d on't permi t the edit or to auto matically execute co pying oper ations. Pl ease use t he keyboar d for that (Ctrl/Cmd +C).","cut ":"Cut","c utError":" Your brows er securit y settings don't per mit the ed itor to au tomaticall y execute cutting op erations. Please use the keybo ard for th at (Ctrl/C md+X).","p aste":"Pas te","paste Area":"Pas te Area"," pasteMsg": "Please pa ste inside the follo wing box u sing the k eyboard (< strong>Ctr l/Cmd+V</s trong>) an d hit OK", "securityM sg":"Becau se of your browser s ecurity se ttings, th e editor i s not able to access your clip board data directly. You are r equired to paste it again in t his window .","title" :"Paste"}, "button":{ "selectedL abel":"%1 (Selected) "},"blockq uote":{"to olbar":"Bl ock Quote" },"bidi":{ "ltr":"Tex t directio n from lef t to right ","rtl":"T ext direct ion from r ight to le ft"},"basi cstyles":{ "bold":"Bo ld","itali c":"Italic ","strike" :"Striketh rough","su bscript":" Subscript" ,"superscr ipt":"Supe rscript"," underline" :"Underlin e"},"about ":{"copy": "Copyright © $1 . All righ ts reserve d.","dlgTi tle":"Abou t CKEditor ","help":" Check $1 f or help.", "moreInfo" :"For lice nsing info rmation pl ease visit our web s ite:","tit le":"About CKEditor" ,"userGuid e":"CKEdit or User's Guide"},"e ditor":"Ri ch Text Ed itor","edi torPanel": "Rich Text Editor pa nel","comm on":{"edit orHelp":"P ress ALT 0 for help" ,"browseSe rver":"Bro wse Server ","url":"U RL","proto col":"Prot ocol","upl oad":"Uplo ad","uploa dSubmit":" Send it to the Serve r","image" :"Image"," flash":"Fl ash","form ":"Form"," checkbox": "Checkbox" ,"radio":" Radio Butt on","textF ield":"Tex t Field"," textarea": "Textarea" ,"hiddenFi eld":"Hidd en Field", "button":" Button","s elect":"Se lection Fi eld","imag eButton":" Image Butt on","notSe t":"<not s et>","id": "Id","name ":"Name"," langDir":" Language D irection", "langDirLt r":"Left t o Right (L TR)","lang DirRtl":"R ight to Le ft (RTL)", "langCode" :"Language Code","lo ngDescr":" Long Descr iption URL ","cssClas s":"Styles heet Class es","advis oryTitle": "Advisory Title","cs sStyle":"S tyle","ok" :"OK","can cel":"Canc el","close ":"Close", "preview": "Preview", "resize":" Resize","g eneralTab" :"Општо"," advancedTa b":"Advanc ed","valid ateNumberF ailed":"Th is value i s not a nu mber.","co nfirmNewPa ge":"Any u nsaved cha nges to th is content will be l ost. Are y ou sure yo u want to load new p age?","con firmCancel ":"You hav e changed some optio ns. Are yo u sure you want to c lose the d ialog wind ow?","opti ons":"Opti ons","targ et":"Targe t","target New":"New Window (_b lank)","ta rgetTop":" Topmost Wi ndow (_top )","target Self":"Sam e Window ( _self)","t argetParen t":"Parent Window (_ parent)"," langDirLTR ":"Left to Right (LT R)","langD irRTL":"Ri ght to Lef t (RTL)"," styles":"S tyle","css Classes":" Stylesheet Classes", "width":"W idth","hei ght":"Heig ht","align ":"Alignme nt","align Left":"Lef t","alignR ight":"Rig ht","align Center":"C enter","al ignJustify ":"Justify ","alignTo p":"Top"," alignMiddl e":"Middle ","alignBo ttom":"Bot tom","alig nNone":"No ne","inval idValue":" Invalid va lue.","inv alidHeight ":"Height must be a number."," invalidWid th":"Width must be a number.", "invalidCs sLength":" Value spec ified for the \"%1\" field mus t be a pos itive numb er with or without a valid CSS measureme nt unit (p x, %, in, cm, mm, em , ex, pt, or pc)."," invalidHtm lLength":" Value spec ified for the \"%1\" field mus t be a pos itive numb er with or without a valid HTM L measurem ent unit ( px or %)." ,"invalidI nlineStyle ":"Value s pecified f or the inl ine style must consi st of one or more tu ples with the format of \"name : value\" , separate d by semi- colons."," cssLengthT ooltip":"E nter a num ber for a value in p ixels or a number wi th a valid CSS unit (px, %, in , cm, mm, em, ex, pt , or pc)." ,"unavaila ble":"%1<s pan class= \"cke_acce ssibility\ ">, unavai lable</spa n>"}}; |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.