Bug 449837. Fixing the tree
authorEduardo Trápani <eduardo@esperanto.org.uy>
Mon, 29 Sep 2008 21:55:38 -0300
changeset 7 9ca96182c5d0ee68d2d62463204b71c96045f264
parent 6 7e7f591786406e8cc7be4801d51ee795371c1771
child 8 ad470db40900651b718a6d2df9b7c9388af6d631
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:46:40 +0000
bugs449837
Bug 449837. Fixing the tree
browser/chrome/browser/preferences/security.dtd
toolkit/chrome/global/regionNames.properties
--- a/browser/chrome/browser/preferences/security.dtd
+++ b/browser/chrome/browser/preferences/security.dtd
@@ -3,20 +3,20 @@
 <!-- LOCALIZATION NOTE (tellMaybeForgery.label, tellMaybeAttackSite.label):
   The methods by which forged (phished) and attack sites will be detected by
   phishing providers will vary from human review to machine-based heuristics to a
   combination of both, so it's important that these strings and
   useDownloadedList.label convey the meaning "reported" (and not something like
   "known").
 -->
 
-<!ENTITY tellMaybeAttackSite2.label "Block reported attack sites">
+<!ENTITY tellMaybeAttackSite.label "Block reported attack sites">
 <!ENTITY tellMaybeAttackSite.accesskey "a">
 
-<!ENTITY tellMaybeForgery2.label "Block reported web forgeries">
+<!ENTITY tellMaybeForgery.label "Block reported web forgeries">
 <!ENTITY tellMaybeForgery.accesskey "D">
 
 <!ENTITY addonExceptions.label "Esceptoj…">
 <!ENTITY addonExceptions.accesskey "E">
 
 
 <!ENTITY passwords.label "Pasvortoj">
 
--- a/toolkit/chrome/global/regionNames.properties
+++ b/toolkit/chrome/global/regionNames.properties
@@ -19,17 +19,16 @@ ba=	Bosnia and Herzegovina
 bb=	Barbados
 bd=	Bangladesh
 be=	Belgio
 bf=	Burkina Faso
 bg=	Bulgaria
 bh=	Barejno
 bi=	Burundi
 bj=	Benin
-bl=	Saint Barthélemy
 bm=	Bermuda
 bn=	Brunejo
 bo=	Bolivio
 br=	Brazilo
 bs=	Bahamas
 bt=	Bhutan
 bv=	Bouvet Island
 bw=	Botswana
@@ -43,16 +42,17 @@ cg=	Congo-Brazzaville
 ch=	Svislando
 ci=	Ivory Coast
 ck=	Cook Islands
 cl=	Ĉilio
 cm=	Cameroon
 cn=	Ĉinio
 co=	Kolombio
 cr=	Kostariko
+cs=	Serbia and Montenegro
 cu=	Cuba
 cv=	Cape Verde
 cx=	Christmas Island
 cy=	Cyprus
 cz=	Czech Republic
 de=	Germanio
 dj=	Djibouti
 dk=	Denmark
@@ -131,18 +131,16 @@ lr=	Liberia
 ls=	Lesotho
 lt=	Lithuania
 lu=	Luksemburgo
 lv=	Latvia
 ly=	Libio
 ma=	Maroko
 mc=	Monako
 md=	Moldova
-me=	Montenegro
-mf=	Saint Martin
 mg=	Madagascar
 mh=	Marshall Islands
 mk=	Makedonio
 ml=	Mali
 mm=	Myanmar
 mn=	Mongolia
 mo=	Makao
 mp=	Northern Mariana Islands
@@ -181,17 +179,16 @@ pn=	Pitcairn
 pr=	Puerto-Riko
 ps=	Occupied Palestinian Territory
 pt=	Portugal
 pw=	Palau
 py=	Paragvajo
 qa=	Kataro
 re=	Reunion
 ro=	Romania
-rs=	Serbia
 ru=	Russian Federation
 rw=	Rwanda
 sa=	Saŭda Arabio
 sb=	Solomon Islands
 sc=	Seychelles
 sd=	Sudan
 se=	Svedio
 sg=	Singapuro