This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch master in repository tor-launcher.

The following commit(s) were added to refs/heads/master by this push: new a1803fc Bug 40823: Revert tor-launcher 5fcd4edb836fcab3db21139e670bddc77811e30c a1803fc is described below

commit a1803fca33f4cf75ad7a422f9035cf9287f59ac1 Author: Richard Pospesel richard@torproject.org AuthorDate: Wed Mar 30 21:01:39 2022 +0000

Bug 40823: Revert tor-launcher 5fcd4edb836fcab3db21139e670bddc77811e30c

This reverts commit 5fcd4edb836fcab3db21139e670bddc77811e30c. --- src/chrome/locale/en-US/network-settings.dtd | 259 --------------------------- 1 file changed, 259 deletions(-)

diff --git a/src/chrome/locale/en-US/network-settings.dtd b/src/chrome/locale/en-US/network-settings.dtd index cc501cd..fe905bf 100644 --- a/src/chrome/locale/en-US/network-settings.dtd +++ b/src/chrome/locale/en-US/network-settings.dtd @@ -94,262 +94,3 @@ <!ENTITY torConnect.connectedConcise "Connected"> <!ENTITY torConnect.notConnectedConcise "Not Connected"> <!ENTITY torConnect.copyLog "Copy Tor Logs"> -<!ENTITY torConnect.configureConnection "Configure Connection…"> -<!ENTITY torConnect.tryBridge "Try a Bridge"> - -<!-- #40773 about:torconnect country names --> -<!-- LOCALIZTION NOTE (countries.XX): The country names should be translated such that: -- some form of the 'official' name is preferred (we try to call countries what they call themselves) -- the name can be easily found within a sorted list (eg: in English we prefer 'Netherlands' over 'The Netherlands' as most English speakers would not skip down to the 'T' section of the list to find the Netherlands, similarly 'Venezuela' vs 'Bolivarian Republic of Venezuela'). The names in this list will displayed to the user in a sorted order using String.prototype.localeCompare(); see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Obj... [...] - -Thank you! - --> -<!ENTITY countries.ad "Andorra"> -<!ENTITY countries.ae "United Arab Emirates"> -<!ENTITY countries.af "Afghanistan"> -<!ENTITY countries.ag "Antigua and Barbuda"> -<!ENTITY countries.ai "Anguilla"> -<!ENTITY countries.al "Albania"> -<!ENTITY countries.am "Armenia"> -<!ENTITY countries.ao "Angola"> -<!ENTITY countries.aq "Antarctica"> -<!ENTITY countries.ar "Argentina"> -<!ENTITY countries.as "American Samoa"> -<!ENTITY countries.at "Austria"> -<!ENTITY countries.au "Australia"> -<!ENTITY countries.aw "Aruba"> -<!ENTITY countries.ax "Åland Islands"> -<!ENTITY countries.az "Azerbaijan"> -<!ENTITY countries.ba "Bosnia and Herzegovina"> -<!ENTITY countries.bb "Barbados"> -<!ENTITY countries.bd "Bangladesh"> -<!ENTITY countries.be "Belgium"> -<!ENTITY countries.bf "Burkina Faso"> -<!ENTITY countries.bg "Bulgaria"> -<!ENTITY countries.bh "Bahrain"> -<!ENTITY countries.bi "Burundi"> -<!ENTITY countries.bj "Benin"> -<!ENTITY countries.bl "Saint Barthélemy"> -<!ENTITY countries.bm "Bermuda"> -<!ENTITY countries.bn "Brunei Darussalam"> -<!ENTITY countries.bo "Bolivia (Plurinational State of)"> -<!ENTITY countries.bq "Bonaire, Sint Eustatius and Saba"> -<!ENTITY countries.br "Brazil"> -<!ENTITY countries.bs "Bahamas"> -<!ENTITY countries.bt "Bhutan"> -<!ENTITY countries.bv "Bouvet Island"> -<!ENTITY countries.bw "Botswana"> -<!ENTITY countries.by "Belarus"> -<!ENTITY countries.bz "Belize"> -<!ENTITY countries.ca "Canada"> -<!ENTITY countries.cc "Cocos (Keeling) Islands"> -<!ENTITY countries.cd "Congo (Kinshasa)"> -<!ENTITY countries.cf "Central African Republic"> -<!ENTITY countries.cg "Congo (Brazzaville)"> -<!ENTITY countries.ch "Switzerland"> -<!ENTITY countries.ci "Côte d'Ivoire"> -<!ENTITY countries.ck "Cook Islands"> -<!ENTITY countries.cl "Chile"> -<!ENTITY countries.cm "Cameroon"> -<!ENTITY countries.cn "China"> -<!ENTITY countries.co "Colombia"> -<!ENTITY countries.cr "Costa Rica"> -<!ENTITY countries.cu "Cuba"> -<!ENTITY countries.cv "Cabo Verde"> -<!ENTITY countries.cw "Curaçao"> -<!ENTITY countries.cx "Christmas Island"> -<!ENTITY countries.cy "Cyprus"> -<!ENTITY countries.cz "Czechia"> -<!ENTITY countries.de "Germany"> -<!ENTITY countries.dj "Djibouti"> -<!ENTITY countries.dk "Denmark"> -<!ENTITY countries.dm "Dominica"> -<!ENTITY countries.do "Dominican Republic"> -<!ENTITY countries.dz "Algeria"> -<!ENTITY countries.ec "Ecuador"> -<!ENTITY countries.ee "Estonia"> -<!ENTITY countries.eg "Egypt"> -<!ENTITY countries.eh "Western Sahara"> -<!ENTITY countries.er "Eritrea"> -<!ENTITY countries.es "Spain"> -<!ENTITY countries.et "Ethiopia"> -<!ENTITY countries.fi "Finland"> -<!ENTITY countries.fj "Fiji"> -<!ENTITY countries.fk "Falkland Islands (Malvinas)"> -<!ENTITY countries.fm "Micronesia (Federated States of)"> -<!ENTITY countries.fo "Faroe Islands"> -<!ENTITY countries.fr "France"> -<!ENTITY countries.ga "Gabon"> -<!ENTITY countries.gb "United Kingdom"> -<!ENTITY countries.gd "Grenada"> -<!ENTITY countries.ge "Georgia"> -<!ENTITY countries.gf "French Guiana"> -<!ENTITY countries.gg "Guernsey"> -<!ENTITY countries.gh "Ghana"> -<!ENTITY countries.gi "Gibraltar"> -<!ENTITY countries.gl "Greenland"> -<!ENTITY countries.gm "Gambia"> -<!ENTITY countries.gn "Guinea"> -<!ENTITY countries.gp "Guadeloupe"> -<!ENTITY countries.gq "Equatorial Guinea"> -<!ENTITY countries.gr "Greece"> -<!ENTITY countries.gs "South Georgia and the South Sandwich Islands"> -<!ENTITY countries.gt "Guatemala"> -<!ENTITY countries.gu "Guam"> -<!ENTITY countries.gw "Guinea-Bissau"> -<!ENTITY countries.gy "Guyana"> -<!ENTITY countries.hk "Hong Kong"> -<!ENTITY countries.hm "Heard Island and McDonald Islands"> -<!ENTITY countries.hn "Honduras"> -<!ENTITY countries.hr "Croatia"> -<!ENTITY countries.ht "Haiti"> -<!ENTITY countries.hu "Hungary"> -<!ENTITY countries.id "Indonesia"> -<!ENTITY countries.ie "Ireland"> -<!ENTITY countries.il "Israel"> -<!ENTITY countries.im "Isle of Man"> -<!ENTITY countries.in "India"> -<!ENTITY countries.io "British Indian Ocean Territory"> -<!ENTITY countries.iq "Iraq"> -<!ENTITY countries.ir "Iran (Islamic Republic of)"> -<!ENTITY countries.is "Iceland"> -<!ENTITY countries.it "Italy"> -<!ENTITY countries.je "Jersey"> -<!ENTITY countries.jm "Jamaica"> -<!ENTITY countries.jo "Jordan"> -<!ENTITY countries.jp "Japan"> -<!ENTITY countries.ke "Kenya"> -<!ENTITY countries.kg "Kyrgyzstan"> -<!ENTITY countries.kh "Cambodia"> -<!ENTITY countries.ki "Kiribati"> -<!ENTITY countries.km "Comoros"> -<!ENTITY countries.kn "Saint Kitts and Nevis"> -<!ENTITY countries.kp "Korea (Democratic People's Republic of)"> -<!ENTITY countries.kr "Korea (Republic of)"> -<!ENTITY countries.kw "Kuwait"> -<!ENTITY countries.ky "Cayman Islands"> -<!ENTITY countries.kz "Kazakhstan"> -<!ENTITY countries.la "Lao People's Democratic Republic"> -<!ENTITY countries.lb "Lebanon"> -<!ENTITY countries.lc "Saint Lucia"> -<!ENTITY countries.li "Liechtenstein"> -<!ENTITY countries.lk "Sri Lanka"> -<!ENTITY countries.lr "Liberia"> -<!ENTITY countries.ls "Lesotho"> -<!ENTITY countries.lt "Lithuania"> -<!ENTITY countries.lu "Luxembourg"> -<!ENTITY countries.lv "Latvia"> -<!ENTITY countries.ly "Libya"> -<!ENTITY countries.ma "Morocco"> -<!ENTITY countries.mc "Monaco"> -<!ENTITY countries.md "Moldova (Republic of)"> -<!ENTITY countries.me "Montenegro"> -<!ENTITY countries.mf "Saint Martin (French part)"> -<!ENTITY countries.mg "Madagascar"> -<!ENTITY countries.mh "Marshall Islands"> -<!ENTITY countries.mk "North Macedonia"> -<!ENTITY countries.ml "Mali"> -<!ENTITY countries.mm "Myanmar"> -<!ENTITY countries.mn "Mongolia"> -<!ENTITY countries.mo "Macao"> -<!ENTITY countries.mp "Northern Mariana Islands"> -<!ENTITY countries.mq "Martinique"> -<!ENTITY countries.mr "Mauritania"> -<!ENTITY countries.ms "Montserrat"> -<!ENTITY countries.mt "Malta"> -<!ENTITY countries.mu "Mauritius"> -<!ENTITY countries.mv "Maldives"> -<!ENTITY countries.mw "Malawi"> -<!ENTITY countries.mx "Mexico"> -<!ENTITY countries.my "Malaysia"> -<!ENTITY countries.mz "Mozambique"> -<!ENTITY countries.na "Namibia"> -<!ENTITY countries.nc "New Caledonia"> -<!ENTITY countries.ne "Niger"> -<!ENTITY countries.nf "Norfolk Island"> -<!ENTITY countries.ng "Nigeria"> -<!ENTITY countries.ni "Nicaragua"> -<!ENTITY countries.nl "Netherlands"> -<!ENTITY countries.no "Norway"> -<!ENTITY countries.np "Nepal"> -<!ENTITY countries.nr "Nauru"> -<!ENTITY countries.nu "Niue"> -<!ENTITY countries.nz "New Zealand"> -<!ENTITY countries.om "Oman"> -<!ENTITY countries.pa "Panama"> -<!ENTITY countries.pe "Peru"> -<!ENTITY countries.pf "French Polynesia"> -<!ENTITY countries.pg "Papua New Guinea"> -<!ENTITY countries.ph "Philippines"> -<!ENTITY countries.pk "Pakistan"> -<!ENTITY countries.pl "Poland"> -<!ENTITY countries.pm "Saint Pierre and Miquelon"> -<!ENTITY countries.pn "Pitcairn"> -<!ENTITY countries.pr "Puerto Rico"> -<!ENTITY countries.ps "Palestine"> -<!ENTITY countries.pt "Portugal"> -<!ENTITY countries.pw "Palau"> -<!ENTITY countries.py "Paraguay"> -<!ENTITY countries.qa "Qatar"> -<!ENTITY countries.re "Réunion"> -<!ENTITY countries.ro "Romania"> -<!ENTITY countries.rs "Serbia"> -<!ENTITY countries.ru "Russian Federation"> -<!ENTITY countries.rw "Rwanda"> -<!ENTITY countries.sa "Saudi Arabia"> -<!ENTITY countries.sb "Solomon Islands"> -<!ENTITY countries.sc "Seychelles"> -<!ENTITY countries.sd "Sudan"> -<!ENTITY countries.se "Sweden"> -<!ENTITY countries.sg "Singapore"> -<!ENTITY countries.sh "Saint Helena, Ascension and Tristan da Cunha"> -<!ENTITY countries.si "Slovenia"> -<!ENTITY countries.sj "Svalbard and Jan Mayen"> -<!ENTITY countries.sk "Slovakia"> -<!ENTITY countries.sl "Sierra Leone"> -<!ENTITY countries.sm "San Marino"> -<!ENTITY countries.sn "Senegal"> -<!ENTITY countries.so "Somalia"> -<!ENTITY countries.sr "Suriname"> -<!ENTITY countries.ss "South Sudan"> -<!ENTITY countries.st "Sao Tome and Principe"> -<!ENTITY countries.sv "El Salvador"> -<!ENTITY countries.sx "Sint Maarten (Dutch part)"> -<!ENTITY countries.sy "Syrian Arab Republic"> -<!ENTITY countries.sz "Eswatini"> -<!ENTITY countries.tc "Turks and Caicos Islands"> -<!ENTITY countries.td "Chad"> -<!ENTITY countries.tf "French Southern Territories"> -<!ENTITY countries.tg "Togo"> -<!ENTITY countries.th "Thailand"> -<!ENTITY countries.tj "Tajikistan"> -<!ENTITY countries.tk "Tokelau"> -<!ENTITY countries.tl "Timor-Leste"> -<!ENTITY countries.tm "Turkmenistan"> -<!ENTITY countries.tn "Tunisia"> -<!ENTITY countries.to "Tonga"> -<!ENTITY countries.tr "Turkey"> -<!ENTITY countries.tt "Trinidad and Tobago"> -<!ENTITY countries.tv "Tuvalu"> -<!ENTITY countries.tw "Taiwan"> -<!ENTITY countries.tz "Tanzania (United Republic of)"> -<!ENTITY countries.ua "Ukraine"> -<!ENTITY countries.ug "Uganda"> -<!ENTITY countries.um "United States Minor Outlying Islands"> -<!ENTITY countries.us "United States of America"> -<!ENTITY countries.uy "Uruguay"> -<!ENTITY countries.uz "Uzbekistan"> -<!ENTITY countries.va "Vatican City"> -<!ENTITY countries.vc "Saint Vincent and the Grenadines"> -<!ENTITY countries.ve "Venezuela (Bolivarian Republic of)"> -<!ENTITY countries.vg "Virgin Islands (British)"> -<!ENTITY countries.vi "Virgin Islands (U.S.)"> -<!ENTITY countries.vn "Vietnam (Socialist Republic of)"> -<!ENTITY countries.vu "Vanuatu"> -<!ENTITY countries.wf "Wallis and Futuna"> -<!ENTITY countries.ws "Samoa"> -<!ENTITY countries.ye "Yemen"> -<!ENTITY countries.yt "Mayotte"> -<!ENTITY countries.za "South Africa"> -<!ENTITY countries.zm "Zambia"> -<!ENTITY countries.zw "Zimbabwe">