1052. Araxis Merge File Comparison Report

1052.1 Files compared

1052.2 Comparison summary

1052.3 Comparison options

1052.4 Active regular expressions

1052.5 Comparison detail

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	sr-latn.js	Tue Dec 20 19:50:42 2016 UTC
2			Wed Feb 1 19:57:44 2017 UTC

Description	Between Files 1 and 2
Description	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.

This softw are is cov ered by CK Editor Com mercial Li cense. Usa ge without proper li cense is p rohibited.

Copyright (c) 2003-2 015, CKSou rce - Fred erico Knab ben. All r ights rese rved.

CKEDITOR.l ang['sr-la tn']={"und o":{"redo" :"Ponovi a kciju","un do":"Poni� ti akciju" },"toolbar ":{"toolba rCollapse" :"Suzi ala tnu traku" ,"toolbarE xpand":"Pr oširi alat nu traku", "toolbarGr oups":{"do cument":"D ocument"," clipboard" :"Clipboar d/Undo","e diting":"E diting","f orms":"For ms","basic styles":"B asic Style s","paragr aph":"Para graph","li nks":"Link s","insert ":"Insert" ,"styles": "Styles"," colors":"C olors","to ols":"Tool s"},"toolb ars":"Alat ne trake"} ,"template s":{"butto n":"Obrasc i","emptyL istMsg":"( Nema defin isanih obr azaca)","i nsertOptio n":"Replac e actual c ontents"," options":" Template O ptions","s electPromp tMsg":"Mol imo Vas da odaberete obrazac k oji ce bit i primenje n na stran icu (trenu tni sadrža j ce biti obrisan):" ,"title":" Obrasci za sadržaj"} ,"table":{ "border":" Veličina o kvira","ca ption":"Na slov tabel e","cell": {"menu":"C ell","inse rtBefore": "Insert Ce ll Before" ,"insertAf ter":"Inse rt Cell Af ter","dele teCell":"O briši ćeli je","merge ":"Spoj ce 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":" Razmak ćel ija","cell Space":"Će lijski pro stor","col umn":{"men u":"Column ","insertB efore":"In sert Colum n Before", "insertAft er":"Inser t Column A fter","del eteColumn" :"Obriši k olone"},"c olumns":"K olona","de leteTable" :"Izbriši tabelu","h eaders":"Z aglavlja", "headersBo th":"Oba", "headersCo lumn":"Prv a kolona", "headersNo ne":"None" ,"headersR ow":"Prvi red","inva lidBorder" :"Veličina okvira mo ra biti br oj.","inva lidCellPad ding":"Pad ding polja mora biti pozitivan broj.","i nvalidCell Spacing":" Razmak izm eđu ćelija mora biti pozitivan broj.","i nvalidCols ":"Broj ko lona mora biti broj veći od 0. ","invalid Height":"V isina tabe le mora bi ti broj.", "invalidRo ws":"Broj redova mor a biti već i od 0."," invalidWid th":"Širin a tabele m ora biti b roj.","men u":"Osobin e tabele", "row":{"me nu":"Row", "insertBef ore":"Inse rt Row Bef ore","inse rtAfter":" Insert Row After","d eleteRow": "Obriši re dove"},"ro ws":"Redov a","summar y":"Sažeta k","title" :"Osobine tabele","t oolbar":"T abela","wi dthPc":"pr ocenata"," widthPx":" piksela"," widthUnit" :"jedinica za širinu "},"styles combo":{"l abel":"Sti l","panelT itle":"For matting St yles","pan elTitle1": "Block Sty les","pane lTitle2":" Inline Sty les","pane lTitle3":" Object Sty les"},"spe cialchar": {"options" :"Special Character Options"," title":"Od aberite sp ecijalni k arakter"," toolbar":" Unesi spec ijalni kar akter"},"s ourcearea" :{"toolbar ":"Kôd"}," smiley":{" options":" Smiley Opt ions","tit le":"Unesi smajlija" ,"toolbar" :"Smajli"} ,"showbloc ks":{"tool bar":"Show Blocks"}, "selectall ":{"toolba r":"Označi sve"},"sa ve":{"tool bar":"Saču vaj"},"rem oveformat" :{"toolbar ":"Ukloni formatiran je"},"prin t":{"toolb ar":"Štamp a"},"previ ew":{"prev iew":"Izgl ed stranic e"},"paste text":{"bu tton":"Zal epi kao či st tekst", "title":"Z alepi kao čist 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 lepi iz Wo rda","tool bar":"Zale pi iz Word a"},"pageb reak":{"al t":"Page B reak","too lbar":"Ins ert Page B reak for P rinting"}, "newpage": {"toolbar" :"Nova str anica"},"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":"Ne nabrojiva lista","nu mberedlist ":"Nabroji va lista"} ,"link":{" acccessKey ":"Pristup ni taster" ,"advanced ":"Napredn i tagovi", "advisoryC ontentType ":"Advisor y vrsta sa držaja","a dvisoryTit le":"Advis ory naslov ","anchor" :{"toolbar ":"Unesi/i zmeni sidr o","menu": "Osobine s idra","tit le":"Osobi ne sidra", "name":"Na ziv sidra" ,"errorNam e":"Unesit e naziv si dra","remo ve":"Uklon i sidro"}, "anchorId" :"Po Id-u elementa", "anchorNam e":"Po naz ivu sidra" ,"charset" :"Linked R esource Ch arset","cs sClasses": "Styleshee t klase"," emailAddre ss":"E-Mai l adresa", "emailBody ":"Sadržaj poruke"," emailSubje ct":"Naslo v","id":"I d","info": "Link Info ","langCod e":"Smer j ezika","la ngDir":"Sm er jezika" ,"langDirL TR":"S lev a na desno (LTR)","l angDirRTL" :"S desna na levo (R TL)","menu ":"Izmeni link","nam e":"Naziv" ,"noAnchor s":"(Nema dostupnih sidra)","n oEmail":"O tkucajte a dresu elek tronske po te","noUrl ":"Unesite URL linka ","other": "<остало>" ,"popupDep endent":"Z avisno (Ne tscape)"," popupFeatu res":"Mogu ćnosti pop up prozora ","popupFu llScreen": "Prikaz pr eko celog ekrana (IE )","popupL eft":"Od l eve ivice ekrana (px )","popupL ocationBar ":"Lokacij a","popupM enuBar":"K ontekstni meni","pop upResizabl e":"Promen ljive veli čine","pop upScrollBa rs":"Scrol l bar","po pupStatusB ar":"Statu sna linija ","popupTo olbar":"To olbar","po pupTop":"O d vrha ekr ana (px)", "rel":"Odn os","selec tAnchor":" Odaberi si dro","styl es":"Stil" ,"tabIndex ":"Tab ind eks","targ et":"Meta" ,"targetFr ame":"<okv ir>","targ etFrameNam e":"Naziv odredišnog frejma"," targetPopu p":"<popup prozor>", "targetPop upName":"N aziv popup prozora", "title":"L ink","toAn chor":"Sid ro na ovoj stranici" ,"toEmail" :"E-Mail", "toUrl":"U RL","toolb ar":"Unesi /izmeni li nk","type" :"Vrsta li nka","unli nk":"Uklon i link","u pload":"Po šalji"},"j ustify":{" block":"Ob ostrano ra vnanje","c enter":"Ce ntriran te kst","left ":"Levo ra vnanje","r ight":"Des no ravnanj e"},"inden t":{"inden t":"Uvećaj levu marg inu","outd ent":"Sman ji levu ma rginu"},"i mage":{"al t":"Altern ativni tek st","borde r":"Okvir" ,"btnUploa d":"Pošalj i na serve r","button 2Img":"Do you want t o transfor m the sele cted image button on a simple image?","h Space":"HS pace","img 2Button":" Do you wan t to trans form the s elected im age on a i mage butto n?","infoT ab":"Info slike","li nkTab":"Li nk","lockR atio":"Zak ljučaj odn os","menu" :"Osobine slika","re setSize":" Resetuj ve ličinu","t itle":"Oso bine slika ","titleBu tton":"Oso bine dugme ta sa slik om","uploa d":"Pošalj i","urlMis sing":"Ima ge source URL is mis sing.","vS pace":"VSp ace","vali dateBorder ":"Border must be a whole numb er.","vali dateHSpace ":"HSpace must be a whole numb er.","vali dateVSpace ":"VSpace must be a whole numb er."},"ifr ame":{"bor der":"Show frame bor der","noUr l":"Please type the iframe URL ","scrolli ng":"Enabl e scrollba rs","title ":"IFrame Properties ","toolbar ":"IFrame" },"horizon talrule":{ "toolbar": "Unesi hor izontalnu liniju"}," forms":{"b utton":{"t itle":"Oso bine dugme ta","text" :"Tekst (v rednost)", "type":"Ti p","typeBt n":"Button ","typeSbm ":"Submit" ,"typeRst" :"Reset"}, "checkboxA ndRadio":{ "checkboxT itle":"Oso bine polja za potvrd u","radioT itle":"Oso bine radio -dugmeta", "value":"V rednost"," selected": "Označeno" ,"required ":"Require d"},"form" :{"title": "Osobine f orme","men u":"Osobin e forme"," action":"A kcija","me thod":"Met oda","enco ding":"Enc oding"},"h idden":{"t itle":"Oso bine skriv enog polja ","name":" Naziv","va lue":"Vred nost"},"se lect":{"ti tle":"Osob ine izborn og polja", "selectInf o":"Info", "opAvail": "Dostupne opcije","v alue":"Vre dnost","si ze":"Velič ina","line s":"linija ","chkMult i":"Dozvol i višestru ku selekci ju","requi red":"Requ ired","opT ext":"Teks t","opValu e":"Vredno st","btnAd d":"Dodaj" ,"btnModif y":"Izmeni ","btnUp": "Gore","bt nDown":"Do le","btnSe tValue":"P odesi kao označenu v rednost"," btnDelete" :"Obriši"} ,"textarea ":{"title" :"Osobine zone tekst a","cols": "Broj kolo na","rows" :"Broj red ova"},"tex tfield":{" title":"Os obine teks tualnog po lja","name ":"Naziv", "value":"V rednost"," charWidth" :"Širina ( karaktera) ","maxChar s":"Maksim alno karak tera","req uired":"Re quired","t ype":"Tip" ,"typeText ":"Tekst", "typePass" :"Lozinka" ,"typeEmai l":"Email" ,"typeSear ch":"Pretr aži","type Tel":"Broj telefona" ,"typeUrl" :"URL"}}," format":{" label":"Fo rmat","pan elTitle":" Format","t ag_address ":"Adresa" ,"tag_div" :"Normalno (DIV)","t ag_h1":"Na slov 1","t ag_h2":"Na slov 2","t ag_h3":"Na slov 3","t ag_h4":"Na slov 4","t ag_h5":"Na slov 5","t ag_h6":"Na slov 6","t ag_p":"Nor mal","tag_ pre":"Form atirano"}, "font":{"f ontSize":{ "label":"V eličina fo nta","voic eLabel":"F ont Size", "panelTitl e":"Veliči na fonta"} ,"label":" Font","pan elTitle":" Font","voi ceLabel":" Font"},"fl ash":{"acc ess":"Scri pt Access" ,"accessAl ways":"Alw ays","acce ssNever":" Never","ac cessSameDo main":"Sam e domain", "alignAbsB ottom":"Ab s dole","a lignAbsMid dle":"Abs sredina"," alignBasel ine":"Bazn o","alignT extTop":"V rh teksta" ,"bgcolor" :"Boja poz adine","ch kFull":"Al low Fullsc reen","chk Loop":"Pon avljaj","c hkMenu":"U ključi fle š meni","c hkPlay":"A utomatski start","fl ashvars":" Variables for Flash" ,"hSpace": "HSpace"," properties ":"Osobine fleša","p ropertiesT ab":"Prope rties","qu ality":"Qu ality","qu alityAutoH igh":"Auto High","qu alityAutoL ow":"Auto Low","qual ityBest":" Best","qua lityHigh": "High","qu alityLow": "Low","qua lityMedium ":"Medium" ,"scale":" Skaliraj", "scaleAll" :"Prikaži sve","scal eFit":"Pop uni površi nu","scale NoBorder": "Bez ivice ","title": "Osobine f leša","vSp ace":"VSpa ce","valid ateHSpace" :"HSpace m ust be a n umber.","v alidateSrc ":"Unesite URL linka ","validat eVSpace":" VSpace mus t be a num ber.","win dowMode":" Window mod e","window ModeOpaque ":"Opaque" ,"windowMo deTranspar ent":"Tran sparent"," windowMode Window":"W indow"},"f ind":{"fin d":"Pretra ga","findO ptions":"F ind Option s","findWh at":"Prona di:","matc hCase":"Ra zlikuj mal a i velika slova","m atchCyclic ":"Match c yclic","ma tchWord":" Uporedi ce le reci"," notFoundMs g":"Tražen i tekst ni je pronađe n.","repla ce":"Zamen a","replac eAll":"Zam eni sve"," replaceSuc cessMsg":" %1 occurre nce(s) rep laced.","r eplaceWith ":"Zameni sa:","titl e":"Find a nd Replace "},"fakeob jects":{"a nchor":"Un esi/izmeni sidro","f lash":"Fla sh Animati on","hidde nfield":"S kriveno po lje","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 naslov", "cssClassI nputLabel" :"Styleshe et klase", "edit":"Ed it Div","i nlineStyle InputLabel ":"Inline Style","la ngDirLTRLa bel":"S le va na desn o (LTR)"," langDirLab el":"Smer jezika","l angDirRTLL abel":"S d esna na le vo (RTL)", "languageC odeInputLa bel":" Lan guage Code ","remove" :"Remove D iv","style SelectLabe l":"Stil", "title":"C reate Div Container" ,"toolbar" :"Create D iv Contain er"},"cont extmenu":{ "options": "Context M enu Option s"},"color dialog":{" clear":"Cl ear","high light":"Hi ghlight"," options":" Color Opti ons","sele cted":"Sel ected Colo r","title" :"Select c olor"},"co lorbutton" :{"auto":" Automatski ","bgColor Title":"Bo ja pozadin e","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":"V iše boja.. .","panelT itle":"Col ors","text ColorTitle ":"Boja te ksta"},"cl ipboard":{ "copy":"Ko piraj","co pyError":" Sigurnosna podešavan ja Vašeg p retraživač a ne dozvo ljavaju op eracije au tomatskog kopiranja teksta. Mo limo Vas d a koristit e prečicu sa tastatu re (Ctrl/C md+C).","c ut":"Iseci ","cutErro r":"Sigurn osna podeš avanja Vaš eg pretraž ivača ne d ozvoljavaj u operacij e automats kog isecan ja teksta. Molimo Va s da koris tite preči cu sa tast ature (Ctr l/Cmd+X)." ,"paste":" Zalepi","p asteArea": "Prostor z a lepljenj e","pasteM sg":"Molim o Vas da z alepite un utar donje povrine k oristeći t astaturnu prečicu (< STRONG>Ctr l/Cmd+V</S TRONG>) i da pritisn ete <STRON G>OK</STRO NG>.","sec urityMsg": "Zbog sigu rnosnih po stavki vaš eg pregled ača, edito r nije u m ogućnosti da direktn o pristupi podacima u klipbord u. Potrebn o je da za lepite još jednom u ovom prozo ru.","titl e":"Zalepi "},"button ":{"select edLabel":" %1 (Select ed)"},"blo ckquote":{ "toolbar": "Block Quo te"},"bidi ":{"ltr":" Text direc tion from left to ri ght","rtl" :"Text dir ection fro m right to left"},"b asicstyles ":{"bold": "Podebljan o","italic ":"Kurziv" ,"strike": "Precrtano ","subscri pt":"Indek s","supers cript":"St epen","und erline":"P odvučeno"} ,"about":{ "copy":"Co pyright &c opy; $1. A ll rights reserved." ,"dlgTitle ":"About C KEditor"," help":"Che ck $1 for help.","mo reInfo":"F or licensi ng informa tion pleas e visit ou r web site :","title" :"About CK Editor","u serGuide": "CKEditor User's Gui de"},"edit or":"Bogat i uređivač teksta"," editorPane l":"Rich T ext Editor panel","c ommon":{"e ditorHelp" :"Press AL T 0 for he lp","brows eServer":" Pretraži s erver","ur l":"URL"," protocol": "Protokol" ,"upload": "Pošalji", "uploadSub mit":"Poša lji na ser ver","imag e":"Slika" ,"flash":" Fleš","for m":"Forma" ,"checkbox ":"Polje z a potvrdu" ,"radio":" Radio-dugm e","textFi eld":"Teks tualno pol je","texta rea":"Zona teksta"," hiddenFiel d":"Skrive no polje", "button":" Dugme","se lect":"Izb orno polje ","imageBu tton":"Dug me sa slik om","notSe t":"<nije postavljen o>","id":" Id","name" :"Naziv"," langDir":" Smer jezik a","langDi rLtr":"S l eva na des no (LTR)", "langDirRt l":"S desn a na levo (RTL)","la ngCode":"K ôd jezika" ,"longDesc r":"Pun op is URL","c ssClass":" Stylesheet klase","a dvisoryTit le":"Advis ory naslov ","cssStyl e":"Stil", "ok":"OK", "cancel":" Otkaži","c lose":"Zat vori","pre view":"Izg led strani ce","resiz e":"Resize ","general Tab":"Opšt e","advanc edTab":"Na predni tag ovi","vali dateNumber Failed":"O va vrednos t nije bro j.","confi rmNewPage" :"Nesačuva ne promene ovog sadr žaja će bi ti izgublj ene. Jeste li sigurn i da želit a da učita te novu st ranu?","co nfirmCance l":"You ha ve changed some opti ons. Are y ou sure yo u want to close the dialog win dow?","opt ions":"Opc ije","targ et":"Meta" ,"targetNe w":"Novi p rozor (_bl ank)","tar getTop":"T opmost Win dow (_top) ","targetS elf":"Isti prozor (_ self)","ta rgetParent ":"Parent Window (_p arent)","l angDirLTR" :"S leva n a desno (L TR)","lang DirRTL":"S desna na levo (RTL) ","styles" :"Stil","c ssClasses" :"Styleshe et klase", "width":"Š irina","he ight":"Vis ina","alig n":"Ravnan je","align Left":"Lev o","alignR ight":"Des no","align Center":"S redina","a lignJustif y":"Obostr ano ravnan je","align Top":"Vrh" ,"alignMid dle":"Sred ina","alig nBottom":" Dole","ali gnNone":"N one","inva lidValue": "Invalid v alue.","in validHeigh t":"Visina mora biti broj.","i nvalidWidt h":"Širina mora biti broj.","i nvalidCssL ength":"Va lue specif ied for th e \"%1\" f ield must be a posit ive number with or w ithout a v alid CSS m easurement unit (px, %, in, cm , mm, em, ex, pt, or pc).","in validHtmlL ength":"Va lue specif ied for th e \"%1\" f ield must be a posit ive number with or w ithout a v alid HTML measuremen t unit (px or %)."," invalidInl ineStyle": "Value spe cified for the inlin e style mu st consist of one or more tupl es with th e format o f \"name : value\", separated by semi-co lons.","cs sLengthToo ltip":"Ent er a numbe r for a va lue in pix els or a n umber with a valid C SS unit (p x, %, in, cm, mm, em , ex, pt, or pc)."," unavailabl e":"%1<spa n class=\" cke_access ibility\"> , unavaila ble</span> "}};