remove all entries which are already commented out

1 files changed, 0 insertions, 386 deletions

diff --git a/english/distrib/pre-installed.data b/english/distrib/pre-installed.data
index c86894741b4..5c9a969ef2a 100644
--- a/english/distrib/pre-installed.data
+++ b/english/distrib/pre-installed.data
@@ -9,30 +9,6 @@
 
 <country code="au" name="<country-name AU>">
 
-#<vendor name="Great Southern Computer Services"
-#  country="au"
-#  URL="http://gscomputers.com.au"
-#  email="support@gscomputers.com.au"
-#  phone="(08) 98217306"
-#  fax="(08) 98217306"
-#  ship="no"
-#  smail="Great Southern Computer Services<br />
-#  P.O. Box 901<br />
-#  Katanning, WA, 6317<br />
-#  <country-name AU>" />
-
-<vendor name="ARKNET PTY LTD"
-  country="au"
-  URL="https://arkpc.com.au/"
-  email="info@arknet.com.au"
-  phone="0478 499 544"
-  fax=""
-  ship="no"
-  smail="ARKNET PTY LTD<br />
-ABN 17 233 494 783<br />
-We are located in Narre Warren, Victoria, 3805<br />
-  <country-name AU>" />
-
 <vendor name="Linux Now"
   country="au"
   URL="https://www.linuxnow.com.au/"
@@ -55,17 +31,6 @@ Balwyn North, Vic, 3104<br />
 
 #<country code="at" name="<country-name AT>">
 
-#<vendor name="G-TEC / Open Source Solutions"
-#  country="at"
-#  URL="http://www.g-tec.co.at"
-#  email="office@g-tec.co.at"
-#  phone="+43 316 890235-0"
-#  fax="+43 316 890236"
-#  ship="yes"
-#  smail="Fichtestrasse 66-68<br />
-#  A-8020 Graz<br />
-#  <country-name AT>" />
-
 #</country>
 
 
@@ -114,14 +79,6 @@ B-9890 Gavere" />
 
 #<country code="br" name="<country-name BR>">
 
-#<vendor name="Nautilus ISP (Pelc Serv. de Com. Ltda)"
-#  country="br"
-#  URL="http://www.nautilus.com.br/"
-#  email="suporte@nautilus.com.br"
-#  phone="(55) 91-2114777"
-#  phone="(55) 91-40054777"
-#  fax="(55) 91-2761646" />
-
 #</country>
 
 
@@ -148,16 +105,6 @@ B-9890 Gavere" />
   phone="+1-613-263-0844"
   ship="yes" />
 
-#<vendor name="NExcess Technologies inc."
-#  country="ca"
-#  URL="https://nexcess.ca/"
-#  email="info@nexcess.ca"
-#  phone="+1 (418) 558-5169"
-#  ship="yes"
-#  smail="NExcess Technologies inc.<br />
-#  161 rue Calixta-Laberge<br />
-#  Boischatel (Québec)  Canada G0A 1H0" />
-
 <vendor name="Precise-ITC, Inc."
   country="ca"
   URL="http://www2.precise-itc.com/x8"
@@ -245,16 +192,6 @@ CZ 56002 &#x10C;esk&aacute; T&#x159;ebov&aacute;" />
 
 <country code="dk" name="<country-name DK>">
 
-#<vendor name="C. Iversen Konsult"
-#  country="dk"
-#  URL="http://www.civersen.dk"
-#  email="civ@civersen.dk"
-#  phone="+45 74 69 39 47"
-#  fax="+45 69 66 10 39"
-#  ship="yes"
-#  smail="C. Iversen Konsult<br />
-#&Oslash;stergade 5, st, DK-6230 R&oslash;dekro" />
-
 <vendor name="LinuxPusher"
   country="dk"
   URL="https://linuxpusher.dk"
@@ -296,28 +233,6 @@ CZ 56002 &#x10C;esk&aacute; T&#x159;ebov&aacute;" />
 
 <country code="fr" name="<country-name FR>">
 
