997. Araxis Merge File Comparison Report

997.1 Files compared

997.2 Comparison summary

997.3 Comparison options

997.4 Active regular expressions

997.5 Comparison detail

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.

#	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	af.js	Tue Dec 20 19:50:43 2016 UTC
2			Wed Feb 1 19:57:43 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['af']= {"undo":{" redo":"Oor doen","und o":"Ontdoe n"},"toolb ar":{"tool barCollaps e":"Verkle in werkbal k","toolba rExpand":" Vergroot w erkbalk"," toolbarGro ups":{"doc ument":"Do kument","c lipboard": "Knipbord/ Undo","edi ting":"Ver ander","fo rms":"Vorm s","basics tyles":"Ee nvoudige S tyl","para graph":"Pa ragraaf"," links":"Sk akels","in sert":"Toe voeg","sty les":"Styl e","colors ":"Kleure" ,"tools":" Gereedskap "},"toolba rs":"Werkb alke"},"te mplates":{ "button":" Sjablone", "emptyList Msg":"(Gee n sjablone gedefinee r nie)","i nsertOptio n":"Vervan g huidige inhoud","o ptions":"S jabloon op sies","sel ectPromptM sg":"Kies die sjablo on om te g ebruik in die redige erder (hui dige inhou d gaan ver lore):","t itle":"Inh oud Sjablo ne"},"tabl e":{"borde r":"Randbr eedte","ca ption":"Na am","cell" :{"menu":" Sel","inse rtBefore": "Voeg sel in voor"," insertAfte r":"Voeg s el in na", "deleteCel l":"Verwyd er sel","m erge":"Voe g selle sa am","merge Right":"Vo eg saam na regs","me rgeDown":" Voeg saam ondertoe", "splitHori zontal":"S plits sel horisontaa l","splitV ertical":" Splits sel vertikaal ","title": "Sel eiens kappe","ce llType":"S el tipe"," rowSpan":" Omspan rye ","colSpan ":"Omspan kolomme"," wordWrap": "Woord ter ugloop","h Align":"Ho risontale oplyning", "vAlign":" Vertikale oplyning", "alignBase line":"Bas islyn","bg Color":"Ag tergrondkl eur","bord erColor":" Randkleur" ,"data":"I nhoud","he ader":"Ops krif","yes ":"Ja","no ":"Nee","i nvalidWidt h":"Selbre edte moet 'n getal w ees.","inv alidHeight ":"Selhoog te moet 'n getal wee s.","inval idRowSpan" :"Omspan r ye moet 'n heelgetal wees.","i nvalidColS pan":"Omsp an kolomme moet 'n h eelgetal w ees.","cho oseColor": "Kies"},"c ellPad":"S el-spasie" ,"cellSpac e":"Sel-af stand","co lumn":{"me nu":"Kolom ","insertB efore":"Vo eg kolom i n voor","i nsertAfter ":"Voeg ko lom in na" ,"deleteCo lumn":"Ver wyder kolo m"},"colum ns":"Kolom me","delet eTable":"V erwyder ta bel","head ers":"Opsk rifte","he adersBoth" :"Beide ","header sColumn":" Eerste kol om","heade rsNone":"G een","head ersRow":"E erste ry", "invalidBo rder":"Ran dbreedte m oet 'n get al wees.", "invalidCe llPadding" :"Sel-spas ie moet 'n getal wee s.","inval idCellSpac ing":"Sel- afstand mo et 'n geta l wees."," invalidCol s":"Aantal kolomme m oet 'n get al groter as 0 wees. ","invalid Height":"T abelhoogte moet 'n g etal wees. ","invalid Rows":"Aan tal rye mo et 'n geta l groter a s 0 wees." ,"invalidW idth":"Tab elbreedte moet 'n ge tal wees." ,"menu":"T abel eiens kappe","ro w":{"menu" :"Ry","ins ertBefore" :"Voeg ry in voor"," insertAfte r":"Voeg r y in na"," deleteRow" :"Verwyder ry"},"row s":"Rye"," summary":" Opsomming" ,"title":" Tabel eien skappe","t oolbar":"T abel","wid thPc":"per sent","wid thPx":"pik sels","wid thUnit":"b reedte-een heid"},"st ylescombo" :{"label": "Styl","pa nelTitle": "Vormaat s tyle","pan elTitle1": "Blok styl e","panelT itle2":"In lyn style" ,"panelTit le3":"Obje k style"}, "specialch ar":{"opti ons":"Spes iale karak ter-opsies ","title": "Kies spes iale karak ter","tool bar":"Voeg spesiaale karakter in"},"sour cearea":{" toolbar":" Bron"},"sm iley":{"op tions":"La gbekkie op sies","tit le":"Voeg lagbekkie by","toolb ar":"Lagbe kkie"},"sh owblocks": {"toolbar" :"Toon blo kke"},"sel ectall":{" toolbar":" Selekteer alles"},"s ave":{"too lbar":"Bew aar"},"rem oveformat" :{"toolbar ":"Verwyde r opmaak"} ,"print":{ "toolbar": "Druk"},"p review":{" preview":" Voorbeeld" },"pastete xt":{"butt on":"Plak as eenvoud ige teks", "title":"P lak as een voudige te ks"},"past efromword" :{"confirm Cleanup":" Die teks w at u wil p lak lyk as of dit uit Word geko piëer is. Wil u dit eers skoon maak voord at dit gep lak word?" ,"error":" Die geplak te teks ko n nie skoo ngemaak wo rd nie, we ens 'n int erne fout" ,"title":" Plak vanui t Word","t oolbar":"P lak vanuit Word"},"p agebreak": {"alt":"Bl adsy-einde ","toolbar ":"Bladsy- einde invo eg"},"newp age":{"too lbar":"Nuw e bladsy"} ,"maximize ":{"maximi ze":"Maksi maliseer", "minimize" :"Minimali seer"},"ma gicline":{ "title":"V oeg paragr aaf hier i n"},"lists tyle":{"ar menian":"A rmeense no mmering"," bulletedTi tle":"Eien skappe van ongenomme rde lys"," circle":"S irkel","de cimal":"De simale syf ers (1, 2, 3, ens.)" ,"decimalL eadingZero ":"Desimal e syfers m et voorloo pnul (01, 02, 03, en s.)","disc ":"Skyf"," georgian": "Georgiese nommering (an, ban, gan, ens. )","lowerA lpha":"Kle inletters (a, b, c, d, e, ens. )","lowerG reek":"Gri ekse klein letters (a lpha, beta , gamma, e ns.)","low erRoman":" Romeinse k leinletter s (i, ii, iii, iv, v , ens.)"," none":"Gee n","notset ":"<nie in gestel nie >","number edTitle":" Eienskappe van genom merde lys" ,"square": "Vierkant" ,"start":" Begin","ty pe":"Tipe" ,"upperAlp ha":"Hoofl etters (A, B, C, D, E, ens.)", "upperRoma n":"Romein se hooflet ters (I, I I, III, IV , V, ens.) ","validat eStartNumb er":"Begin nommer van lys moet 'n heelget al wees."} ,"list":{" bulletedli st":"Ongen ommerde ly s","number edlist":"G enommerde lys"},"lin k":{"accce ssKey":"To egangsleut el","advan ced":"Gevo rderd","ad visoryCont entType":" Aanbevole inhoudstip e","adviso ryTitle":" Aanbevole titel","an chor":{"to olbar":"An ker byvoeg /verander" ,"menu":"A nker-eiens kappe","ti tle":"Anke r-eienskap pe","name" :"Ankernaa m","errorN ame":"Volt ooi die an kernaam as seblief"," remove":"R emove Anch or"},"anch orId":"Op element Id ","anchorN ame":"Op a nkernaam", "charset": "Karakters tel van ge skakelde b ron","cssC lasses":"C SS klasse" ,"emailAdd ress":"E-p osadres"," emailBody" :"Berig-in houd","ema ilSubject" :"Berig-on derwerp"," id":"Id"," info":"Ska kel inform asie","lan gCode":"Ta alkode","l angDir":"S kryfrigtin g","langDi rLTR":"Lin ks na regs (LTR)","l angDirRTL" :"Regs na links (RTL )","menu": "Wysig ska kel","name ":"Naam"," noAnchors" :"(Geen an kers beski kbaar in d okument)", "noEmail": "Gee die e -posadres" ,"noUrl":" Gee die sk akel se UR L","other" :"<ander>" ,"popupDep endent":"A fhanklik ( Netscape)" ,"popupFea tures":"Ei enskappe v an opsprin gvenster", "popupFull Screen":"V olskerm (I E)","popup Left":"Pos isie links ","popupLo cationBar" :"Adresbal k","popupM enuBar":"S pyskaartba lk","popup Resizable" :"Herskaal baar","pop upScrollBa rs":"Skuif balke","po pupStatusB ar":"Statu sbalk","po pupToolbar ":"Werkbal k","popupT op":"Posis ie bo","re l":"Relati onship","s electAncho r":"Kies ' n anker"," styles":"S tyl","tabI ndex":"Tab indeks"," target":"D oel","targ etFrame":" <raam>","t argetFrame Name":"Naa m van doel raam","tar getPopup": "<opspring venster>", "targetPop upName":"N aam van op springvens ter","titl e":"Skakel ","toAncho r":"Anker in bladsy" ,"toEmail" :"E-pos"," toUrl":"UR L","toolba r":"Skakel invoeg/wy sig","type ":"Skakels oort","unl ink":"Verw yder skake l","upload ":"Oplaai" },"justify ":{"block" :"Uitvul", "center":" Sentreer", "left":"Li nks oplyn" ,"right":" Regs oplyn "},"indent ":{"indent ":"Vergroo t inspring ","outdent ":"Verklei n inspring "},"image" :{"alt":"A lternatiew e teks","b order":"Ra nd","btnUp load":"Stu ur na bedi ener","but ton2Img":" Wil u die geselektee rde afbeel dingsknop vervang me t 'n eenvo udige afbe elding?"," hSpace":"H Spasie","i mg2Button" :"Wil u di e geselekt eerde afbe elding ver vang met ' n afbeeldi ngsknop?", "infoTab": "Afbeeldin g informas ie","linkT ab":"Skake l","lockRa tio":"Vast e proporsi e","menu": "Afbeeldin g eienskap pe","reset Size":"Her stel groot te","title ":"Afbeeld ing eiensk appe","tit leButton": "Afbeeldin gsknop eie nskappe"," upload":"O plaai","ur lMissing": "Die URL n a die afbe elding ont breek.","v Space":"VS pasie","va lidateBord er":"Rand moet 'n he elgetal we es.","vali dateHSpace ":"HSpasie moet 'n h eelgetal w ees.","val idateVSpac e":"VSpasi e moet 'n heelgetal wees."},"i frame":{"b order":"Wy s rand van raam","no Url":"Gee die iframe URL","scr olling":"S kuifbalke aan","titl e":"IFrame Eienskapp e","toolba r":"IFrame "},"horizo ntalrule": {"toolbar" :"Horisont ale lyn in voeg"},"fo rms":{"but ton":{"tit le":"Knop eienskappe ","text":" Teks (Waar de)","type ":"Soort", "typeBtn": "Knop","ty peSbm":"St uur","type Rst":"Maak leeg"},"c heckboxAnd Radio":{"c heckboxTit le":"Merkh okkie eien skappe","r adioTitle" :"Radiokno ppie eiens kappe","va lue":"Waar de","selec ted":"Gese lekteer"," required": "Required" },"form":{ "title":"V orm eiensk appe","men u":"Vorm e ienskappe" ,"action": "Aksie","m ethod":"Me tode","enc oding":"Ko dering"}," hidden":{" title":"Ve rborge vel d eienskap pe","name" :"Naam","v alue":"Waa rde"},"sel ect":{"tit le":"Keuse veld eiens kappe","se lectInfo": "Info","op Avail":"Be skikbare o psies","va lue":"Waar de","size" :"Grootte" ,"lines":" Lyne","chk Multi":"La at meer as een keuse toe","req uired":"Re quired","o pText":"Te ks","opVal ue":"Waard e","btnAdd ":"Byvoeg" ,"btnModif y":"Wysig" ,"btnUp":" Op","btnDo wn":"Af"," btnSetValu e":"Stel a s geselekt eerde waar de","btnDe lete":"Ver wyder"},"t extarea":{ "title":"T eks-area e ienskappe" ,"cols":"K olomme","r ows":"Rye" },"textfie ld":{"titl e":"Teksve ld eienska ppe","name ":"Naam"," value":"Wa arde","cha rWidth":"B reedte (ka rakters)", "maxChars" :"Maksimum karakters ","require d":"Requir ed","type" :"Soort"," typeText": "Teks","ty pePass":"W agwoord"," typeEmail" :"Email"," typeSearch ":"Search" ,"typeTel" :"Telephon e Number", "typeUrl": "URL"}},"f ormat":{"l abel":"Opm aak","pane lTitle":"O pmaak","ta g_address" :"Adres"," tag_div":" Normaal (D IV)","tag_ h1":"Opskr if 1","tag _h2":"Opsk rif 2","ta g_h3":"Ops krif 3","t ag_h4":"Op skrif 4"," tag_h5":"O pskrif 5", "tag_h6":" Opskrif 6" ,"tag_p":" Normaal"," tag_pre":" Opgemaak"} ,"font":{" fontSize": {"label":" Grootte"," voiceLabel ":"Fontgro otte","pan elTitle":" Fontgroott e"},"label ":"Font"," panelTitle ":"Fontnaa m","voiceL abel":"Fon t"},"flash ":{"access ":"Skrip t oegang","a ccessAlway s":"Altyd" ,"accessNe ver":"Nooi t","access SameDomain ":"Selfde domeinnaam ","alignAb sBottom":" Absoluut-o nder","ali gnAbsMiddl e":"Absolu ut-middel" ,"alignBas eline":"Ba sislyn","a lignTextTo p":"Teks b o","bgcolo r":"Agterg rondkleur" ,"chkFull" :"Laat vol ledige ske rm toe","c hkLoop":"H erhaal","c hkMenu":"F lash spysk aart aan", "chkPlay": "Speel out omaties"," flashvars" :"Verander likes vir Flash","hS pace":"HSp asie","pro perties":" Flash eien skappe","p ropertiesT ab":"Eiens kappe","qu ality":"Kw aliteit"," qualityAut oHigh":"Ou tomaties h oog","qual ityAutoLow ":"Outomat ies laag", "qualityBe st":"Beste ","quality High":"Hoo g","qualit yLow":"Laa g","qualit yMedium":" Gemiddeld" ,"scale":" Skaal","sc aleAll":"W ys alles", "scaleFit" :"Presiese pas","sca leNoBorder ":"Geen ra nd","title ":"Flash e ienskappe" ,"vSpace": "VSpasie", "validateH Space":"HS pasie moet 'n heelge tal wees." ,"validate Src":"Voeg die URL i n","valida teVSpace": "VSpasie m oet 'n hee lgetal wee s.","windo wMode":"Ve nster modu s","window ModeOpaque ":"Ondeurs igtig","wi ndowModeTr ansparent" :"Deursigt ig","windo wModeWindo w":"Venste r"},"find" :{"find":" Soek","fin dOptions": "Find Opti ons","find What":"Soe k na:","ma tchCase":" Hoof/klein letter sen sitief","m atchCyclic ":"Soek de urlopend", "matchWord ":"Hele wo ord moet v oorkom","n otFoundMsg ":"Teks ni e gevind n ie.","repl ace":"Verv ang","repl aceAll":"V ervang all es","repla ceSuccessM sg":"%1 vo orkoms(te) vervang." ,"replaceW ith":"Verv ang met:", "title":"S oek en ver vang"},"fa keobjects" :{"anchor" :"Anker"," flash":"Fl ash animas ie","hidde nfield":"V erborge ve ld","ifram e":"IFrame ","unknown ":"Onbeken de objek"} ,"elements path":{"el eLabel":"E lemente-pa d","eleTit le":"%1 el ement"},"d iv":{"IdIn putLabel": "Id","advi soryTitleI nputLabel" :"Aanbevol e Titel"," cssClassIn putLabel": "CSS klass e","edit": "Wysig Div ","inlineS tyleInputL abel":"Inl yn Styl"," langDirLTR Label":"Li nks na reg s (LTR)"," langDirLab el":"Skryf rigting"," langDirRTL Label":"Re gs na link s (RTL)"," languageCo deInputLab el":" Taal kode","rem ove":"Verw yder Div", "styleSele ctLabel":" Styl","tit le":"Skep Div houer" ,"toolbar" :"Skep Div houer"}," contextmen u":{"optio ns":"Konte ks Spyskaa rt-opsies" },"colordi alog":{"cl ear":"Hers tel","high light":"Ak tief","opt ions":"Kle uropsies", "selected" :"Geselekt eer","titl e":"Kies k leur"},"co lorbutton" :{"auto":" Outomaties ","bgColor Title":"Ag tergrondkl eur","colo rs":{"000" :"Swart"," 800000":"M eroen","8B 4513":"Sjo koladebrui n","2F4F4F ":"Donkerl eisteengry s","008080 ":"Blougro en","00008 0":"Vlootb lou","4B00 82":"Indig o","696969 ":"Donkerg rys","B222 22":"Rooib aksteen"," A52A2A":"B ruin","DAA 520":"Donk ergeel","0 06400":"Do nkergroen" ,"40E0D0": "Turkoois" ,"0000CD": "Middelblo u","800080 ":"Pers"," 808080":"G rys","F00" :"Rooi","F F8C00":"Do nkeroranje ","FFD700" :"Goud","0 08000":"Gr oen","0FF" :"Siaan"," 00F":"Blou ","EE82EE" :"Viooltji eblou","A9 A9A9":"Don kergrys"," FFA07A":"L igsalm","F FA500":"Or anje","FFF F00":"Geel ","00FF00" :"Lemmetji e","AFEEEE ":"Ligturk oois","ADD 8E6":"Ligb lou","DDA0 DD":"Pruim ","D3D3D3" :"Liggrys" ,"FFF0F5": "Linne","F AEBD7":"Iv oor","FFFF E0":"Ligge el","F0FFF 0":"Heunin gdou","F0F FFF":"Asuu r","F0F8FF ":"Ligte h emelsblou" ,"E6E6FA": "Laventel" ,"FFF":"Wi t"},"more" :"Meer Kle ure...","p anelTitle" :"Kleure", "textColor Title":"Te kskleur"}, "clipboard ":{"copy": "Kopiëer", "copyError ":"U blaai er se seku riteitsins telling be let die ko piëringsak sie. Gebru ik die sle utelbordko mbinasie ( Ctrl/Cmd+C ).","cut": "Knip","cu tError":"U blaaier s e sekurite itsinstell ing belet die outoma tiese knip -aksie. Ge bruik die sleutelbor dkombinasi e (Ctrl/Cm d+X).","pa ste":"Plak ","pasteAr ea":"Plak- area","pas teMsg":"Pl ak die tek s in die v olgende te ks-area me t die sleu telbordkom binasie (< STRONG>Ctr l/Cmd+V</S TRONG>) en druk <STR ONG>OK</ST RONG>.","s ecurityMsg ":"Weens u blaaier s e sekurite itsinstell ing is dat a op die k nipbord ni e toegankl ik nie. U kan dit ee rs weer in hierdie v enster pla k.","title ":"Byvoeg" },"button" :{"selecte dLabel":"% 1 uitgekie s"},"block quote":{"t oolbar":"S itaatblok" },"bidi":{ "ltr":"Skr yfrigting van links na regs"," rtl":"Skry frigting v an regs na links"}," basicstyle s":{"bold" :"Vet","it alic":"Sku ins","stri ke":"Deurg estreep"," subscript" :"Onderskr if","super script":"B o-skrif"," underline" :"Onderstr eep"},"abo ut":{"copy ":"Kopiere g © $ 1. Alle re gte voorbe hou.","dlg Title":"Me er oor CKE ditor","he lp":"Slaan $1 na vir hulp.","m oreInfo":" Vir lisens ie-informa sie, besoe k asb. ons webwerf:" ,"title":" Meer oor C KEditor"," userGuide" :"CKEditor Gebruiker s gits"}," editor":"W oordverwer ker","edit orPanel":" Woordverwe rkerpaneel ","common" :{"editorH elp":"Druk op ALT 0 vir hulp", "browseSer ver":"Blaa i op bedie ner","url" :"URL","pr otocol":"P rotokol"," upload":"O plaai","up loadSubmit ":"Stuur a an die bed iener","im age":"Beel d","flash" :"Flash"," form":"Vor m","checkb ox":"Merkh okkie","ra dio":"Radi oknoppie", "textField ":"Teksvel d","textar ea":"Teksa rea","hidd enField":" Versteekte veld","but ton":"Knop ","select" :"Keusevel d","imageB utton":"Be eldknop"," notSet":"< geen inste lling>","i d":"Id","n ame":"Naam ","langDir ":"Skryfri gting","la ngDirLtr": "Links na regs (LTR) ","langDir Rtl":"Regs na links (RTL)","la ngCode":"T aalkode"," longDescr" :"Lang bes krywing UR L","cssCla ss":"CSS k lasse","ad visoryTitl e":"Aanbev ole titel" ,"cssStyle ":"Styl"," ok":"OK"," cancel":"K anselleer" ,"close":" Sluit","pr eview":"Vo orbeeld"," resize":"S kalierung" ,"generalT ab":"Algem een","adva ncedTab":" Gevorderd" ,"validate NumberFail ed":"Hierd ie waarde is nie 'n nommer nie .","confir mNewPage": "Alle wysi ginge sal verlore ga an. Is jy seker dat jy 'n nuwe bladsy wi l laai?"," confirmCan cel":"Somm ige opsies is gewysi g. Is jy s eker dat j y hierdie dialoogven ster wil s luit?","op tions":"Op sies","tar get":"Teik en","targe tNew":"Nuw e venster (_blank)", "targetTop ":"Boonste venster ( _top)","ta rgetSelf": "Selfde ve nster (_se lf)","targ etParent": "Oorspronk like venst er (_paren t)","langD irLTR":"Li nks na Reg s (LTR)"," langDirRTL ":"Regs na Links (RT L)","style s":"Styl", "cssClasse s":"CSS kl asse","wid th":"Breed te","heigh t":"Hoogte ","align": "Orienteer ung","alig nLeft":"Li nks","alig nRight":"R egs","alig nCenter":" Middel","a lignJustif y":"Ewered ig","align Top":"Bo", "alignMidd le":"Midde l","alignB ottom":"On der","alig nNone":"Ge en","inval idValue":" Ongeldige waarde","i nvalidHeig ht":"Hoogt e moet 'n getal wees ","invalid Width":"Br eedte moet 'n getal wees.","in validCssLe ngth":"Die waarde vi r die \"%1 \" veld mo et 'n pose tiewe geta l wees met of sonder 'n geldig e CSS eenh eid (px, % , in, cm, mm, em, ex , pt, of p c).","inva lidHtmlLen gth":"Die waarde vir die \"%1 \" veld mo et 'n pose tiewe geta l wees met of sonder 'n geldig e HTML een heid (px o f %).","in validInlin eStyle":"O ngeldige C SS. Formaa t is een o f meer sle utel-wert paare, \"n aam : wert \" met kom mapunte ge sky.","css LengthTool tip":"Voeg 'n getal wert in pi xel in, of 'n waarde met geldi ge CSS een heid (px, %, in, cm, mm, em, e x, pt, of pc).","una vailable": "%1<span c lass=\"cke _accessibi lity\">, n ie beskikb aar nie</s pan>"}};