diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2012-01-30 11:15:12 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2012-01-30 11:15:12 +0000 |
| commit | fdec90c042f73153dd360cb5ccd282f4cf507520 (patch) | |
| tree | 475513a6fdec33f286f4580e1c51fd58ef06e2aa /resource/gnu/java/locale/LocaleInformation_is.properties | |
| parent | 3c1fe03abf12818cf772fdae90fef4ab9170854d (diff) | |
| download | classpath-fdec90c042f73153dd360cb5ccd282f4cf507520.tar.gz | |
Use the main approved value for properties, not the one that occurs last in the source file.
2011-12-30 Andrew John Hughes <ahughes@redhat.com>
* resource/gnu/java/locale/LocaleInformation_ar.properties,
* resource/gnu/java/locale/LocaleInformation_ar_LB.properties,
* resource/gnu/java/locale/LocaleInformation_az.properties,
* resource/gnu/java/locale/LocaleInformation_be.properties,
* resource/gnu/java/locale/LocaleInformation_bg.properties,
* resource/gnu/java/locale/LocaleInformation_bn.properties,
* resource/gnu/java/locale/LocaleInformation_bn_IN.properties,
* resource/gnu/java/locale/LocaleInformation_ca.properties,
* resource/gnu/java/locale/LocaleInformation_cs.properties,
* resource/gnu/java/locale/LocaleInformation_cy.properties,
* resource/gnu/java/locale/LocaleInformation_da.properties,
* resource/gnu/java/locale/LocaleInformation_de.properties,
* resource/gnu/java/locale/LocaleInformation_el.properties,
* resource/gnu/java/locale/LocaleInformation_en.properties,
* resource/gnu/java/locale/LocaleInformation_en_Dsrt.properties,
* resource/gnu/java/locale/LocaleInformation_eo.properties,
* resource/gnu/java/locale/LocaleInformation_es.properties,
* resource/gnu/java/locale/LocaleInformation_et.properties,
* resource/gnu/java/locale/LocaleInformation_fa.properties,
* resource/gnu/java/locale/LocaleInformation_fi.properties,
* resource/gnu/java/locale/LocaleInformation_fil.properties,
* resource/gnu/java/locale/LocaleInformation_fo.properties,
* resource/gnu/java/locale/LocaleInformation_fr.properties,
* resource/gnu/java/locale/LocaleInformation_ga.properties,
* resource/gnu/java/locale/LocaleInformation_gl.properties,
* resource/gnu/java/locale/LocaleInformation_gu.properties,
* resource/gnu/java/locale/LocaleInformation_he.properties,
* resource/gnu/java/locale/LocaleInformation_hi.properties,
* resource/gnu/java/locale/LocaleInformation_hr.properties,
* resource/gnu/java/locale/LocaleInformation_hu.properties,
* resource/gnu/java/locale/LocaleInformation_is.properties,
* resource/gnu/java/locale/LocaleInformation_it.properties,
* resource/gnu/java/locale/LocaleInformation_ja.properties,
* resource/gnu/java/locale/LocaleInformation_ka.properties,
* resource/gnu/java/locale/LocaleInformation_ko.properties,
* resource/gnu/java/locale/LocaleInformation_lt.properties,
* resource/gnu/java/locale/LocaleInformation_lv.properties,
* resource/gnu/java/locale/LocaleInformation_ml.properties,
* resource/gnu/java/locale/LocaleInformation_my.properties,
* resource/gnu/java/locale/LocaleInformation_nb.properties,
* resource/gnu/java/locale/LocaleInformation_ne.properties,
* resource/gnu/java/locale/LocaleInformation_nl.properties,
* resource/gnu/java/locale/LocaleInformation_nn.properties,
* resource/gnu/java/locale/LocaleInformation_pl.properties,
* resource/gnu/java/locale/LocaleInformation_pt.properties,
* resource/gnu/java/locale/LocaleInformation_pt_PT.properties,
* resource/gnu/java/locale/LocaleInformation_ro.properties,
* resource/gnu/java/locale/LocaleInformation_ru.properties,
* resource/gnu/java/locale/LocaleInformation_se.properties,
* resource/gnu/java/locale/LocaleInformation_se_FI.properties,
* resource/gnu/java/locale/LocaleInformation_si.properties,
* resource/gnu/java/locale/LocaleInformation_sk.properties,
* resource/gnu/java/locale/LocaleInformation_sl.properties,
* resource/gnu/java/locale/LocaleInformation_sr.properties,
* resource/gnu/java/locale/LocaleInformation_sr_Latn.properties,
* resource/gnu/java/locale/LocaleInformation_sv.properties,
* resource/gnu/java/locale/LocaleInformation_ta.properties,
* resource/gnu/java/locale/LocaleInformation_th.properties,
* resource/gnu/java/locale/LocaleInformation_to.properties,
* resource/gnu/java/locale/LocaleInformation_tr.properties,
* resource/gnu/java/locale/LocaleInformation_uk.properties,
* resource/gnu/java/locale/LocaleInformation_vi.properties,
* resource/gnu/java/locale/LocaleInformation_zh.properties,
* resource/gnu/java/locale/LocaleInformation_zh_Hant.properties:
Use the main approved value for our properties, rather than
just the one that happens to appear last in the XML source file.
Diffstat (limited to 'resource/gnu/java/locale/LocaleInformation_is.properties')
| -rw-r--r-- | resource/gnu/java/locale/LocaleInformation_is.properties | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/resource/gnu/java/locale/LocaleInformation_is.properties b/resource/gnu/java/locale/LocaleInformation_is.properties index 1d1644a7d..8581ca9a4 100644 --- a/resource/gnu/java/locale/LocaleInformation_is.properties +++ b/resource/gnu/java/locale/LocaleInformation_is.properties @@ -322,13 +322,13 @@ territories.AS=Bandar\u00edska Sam\u00f3a territories.AT=Austurr\u00edki territories.AU=\u00c1stral\u00eda territories.AW=Ar\u00faba -territories.AX=\u00c1land +territories.AX=\u00c1landseyjar territories.AZ=Aserba\u00eddsjan territories.BA=Bosn\u00eda og Herseg\u00f3v\u00edna territories.BB=Barbados territories.BD=Bangladess territories.BE=Belg\u00eda -territories.BF=Burk\u00edna Fas\u00f3 +territories.BF=B\u00fark\u00edna Fas\u00f3 territories.BG=B\u00falgar\u00eda territories.BH=Barein territories.BI=B\u00far\u00fand\u00ed @@ -346,9 +346,9 @@ territories.BY=Hv\u00edta-R\u00fassland territories.BZ=Bel\u00eds territories.CA=Kanada territories.CC=K\u00f3koseyjar -territories.CD=Kong\u00f3-Kinshasa +territories.CD=Austur-Kong\u00f3 territories.CF=Mi\u00f0-Afr\u00edkul\u00fd\u00f0veldi\u00f0 -territories.CG=Kong\u00f3-Brazzaville +territories.CG=Vestur-Kong\u00f3 territories.CH=Sviss territories.CI=F\u00edlabeinsstr\u00f6ndin territories.CK=Cookseyjar @@ -454,7 +454,7 @@ territories.MK=Maked\u00f3n\u00eda territories.ML=Mal\u00ed territories.MM=Mjanmar territories.MN=Mong\u00f3l\u00eda -territories.MO=Mak\u00e1o +territories.MO=Maka\u00f3 territories.MP=Nor\u00f0ur-Mar\u00edanaeyjar territories.MQ=Martin\u00edk territories.MR=M\u00e1ritan\u00eda @@ -472,7 +472,7 @@ territories.NE=N\u00edger territories.NF=Norfolkeyja territories.NG=N\u00edger\u00eda territories.NI=N\u00edkaragva -territories.NL=Holland +territories.NL=Ni\u00f0url\u00f6nd territories.NO=Noregur territories.NP=Nepal territories.NR=N\u00e1r\u00fa @@ -545,8 +545,8 @@ territories.UZ=\u00dasbekistan territories.VA=P\u00e1fagar\u00f0ur territories.VC=Sankti Vinsent og Grenad\u00edneyjar territories.VE=Venes\u00faela -territories.VG=Bresku J\u00f3mfr\u00faareyjar -territories.VI=Bandar\u00edsku J\u00f3mfr\u00faareyjar +territories.VG=J\u00f3mfr\u00faaeyjar (bresku) +territories.VI=J\u00f3mfr\u00faaeyjar (bandar\u00edsku) territories.VN=V\u00edetnam territories.VU=Van\u00faat\u00fa territories.WF=Wallis- og F\u00fat\u00fanaeyjar @@ -556,7 +556,7 @@ territories.YT=Mayotte territories.ZA=Su\u00f0ur-Afr\u00edka territories.ZM=Samb\u00eda territories.ZW=Simbabve -territories.ZZ=\u00f3\u00feekkt e\u00f0a \u00f3gilt sv\u00e6\u00f0i +territories.ZZ=\u00d3\u00feekkt e\u00f0a \u00f3gilt sv\u00e6\u00f0i languages.aa=af\u00e1r languages.ab=abkas\u00edska languages.ace=akk\u00edska @@ -565,26 +565,26 @@ languages.ada=adangme languages.ady=ad\u00fdge languages.ae=avest\u00edska languages.af=afr\u00edkanska -languages.afa=afr\u00f3as\u00edsk m\u00e1l +languages.afa=afr\u00f3as\u00edsk m\u00e1l (\u00f6nnur) languages.afh=afr\u00edh\u00edl\u00ed languages.ain=a\u00ednu languages.ak=akan languages.akk=akkad\u00edska -languages.ale=aleut\u00edska +languages.ale=ale\u00faska languages.alg=algonkv\u00ednsk m\u00e1l languages.alt=su\u00f0uralta\u00edska languages.am=amhar\u00edska languages.an=aragonska -languages.ang=fornenska +languages.ang=fornenska (um 450-1100) languages.anp=ang\u00edka languages.apa=apatsjam\u00e1l languages.ar=arab\u00edska languages.arc=arame\u00edska languages.arn=ar\u00e1kan\u00edska languages.arp=arapah\u00f3 -languages.art=al\u00fej\u00f3\u00f0am\u00e1l +languages.art=al\u00fej\u00f3\u00f0am\u00e1l (\u00f6nnur) languages.arw=aravakska -languages.as=assame\u00edska +languages.as=assamska languages.ast=ast\u00far\u00edska languages.ath=atapask\u00edsk m\u00e1l languages.aus=\u00e1str\u00f6lsk m\u00e1l @@ -598,7 +598,7 @@ languages.bai=bam\u00edlekem\u00e1l languages.bal=bal\u00fak\u00ed languages.ban=bal\u00edska languages.bas=basa -languages.bat=baltnesk m\u00e1l +languages.bat=baltnesk m\u00e1l (\u00f6nnur) languages.be=hv\u00edtr\u00fassneska languages.bej=beja languages.bem=bemba @@ -623,13 +623,13 @@ languages.bug=b\u00fag\u00edska languages.byn=bl\u00edn languages.ca=katal\u00f3nska languages.cad=kadd\u00f3 -languages.cai=Mi\u00f0-Amer\u00edku ind\u00ed\u00e1nam\u00e1l +languages.cai=Ind\u00ed\u00e1nam\u00e1l Mi\u00f0-Amer\u00edku (\u00f6nnur) languages.car=kar\u00edbam\u00e1l -languages.cau=k\u00e1kasusm\u00e1l +languages.cau=k\u00e1kasusm\u00e1l (\u00f6nnur) languages.cch=atsam languages.ce=tsjetsjenska languages.ceb=keb\u00faan\u00f3 -languages.cel=keltnesk m\u00e1l +languages.cel=keltnesk (\u00f6nnur) languages.ch=kamorr\u00f3 languages.chb=s\u00edbsja languages.chg=sjagata\u00ed @@ -648,11 +648,11 @@ languages.cpf=kre\u00f3l- og pidginm\u00e1l \u00e1 fr\u00f6nskum grunni languages.cpp=kre\u00f3l- og pidginm\u00e1l \u00e1 port\u00fag\u00f6lskum grunni languages.cr=kr\u00ed languages.crh=kr\u00edmtyrkneska -languages.crp=kre\u00f3l-/pidginm\u00e1l +languages.crp=kre\u00f3l- og pidginm\u00e1l (\u00f6nnur) languages.cs=t\u00e9kkneska languages.csb=kas\u00fab\u00edska languages.cu=kirkjuslavneska -languages.cus=k\u00fasit\u00edsk m\u00e1l +languages.cus=k\u00fasit\u00edsk m\u00e1l (\u00f6nnur) languages.cv=sj\u00favas languages.cy=velska languages.da=danska @@ -667,10 +667,10 @@ languages.den=slav languages.dgr=dogr\u00edb languages.din=dinka languages.doi=dogr\u00ed -languages.dra=dravid\u00edsk m\u00e1l +languages.dra=dravid\u00edsk m\u00e1l (\u00f6nnur) languages.dsb=l\u00e1gsorbneska languages.dua=d\u00faala -languages.dum=mi\u00f0hollenska +languages.dum=mi\u00f0hollenska (um 1050-1350) languages.dv=d\u00edveh\u00ed languages.dyu=dj\u00fala languages.dz=dsongka @@ -678,14 +678,14 @@ languages.ee=eve languages.efi=ef\u00edk languages.egy=fornegypska languages.eka=ekaj\u00fak -languages.el=gr\u00edska +languages.el=n\u00fdgr\u00edska (1453-) languages.elx=elam\u00edt languages.en=enska languages.en_AU=\u00e1str\u00f6lsk enska languages.en_CA=kanad\u00edsk enska languages.en_GB=bresk enska languages.en_US=bandar\u00edsk enska -languages.enm=mi\u00f0enska +languages.enm=mi\u00f0enska (1100-1500) languages.eo=esperant\u00f3 languages.es=sp\u00e6nska languages.es_419=latnesk-amer\u00edsk sp\u00e6nska @@ -699,15 +699,15 @@ languages.fat=fant\u00ed languages.ff=f\u00fala languages.fi=finnska languages.fil=filip\u00ednska -languages.fiu=finnsk\u00fagr\u00edsk m\u00e1l +languages.fiu=finnsk\u00fagr\u00edsk m\u00e1l (\u00f6nnur) languages.fj=f\u00eddjeyska languages.fo=f\u00e6reyska languages.fon=f\u00f3n languages.fr=franska languages.fr_CA=kanad\u00edsk franska languages.fr_CH=svissnesk franska -languages.frm=mi\u00f0franska -languages.fro=fornfranska +languages.frm=mi\u00f0franska (um 1400-1600) +languages.fro=fornfranska (842 - um 1400) languages.frr=nor\u00f0urfr\u00edsneska languages.frs=austurfr\u00edsneska languages.fur=fr\u00ed\u00falska @@ -717,18 +717,18 @@ languages.gaa=ga languages.gay=gaj\u00f3 languages.gba=gbaja languages.gd=skosk gel\u00edska -languages.gem=germ\u00f6nsk m\u00e1l +languages.gem=germ\u00f6nsk m\u00e1l (\u00f6nnur) languages.gez=g\u00eds languages.gil=gilberska languages.gl=gallegska -languages.gmh=mi\u00f0h\u00e1\u00fe\u00fdska +languages.gmh=mi\u00f0h\u00e1\u00fe\u00fdska (um 1050-1500 languages.gn=gvaran\u00ed -languages.goh=fornh\u00e1\u00fe\u00fdska +languages.goh=fornh\u00e1\u00fe\u00fdska (um 750-1050) languages.gon=gond\u00ed languages.gor=gorontal\u00f3 languages.got=gotneska languages.grb=gerb\u00f3 -languages.grc=forngr\u00edska +languages.grc=forngr\u00edska (til 1453) languages.gsw=svissnesk \u00fe\u00fdska languages.gu=g\u00fajarat\u00ed languages.gv=manx @@ -759,8 +759,8 @@ languages.ii=s\u00eds\u00faanj\u00ed languages.ijo=\u00edj\u00f3 languages.ik=\u00edn\u00fap\u00edak languages.ilo=\u00edlok\u00f3 -languages.inc=indversk m\u00e1l -languages.ine=ind\u00f3evr\u00f3psk m\u00e1l +languages.inc=indversk m\u00e1l (\u00f6nnur) +languages.ine=ind\u00f3evr\u00f3psk m\u00e1l (\u00f6nnur) languages.inh=ing\u00fas languages.io=\u00edd\u00f3 languages.ira=\u00edranska @@ -786,7 +786,7 @@ languages.kcg=tyap languages.kfo=koro languages.kg=kong\u00f3 languages.kha=kas\u00ed -languages.khi=ko\u00edm\u00e1l +languages.khi=ko\u00edm\u00e1l (\u00f6nnur) languages.kho=kotaska languages.ki=k\u00edk\u00faj\u00fa languages.kj=k\u00faanjama @@ -842,14 +842,14 @@ languages.mdf=moksa languages.mdr=mandar languages.men=mende languages.mg=malagas\u00edska -languages.mga=mi\u00f0\u00edrska +languages.mga=mi\u00f0\u00edrska (900-1200) languages.mh=marshallska languages.mi=ma\u00f3r\u00ed languages.mic=mikmak languages.min=m\u00ednangkab\u00e1 languages.mis=\u00fdmis m\u00e1l languages.mk=maked\u00f3nska -languages.mkh=monkmerm\u00e1l +languages.mkh=monkmerm\u00e1l (\u00f6nnur) languages.ml=malajalam languages.mn=mong\u00f3lska languages.mnc=mansj\u00fa @@ -866,21 +866,21 @@ languages.mun=m\u00fandam\u00e1l languages.mus=kr\u00edk languages.mwl=mirandes\u00edska languages.mwr=marvar\u00ed -languages.my=b\u00farm\u00edska +languages.my=burmneska languages.myn=majam\u00e1l languages.myv=ersja languages.na=n\u00e1r\u00faska languages.nah=nah\u00faatl -languages.nai=Nor\u00f0ur-Amer\u00edku ind\u00ed\u00e1nam\u00e1l +languages.nai=Ind\u00ed\u00e1nam\u00e1l Nor\u00f0ur-Amer\u00edku (\u00f6nnur) languages.nap=nap\u00f3l\u00edska languages.nb=norskt b\u00f3km\u00e1l languages.nd=nor\u00f0urndebele -languages.nds=l\u00e1g\u00fe\u00fdska +languages.nds=L\u00e1g\u00fe\u00fdska; L\u00e1gsaxneska languages.ne=nepalska languages.new=nevar\u00ed languages.ng=ndonga languages.nia=n\u00edas -languages.nic=n\u00edgerkord\u00f3fanm\u00e1l +languages.nic=n\u00edgerkord\u00f3fanm\u00e1l (\u00f6nnur) languages.niu=n\u00edveska languages.nl=hollenska languages.nl_BE=fl\u00e6mska @@ -894,34 +894,34 @@ languages.nso=nor\u00f0urs\u00f3t\u00f3 languages.nub=n\u00fab\u00edsk m\u00e1l languages.nv=navah\u00f3 languages.nwc=klassisk nevar\u00ed -languages.ny=njanja +languages.ny=Njanja; S\u00edsjeva; Sjeva languages.nym=njamves\u00ed languages.nyn=njank\u00f3le languages.nyo=nj\u00f3r\u00f3 languages.nzi=ns\u00edma -languages.oc=oks\u00edtan\u00edska +languages.oc=Okkit\u00edska (eftir 1500); Pr\u00f3vensalska languages.oj=ojibva languages.om=\u00f3r\u00f3m\u00f3 languages.or=\u00f3r\u00eda languages.os=osset\u00edska languages.osa=\u00f3sage -languages.ota=ott\u00f3mantyrkneska +languages.ota=tyrkneska, ott\u00f3man (1500-1928) languages.oto=\u00f3tomm\u00e1l languages.pa=p\u00fanjab\u00ed -languages.paa=pap\u00fask m\u00e1l +languages.paa=pap\u00fask m\u00e1l (\u00f6nnur) languages.pag=pangas\u00ednm\u00e1l languages.pal=palav\u00ed languages.pam=pampanga languages.pap=pap\u00edament\u00f3 languages.pau=pal\u00e1ska languages.peo=fornpersneska -languages.phi=filippseysk m\u00e1l +languages.phi=filippseysk m\u00e1l (\u00f6nnur) languages.phn=f\u00f6nik\u00edska languages.pi=pal\u00ed languages.pl=p\u00f3lska languages.pon=ponpeiska languages.pra=prakr\u00edtm\u00e1l -languages.pro=fornpr\u00f3vensalska +languages.pro=fornpr\u00f3vensalska (til 1500) languages.ps=past\u00fa languages.pt=port\u00fagalska languages.pt_BR=bras\u00edl\u00edsk port\u00fagalska @@ -933,7 +933,7 @@ languages.rar=rar\u00f3tongska languages.rm=ret\u00f3r\u00f3manska languages.rn=r\u00fand\u00ed languages.ro=r\u00famenska -languages.roa=r\u00f3m\u00f6nsk m\u00e1l +languages.roa=r\u00f3m\u00f6nsk m\u00e1l (\u00f6nnur) languages.rom=roman\u00ed languages.root=r\u00f3t languages.ru=r\u00fassneska @@ -953,7 +953,7 @@ languages.sco=skoska languages.sd=sind\u00ed languages.se=nor\u00f0ursam\u00edska languages.sel=selk\u00fap -languages.sem=sem\u00edsk m\u00e1l +languages.sem=sem\u00edsk m\u00e1l (\u00f6nnur) languages.sg=sang\u00f3 languages.sga=forn\u00edrska (til 900) languages.sgn=t\u00e1knm\u00e1l @@ -968,7 +968,7 @@ languages.sl=sl\u00f3venska languages.sla=slavnesk m\u00e1l (\u00f6nnur) languages.sm=sam\u00f3ska languages.sma=su\u00f0ursam\u00edska -languages.smi=sam\u00edsk m\u00e1l +languages.smi=sam\u00edsk m\u00e1l (\u00f6nnur) languages.smj=l\u00falesam\u00edska languages.smn=enaresam\u00edska languages.sms=skoltesam\u00edska @@ -982,7 +982,7 @@ languages.sr=serbneska languages.srn=sranan tongo languages.srr=serer languages.ss=svat\u00ed -languages.ssa=n\u00edl\u00f3saharam\u00e1l +languages.ssa=n\u00edl\u00f3saharam\u00e1l (\u00f6nnur) languages.st=su\u00f0urs\u00f3t\u00f3 languages.su=s\u00fandanska languages.suk=s\u00fak\u00fama @@ -993,7 +993,7 @@ languages.sw=svah\u00edl\u00ed languages.syc=klassisk s\u00fdrlenska languages.syr=s\u00fdrlenska languages.ta=tam\u00edlska -languages.tai=ta\u00edm\u00e1l +languages.tai=ta\u00edm\u00e1l (\u00f6nnur) languages.te=tel\u00fag\u00fa languages.tem=t\u00edmne languages.ter=teren\u00f3 @@ -1010,8 +1010,8 @@ languages.tlh=kling\u00f3nska languages.tli=tlingit languages.tmh=tamasjek languages.tn=ts\u00faana -languages.to=tongverska (Tongaeyjar) -languages.tog=tongverska (Nyasa) +languages.to=Tongverska (Tongaeyjar) +languages.tog=Tongverska (Nyasa) languages.tpi=tokpisin languages.tr=tyrkneska languages.ts=tsonga @@ -1019,7 +1019,7 @@ languages.tsi=tsims\u00edska languages.tt=tatarska languages.tum=t\u00famb\u00faka languages.tup=t\u00fap\u00edm\u00e1l -languages.tut=alta\u00edsk m\u00e1l +languages.tut=alta\u00edsk m\u00e1l (\u00f6nnur) languages.tvl=t\u00faval\u00faska languages.tw=tv\u00ed languages.ty=tah\u00edt\u00edska @@ -1029,7 +1029,7 @@ languages.ug=\u00fa\u00edg\u00far languages.uga=\u00fagar\u00edt\u00edska languages.uk=\u00fakra\u00ednska languages.umb=\u00famb\u00fand\u00fa -languages.und=\u00f3\u00feekkt e\u00f0a \u00f3gilt tungum\u00e1l +languages.und=\u00f3lj\u00f3st languages.ur=\u00fard\u00fa languages.uz=\u00fasbekska languages.vai=va\u00ed |