-#<vendor name="DeCAD"
-#  country="fr"
-#  URL="http://www.decad.fr/"
-#  email="debian@decad.fr"
-#  phone="+33 4 93 92 34 24"
-#  fax="+33 4 93 92 87 70"
-#  ship="no"
-#  smail="DeCAD<br/>
-#11, rue de Paris<br/>
-#06000 Nice" />
-
-#<vendor name="ADSiS"
-#  country="fr"
-#  URL="http://www.adsis.fr/"
-#  email="contact@adsis.fr"
-#  phone="+33 0 450 226 313"
-#  fax="+33 0 450 229 216"
-#  ship="yes"
-#  smail="ADSiS<br/>
-#9, impasse des fusains<br/>
-#74960 MEYTHET" />
-
 # last check: 2019/07/15 mail to switch from accelibreinfo to Hypra
 <vendor name="Hypra"
   country="fr"
@@ -364,17 +279,6 @@ CZ 56002 &#x10C;esk&aacute; T&#x159;ebov&aacute;" />
  30960 Le Martinet<br />
 <country-name FR>" />
 
-#<vendor name="Proformatique"
-#  country="fr"
-#  URL="http://www.proformatique.com/"
-#  email="contact@proformatique.com"
-#  phone="+33 1 41 38 99 60"
-#  fax="+33 1 41 38 99 70"
-#  ship="no"
-#  smail="Proformatique<br/>
-#67 rue Voltaire<br/>
-#92800 Puteaux" />
-
 </country>
 
 
@@ -429,17 +333,6 @@ D-35114 Haina-L&ouml;hlbach" />
 Roentgenstr. 4<br />
 21465 Reinbek, Germany" />
 
-#<vendor name="Imap4web"
-#  country="de"
-#  URL="http://www.imap4web.de/"
-#  email="info@imap4web.de"
-#  phone="+49 7154 - 155 165"
-#  fax="+49 7154 - 15 63 65"
-#  ship="no"
-#  smail="Imap4web<br/>
-#Lange Strasse 44<br/>
-#D-70806 Kornwestheim" />
-
 <vendor name="IT-Service Sebastian Reimers"
   country="de"
   URL="https://miete-admin.de/"
@@ -495,16 +388,6 @@ CZ 56002 &#x10C;esk&aacute; T&#x159;ebov&aacute;" />
 ### the vendor has requested to be listed both in Germany and Czech
 ### Republic as he's located on the border and he sell mostly to Germans
 
-#<vendor name="Sascha Schmidt Datentechnik"
-#  country="de"
-#  URL="http://www.saschaschmidt.de"
-#  email="info@saschaschmidt.de"
-#  phone="+49 1577 3090158"
-#  ship="no"
-#  smail="Sascha Schmidt Datentechnik <br />
-#  Zollernstraße 5<br />
-#  D-72250 Freudenstadt" />
-
 <vendor name="Sanux.de"
   country="de"
   URL="https://www.sanux.de/"
@@ -580,16 +463,6 @@ D-22041 Hamburg" />
 
 # <country code="gr" name="<country-name GR>">
 
-#<vendor name="Step"
-#  country="gr"
-#  URL="http://www.step.gr/"
-#  email="debian@step.gr"
-#  phone="210-4181239"
-#  fax="210-4184391"
-#  ship="no"
-#  smail="Step<br/>
-#36 Akti Moutsopoulou str.<br/>
-#18536 Piraeus" />
 
 #</country>
 
@@ -607,20 +480,6 @@ D-22041 Hamburg" />
   phone="+36 703811680"
   ship="yes" />
 
-#  <vendor name="ENEXIS Informatics Ltd."
-#  country="hu"
-#  URL="http://www.enexis.hu/"
-#  email="info@enexis.hu"
-#  phone="+36-70/339-1197"
-#  ship="no" />
-
-#<vendor name="AC-INFO Ltd."
-#  country="hu"
-#  URL="http://acinfo.hu/"
-#  email="linux@acinfo.hu"
-#  phone="+36-70-242-9853"
-#  ship="no" />
-
 <vendor name="INTEGRITY Ltd."
   country="hu"
   URL="https://integrity.hu/"
@@ -697,27 +556,6 @@ Kerala - 695004, <country-name IN>" />
 
 <country code="it" name="<country-name IT>">
 
