1028. Araxis Merge File Comparison Report

1028.1 Files compared

1028.2 Comparison summary

1028.3 Comparison options

1028.4 Active regular expressions

1028.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	is.js	Tue Dec 20 19:50:43 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['is']= {"undo":{" redo":"Hæt ta við aft urköllun", "undo":"Af turkalla"} ,"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":"S niðmát","e mptyListMs g":"(Ekker t sniðmát er skilgre int!)","in sertOption ":"Skipta út raunver ulegu inni haldi","op tions":"Te mplate Opt ions","sel ectPromptM sg":"Veldu sniðmát t il að opna í ritlinu m.<br>(Núv erandi inn ihald víku r fyrir þv í!):","tit le":"Innih aldssniðmá t"},"table ":{"border ":"Breidd ramma","ca ption":"Ti till","cel l":{"menu" :"Reitur", "insertBef ore":"Skjó ta inn rei ti fyrir a ftan","ins ertAfter": "Skjóta in n reiti fy rir framan ","deleteC ell":"Fell a reit","m erge":"Sam eina reiti ","mergeRi ght":"Same ina til hæ gri","merg eDown":"Sa meina niðu r á við"," splitHoriz ontal":"Kl júfa reit lárétt","s plitVertic al":"Kljúf a reit lóð rétt","tit le":"Cell Properties ","cellTyp e":"Cell T ype","rowS pan":"Rows Span","co lSpan":"Co lumns Span ","wordWra p":"Word W rap","hAli gn":"Horiz ontal Alig nment","vA lign":"Ver tical Alig nment","al ignBaselin e":"Baseli ne","bgCol or":"Backg round Colo r","border Color":"Bo rder Color ","data":" Data","hea der":"Head er","yes": "Yes","no" :"No","inv alidWidth" :"Cell wid th must be a number. ","invalid Height":"C ell height must be a number.", "invalidRo wSpan":"Ro ws span mu st be a wh ole number .","invali dColSpan": "Columns s pan must b e a whole number."," chooseColo r":"Choose "},"cellPa d":"Reitas pássía","c ellSpace": "Bil milli reita","c olumn":{"m enu":"Dálk ur","inser tBefore":" Skjóta inn dálki vin stra megin ","insertA fter":"Skj óta inn dá lki hægra megin","de leteColumn ":"Fella d álk"},"col umns":"Dál kar","dele teTable":" Fella töfl u","header s":"Fyrirs agnir","he adersBoth" :"Hvort tv eggja","he adersColum n":"Fyrsti dálkur"," headersNon e":"Engar" ,"headersR ow":"Fyrst a röð","in validBorde r":"Border size must be a numb er.","inva lidCellPad ding":"Cel l padding must be a positive n umber.","i nvalidCell Spacing":" Cell spaci ng must be a positiv e number." ,"invalidC ols":"Numb er of colu mns must b e a number greater t han 0.","i nvalidHeig ht":"Table height mu st be a nu mber.","in validRows" :"Number o f rows mus t be a num ber greate r than 0." ,"invalidW idth":"Tab le width m ust be a n umber.","m enu":"Eigi ndi töflu" ,"row":{"m enu":"Röð" ,"insertBe fore":"Skj óta inn rö ð fyrir of an","inser tAfter":"S kjóta inn röð fyrir neðan","de leteRow":" Eyða röð"} ,"rows":"R aðir","sum mary":"Áfr am","title ":"Eigindi töflu","t oolbar":"T afla","wid thPc":"pró sent","wid thPx":"myn deindir"," widthUnit" :"width un it"},"styl escombo":{ "label":"S tílflokkur ","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":"Vel ja tákn"," toolbar":" Setja inn merki"},"s ourcearea" :{"toolbar ":"Kóði"}, "smiley":{ "options": "Smiley Op tions","ti tle":"Velj a svip","t oolbar":"S vipur"},"s howblocks" :{"toolbar ":"Sýna bl okkir"},"s electall": {"toolbar" :"Velja al lt"},"save ":{"toolba r":"Vista" },"removef ormat":{"t oolbar":"F jarlægja s nið"},"pri nt":{"tool bar":"Pren ta"},"prev iew":{"pre view":"For skoða"},"p astetext": {"button": "Líma sem ósniðinn t exta","tit le":"Líma sem ósniði nn texta"} ,"pastefro mword":{"c onfirmClea nup":"The text you w ant to pas te seems t o be copie d from Wor d. Do you want to cl ean it bef ore pastin g?","error ":"It was not possib le to clea n up the p asted data due to an internal error","ti tle":"Líma úr Word", "toolbar": "Líma úr W ord"},"pag ebreak":{" alt":"Page Break","t oolbar":"S etja inn s íðuskil"}, "newpage": {"toolbar" :"Ný síða" },"maximiz e":{"maxim ize":"Maxi mize","min imize":"Mi nimize"}," magicline" :{"title": "Insert pa ragraph he re"},"list style":{"a rmenian":" Armenian n umbering", "bulletedT itle":"Bul leted List Propertie s","circle ":"Circle" ,"decimal" :"Decimal (1, 2, 3, etc.)","de cimalLeadi ngZero":"D ecimal lea ding zero (01, 02, 0 3, etc.)", "disc":"Di sc","georg ian":"Geor gian numbe ring (an, ban, gan, etc.)","lo werAlpha": "Lower Alp ha (a, b, c, d, e, e tc.)","low erGreek":" Lower Gree k (alpha, beta, gamm a, etc.)", "lowerRoma n":"Lower Roman (i, ii, iii, i v, v, etc. )","none": "None","no tset":"<no t set>","n umberedTit le":"Numbe red List P roperties" ,"square": "Square"," start":"St art","type ":"Type"," upperAlpha ":"Upper A lpha (A, B , C, D, E, etc.)","u pperRoman" :"Upper Ro man (I, II , III, IV, V, etc.)" ,"validate StartNumbe r":"List s tart numbe r must be a whole nu mber."},"l ist":{"bul letedlist" :"Punktali sti","numb eredlist": "Númeraður listi"}," link":{"ac ccessKey": "Skammvals hnappur"," advanced": "Tæknilegt ","advisor yContentTy pe":"Tegun d innihald s","adviso ryTitle":" Titill","a nchor":{"t oolbar":"S tofna/brey ta kaflame rki","menu ":"Eigindi kaflamerk is","title ":"Eigindi kaflamerk is","name" :"Nafn bók amerkis"," errorName" :"Sláðu in n nafn bók amerkis!", "remove":" Remove Anc hor"},"anc horId":"Ef tir auðken ni eininga r","anchor Name":"Eft ir akkeris nafni","ch arset":"Tá knróf","cs sClasses": "Stílsniðs flokkur"," emailAddre ss":"Netfa ng","email Body":"Meg inmál","em ailSubject ":"Efni"," id":"Auðke nni","info ":"Almennt ","langCod e":"Lesste fna","lang Dir":"Less tefna","la ngDirLTR": "Frá vinst ri til hæg ri (LTR)", "langDirRT L":"Frá hæ gri til vi nstri (RTL )","menu": "Breyta st iklu","nam e":"Nafn", "noAnchors ":"<Engin bókamerki á skrá>"," noEmail":" Sláðu inn netfang!", "noUrl":"S láðu inn v effang sti klunnar!", "other":"< annar>","p opupDepend ent":"Háð venslum (N etscape)", "popupFeat ures":"Eig indi spret tiglugga", "popupFull Screen":"H eilskjár ( IE)","popu pLeft":"Fj arlægð frá vinstri", "popupLoca tionBar":" Fanglína", "popupMenu Bar":"Vall ína","popu pResizable ":"Resizab le","popup ScrollBars ":"Skrunst ikur","pop upStatusBa r":"Stöðus tika","pop upToolbar" :"Verkfæra stika","po pupTop":"F jarlægð fr á efri brú n","rel":" Relationsh ip","selec tAnchor":" Veldu akke ri","style s":"Stíll" ,"tabIndex ":"Raðnúme r innslátt arreits"," target":"M ark","targ etFrame":" <rammi>"," targetFram eName":"Na fn markglu gga","targ etPopup":" <sprettigl uggi>","ta rgetPopupN ame":"Nafn sprettigl ugga","tit le":"Stikl a","toAnch or":"Bókam erki á þes sari síðu" ,"toEmail" :"Netfang" ,"toUrl":" Vefslóð"," toolbar":" Stofna/bre yta stiklu ","type":" Stikluflok kur","unli nk":"Fjarl ægja stikl u","upload ":"Senda u pp"},"just ify":{"blo ck":"Jafna báðum meg in","cente r":"Miðja texta","le ft":"Vinst rijöfnun", "right":"H ægrijöfnun "},"indent ":{"indent ":"Minnka inndrátt", "outdent": "Auka innd rátt"},"im age":{"alt ":"Baklægu r texti"," border":"R ammi","btn Upload":"H laða upp", "button2Im g":"Do you want to t ransform t he selecte d image bu tton on a simple ima ge?","hSpa ce":"Vinst ri bil","i mg2Button" :"Do you w ant to tra nsform the selected image on a image but ton?","inf oTab":"Alm ennt","lin kTab":"Sti kla","lock Ratio":"Fe sta stærða rhlutfall" ,"menu":"E igindi myn dar","rese tSize":"Re ikna stærð ","title": "Eigindi m yndar","ti tleButton" :"Eigindi myndahnapp s","upload ":"Hlaða u pp","urlMi ssing":"Im age source URL is mi ssing.","v Space":"Hæ gri bil"," validateBo rder":"Bor der must b e a whole number."," validateHS pace":"HSp ace must b e a whole number."," validateVS pace":"VSp ace must b e a whole number."}, "iframe":{ "border":" Show frame border"," noUrl":"Pl ease type the iframe URL","scr olling":"E nable scro llbars","t itle":"IFr ame Proper ties","too lbar":"IFr ame"},"hor izontalrul e":{"toolb ar":"Lóðré tt lína"}, "forms":{" button":{" title":"Ei gindi hnap ps","text" :"Texti"," type":"Ger ð","typeBt n":"Hnappu r","typeSb m":"Staðfe sta","type Rst":"Hrei nsa"},"che ckboxAndRa dio":{"che ckboxTitle ":"Eigindi markreits ","radioTi tle":"Eigi ndi valhna pps","valu e":"Gildi" ,"selected ":"Valið", "required" :"Required "},"form": {"title":" Eigindi in nsláttarfo rms","menu ":"Eigindi innslátta rforms","a ction":"Að gerð","met hod":"Aðfe rð","encod ing":"Enco ding"},"hi dden":{"ti tle":"Eigi ndi falins svæðis"," name":"Naf n","value" :"Gildi"}, "select":{ "title":"E igindi lis ta","selec tInfo":"Up plýsingar" ,"opAvail" :"Kostir", "value":"G ildi","siz e":"Stærð" ,"lines":" línur","ch kMulti":"L eyfa fleir i kosti"," required": "Required" ,"opText": "Texti","o pValue":"G ildi","btn Add":"Bæta við","btn Modify":"B reyta","bt nUp":"Upp" ,"btnDown" :"Niður"," btnSetValu e":"Merkja sem valið ","btnDele te":"Eyða" },"textare a":{"title ":"Eigindi textasvæð is","cols" :"Dálkar", "rows":"Lí nur"},"tex tfield":{" title":"Ei gindi text areits","n ame":"Nafn ","value": "Gildi","c harWidth": "Breidd (l eturtákn)" ,"maxChars ":"Hámarks fjöldi let urtákna"," required": "Required" ,"type":"G erð","type Text":"Tex ti","typeP ass":"Lyki lorð","typ eEmail":"E mail","typ eSearch":" Search","t ypeTel":"T elephone N umber","ty peUrl":"Ve fslóð"}}," format":{" label":"St ílsnið","p anelTitle" :"Stílsnið ","tag_add ress":"Vis tfang","ta g_div":"Ve njulegt (D IV)","tag_ h1":"Fyrir sögn 1","t ag_h2":"Fy rirsögn 2" ,"tag_h3": "Fyrirsögn 3","tag_h 4":"Fyrirs ögn 4","ta g_h5":"Fyr irsögn 5", "tag_h6":" Fyrirsögn 6","tag_p" :"Venjuleg t letur"," tag_pre":" Forsniðið" },"font":{ "fontSize" :{"label": "Leturstær ð ","voice Label":"Fo nt Size"," panelTitle ":"Leturst ærð "},"la bel":"Letu rgerð ","p anelTitle" :"Leturger ð ","voice Label":"Le turgerð "} ,"flash":{ "access":" Script Acc ess","acce ssAlways": "Always"," accessNeve r":"Never" ,"accessSa meDomain": "Same doma in","align AbsBottom" :"Abs neðs t","alignA bsMiddle": "Abs miðju ð","alignB aseline":" Grunnlína" ,"alignTex tTop":"Efr i brún tex ta","bgcol or":"Bakgr unnslitur" ,"chkFull" :"Allow Fu llscreen", "chkLoop": "Endurtekn ing","chkM enu":"Sýna Flash-val mynd","chk Play":"Sjá lfvirk spi lun","flas hvars":"Va riables fo r Flash"," hSpace":"V instri bil ","propert ies":"Eigi ndi Flash" ,"properti esTab":"Pr operties", "quality": "Quality", "qualityAu toHigh":"A uto High", "qualityAu toLow":"Au to Low","q ualityBest ":"Best"," qualityHig h":"High", "qualityLo w":"Low"," qualityMed ium":"Medi um","scale ":"Skali", "scaleAll" :"Sýna all t","scaleF it":"Fella skala að stærð","sc aleNoBorde r":"Án ram ma","title ":"Eigindi Flash","v Space":"Hæ gri bil"," validateHS pace":"HSp ace must b e a number .","valida teSrc":"Sl áðu inn ve ffang stik lunnar!"," validateVS pace":"VSp ace must b e a number .","window Mode":"Win dow mode", "windowMod eOpaque":" Opaque","w indowModeT ransparent ":"Transpa rent","win dowModeWin dow":"Wind ow"},"find ":{"find": "Leita","f indOptions ":"Find Op tions","fi ndWhat":"L eita að:", "matchCase ":"Gera gr einarmun á ¡ há¡- og lágstöfum" ,"matchCyc lic":"Matc h cyclic", "matchWord ":"Aðeins heil orð", "notFoundM sg":"Leita rtexti fan nst ekki!" ,"replace" :"Skipta ú t","replac eAll":"Ski pta út all sstaðar"," replaceSuc cessMsg":" %1 occurre nce(s) rep laced.","r eplaceWith ":"Skipta út fyrir:" ,"title":" Finna og s kipta"},"f akeobjects ":{"anchor ":"Anchor" ,"flash":" Flash Anim ation","hi ddenfield" :"Hidden F ield","ifr ame":"IFra me","unkno wn":"Unkno wn Object" },"element spath":{"e leLabel":" Elements p ath","eleT itle":"%1 element"}, "div":{"Id InputLabel ":"Id","ad visoryTitl eInputLabe l":"Adviso ry Title", "cssClassI nputLabel" :"Styleshe et Classes ","edit":" Edit Div", "inlineSty leInputLab el":"Inlin e Style"," langDirLTR Label":"Le ft to Righ t (LTR)"," langDirLab el":"Langu age Direct ion","lang DirRTLLabe l":"Right to Left (R TL)","lang uageCodeIn putLabel": " Language Code","re move":"Rem ove Div"," styleSelec tLabel":"S tyle","tit le":"Creat e Div Cont ainer","to olbar":"Cr eate Div C ontainer"} ,"contextm enu":{"opt ions":"Con text Menu Options"}, "colordial og":{"clea r":"Clear" ,"highligh t":"Highli ght","opti ons":"Colo r Options" ,"selected ":"Selecte d Color"," title":"Se lect color "},"colorb utton":{"a uto":"Sjál fval","bgC olorTitle" :"Bakgrunn slitur","c olors":{"0 00":"Black ","800000" :"Maroon", "8B4513":" Saddle Bro wn","2F4F4 F":"Dark S late Gray" ,"008080": "Teal","00 0080":"Nav y","4B0082 ":"Indigo" ,"696969": "Dark Gray ","B22222" :"Fire Bri ck","A52A2 A":"Brown" ,"DAA520": "Golden Ro d","006400 ":"Dark Gr een","40E0 D0":"Turqu oise","000 0CD":"Medi um Blue"," 800080":"P urple","80 8080":"Gra y","F00":" Red","FF8C 00":"Dark Orange","F FD700":"Go ld","00800 0":"Green" ,"0FF":"Cy an","00F": "Blue","EE 82EE":"Vio let","A9A9 A9":"Dim G ray","FFA0 7A":"Light Salmon"," FFA500":"O range","FF FF00":"Yel low","00FF 00":"Lime" ,"AFEEEE": "Pale Turq uoise","AD D8E6":"Lig ht Blue"," DDA0DD":"P lum","D3D3 D3":"Light Grey","FF F0F5":"Lav ender Blus h","FAEBD7 ":"Antique White","F FFFE0":"Li ght Yellow ","F0FFF0" :"Honeydew ","F0FFFF" :"Azure"," F0F8FF":"A lice Blue" ,"E6E6FA": "Lavender" ,"FFF":"Wh ite"},"mor e":"Fleiri liti...", "panelTitl e":"Colors ","textCol orTitle":" Litur text a"},"clipb oard":{"co py":"Afrit a","copyEr ror":"Öryg gisstillin gar vafran s þíns ley fa ekki af ritun text a með músa raðgerð. N otaðu lykl aborðið í afrita (Ct rl/Cmd+C). ","cut":"K lippa","cu tError":"Ö ryggisstil lingar vaf rans þíns leyfa ekki klippingu texta með músaraðge rð. Notaðu lyklaborð ið í klipp a (Ctrl/Cm d+X).","pa ste":"Líma ","pasteAr ea":"Paste Area","pa steMsg":"L ímdu í svæ ðið hér að neðan og (<STRONG>C trl/Cmd+V< /STRONG>) og smelltu á <STRONG >OK</STRON G>.","secu rityMsg":" Vegna öryg gisstillin ga í vafra num þínum fær ritill inn ekki b einan aðga ng að klip puborðinu. Þú verður að líma i nnihaldið aftur inn í þennan g lugga.","t itle":"Lím a"},"butto n":{"selec tedLabel": "%1 (Selec ted)"},"bl ockquote": {"toolbar" :"Inndrátt ur"},"bidi ":{"ltr":" Text direc tion from left to ri ght","rtl" :"Text dir ection fro m right to left"},"b asicstyles ":{"bold": "Feitletra ð","italic ":"Skáletr að","strik e":"Yfirst rikað","su bscript":" Niðurskrif að","super script":"U ppskrifað" ,"underlin e":"Undirs trikað"}," 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" :"Fletta í skjalasaf ni","url": "Vefslóð", "protocol" :"Samskipt astaðall", "upload":" Senda upp" ,"uploadSu bmit":"Hla ða upp","i mage":"Set ja inn myn d","flash" :"Flash"," form":"Set ja inn inn sláttarfor m","checkb ox":"Setja inn hökun arreit","r adio":"Set ja inn val hnapp","te xtField":" Setja inn textareit" ,"textarea ":"Setja i nn textasv æði","hidd enField":" Setja inn falið svæð i","button ":"Setja i nn hnapp", "select":" Setja inn lista","im ageButton" :"Setja in n myndahna pp","notSe t":"<ekker t valið>", "id":"Auðk enni","nam e":"Nafn", "langDir": "Lesstefna ","langDir Ltr":"Frá vinstri ti l hægri (L TR)","lang DirRtl":"F rá hægri t il vinstri (RTL)","l angCode":" Tungumálak óði","long Descr":"Ná nari lýsin g","cssCla ss":"Stíls niðsflokku r","adviso ryTitle":" Titill","c ssStyle":" Stíll","ok ":"Í lagi" ,"cancel": "Hætta við ","close": "Close","p review":"F orskoða"," resize":"R esize","ge neralTab": "Almennt", "advancedT ab":"Tækni legt","val idateNumbe rFailed":" This value is not a number."," confirmNew Page":"Any unsaved c hanges to this conte nt will be lost. Are you sure you want t o load new page?","c onfirmCanc el":"You h ave change d some opt ions. Are you sure y ou want to close the dialog wi ndow?","op tions":"Op tions","ta rget":"Mar k","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 ":"Frá vin stri til h ægri (LTR) ","langDir RTL":"Frá hægri til vinstri (R TL)","styl es":"Stíll ","cssClas ses":"Stíl sniðsflokk ur","width ":"Breidd" ,"height": "Hæð","ali gn":"Jöfnu n","alignL eft":"Vins tri","alig nRight":"H ægri","ali gnCenter": "Miðjað"," alignJusti fy":"Jafna báðum meg in","align Top":"Efst ","alignMi ddle":"Mið juð","alig nBottom":" Neðst","al ignNone":" None","inv alidValue" :"Invalid value.","i nvalidHeig ht":"Heigh t must be a number." ,"invalidW idth":"Wid th must be a number. ","invalid CssLength" :"Value sp ecified fo r the \"%1 \" field m ust be a p ositive nu mber with or without a valid C SS measure ment unit (px, %, in , cm, mm, em, ex, pt , or pc)." ,"invalidH tmlLength" :"Value sp ecified fo r the \"%1 \" field m ust be a p ositive nu mber with or without a valid H TML measur ement unit (px or %) .","invali dInlineSty le":"Value specified for the i nline styl e must con sist of on e or more tuples wit h the form at of \"na me : value \", separa ted by sem i-colons." ,"cssLengt hTooltip": "Enter a n umber for a value in pixels or a number with a val id CSS uni t (px, %, in, cm, mm , em, ex, pt, or pc) .","unavai lable":"%1 <span clas s=\"cke_ac cessibilit y\">, unav ailable</s pan>"}};