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

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

1001.2 Comparison summary

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

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

1001.4 Active regular expressions

No regular expressions were active.

1001.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['bs']= {"undo":{" redo":"Pon ovi","undo ":"Vrati"} ,"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":"Okv ir","capti on":"Naslo v","cell": {"menu":"C ell","inse rtBefore": "Insert Ce ll Before" ,"insertAf ter":"Inse rt Cell Af ter","dele teCell":"B riši æelij e","merge" :"Spoji æe lije","mer geRight":" Merge Righ t","mergeD own":"Merg e Down","s plitHorizo ntal":"Spl it Cell Ho rizontally ","splitVe rtical":"S plit Cell  Vertically ","title": "Cell Prop erties","c ellType":" Cell Type" ,"rowSpan" :"Rows Spa n","colSpa n":"Column s Span","w ordWrap":" Word Wrap" ,"hAlign": "Horizonta l Alignmen t","vAlign ":"Vertica l Alignmen t","alignB aseline":" Baseline", "bgColor": "Backgroun d Color"," borderColo r":"Border  Color","d ata":"Data ","header" :"Header", "yes":"Yes ","no":"No ","invalid Width":"Ce ll width m ust be a n umber.","i nvalidHeig ht":"Cell  height mus t be a num ber.","inv alidRowSpa n":"Rows s pan must b e a whole  number."," invalidCol Span":"Col umns span  must be a  whole numb er.","choo seColor":" Choose"}," cellPad":" Uvod æelij a","cellSp ace":"Razm ak æelija" ,"column": {"menu":"C olumn","in sertBefore ":"Insert  Column Bef ore","inse rtAfter":" Insert Col umn After" ,"deleteCo lumn":"Bri ši kolone" },"columns ":"Kolona" ,"deleteTa ble":"Dele te Table", "headers": "Headers", "headersBo th":"Both" ,"headersC olumn":"Fi rst column ","headers None":"Non e","header sRow":"Fir st Row","i nvalidBord er":"Borde r size mus t be a num ber.","inv alidCellPa dding":"Ce ll padding  must be a  positive  number."," invalidCel lSpacing": "Cell spac ing must b e a positi ve number. ","invalid Cols":"Num ber of col umns must  be a numbe r greater  than 0."," invalidHei ght":"Tabl e height m ust be a n umber.","i nvalidRows ":"Number  of rows mu st be a nu mber great er than 0. ","invalid Width":"Ta ble width  must be a  number."," menu":"Svo jstva tabe le","row": {"menu":"R ow","inser tBefore":" Insert Row  Before"," insertAfte r":"Insert  Row After ","deleteR ow":"Briši  redove"}, "rows":"Re dova","sum mary":"Sum mary","tit le":"Svojs tva tabele ","toolbar ":"Tabela" ,"widthPc" :"posto"," widthPx":" piksela"," widthUnit" :"width un it"},"styl escombo":{ "label":"S til","pane lTitle":"F ormatting  Styles","p anelTitle1 ":"Block S tyles","pa nelTitle2" :"Inline S tyles","pa nelTitle3" :"Object S tyles"},"s pecialchar ":{"option s":"Specia l Characte r Options" ,"title":" Izaberi sp ecijalni k arakter"," toolbar":" Ubaci spec ijalni kar ater"},"so urcearea": {"toolbar" :"HTML kôd "},"smiley ":{"option s":"Smiley  Options", "title":"U baci smješ ka","toolb ar":"Smješ ko"},"show blocks":{" toolbar":" Show Block s"},"selec tall":{"to olbar":"Se lektuj sve "},"save": {"toolbar" :"Snimi"}, "removefor mat":{"too lbar":"Pon išti forma t"},"print ":{"toolba r":"Štampa j"},"previ ew":{"prev iew":"Prik aži"},"pas tetext":{" button":"Z alijepi ka o obièan t ekst","tit le":"Zalij epi kao ob ièan tekst "},"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":"Za lijepi iz  Word-a","t oolbar":"Z alijepi iz  Word-a"}, "pagebreak ":{"alt":" Page Break ","toolbar ":"Insert  Page Break  for Print ing"},"new page":{"to olbar":"No vi dokumen t"},"maxim ize":{"max imize":"Ma ximize","m inimize":" Minimize"} ,"magiclin e":{"title ":"Insert  paragraph  here"},"li ststyle":{ "armenian" :"Armenian  numbering ","bullete dTitle":"B ulleted Li st Propert ies","circ le":"Circl e","decima l":"Decima l (1, 2, 3 , etc.)"," decimalLea dingZero": "Decimal l eading zer o (01, 02,  03, etc.) ","disc":" Disc","geo rgian":"Ge orgian num bering (an , ban, gan , etc.)"," lowerAlpha ":"Lower A lpha (a, b , c, d, e,  etc.)","l owerGreek" :"Lower Gr eek (alpha , beta, ga mma, etc.) ","lowerRo man":"Lowe r Roman (i , ii, iii,  iv, v, et c.)","none ":"None"," notset":"< not set>", "numberedT itle":"Num bered List  Propertie s","square ":"Square" ,"start":" Start","ty pe":"Type" ,"upperAlp ha":"Upper  Alpha (A,  B, C, D,  E, etc.)", "upperRoma n":"Upper  Roman (I,  II, III, I V, V, etc. )","valida teStartNum ber":"List  start num ber must b e a whole  number."}, "list":{"b ulletedlis t":"Lista" ,"numbered list":"Num erisana li sta"},"lin k":{"accce ssKey":"Pr istupna ti pka","adva nced":"Nap rednije"," advisoryCo ntentType" :"Advisory  vrsta sad ržaja","ad visoryTitl e":"Adviso ry title", "anchor":{ "toolbar": "Anchor"," menu":"Edi t Anchor", "title":"A nchor Prop erties","n ame":"Anch or Name"," errorName" :"Please t ype the an chor name" ,"remove": "Remove An chor"},"an chorId":"P o Id-u ele menta","an chorName": "Po nazivu  sidra","c harset":"L inked Reso urce Chars et","cssCl asses":"Kl ase CSS st ilova","em ailAddress ":"E-Mail  Adresa","e mailBody": "Poruka"," emailSubje ct":"Subje kt poruke" ,"id":"Id" ,"info":"L ink info", "langCode" :"Smjer pi sanja","la ngDir":"Sm jer pisanj a","langDi rLTR":"S l ijeva na d esno (LTR) ","langDir RTL":"S de sna na lij evo (RTL)" ,"menu":"I zmjeni lin k","name": "Naziv","n oAnchors": "(Nema dos tupnih sid ra na stra nici)","no Email":"Mo limo ukuca jte e-mail  adresu"," noUrl":"Mo limo ukuca jte URL li nk","other ":"<other> ","popupDe pendent":" Ovisno (Ne tscape)"," popupFeatu res":"Mogu ænosti pop up prozora ","popupFu llScreen": "Cijeli ek ran (IE)", "popupLeft ":"Lijeva  pozicija", "popupLoca tionBar":" Traka za l okaciju"," popupMenuB ar":"Izbor na traka", "popupResi zable":"Re sizable"," popupScrol lBars":"Sc roll traka ","popupSt atusBar":" Statusna t raka","pop upToolbar" :"Traka sa  alatima", "popupTop" :"Gornja p ozicija"," rel":"Rela tionship", "selectAnc hor":"Izab eri sidro" ,"styles": "Stil","ta bIndex":"T ab indeks" ,"target": "Prozor"," targetFram e":"<frejm >","target FrameName" :"Target F rame Name" ,"targetPo pup":"<pop up prozor> ","targetP opupName": "Naziv pop up prozora ","title": "Link","to Anchor":"S idro na ov oj stranic i","toEmai l":"E-Mail ","toUrl": "URL","too lbar":"Uba ci/Izmjeni  link","ty pe":"Tip l inka","unl ink":"Izbr iši link", "upload":" Šalji"},"j ustify":{" block":"Pu no poravna nje","cent er":"Centr alno porav nanje","le ft":"Lijev o poravnan je","right ":"Desno p oravnanje" },"indent" :{"indent" :"Poveæaj  uvod","out dent":"Sma nji uvod"} ,"image":{ "alt":"Tek st na slic i","border ":"Okvir", "btnUpload ":"Šalji n a server", "button2Im g":"Do you  want to t ransform t he selecte d image bu tton on a  simple ima ge?","hSpa ce":"HSpac e","img2Bu tton":"Do  you want t o transfor m the sele cted image  on a imag e button?" ,"infoTab" :"Info sli ke","linkT ab":"Link" ,"lockRati o":"Zaklju èaj odnos" ,"menu":"S vojstva sl ike","rese tSize":"Re setuj dime nzije","ti tle":"Svoj stva slike ","titleBu tton":"Ima ge Button  Properties ","upload" :"Šalji"," urlMissing ":"Image s ource URL  is missing .","vSpace ":"VSpace" ,"validate Border":"B order must  be a whol e number." ,"validate HSpace":"H Space must  be a whol e number." ,"validate VSpace":"V Space must  be a whol e number." },"iframe" :{"border" :"Show fra me border" ,"noUrl":" Please typ e the ifra me URL","s crolling": "Enable sc rollbars", "title":"I Frame Prop erties","t oolbar":"I Frame"},"h orizontalr ule":{"too lbar":"Uba ci horizon talnu lini ju"},"form s":{"butto n":{"title ":"Button  Properties ","text":" Text (Valu e)","type" :"Type","t ypeBtn":"B utton","ty peSbm":"Su bmit","typ eRst":"Res et"},"chec kboxAndRad io":{"chec kboxTitle" :"Checkbox  Propertie s","radioT itle":"Rad io Button  Properties ","value": "Value","s elected":" Selected", "required" :"Required "},"form": {"title":" Form Prope rties","me nu":"Form  Properties ","action" :"Action", "method":" Method","e ncoding":" Encoding"} ,"hidden": {"title":" Hidden Fie ld Propert ies","name ":"Name"," value":"Va lue"},"sel ect":{"tit le":"Selec tion Field  Propertie s","select Info":"Sel ect Info", "opAvail": "Available  Options", "value":"V alue","siz e":"Size", "lines":"l ines","chk Multi":"Al low multip le selecti ons","requ ired":"Req uired","op Text":"Tex t","opValu e":"Value" ,"btnAdd": "Add","btn Modify":"M odify","bt nUp":"Up", "btnDown": "Down","bt nSetValue" :"Set as s elected va lue","btnD elete":"De lete"},"te xtarea":{" title":"Te xtarea Pro perties"," cols":"Col umns","row s":"Rows"} ,"textfiel d":{"title ":"Text Fi eld Proper ties","nam e":"Name", "value":"V alue","cha rWidth":"C haracter W idth","max Chars":"Ma ximum Char acters","r equired":" Required", "type":"Ty pe","typeT ext":"Text ","typePas s":"Passwo rd","typeE mail":"Ema il","typeS earch":"Se arch","typ eTel":"Tel ephone Num ber","type Url":"URL" }},"format ":{"label" :"Format", "panelTitl e":"Format ","tag_add ress":"Add ress","tag _div":"Nor mal (DIV)" ,"tag_h1": "Heading 1 ","tag_h2" :"Heading  2","tag_h3 ":"Heading  3","tag_h 4":"Headin g 4","tag_ h5":"Headi ng 5","tag _h6":"Head ing 6","ta g_p":"Norm al","tag_p re":"Forma tted"},"fo nt":{"font Size":{"la bel":"Veli èina","voi ceLabel":" Font Size" ,"panelTit le":"Veliè ina"},"lab el":"Font" ,"panelTit le":"Font" ,"voiceLab el":"Font" },"flash": {"access": "Script Ac cess","acc essAlways" :"Always", "accessNev er":"Never ","accessS ameDomain" :"Same dom ain","alig nAbsBottom ":"Abs dol e","alignA bsMiddle": "Abs sredi na","align Baseline": "Bazno","a lignTextTo p":"Vrh te ksta","bgc olor":"Boj a pozadine ","chkFull ":"Allow F ullscreen" ,"chkLoop" :"Loop","c hkMenu":"E nable Flas h Menu","c hkPlay":"A uto Play", "flashvars ":"Variabl es for Fla sh","hSpac e":"HSpace ","propert ies":"Flas h Properti es","prope rtiesTab": "Propertie s","qualit y":"Qualit y","qualit yAutoHigh" :"Auto Hig h","qualit yAutoLow": "Auto Low" ,"qualityB est":"Best ","quality High":"Hig h","qualit yLow":"Low ","quality Medium":"M edium","sc ale":"Scal e","scaleA ll":"Show  all","scal eFit":"Exa ct Fit","s caleNoBord er":"No Bo rder","tit le":"Flash  Propertie s","vSpace ":"VSpace" ,"validate HSpace":"H Space must  be a numb er.","vali dateSrc":" Molimo uku cajte URL  link","val idateVSpac e":"VSpace  must be a  number.", "windowMod e":"Window  mode","wi ndowModeOp aque":"Opa que","wind owModeTran sparent":" Transparen t","window ModeWindow ":"Window" },"find":{ "find":"Na ði","findO ptions":"F ind Option s","findWh at":"Naði  šta:","mat chCase":"U poreðuj ve lika/mala  slova","ma tchCyclic" :"Match cy clic","mat chWord":"U poreðuj sa mo cijelu  rijeè","no tFoundMsg" :"Traženi  tekst nije  pronaðen. ","replace ":"Zamjeni ","replace All":"Zamj eni sve"," replaceSuc cessMsg":" %1 occurre nce(s) rep laced.","r eplaceWith ":"Zamjeni  sa:","tit le":"Find  and Replac e"},"fakeo bjects":{" anchor":"A nchor","fl ash":"Flas h Animatio n","hidden field":"Hi dden Field ","iframe" :"IFrame", "unknown": "Unknown O bject"},"e lementspat h":{"eleLa bel":"Elem ents path" ,"eleTitle ":"%1 elem ent"},"div ":{"IdInpu tLabel":"I d","adviso ryTitleInp utLabel":" Advisory t itle","css ClassInput Label":"Kl ase CSS st ilova","ed it":"Edit  Div","inli neStyleInp utLabel":" Inline Sty le","langD irLTRLabel ":"S lijev a na desno  (LTR)","l angDirLabe l":"Smjer  pisanja"," langDirRTL Label":"S  desna na l ijevo (RTL )","langua geCodeInpu tLabel":"  Language C ode","remo ve":"Remov e Div","st yleSelectL abel":"Sti l","title" :"Create D iv Contain er","toolb ar":"Creat e Div Cont ainer"},"c ontextmenu ":{"option s":"Contex t Menu Opt ions"},"co lordialog" :{"clear": "Clear","h ighlight": "Highlight ","options ":"Color O ptions","s elected":" Selected C olor","tit le":"Selec t color"}, "colorbutt on":{"auto ":"Automat ska","bgCo lorTitle": "Boja poza dine","col ors":{"000 ":"Black", "800000":" Maroon","8 B4513":"Sa ddle Brown ","2F4F4F" :"Dark Sla te Gray"," 008080":"T eal","0000 80":"Navy" ,"4B0082": "Indigo"," 696969":"D ark Gray", "B22222":" Fire Brick ","A52A2A" :"Brown"," DAA520":"G olden Rod" ,"006400": "Dark Gree n","40E0D0 ":"Turquoi se","0000C D":"Medium  Blue","80 0080":"Pur ple","8080 80":"Gray" ,"F00":"Re d","FF8C00 ":"Dark Or ange","FFD 700":"Gold ","008000" :"Green"," 0FF":"Cyan ","00F":"B lue","EE82 EE":"Viole t","A9A9A9 ":"Dim Gra y","FFA07A ":"Light S almon","FF A500":"Ora nge","FFFF 00":"Yello w","00FF00 ":"Lime"," AFEEEE":"P ale Turquo ise","ADD8 E6":"Light  Blue","DD A0DD":"Plu m","D3D3D3 ":"Light G rey","FFF0 F5":"Laven der Blush" ,"FAEBD7": "Antique W hite","FFF FE0":"Ligh t Yellow", "F0FFF0":" Honeydew", "F0FFFF":" Azure","F0 F8FF":"Ali ce Blue"," E6E6FA":"L avender"," FFF":"Whit e"},"more" :"Više boj a...","pan elTitle":" Colors","t extColorTi tle":"Boja  teksta"}, "clipboard ":{"copy": "Kopiraj", "copyError ":"Sigurno sne postav ke Vašeg p retraživaè a ne dozvo ljavaju op eracije au tomatskog  kopiranja.  Molimo ko ristite kr aticu na t astaturi ( Ctrl/Cmd+C ).","cut": "Izreži"," cutError": "Sigurnosn e postavke  vašeg pre traživaèa  ne dozvolj avaju oper acije auto matskog re zanja. Mol imo korist ite kratic u na tasta turi (Ctrl /Cmd+X).", "paste":"Z alijepi"," pasteArea" :"Paste Ar ea","paste Msg":"Plea se paste i nside the  following  box using  the keyboa rd (<stron g>Ctrl/Cmd +V</strong >) and hit  OK","secu rityMsg":" Because of  your brow ser securi ty setting s, the edi tor is not  able to a ccess your  clipboard  data dire ctly. You  are requir ed to past e it again  in this w indow.","t itle":"Zal ijepi"},"b utton":{"s electedLab el":"%1 (S elected)"} ,"blockquo te":{"tool bar":"Bloc k Quote"}, "bidi":{"l tr":"Text  direction  from left  to right", "rtl":"Tex t directio n from rig ht to left "},"basics tyles":{"b old":"Bold iraj","ita lic":"Ukos i","strike ":"Precrta j","subscr ipt":"Subs cript","su perscript" :"Superscr ipt","unde rline":"Po dvuci"},"a bout":{"co py":"Copyr ight &copy ; $1. All  rights res erved.","d lgTitle":" About CKEd itor","hel p":"Check  $1 for hel p.","moreI nfo":"For  licensing  informatio n please v isit our w eb site:", "title":"A bout CKEdi tor","user Guide":"CK Editor Use r's Guide" },"editor" :"Rich Tex t Editor", "editorPan el":"Rich  Text Edito r panel"," common":{" editorHelp ":"Press A LT 0 for h elp","brow seServer": "Browse Se rver","url ":"URL","p rotocol":" Protokol", "upload":" Šalji","up loadSubmit ":"Šalji n a server", "image":"S lika","fla sh":"Flash ","form":" Form","che ckbox":"Ch eckbox","r adio":"Rad io Button" ,"textFiel d":"Text F ield","tex tarea":"Te xtarea","h iddenField ":"Hidden  Field","bu tton":"But ton","sele ct":"Selec tion Field ","imageBu tton":"Ima ge Button" ,"notSet": "<nije pod ešeno>","i d":"Id","n ame":"Nazi v","langDi r":"Smjer  pisanja"," langDirLtr ":"S lijev a na desno  (LTR)","l angDirRtl" :"S desna  na lijevo  (RTL)","la ngCode":"J ezièni kôd ","longDes cr":"Dugaè ki opis UR L-a","cssC lass":"Kla se CSS sti lova","adv isoryTitle ":"Advisor y title"," cssStyle": "Stil","ok ":"OK","ca ncel":"Odu stani","cl ose":"Clos e","previe w":"Prikaž i","resize ":"Resize" ,"generalT ab":"Gener al","advan cedTab":"N aprednije" ,"validate NumberFail ed":"This  value is n ot a numbe r.","confi rmNewPage" :"Any unsa ved change s to this  content wi ll be lost . Are you  sure you w ant to loa d new page ?","confir mCancel":" You have c hanged som e options.  Are you s ure you wa nt to clos e the dial og window? ","options ":"Options ","target" :"Prozor", "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":" S lijeva n a desno (L TR)","lang DirRTL":"S  desna na  lijevo (RT L)","style s":"Stil", "cssClasse s":"Klase  CSS stilov a","width" :"Širina", "height":" Visina","a lign":"Por avnanje"," alignLeft" :"Lijevo", "alignRigh t":"Desno" ,"alignCen ter":"Cent ar","align Justify":" Puno porav nanje","al ignTop":"V rh","align Middle":"S redina","a lignBottom ":"Dno","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>"}};