-#<vendor name="PROSA Progettazione Sviluppo Aperto"
-#  country="it"
-#  URL="http://www.prosa.it/"
-#  email="sales@prosa.it"
-#  phone="+39 049 87 74 950"
-#  fax="+39 049 87 85 854"
-#  ship="no"
-#  smail="via Degli Zabarella, 3<br />
-#       35121, Padova (<country-name IT>)" />
-
-# <vendor name="Aptadigital srl"
-#  country="it"
-# URL="http://www.aptadigital-sistemi.it"
-# email="info@aptadigital.it"
-# phone="+39 045 8345086"
-# fax="+39 045 2109229"
-# ship="yes"
-# smail="Aptadigital srl<br />
-# Via Podgora 1 <br />
-# 37217 Verona" />
-
 <vendor name="Binario Etico"
   country="it"
  URL="https://www.binarioetico.it/servizi/officina-informatica.html"
@@ -735,41 +573,6 @@ Kerala - 695004, <country-name IN>" />
   email="cr1pt0@yandex.com"
   ship="yes" />
 
-#<vendor name="DGrent S.n.c."
-#  country="it"
-#  URL="http://www.dgrent.it/"
-#  email="carlo@dgrent.it"
-#  phone="011-4531151"
-#  fax="011-4535350"
-#  ship="no"
-#  smail="DGrent S.n.c.<br/>
-#Strada Comunale di Altessano, 146<br>
-#CAP 10151<br/>
-#TORINO" />
-
-#<vendor name="Openhost"
-#  country="it"
-#  URL="http://www.openhost.it/"
-#  email="info@openhost.it"
-#  phone="+39059236594"
-#  fax="+39059236594"
-#  ship="no"
-#  smail="
-#Openhost<br />
-#via Puccini 24<br />
-#41100 Modena MO" />
-
-#<vendor name="Modula Informatica Srl"
-#  country="it"
-#  URL="http://www.modula.net/"
-#  email="info@modula.net"
-#  phone="+39 0574 643599"
-#  fax="+39 0574 540479"
-#  ship="yes"
-#  smail="Modula Informatica Srl<br/>
-#Via dell'Alloro 33 F/G<br/>
-#59100 Prato PO" />
-
 <vendor name="Pretecno di Pretto Luca"
   country="it"
   URL="https://pretecno.it/"
@@ -792,18 +595,6 @@ Kerala - 695004, <country-name IN>" />
   10148 Torino<br />
   <country-name IT>" />
 
-#<vendor name="Technolab snc"
-#  country="it"
-#  URL="http://technolabsnc.it/site/store/index.php?route=common/home"
-#  email="mail@technolabsnc.it"
-#  phone="0573 36 61 77"
-#  fax="0573 36 61 77"
-#  ship="no"
-#  smail="Technolab snc<br />
-#Via di Porta al borgo, 15<br />
-#51100 Pistoia<br />
-#<country-name IT>" />
-
 <vendor name="vaSystems di Vincenzo Argese"
   country="it"
   URL="https://www.informaticawebsystems.com/"
@@ -811,18 +602,6 @@ Kerala - 695004, <country-name IN>" />
   phone="+39 328 8437929"
   ship="no" />
 
-#<vendor name="Vedova Computing di Emanuele Vedova"
-#  country="it"
-#  URL="http://www.vedova.it"
-#  email="info@vedova.it"
-#  phone="+39 031 4491005"
-#  fax="+39 031 4491084"
-#  ship="no"
-#  smail="Vedova Computing di Emanuele Vedova<br />
-#Via Acquanera, 26/D<br />
-#22100 Como<br />
-#<country-name IT>" />
-
 <vendor name="YetOpen S.r.l."
   country="it"
   URL="https://www.yetopen.it/"
@@ -834,17 +613,6 @@ Kerala - 695004, <country-name IN>" />
 C.so E. Filiberto, 74<br/>
 23900 Lecco" />
 
-#<vendor name="HAPPY S.r.l."
-#  country="it"
-#  URL="http://www.happypc.it/"
-#  email="service@happypc.it"
-#  phone="0824 875465"
-#  fax="0824 875115"
-#  ship="no"
-#  smail="HAPPY S.r.l.<br/>
-#Via Collepiano, 20<br/>
-#CAP 82030 Torrecuso (BN)" />
-
 </country>
 
 
@@ -874,18 +642,6 @@ C.so E. Filiberto, 74<br/>
    Hda. Bilbao N0.58 Fracc. Urbi Hacienda Balboa,<br />
    Col. Atlanta Edo. Mexico C.P. 54740" />
 
-#<vendor name="Linux OpenSource de M&eacute;xico S.A. de C.V."
-#  country="mx"
-#  URL="http://www.linuxopensource.com.mx/"
-#  email="info@linuxopensource.com.mx"
-#  phone="+52 (443) 312.8724"
-#  fax="+52 (443) 317.3945"
-#  ship="yes"
-#  smail="
-#Linux OpenSource<br/>
-#Ray&oacute;n #523. Colonia Centro CP 58000<br/>
-#Morelia, Michoac&aacute;n. M&eacute;xico" />
-
 </country>
 
 
@@ -962,17 +718,6 @@ Rzesz&oacute;w<br />
 
 #<country code="ro" name="<country-name RO>">
 
-#<vendor name="SC NECSYS SRL"
-#  country="ro"
-#  URL="http://www.necsys.ro"
-#  email="office@necsys.ro"
-#  phone="+40 742 639 109"
-#  ship="no"
-#  smail="SC NECSYS SRL<br />
-#  Str. poligonului BI. B11 Ap.15<br />
-#  Alba Iulia<br />
-#  <country-name RO>" />
-
 #</country>
 
 
@@ -1003,18 +748,6 @@ Piestany 921 01<br />
 
 <country code="za" name="<country-name ZA>">
 
-# No longer operating:
-# https://lists.debian.org/BC0C8CF3AD3E874098C14F20C620537D0167002387@TRAMX.tra.local
-#<vendor name="Goldencreations Debian Store"
-#  country="za"
-# URL="http://debian.goldencreations.co.za"
-# email="sales@debian.goldencreations.co.za"
-# phone="+27 041 457 5808"
-# ship="no"
-# smail="Linux OS Online Store <br />
-#512 Govenmbeki ave northend <br />
-#<country-name ZA>" />
-
 <vendor name="Radiant Networks (Pty) Ltd"
   country="za"
  URL="https://www.radiantnet.co.za/"
@@ -1068,17 +801,6 @@ Ausi&agrave;s Marc, 56<br/>
  08904 Hospitalet de Llobregat<br />
  Barcelona (<country-name ES>)" />
 
-#<vendor name="Inforreg Maella, SL"
-#  country="es"
-# URL="http://linuxocasion.net"
-# email="comercial@inforreg.es"
-# phone="34 976639232"
-# ship="yes"
-# smail="Inforreg, SL.<br />
-# Francisco Goya, 10<br />
-# 50710 Maella<br />
-# Zaragoza, <country-name ES>" />
-
 <vendor name="InsMas"
   country="es"
   URL="https://insmas.com/"
@@ -1156,17 +878,6 @@ CH-6006 Luzern<br />
   Birmensdorferstr. 379<br />
   8055 Zürich<br />
   <country-name CH>" />
-  
-#<vendor name="Panthera Systems"
-#  country="ch"
-#   URL="http://www.panthera-systems.net/"
-#   email="info@panthera-systems.net"
-#   phone="+41 32 672 40 91"
-#   fax="+41 32 672 43 64"
-#   ship="yes"
-#   smail="Panthera Systems<br/>
-# Burgunderstrasse 3<br/>
-# CH-4562 Biberist" />
 
 </country>
 
@@ -1210,35 +921,6 @@ CH-6006 Luzern<br />
 
 <country code="us" name="<country-name US>">
 
-# <vendor name="AVADirect Custom Computers"
-#  country="us"
-# URL="https://www.avadirect.com/"
-# email="sales@avadirect.com"
-# phone="1-866-766-4629"
-# ship="no"
-# smail="AVADirect Custom Computers<br />
-# 1750 Highland Rd. Suite #4<br />
-# Twinsburg, OH 44087<br />
-# <country-name US>" />
-
-# <vendor name="California Digital"
-#  country="us"
-# URL="http://www.californiadigital.com/"
-#  email="sales@californiadigital.com"
-#  phone="+1 888 LINUX-4U (+1 888 546-8948), +1 (510) 651-8811"
-#  fax="+1 (510) 651-8844"
-#  smail="California Digital<br />
-# 47071 Bayside Parkway<br />
-# Fremont, CA 94538<br />
-# <country-name US>" />
-
-#<vendor name="CT Quantum CCSvc"
-#  country="us"
-# URL="https://www.ctquantum.com/"
-#  email="support@ctquantum.com"
-# phone="+1 (401) 244-5855"
-#  ship="yes" />
-
 <vendor name="CurrentBuild Computer"
   country="us"
   URL="https://www.currentbuild.com/"
@@ -1317,28 +999,6 @@ San Jose CA 95131<br />
   PO BOX 86<br />
   Tybee GA 31328" />
 
-#<vendor name="Linux-1U.net"
-#  country="us"
-#  URL="http://Linux-1U.net/"
-#  email="Info@Linux-1U.net"
-#  phone="+1 408-98-Linux"
-#  ship="yes"
-#  smail="1U Ring Inc dba Linux-1U.net<br/>
-#P.O. Box 70968<br/>
-#Sunnyvale, CA  94086<br/>
-#<country-name US>" />
-
-#<vendor name="LinuxCertified, Inc."
-#  country="us"
-#  URL="http://www.linuxcertified.com/"
-#  email="info@linuxcertified.com"
-#  phone="+1 408 314 6700"
-#  ship="yes"
-#  smail="LinuxCertified, Inc.<br/>
-#1072 S. De Anza Blvd. #A107-19<br/>
-#San Jose, CA 95129<br/>
-#<country-name US>" />
-
 <vendor name="LAC Portland"
   country="us"
   URL="https://lacpdx.com/"
@@ -1351,29 +1011,6 @@ Suite 142 #229<br />
 Sherwood OR 97140<br />
 <country-name US>" />
 
-#<vendor name="Microway, Inc"
-#  country="us"
-#  URL="http://www.microway.com/"
-#  email="sales@microway.com"
-#  phone="+1 508-746-7341"
-#  fax="+1 508-746-4678"
-#  ship="yes"
-#  smail="Microway, Inc<br/>
-#12 Richards Rd<br/>
-#Plymouth, MA 02360<br/>
-#<country-name US>" />
-
-#<vendor name="Open Sense Solutions LLC"
-#  country="us"
-#  URL="http://opensensesolutions.com/products.html"
-#  email="info@opensensesolutions.com"
-#  phone="+1 888-323-1742"
-#  ship="no"
-#  smail="Open Sense Solutions LLC<br/>
-#2693 Texas Hill Rd.<br/>
-#Hinesburg VT 05461<br/>
-#<country-name US>" />
-
 <vendor name="Psychsoftpc"
   country="us"
   URL="http://www.psychsoftpc.com/"
@@ -1384,29 +1021,6 @@ Sherwood OR 97140<br />
 Quincy, MA 02171<br />
 <country-name US>" />
 
-#<vendor name="Sean Brady, LLC"
-#  country="us"
-# URL="http://www.seanbrady.us"
-# email="sales@seanbrady.us"
-# phone="+1 (256) 277-3579"
-# ship="yes"
-# smail="Sean Brady, LLC<br />
-#95 S. Interlaken Dr.<br />
-#Madison, AL 35758<br />
-#<country-name US>" />
-
-#<vendor name="StoreAnyWhere.com Inc."
-#  country="us"
-#  URL="http://www.storeanywhere.com/"
-#  email="sales@storeanywhere.com"
-#  phone="+1 (718) 934-7313"
-#  fax="+1 (718) 934-7305"
-#  ship="yes"
-#  smail="StoreAnyWhere.com Inc.<br />
-# 1816 Gravesend Neck Rd., (Bet. E18 &amp; E19th St.)<br />
-# Brooklyn, NY 11229<br />
-# <country-name US>" />
-
 <vendor name="SW Technology"
   country="us"
   URL="https://www.swt.com/"