aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Huriaux <thuriaux>2005-08-25 14:06:06 +0000
committerThomas Huriaux <thuriaux>2005-08-25 14:06:06 +0000
commit1dec5e3bbb4b0d98ac258ca55b7b0d4cf17dbbc3 (patch)
tree04558bacbb3e296817ba4b934f97c6d4c9474699
parent6068ab02cc2e6377d58be6ca75c04b9c6e2c8734 (diff)
New consultant template
No longer use <pre></pre> Translations have been fixed as well I'm sure there is a few mistakes, I will fix these as soon as possible CVS version numbers catalan/consultants/alex_r.wml: 1.1 -> 1.2 catalan/consultants/ben_b.wml: 1.1 -> 1.2 catalan/consultants/catalyst.wml: 1.2 -> 1.3 catalan/consultants/charles_s.wml: 1.1 -> 1.2 catalan/consultants/con_z.wml: 1.1 -> 1.2 croatian/consultants/alex_r.wml: 1.2 -> 1.3 croatian/consultants/charles_s.wml: 1.3 -> 1.4 croatian/consultants/jim_w.wml: 1.5 -> 1.6 croatian/consultants/jurgen_l.wml: 1.3 -> 1.4 croatian/consultants/marques_j.wml: 1.4 -> 1.5 croatian/consultants/nikolai_l.wml: 1.4 -> 1.5 croatian/consultants/prosa.wml: 1.2 -> 1.3 croatian/consultants/tim_o.wml: 1.5 -> 1.6 czech/consultants/credativ.wml: 1.1 -> 1.2 danish/consultants/757_technologies.wml: 1.2 -> 1.3 danish/consultants/ace_technology_group.wml: 1.1 -> 1.2 danish/consultants/aerasec.wml: 1.2 -> 1.3 danish/consultants/alex_r.wml: 1.1 -> 1.2 danish/consultants/andreu_i.wml: 1.1 -> 1.2 danish/consultants/antonio_cosenza.wml: 1.2 -> 1.3 danish/consultants/avalonix.wml: 1.1 -> 1.2 danish/consultants/beeznest.wml: 1.1 -> 1.2 danish/consultants/ben_b.wml: 1.1 -> 1.2 danish/consultants/bryan_b.wml: 1.1 -> 1.2 danish/consultants/charles_s.wml: 1.1 -> 1.2 danish/consultants/clue_inc.wml: 1.1 -> 1.2 danish/consultants/cory_p.wml: 1.1 -> 1.2 danish/consultants/credativ.wml: 1.1 -> 1.2 danish/consultants/datalink_internet.wml: 1.3 -> 1.4 danish/consultants/delicate.ch.wml: 1.1 -> 1.2 danish/consultants/et_computer.wml: 1.2 -> 1.3 danish/consultants/eugene_g.wml: 1.1 -> 1.2 danish/consultants/fai-cluster.wml: 1.1 -> 1.2 danish/consultants/filippo_giunchedi.wml: 1.1 -> 1.2 danish/consultants/forlinux.wml: 1.2 -> 1.3 danish/consultants/heureka.wml: 1.2 -> 1.3 danish/consultants/indus_net_technologies.wml: 1.1 -> 1.2 danish/consultants/it_service_drillich.wml: 1.1 -> 1.2 danish/consultants/ivan_k.wml: 1.1 -> 1.2 danish/consultants/jarno_saarinen.wml: 1.1 -> 1.2 danish/consultants/jaume_t.wml: 1.1 -> 1.2 danish/consultants/jean_p.wml: 1.1 -> 1.2 danish/consultants/jh_networks.wml: 1.2 -> 1.3 danish/consultants/jim_w.wml: 1.1 -> 1.2 danish/consultants/joan_l.wml: 1.1 -> 1.2 danish/consultants/joe_m.wml: 1.1 -> 1.2 danish/consultants/joerg_w.wml: 1.2 -> 1.3 danish/consultants/kaarlo_m.wml: 1.2 -> 1.3 danish/consultants/kevin_l.wml: 1.1 -> 1.2 danish/consultants/kevin_t.wml: 1.1 -> 1.2 danish/consultants/kotarba.wml: 1.1 -> 1.2 danish/consultants/linux_box.wml: 1.1 -> 1.2 danish/consultants/linux_certified.wml: 1.3 -> 1.4 danish/consultants/linux_consultancy.wml: 1.1 -> 1.2 danish/consultants/linuxmagic.wml: 1.1 -> 1.2 danish/consultants/linuxworks.wml: 1.2 -> 1.3 danish/consultants/michaeljohn_c.wml: 1.1 -> 1.2 danish/consultants/mind.wml: 1.1 -> 1.2 danish/consultants/minihub.wml: 1.1 -> 1.2 danish/consultants/murphy_soft.wml: 1.1 -> 1.2 danish/consultants/norrix.wml: 1.2 -> 1.3 danish/consultants/opentechnologies.wml: 1.1 -> 1.2 danish/consultants/opentrend.wml: 1.1 -> 1.2 danish/consultants/orbit.wml: 1.1 -> 1.2 danish/consultants/pete_b.wml: 1.1 -> 1.2 danish/consultants/peter_d.wml: 1.1 -> 1.2 danish/consultants/peter_naulls.wml: 1.1 -> 1.2 danish/consultants/produktivit.wml: 1.1 -> 1.2 danish/consultants/r_w_r.wml: 1.1 -> 1.2 danish/consultants/rafez_n.wml: 1.1 -> 1.2 danish/consultants/robert_millan.wml: 1.1 -> 1.2 danish/consultants/sergio_a.wml: 1.1 -> 1.2 danish/consultants/shannon_d.wml: 1.2 -> 1.3 danish/consultants/sine_nomine.wml: 1.1 -> 1.2 danish/consultants/sosa.wml: 1.2 -> 1.3 danish/consultants/steve_l.wml: 1.1 -> 1.2 danish/consultants/stuart_t.wml: 1.1 -> 1.2 danish/consultants/ted_j.wml: 1.1 -> 1.2 danish/consultants/tim_o.wml: 1.2 -> 1.3 danish/consultants/toni_m.wml: 1.1 -> 1.2 danish/consultants/turo_technology.wml: 1.1 -> 1.2 danish/consultants/vivek_k.wml: 1.1 -> 1.2 dutch/consultants/credativ.wml: 1.1 -> 1.2 english/consultants/757_technologies.wml: 1.2 -> 1.3 english/consultants/abv.wml: 1.3 -> 1.4 english/consultants/ace_technology_group.wml: 1.1 -> 1.2 english/consultants/aerasec.wml: 1.2 -> 1.3 english/consultants/agentbob.wml: 1.2 -> 1.3 english/consultants/aleph1.wml: 1.2 -> 1.3 english/consultants/alex_r.wml: 1.1 -> 1.2 english/consultants/amazon.wml: 1.2 -> 1.3 english/consultants/anderson.wml: 1.1 -> 1.2 english/consultants/andreu_i.wml: 1.1 -> 1.2 english/consultants/anmsoft.wml: 1.1 -> 1.2 english/consultants/antonio_cosenza.wml: 1.2 -> 1.3 english/consultants/ants-art.wml: 1.1 -> 1.2 english/consultants/applepie-solutions.wml: 1.1 -> 1.2 english/consultants/apsis.wml: 1.1 -> 1.2 english/consultants/avalonix.wml: 1.1 -> 1.2 english/consultants/baton_rouge.wml: 1.1 -> 1.2 english/consultants/beeznest.wml: 1.1 -> 1.2 english/consultants/beil.wml: 1.2 -> 1.3 english/consultants/ben_b.wml: 1.1 -> 1.2 english/consultants/bentosolutions.wml: 1.2 -> 1.3 english/consultants/bitpusher.wml: 1.1 -> 1.2 english/consultants/bitspot.wml: 1.1 -> 1.2 english/consultants/brainalliance.wml: 1.1 -> 1.2 english/consultants/bryan_b.wml: 1.1 -> 1.2 english/consultants/buici.wml: 1.1 -> 1.2 english/consultants/buttersideup.wml: 1.2 -> 1.3 english/consultants/cargol.wml: 1.2 -> 1.3 english/consultants/catalyst.wml: 1.4 -> 1.5 english/consultants/charles_s.wml: 1.2 -> 1.3 english/consultants/cits.wml: 1.3 -> 1.4 english/consultants/clockwork.wml: 1.2 -> 1.3 english/consultants/clue_inc.wml: 1.1 -> 1.2 english/consultants/coderscorp.wml: 1.2 -> 1.3 english/consultants/coherent_light.wml: 1.1 -> 1.2 english/consultants/con_z.wml: 1.5 -> 1.6 english/consultants/cory_p.wml: 1.1 -> 1.2 english/consultants/credativ.wml: 1.1 -> 1.2 english/consultants/csinetworks.wml: 1.2 -> 1.3 english/consultants/custom_engineering.wml: 1.1 -> 1.2 english/consultants/datalay.wml: 1.1 -> 1.2 english/consultants/datalink_internet.wml: 1.3 -> 1.4 english/consultants/davonet.wml: 1.1 -> 1.2 english/consultants/deeproot.wml: 1.3 -> 1.4 english/consultants/delemar.wml: 1.1 -> 1.2 english/consultants/delicate.ch.wml: 1.1 -> 1.2 english/consultants/disoft.wml: 1.2 -> 1.3 english/consultants/douglas_h.wml: 1.2 -> 1.3 english/consultants/eauzone.wml: 1.2 -> 1.3 english/consultants/emergya.wml: 1.2 -> 1.3 english/consultants/enterux.wml: 1.5 -> 1.6 english/consultants/et_computer.wml: 1.3 -> 1.4 english/consultants/eugene_g.wml: 1.1 -> 1.2 english/consultants/extralogix.wml: 1.1 -> 1.2 english/consultants/fai-cluster.wml: 1.1 -> 1.2 english/consultants/federico_sevilla.wml: 1.2 -> 1.3 english/consultants/fensterkitt.wml: 1.1 -> 1.2 english/consultants/fff_managed.wml: 1.3 -> 1.4 english/consultants/filippo_giunchedi.wml: 1.1 -> 1.2 english/consultants/firman.wml: 1.2 -> 1.3 english/consultants/forlinux.wml: 1.2 -> 1.3 english/consultants/fortuitous.wml: 1.3 -> 1.4 english/consultants/fotopic.wml: 1.1 -> 1.2 english/consultants/freesoft.wml: 1.1 -> 1.2 english/consultants/gbcomputers.wml: 1.3 -> 1.4 english/consultants/genilto_dallo.wml: 1.1 -> 1.2 english/consultants/gnulinux.wml: 1.1 -> 1.2 english/consultants/guillermo_rico.wml: 1.2 -> 1.3 english/consultants/gurunetwork.wml: 1.1 -> 1.2 english/consultants/harmuth.wml: 1.1 -> 1.2 english/consultants/heureka.wml: 1.2 -> 1.3 english/consultants/hornfordassociates.wml: 1.1 -> 1.2 english/consultants/houdek.wml: 1.1 -> 1.2 english/consultants/hp_germany.wml: 1.2 -> 1.3 english/consultants/hytechpro.wml: 1.2 -> 1.3 english/consultants/ideal.wml: 1.1 -> 1.2 english/consultants/imagin.wml: 1.1 -> 1.2 english/consultants/incipit.wml: 1.1 -> 1.2 english/consultants/indus_net_technologies.wml: 1.1 -> 1.2 english/consultants/inittab.wml: 1.1 -> 1.2 english/consultants/inl.wml: 1.2 -> 1.3 english/consultants/integrics.wml: 1.1 -> 1.2 english/consultants/internet_solutions.wml: 1.1 -> 1.2 english/consultants/ipodion.wml: 1.1 -> 1.2 english/consultants/it_service_drillich.wml: 1.1 -> 1.2 english/consultants/itsecuritymn.wml: 1.1 -> 1.2 english/consultants/ivan_k.wml: 1.1 -> 1.2 english/consultants/jarno_saarinen.wml: 1.2 -> 1.3 english/consultants/jaume_t.wml: 1.2 -> 1.3 english/consultants/javier_v.wml: 1.3 -> 1.4 english/consultants/jean_p.wml: 1.1 -> 1.2 english/consultants/jeremy_r.wml: 1.3 -> 1.4 english/consultants/jfranken.wml: 1.1 -> 1.2 english/consultants/jh_networks.wml: 1.2 -> 1.3 english/consultants/jibsystems.wml: 1.1 -> 1.2 english/consultants/jim_w.wml: 1.2 -> 1.3 english/consultants/joan_l.wml: 1.1 -> 1.2 english/consultants/joe_m.wml: 1.1 -> 1.2 english/consultants/joerg_w.wml: 1.2 -> 1.3 english/consultants/joeyh.wml: 1.1 -> 1.2 english/consultants/jurgen_l.wml: 1.3 -> 1.4 english/consultants/kaarlo_m.wml: 1.2 -> 1.3 english/consultants/karsten_m_self.wml: 1.2 -> 1.3 english/consultants/kevin_l.wml: 1.1 -> 1.2 english/consultants/kevin_t.wml: 1.1 -> 1.2 english/consultants/knaepper.wml: 1.1 -> 1.2 english/consultants/koenigsmann.wml: 1.1 -> 1.2 english/consultants/kotarba.wml: 1.1 -> 1.2 english/consultants/kring.wml: 1.2 -> 1.3 english/consultants/lawrence_c.wml: 1.5 -> 1.6 english/consultants/lcs.wml: 1.3 -> 1.4 english/consultants/leos.wml: 1.1 -> 1.2 english/consultants/liberobit.wml: 1.1 -> 1.2 english/consultants/libhertz.wml: 1.1 -> 1.2 english/consultants/libren.wml: 1.1 -> 1.2 english/consultants/linbit.wml: 1.1 -> 1.2 english/consultants/linbox.wml: 1.1 -> 1.2 english/consultants/linux_ag.wml: 1.1 -> 1.2 english/consultants/linux_box.wml: 1.1 -> 1.2 english/consultants/linux_certified.wml: 1.3 -> 1.4 english/consultants/linux_consultancy.wml: 1.1 -> 1.2 english/consultants/linux_mania.wml: 1.2 -> 1.3 english/consultants/linuxcare.wml: 1.1 -> 1.2 english/consultants/linuxmagic.wml: 1.1 -> 1.2 english/consultants/linuxworks.wml: 1.2 -> 1.3 english/consultants/logilab.wml: 1.3 -> 1.4 english/consultants/mark_stanislav.wml: 1.1 -> 1.2 english/consultants/markoer.wml: 1.1 -> 1.2 english/consultants/maroonpoint.wml: 1.1 -> 1.2 english/consultants/marques_j.wml: 1.3 -> 1.4 english/consultants/mathias_kettner.wml: 1.2 -> 1.3 english/consultants/michaeljohn_c.wml: 1.1 -> 1.2 english/consultants/miju.wml: 1.1 -> 1.2 english/consultants/mind.wml: 1.3 -> 1.4 english/consultants/minihub.wml: 1.1 -> 1.2 english/consultants/mivitec.wml: 1.2 -> 1.3 english/consultants/mladen_adamovic.wml: 1.1 -> 1.2 english/consultants/murphy_soft.wml: 1.1 -> 1.2 english/consultants/netdigix.wml: 1.1 -> 1.2 english/consultants/nikolai_l.wml: 1.3 -> 1.4 english/consultants/norrix.wml: 1.2 -> 1.3 english/consultants/novochip.wml: 1.2 -> 1.3 english/consultants/ns_computing.wml: 1.2 -> 1.3 english/consultants/openbizz.wml: 1.1 -> 1.2 english/consultants/openit.wml: 1.1 -> 1.2 english/consultants/opentechnologies.wml: 1.1 -> 1.2 english/consultants/opentrend.wml: 1.1 -> 1.2 english/consultants/orbit.wml: 1.1 -> 1.2 english/consultants/osourcery.wml: 1.2 -> 1.3 english/consultants/ossafrica.wml: 1.1 -> 1.2 english/consultants/ouattara.wml: 1.1 -> 1.2 english/consultants/oxalide.wml: 1.1 -> 1.2 english/consultants/pahne.wml: 1.1 -> 1.2 english/consultants/parreiras_m.wml: 1.1 -> 1.2 english/consultants/penguintechs.wml: 1.1 -> 1.2 english/consultants/pete_b.wml: 1.1 -> 1.2 english/consultants/peter_d.wml: 1.1 -> 1.2 english/consultants/peter_naulls.wml: 1.1 -> 1.2 english/consultants/picone.wml: 1.3 -> 1.4 english/consultants/pits.wml: 1.1 -> 1.2 english/consultants/porcacchia.wml: 1.1 -> 1.2 english/consultants/praksys.wml: 1.1 -> 1.2 english/consultants/produktivit.wml: 1.1 -> 1.2 english/consultants/prolibre.wml: 1.1 -> 1.2 english/consultants/prosa.wml: 1.2 -> 1.3 english/consultants/python_byte.wml: 1.1 -> 1.2 english/consultants/qualsoftservices.wml: 1.1 -> 1.2 english/consultants/qulix.wml: 1.1 -> 1.2 english/consultants/r3deng.wml: 1.1 -> 1.2 english/consultants/r_w_r.wml: 1.1 -> 1.2 english/consultants/rafez_n.wml: 1.1 -> 1.2 english/consultants/researchut.wml: 1.1 -> 1.2 english/consultants/robert_millan.wml: 1.1 -> 1.2 english/consultants/sam_solutions.wml: 1.2 -> 1.3 english/consultants/samantha_s.wml: 1.3 -> 1.4 english/consultants/samurai.wml: 1.1 -> 1.2 english/consultants/scheeder.wml: 1.1 -> 1.2 english/consultants/seattlelinux.wml: 1.1 -> 1.2 english/consultants/sergio_a.wml: 1.1 -> 1.2 english/consultants/serverflow.wml: 1.1 -> 1.2 english/consultants/servitux.wml: 1.1 -> 1.2 english/consultants/shannon_d.wml: 1.2 -> 1.3 english/consultants/simone_giustetti.wml: 1.3 -> 1.4 english/consultants/sine_nomine.wml: 1.1 -> 1.2 english/consultants/sniffer.wml: 1.1 -> 1.2 english/consultants/softitaly.wml: 1.1 -> 1.2 english/consultants/soleyman.wml: 1.1 -> 1.2 english/consultants/solutionsfirst.wml: 1.1 -> 1.2 english/consultants/sosa.wml: 1.2 -> 1.3 english/consultants/steve_l.wml: 1.1 -> 1.2 english/consultants/storitback.wml: 1.1 -> 1.2 english/consultants/stuart_t.wml: 1.1 -> 1.2 english/consultants/syscovery.wml: 1.1 -> 1.2 english/consultants/tagfl.wml: 1.1 -> 1.2 english/consultants/tecexperts.wml: 1.2 -> 1.3 english/consultants/ted_j.wml: 1.2 -> 1.3 english/consultants/tegtmeier.wml: 1.3 -> 1.4 english/consultants/terran_universal_systems.wml: 1.7 -> 1.8 english/consultants/thoughtprocess.wml: 1.1 -> 1.2 english/consultants/tim_o.wml: 1.2 -> 1.3 english/consultants/togaware.wml: 1.2 -> 1.3 english/consultants/toni_m.wml: 1.1 -> 1.2 english/consultants/transparen.wml: 1.3 -> 1.4 english/consultants/triona.wml: 1.1 -> 1.2 english/consultants/trisinus.wml: 1.1 -> 1.2 english/consultants/trusted.wml: 1.2 -> 1.3 english/consultants/trustsec.wml: 1.1 -> 1.2 english/consultants/turinglabs.wml: 1.2 -> 1.3 english/consultants/turo_technology.wml: 1.1 -> 1.2 english/consultants/udslinux.wml: 1.1 -> 1.2 english/consultants/ullrich-it-consult.wml: 1.1 -> 1.2 english/consultants/ultreia.wml: 1.6 -> 1.7 english/consultants/unimedgv.wml: 1.1 -> 1.2 english/consultants/uslinux.wml: 1.1 -> 1.2 english/consultants/viridiansun.wml: 1.1 -> 1.2 english/consultants/vivek_k.wml: 1.1 -> 1.2 english/consultants/webspacestation.wml: 1.1 -> 1.2 english/consultants/welters.wml: 1.1 -> 1.2 english/consultants/woods.wml: 1.1 -> 1.2 english/consultants/xsto.info.wml: 1.1 -> 1.2 english/template/debian/consultant.wml: 1.56 -> 1.57 finnish/consultants/credativ.wml: 1.1 -> 1.2 french/consultants/757_technologies.wml: 1.2 -> 1.3 french/consultants/abv.wml: 1.3 -> 1.4 french/consultants/ace_technology_group.wml: 1.1 -> 1.2 french/consultants/aerasec.wml: 1.1 -> 1.2 french/consultants/agentbob.wml: 1.1 -> 1.2 french/consultants/aleph1.wml: 1.2 -> 1.3 french/consultants/alex_r.wml: 1.1 -> 1.2 french/consultants/amazon.wml: 1.2 -> 1.3 french/consultants/anderson.wml: 1.1 -> 1.2 french/consultants/andreu_i.wml: 1.1 -> 1.2 french/consultants/anmsoft.wml: 1.2 -> 1.3 french/consultants/antonio_cosenza.wml: 1.2 -> 1.3 french/consultants/ants-art.wml: 1.1 -> 1.2 french/consultants/applepie-solutions.wml: 1.1 -> 1.2 french/consultants/apsis.wml: 1.2 -> 1.3 french/consultants/avalonix.wml: 1.2 -> 1.3 french/consultants/baton_rouge.wml: 1.2 -> 1.3 french/consultants/beeznest.wml: 1.1 -> 1.2 french/consultants/beil.wml: 1.2 -> 1.3 french/consultants/ben_b.wml: 1.1 -> 1.2 french/consultants/bentosolutions.wml: 1.1 -> 1.2 french/consultants/bitpusher.wml: 1.2 -> 1.3 french/consultants/bitspot.wml: 1.1 -> 1.2 french/consultants/brainalliance.wml: 1.1 -> 1.2 french/consultants/bryan_b.wml: 1.1 -> 1.2 french/consultants/buici.wml: 1.2 -> 1.3 french/consultants/buttersideup.wml: 1.2 -> 1.3 french/consultants/cargol.wml: 1.1 -> 1.2 french/consultants/catalyst.wml: 1.5 -> 1.6 french/consultants/charles_s.wml: 1.1 -> 1.2 french/consultants/cits.wml: 1.2 -> 1.3 french/consultants/clockwork.wml: 1.3 -> 1.4 french/consultants/clue_inc.wml: 1.2 -> 1.3 french/consultants/coderscorp.wml: 1.3 -> 1.4 french/consultants/coherent_light.wml: 1.2 -> 1.3 french/consultants/con_z.wml: 1.5 -> 1.6 french/consultants/cory_p.wml: 1.1 -> 1.2 french/consultants/credativ.wml: 1.1 -> 1.2 french/consultants/csinetworks.wml: 1.3 -> 1.4 french/consultants/custom_engineering.wml: 1.1 -> 1.2 french/consultants/datalay.wml: 1.1 -> 1.2 french/consultants/datalink_internet.wml: 1.4 -> 1.5 french/consultants/davonet.wml: 1.1 -> 1.2 french/consultants/deeproot.wml: 1.5 -> 1.6 french/consultants/delemar.wml: 1.1 -> 1.2 french/consultants/delicate.ch.wml: 1.1 -> 1.2 french/consultants/disoft.wml: 1.1 -> 1.2 french/consultants/douglas_h.wml: 1.4 -> 1.5 french/consultants/eauzone.wml: 1.1 -> 1.2 french/consultants/emergya.wml: 1.2 -> 1.3 french/consultants/enterux.wml: 1.4 -> 1.5 french/consultants/et_computer.wml: 1.2 -> 1.3 french/consultants/eugene_g.wml: 1.1 -> 1.2 french/consultants/extralogix.wml: 1.2 -> 1.3 french/consultants/fai-cluster.wml: 1.1 -> 1.2 french/consultants/federico_sevilla.wml: 1.2 -> 1.3 french/consultants/fensterkitt.wml: 1.1 -> 1.2 french/consultants/fff_managed.wml: 1.4 -> 1.5 french/consultants/filippo_giunchedi.wml: 1.1 -> 1.2 french/consultants/firman.wml: 1.2 -> 1.3 french/consultants/forlinux.wml: 1.2 -> 1.3 french/consultants/fortuitous.wml: 1.3 -> 1.4 french/consultants/fotopic.wml: 1.1 -> 1.2 french/consultants/freesoft.wml: 1.2 -> 1.3 french/consultants/gbcomputers.wml: 1.1 -> 1.2 french/consultants/genilto_dallo.wml: 1.1 -> 1.2 french/consultants/gnulinux.wml: 1.1 -> 1.2 french/consultants/guillermo_rico.wml: 1.2 -> 1.3 french/consultants/gurunetwork.wml: 1.2 -> 1.3 french/consultants/harmuth.wml: 1.2 -> 1.3 french/consultants/heureka.wml: 1.2 -> 1.3 french/consultants/hornfordassociates.wml: 1.1 -> 1.2 french/consultants/houdek.wml: 1.1 -> 1.2 french/consultants/hp_germany.wml: 1.1 -> 1.2 french/consultants/hytechpro.wml: 1.2 -> 1.3 french/consultants/ideal.wml: 1.2 -> 1.3 french/consultants/imagin.wml: 1.1 -> 1.2 french/consultants/incipit.wml: 1.1 -> 1.2 french/consultants/indus_net_technologies.wml: 1.1 -> 1.2 french/consultants/inittab.wml: 1.2 -> 1.3 french/consultants/inl.wml: 1.3 -> 1.4 french/consultants/integrics.wml: 1.1 -> 1.2 french/consultants/internet_solutions.wml: 1.1 -> 1.2 french/consultants/ipodion.wml: 1.1 -> 1.2 french/consultants/it_service_drillich.wml: 1.1 -> 1.2 french/consultants/itsecuritymn.wml: 1.1 -> 1.2 french/consultants/ivan_k.wml: 1.1 -> 1.2 french/consultants/jarno_saarinen.wml: 1.1 -> 1.2 french/consultants/jaume_t.wml: 1.1 -> 1.2 french/consultants/javier_v.wml: 1.4 -> 1.5 french/consultants/jean_p.wml: 1.2 -> 1.3 french/consultants/jeremy_r.wml: 1.2 -> 1.3 french/consultants/jfranken.wml: 1.2 -> 1.3 french/consultants/jh_networks.wml: 1.2 -> 1.3 french/consultants/jibsystems.wml: 1.1 -> 1.2 french/consultants/jim_w.wml: 1.3 -> 1.4 french/consultants/joan_l.wml: 1.1 -> 1.2 french/consultants/joe_m.wml: 1.1 -> 1.2 french/consultants/joerg_w.wml: 1.2 -> 1.3 french/consultants/joeyh.wml: 1.1 -> 1.2 french/consultants/jurgen_l.wml: 1.2 -> 1.3 french/consultants/kaarlo_m.wml: 1.1 -> 1.2 french/consultants/karsten_m_self.wml: 1.2 -> 1.3 french/consultants/kevin_l.wml: 1.1 -> 1.2 french/consultants/kevin_t.wml: 1.1 -> 1.2 french/consultants/knaepper.wml: 1.1 -> 1.2 french/consultants/koenigsmann.wml: 1.1 -> 1.2 french/consultants/kotarba.wml: 1.1 -> 1.2 french/consultants/kring.wml: 1.1 -> 1.2 french/consultants/lawrence_c.wml: 1.2 -> 1.3 french/consultants/lcs.wml: 1.5 -> 1.6 french/consultants/leos.wml: 1.1 -> 1.2 french/consultants/liberobit.wml: 1.2 -> 1.3 french/consultants/libhertz.wml: 1.1 -> 1.2 french/consultants/libren.wml: 1.1 -> 1.2 french/consultants/linbit.wml: 1.2 -> 1.3 french/consultants/linbox.wml: 1.1 -> 1.2 french/consultants/linux_ag.wml: 1.2 -> 1.3 french/consultants/linux_box.wml: 1.1 -> 1.2 french/consultants/linux_certified.wml: 1.3 -> 1.4 french/consultants/linux_consultancy.wml: 1.1 -> 1.2 french/consultants/linux_mania.wml: 1.2 -> 1.3 french/consultants/linuxcare.wml: 1.1 -> 1.2 french/consultants/linuxmagic.wml: 1.1 -> 1.2 french/consultants/linuxworks.wml: 1.2 -> 1.3 french/consultants/logilab.wml: 1.4 -> 1.5 french/consultants/mark_stanislav.wml: 1.1 -> 1.2 french/consultants/markoer.wml: 1.1 -> 1.2 french/consultants/maroonpoint.wml: 1.1 -> 1.2 french/consultants/marques_j.wml: 1.3 -> 1.4 french/consultants/mathias_kettner.wml: 1.1 -> 1.2 french/consultants/michaeljohn_c.wml: 1.1 -> 1.2 french/consultants/miju.wml: 1.2 -> 1.3 french/consultants/mind.wml: 1.1 -> 1.2 french/consultants/minihub.wml: 1.1 -> 1.2 french/consultants/mivitec.wml: 1.2 -> 1.3 french/consultants/mladen_adamovic.wml: 1.1 -> 1.2 french/consultants/murphy_soft.wml: 1.2 -> 1.3 french/consultants/netdigix.wml: 1.1 -> 1.2 french/consultants/nikolai_l.wml: 1.2 -> 1.3 french/consultants/norrix.wml: 1.2 -> 1.3 french/consultants/novochip.wml: 1.2 -> 1.3 french/consultants/ns_computing.wml: 1.3 -> 1.4 french/consultants/openbizz.wml: 1.2 -> 1.3 french/consultants/openit.wml: 1.1 -> 1.2 french/consultants/opentechnologies.wml: 1.2 -> 1.3 french/consultants/opentrend.wml: 1.1 -> 1.2 french/consultants/orbit.wml: 1.1 -> 1.2 french/consultants/osourcery.wml: 1.4 -> 1.5 french/consultants/ossafrica.wml: 1.1 -> 1.2 french/consultants/ouattara.wml: 1.1 -> 1.2 french/consultants/oxalide.wml: 1.1 -> 1.2 french/consultants/pahne.wml: 1.2 -> 1.3 french/consultants/parreiras_m.wml: 1.1 -> 1.2 french/consultants/penguintechs.wml: 1.3 -> 1.4 french/consultants/pete_b.wml: 1.3 -> 1.4 french/consultants/peter_d.wml: 1.2 -> 1.3 french/consultants/peter_naulls.wml: 1.1 -> 1.2 french/consultants/picone.wml: 1.4 -> 1.5 french/consultants/pits.wml: 1.1 -> 1.2 french/consultants/porcacchia.wml: 1.1 -> 1.2 french/consultants/praksys.wml: 1.2 -> 1.3 french/consultants/produktivit.wml: 1.1 -> 1.2 french/consultants/prolibre.wml: 1.1 -> 1.2 french/consultants/prosa.wml: 1.2 -> 1.3 french/consultants/python_byte.wml: 1.1 -> 1.2 french/consultants/qualsoftservices.wml: 1.3 -> 1.4 french/consultants/qulix.wml: 1.1 -> 1.2 french/consultants/r3deng.wml: 1.3 -> 1.4 french/consultants/r_w_r.wml: 1.1 -> 1.2 french/consultants/rafez_n.wml: 1.1 -> 1.2 french/consultants/researchut.wml: 1.1 -> 1.2 french/consultants/robert_millan.wml: 1.1 -> 1.2 french/consultants/sam_solutions.wml: 1.4 -> 1.5 french/consultants/samantha_s.wml: 1.2 -> 1.3 french/consultants/samurai.wml: 1.1 -> 1.2 french/consultants/scheeder.wml: 1.1 -> 1.2 french/consultants/seattlelinux.wml: 1.1 -> 1.2 french/consultants/sergio_a.wml: 1.1 -> 1.2 french/consultants/serverflow.wml: 1.1 -> 1.2 french/consultants/servitux.wml: 1.1 -> 1.2 french/consultants/shannon_d.wml: 1.2 -> 1.3 french/consultants/simone_giustetti.wml: 1.2 -> 1.3 french/consultants/sine_nomine.wml: 1.1 -> 1.2 french/consultants/sniffer.wml: 1.1 -> 1.2 french/consultants/softitaly.wml: 1.2 -> 1.3 french/consultants/soleyman.wml: 1.1 -> 1.2 french/consultants/solutionsfirst.wml: 1.2 -> 1.3 french/consultants/sosa.wml: 1.1 -> 1.2 french/consultants/steve_l.wml: 1.1 -> 1.2 french/consultants/storitback.wml: 1.1 -> 1.2 french/consultants/stuart_t.wml: 1.1 -> 1.2 french/consultants/syscovery.wml: 1.1 -> 1.2 french/consultants/tagfl.wml: 1.1 -> 1.2 french/consultants/tecexperts.wml: 1.1 -> 1.2 french/consultants/ted_j.wml: 1.1 -> 1.2 french/consultants/tegtmeier.wml: 1.3 -> 1.4 french/consultants/terran_universal_systems.wml: 1.5 -> 1.6 french/consultants/thoughtprocess.wml: 1.1 -> 1.2 french/consultants/tim_o.wml: 1.3 -> 1.4 french/consultants/togaware.wml: 1.2 -> 1.3 french/consultants/toni_m.wml: 1.2 -> 1.3 french/consultants/transparen.wml: 1.5 -> 1.6 french/consultants/triona.wml: 1.2 -> 1.3 french/consultants/trisinus.wml: 1.1 -> 1.2 french/consultants/trusted.wml: 1.1 -> 1.2 french/consultants/trustsec.wml: 1.1 -> 1.2 french/consultants/turinglabs.wml: 1.3 -> 1.4 french/consultants/turo_technology.wml: 1.1 -> 1.2 french/consultants/udslinux.wml: 1.1 -> 1.2 french/consultants/ullrich-it-consult.wml: 1.1 -> 1.2 french/consultants/ultreia.wml: 1.4 -> 1.5 french/consultants/unimedgv.wml: 1.1 -> 1.2 french/consultants/uslinux.wml: 1.1 -> 1.2 french/consultants/viridiansun.wml: 1.3 -> 1.4 french/consultants/vivek_k.wml: 1.1 -> 1.2 french/consultants/webspacestation.wml: 1.1 -> 1.2 french/consultants/welters.wml: 1.1 -> 1.2 french/consultants/woods.wml: 1.1 -> 1.2 french/consultants/xsto.info.wml: 1.6 -> 1.7 german/consultants/757_technologies.wml: 1.2 -> 1.3 german/consultants/abv.wml: 1.1 -> 1.2 german/consultants/ace_technology_group.wml: 1.1 -> 1.2 german/consultants/aerasec.wml: 1.1 -> 1.2 german/consultants/agentbob.wml: 1.1 -> 1.2 german/consultants/aleph1.wml: 1.4 -> 1.5 german/consultants/alex_r.wml: 1.3 -> 1.4 german/consultants/amazon.wml: 1.1 -> 1.2 german/consultants/anderson.wml: 1.1 -> 1.2 german/consultants/andreu_i.wml: 1.3 -> 1.4 german/consultants/anmsoft.wml: 1.2 -> 1.3 german/consultants/antonio_cosenza.wml: 1.1 -> 1.2 german/consultants/ants-art.wml: 1.1 -> 1.2 german/consultants/applepie-solutions.wml: 1.2 -> 1.3 german/consultants/apsis.wml: 1.1 -> 1.2 german/consultants/avalonix.wml: 1.2 -> 1.3 german/consultants/baton_rouge.wml: 1.1 -> 1.2 german/consultants/beeznest.wml: 1.1 -> 1.2 german/consultants/beil.wml: 1.1 -> 1.2 german/consultants/ben_b.wml: 1.2 -> 1.3 german/consultants/bentosolutions.wml: 1.2 -> 1.3 german/consultants/bitpusher.wml: 1.1 -> 1.2 german/consultants/bitspot.wml: 1.1 -> 1.2 german/consultants/brainalliance.wml: 1.1 -> 1.2 german/consultants/bryan_b.wml: 1.2 -> 1.3 german/consultants/buici.wml: 1.1 -> 1.2 german/consultants/buttersideup.wml: 1.1 -> 1.2 german/consultants/cargol.wml: 1.1 -> 1.2 german/consultants/catalyst.wml: 1.2 -> 1.3 german/consultants/charles_s.wml: 1.1 -> 1.2 german/consultants/cits.wml: 1.2 -> 1.3 german/consultants/clockwork.wml: 1.2 -> 1.3 german/consultants/clue_inc.wml: 1.2 -> 1.3 german/consultants/coderscorp.wml: 1.1 -> 1.2 german/consultants/coherent_light.wml: 1.2 -> 1.3 german/consultants/con_z.wml: 1.2 -> 1.3 german/consultants/cory_p.wml: 1.2 -> 1.3 german/consultants/credativ.wml: 1.2 -> 1.3 german/consultants/csinetworks.wml: 1.3 -> 1.4 german/consultants/custom_engineering.wml: 1.1 -> 1.2 german/consultants/datalay.wml: 1.1 -> 1.2 german/consultants/datalink_internet.wml: 1.2 -> 1.3 german/consultants/davonet.wml: 1.1 -> 1.2 german/consultants/deeproot.wml: 1.1 -> 1.2 german/consultants/delemar.wml: 1.1 -> 1.2 german/consultants/delicate.ch.wml: 1.1 -> 1.2 german/consultants/disoft.wml: 1.1 -> 1.2 german/consultants/douglas_h.wml: 1.2 -> 1.3 german/consultants/eauzone.wml: 1.1 -> 1.2 german/consultants/emergya.wml: 1.1 -> 1.2 german/consultants/enterux.wml: 1.3 -> 1.4 german/consultants/et_computer.wml: 1.3 -> 1.4 german/consultants/eugene_g.wml: 1.1 -> 1.2 german/consultants/extralogix.wml: 1.1 -> 1.2 german/consultants/fai-cluster.wml: 1.2 -> 1.3 german/consultants/federico_sevilla.wml: 1.1 -> 1.2 german/consultants/fensterkitt.wml: 1.2 -> 1.3 german/consultants/fff_managed.wml: 1.1 -> 1.2 german/consultants/filippo_giunchedi.wml: 1.1 -> 1.2 german/consultants/firman.wml: 1.1 -> 1.2 german/consultants/forlinux.wml: 1.1 -> 1.2 german/consultants/fortuitous.wml: 1.3 -> 1.4 german/consultants/fotopic.wml: 1.1 -> 1.2 german/consultants/freesoft.wml: 1.1 -> 1.2 german/consultants/gbcomputers.wml: 1.1 -> 1.2 german/consultants/genilto_dallo.wml: 1.1 -> 1.2 german/consultants/gnulinux.wml: 1.1 -> 1.2 german/consultants/guillermo_rico.wml: 1.2 -> 1.3 german/consultants/gurunetwork.wml: 1.1 -> 1.2 german/consultants/harmuth.wml: 1.1 -> 1.2 german/consultants/heureka.wml: 1.2 -> 1.3 german/consultants/hornfordassociates.wml: 1.1 -> 1.2 german/consultants/houdek.wml: 1.1 -> 1.2 german/consultants/hp_germany.wml: 1.2 -> 1.3 german/consultants/hytechpro.wml: 1.2 -> 1.3 german/consultants/ideal.wml: 1.1 -> 1.2 german/consultants/imagin.wml: 1.1 -> 1.2 german/consultants/incipit.wml: 1.1 -> 1.2 german/consultants/indus_net_technologies.wml: 1.1 -> 1.2 german/consultants/inittab.wml: 1.1 -> 1.2 german/consultants/inl.wml: 1.1 -> 1.2 german/consultants/integrics.wml: 1.1 -> 1.2 german/consultants/internet_solutions.wml: 1.1 -> 1.2 german/consultants/ipodion.wml: 1.1 -> 1.2 german/consultants/it_service_drillich.wml: 1.1 -> 1.2 german/consultants/itsecuritymn.wml: 1.1 -> 1.2 german/consultants/ivan_k.wml: 1.1 -> 1.2 german/consultants/jarno_saarinen.wml: 1.1 -> 1.2 german/consultants/jaume_t.wml: 1.1 -> 1.2 german/consultants/javier_v.wml: 1.1 -> 1.2 german/consultants/jean_p.wml: 1.1 -> 1.2 german/consultants/jeremy_r.wml: 1.3 -> 1.4 german/consultants/jfranken.wml: 1.1 -> 1.2 german/consultants/jh_networks.wml: 1.2 -> 1.3 german/consultants/jibsystems.wml: 1.1 -> 1.2 german/consultants/jim_w.wml: 1.1 -> 1.2 german/consultants/joan_l.wml: 1.2 -> 1.3 german/consultants/joe_m.wml: 1.1 -> 1.2 german/consultants/joerg_w.wml: 1.3 -> 1.4 german/consultants/joeyh.wml: 1.1 -> 1.2 german/consultants/jurgen_l.wml: 1.2 -> 1.3 german/consultants/kaarlo_m.wml: 1.1 -> 1.2 german/consultants/karsten_m_self.wml: 1.1 -> 1.2 german/consultants/kevin_l.wml: 1.1 -> 1.2 german/consultants/kevin_t.wml: 1.2 -> 1.3 german/consultants/knaepper.wml: 1.2 -> 1.3 german/consultants/koenigsmann.wml: 1.1 -> 1.2 german/consultants/kotarba.wml: 1.1 -> 1.2 german/consultants/kring.wml: 1.1 -> 1.2 german/consultants/lawrence_c.wml: 1.1 -> 1.2 german/consultants/lcs.wml: 1.1 -> 1.2 german/consultants/leos.wml: 1.1 -> 1.2 german/consultants/liberobit.wml: 1.1 -> 1.2 german/consultants/libhertz.wml: 1.1 -> 1.2 german/consultants/libren.wml: 1.1 -> 1.2 german/consultants/linbit.wml: 1.2 -> 1.3 german/consultants/linbox.wml: 1.1 -> 1.2 german/consultants/linux_ag.wml: 1.1 -> 1.2 german/consultants/linux_box.wml: 1.1 -> 1.2 german/consultants/linux_certified.wml: 1.1 -> 1.2 german/consultants/linux_consultancy.wml: 1.2 -> 1.3 german/consultants/linux_mania.wml: 1.1 -> 1.2 german/consultants/linuxcare.wml: 1.1 -> 1.2 german/consultants/linuxmagic.wml: 1.1 -> 1.2 german/consultants/linuxworks.wml: 1.2 -> 1.3 german/consultants/logilab.wml: 1.2 -> 1.3 german/consultants/mark_stanislav.wml: 1.1 -> 1.2 german/consultants/markoer.wml: 1.1 -> 1.2 german/consultants/maroonpoint.wml: 1.2 -> 1.3 german/consultants/marques_j.wml: 1.1 -> 1.2 german/consultants/mathias_kettner.wml: 1.1 -> 1.2 german/consultants/michaeljohn_c.wml: 1.1 -> 1.2 german/consultants/miju.wml: 1.1 -> 1.2 german/consultants/mind.wml: 1.3 -> 1.4 german/consultants/minihub.wml: 1.1 -> 1.2 german/consultants/mivitec.wml: 1.3 -> 1.4 german/consultants/mladen_adamovic.wml: 1.1 -> 1.2 german/consultants/murphy_soft.wml: 1.1 -> 1.2 german/consultants/netdigix.wml: 1.1 -> 1.2 german/consultants/nikolai_l.wml: 1.2 -> 1.3 german/consultants/norrix.wml: 1.1 -> 1.2 german/consultants/novochip.wml: 1.1 -> 1.2 german/consultants/ns_computing.wml: 1.3 -> 1.4 german/consultants/openbizz.wml: 1.2 -> 1.3 german/consultants/openit.wml: 1.1 -> 1.2 german/consultants/opentechnologies.wml: 1.1 -> 1.2 german/consultants/opentrend.wml: 1.1 -> 1.2 german/consultants/orbit.wml: 1.1 -> 1.2 german/consultants/osourcery.wml: 1.1 -> 1.2 german/consultants/ossafrica.wml: 1.1 -> 1.2 german/consultants/ouattara.wml: 1.1 -> 1.2 german/consultants/oxalide.wml: 1.1 -> 1.2 german/consultants/pahne.wml: 1.1 -> 1.2 german/consultants/parreiras_m.wml: 1.1 -> 1.2 german/consultants/penguintechs.wml: 1.1 -> 1.2 german/consultants/pete_b.wml: 1.3 -> 1.4 german/consultants/peter_d.wml: 1.2 -> 1.3 german/consultants/peter_naulls.wml: 1.1 -> 1.2 german/consultants/picone.wml: 1.1 -> 1.2 german/consultants/pits.wml: 1.1 -> 1.2 german/consultants/porcacchia.wml: 1.1 -> 1.2 german/consultants/praksys.wml: 1.3 -> 1.4 german/consultants/produktivit.wml: 1.2 -> 1.3 german/consultants/prolibre.wml: 1.1 -> 1.2 german/consultants/prosa.wml: 1.1 -> 1.2 german/consultants/python_byte.wml: 1.1 -> 1.2 german/consultants/qualsoftservices.wml: 1.1 -> 1.2 german/consultants/qulix.wml: 1.2 -> 1.3 german/consultants/r3deng.wml: 1.1 -> 1.2 german/consultants/r_w_r.wml: 1.2 -> 1.3 german/consultants/rafez_n.wml: 1.1 -> 1.2 german/consultants/researchut.wml: 1.2 -> 1.3 german/consultants/robert_millan.wml: 1.1 -> 1.2 german/consultants/sam_solutions.wml: 1.1 -> 1.2 german/consultants/samantha_s.wml: 1.1 -> 1.2 german/consultants/samurai.wml: 1.1 -> 1.2 german/consultants/scheeder.wml: 1.1 -> 1.2 german/consultants/seattlelinux.wml: 1.1 -> 1.2 german/consultants/sergio_a.wml: 1.1 -> 1.2 german/consultants/serverflow.wml: 1.1 -> 1.2 german/consultants/servitux.wml: 1.1 -> 1.2 german/consultants/shannon_d.wml: 1.2 -> 1.3 german/consultants/simone_giustetti.wml: 1.1 -> 1.2 german/consultants/sine_nomine.wml: 1.1 -> 1.2 german/consultants/sniffer.wml: 1.1 -> 1.2 german/consultants/softitaly.wml: 1.1 -> 1.2 german/consultants/soleyman.wml: 1.1 -> 1.2 german/consultants/solutionsfirst.wml: 1.1 -> 1.2 german/consultants/sosa.wml: 1.1 -> 1.2 german/consultants/steve_l.wml: 1.1 -> 1.2 german/consultants/storitback.wml: 1.2 -> 1.3 german/consultants/stuart_t.wml: 1.2 -> 1.3 german/consultants/syscovery.wml: 1.1 -> 1.2 german/consultants/tagfl.wml: 1.1 -> 1.2 german/consultants/tecexperts.wml: 1.1 -> 1.2 german/consultants/ted_j.wml: 1.4 -> 1.5 german/consultants/tegtmeier.wml: 1.2 -> 1.3 german/consultants/terran_universal_systems.wml: 1.2 -> 1.3 german/consultants/thoughtprocess.wml: 1.1 -> 1.2 german/consultants/tim_o.wml: 1.1 -> 1.2 german/consultants/togaware.wml: 1.2 -> 1.3 german/consultants/toni_m.wml: 1.3 -> 1.4 german/consultants/transparen.wml: 1.2 -> 1.3 german/consultants/triona.wml: 1.3 -> 1.4 german/consultants/trisinus.wml: 1.3 -> 1.4 german/consultants/trusted.wml: 1.1 -> 1.2 german/consultants/trustsec.wml: 1.2 -> 1.3 german/consultants/turinglabs.wml: 1.1 -> 1.2 german/consultants/turo_technology.wml: 1.1 -> 1.2 german/consultants/udslinux.wml: 1.1 -> 1.2 german/consultants/ullrich-it-consult.wml: 1.3 -> 1.4 german/consultants/ultreia.wml: 1.1 -> 1.2 german/consultants/unimedgv.wml: 1.1 -> 1.2 german/consultants/uslinux.wml: 1.1 -> 1.2 german/consultants/viridiansun.wml: 1.2 -> 1.3 german/consultants/vivek_k.wml: 1.2 -> 1.3 german/consultants/webspacestation.wml: 1.1 -> 1.2 german/consultants/welters.wml: 1.1 -> 1.2 german/consultants/woods.wml: 1.1 -> 1.2 german/consultants/xsto.info.wml: 1.1 -> 1.2 italian/consultants/apsis.wml: 1.2 -> 1.3 italian/consultants/credativ.wml: 1.1 -> 1.2 italian/consultants/incipit.wml: 1.1 -> 1.2 italian/consultants/r3deng.wml: 1.1 -> 1.2 italian/consultants/simone_giustetti.wml: 1.3 -> 1.4 japanese/consultants/credativ.wml: 1.1 -> 1.2 polish/consultants/757_technologies.wml: 1.2 -> 1.3 polish/consultants/abv.wml: 1.2 -> 1.3 polish/consultants/aerasec.wml: 1.2 -> 1.3 polish/consultants/alex_r.wml: 1.1 -> 1.2 polish/consultants/andreu_i.wml: 1.1 -> 1.2 polish/consultants/avalonix.wml: 1.1 -> 1.2 polish/consultants/beeznest.wml: 1.1 -> 1.2 polish/consultants/ben_b.wml: 1.1 -> 1.2 polish/consultants/bryan_b.wml: 1.1 -> 1.2 polish/consultants/catalyst.wml: 1.2 -> 1.3 polish/consultants/filippo_giunchedi.wml: 1.1 -> 1.2 polish/consultants/heureka.wml: 1.1 -> 1.2 polish/consultants/kotarba.wml: 1.1 -> 1.2 polish/consultants/lawrence_c.wml: 1.1 -> 1.2 polish/consultants/rafez_n.wml: 1.1 -> 1.2 polish/consultants/sosa.wml: 1.1 -> 1.2 polish/consultants/stuart_t.wml: 1.1 -> 1.2 polish/consultants/turo_technology.wml: 1.1 -> 1.2 polish/consultants/vivek_k.wml: 1.1 -> 1.2 portuguese/consultants/757_technologies.wml: 1.2 -> 1.3 portuguese/consultants/ace_technology_group.wml: 1.1 -> 1.2 portuguese/consultants/credativ.wml: 1.1 -> 1.2 portuguese/consultants/genilto_dallo.wml: 1.2 -> 1.3 portuguese/consultants/guillermo_rico.wml: 1.1 -> 1.2 portuguese/consultants/samurai.wml: 1.2 -> 1.3 portuguese/consultants/unimedgv.wml: 1.1 -> 1.2 romanian/consultants/credativ.wml: 1.1 -> 1.2 spanish/consultants/757_technologies.wml: 1.2 -> 1.3 spanish/consultants/aerasec.wml: 1.1 -> 1.2 spanish/consultants/alex_r.wml: 1.1 -> 1.2 spanish/consultants/andreu_i.wml: 1.1 -> 1.2 spanish/consultants/antonio_cosenza.wml: 1.1 -> 1.2 spanish/consultants/applepie-solutions.wml: 1.1 -> 1.2 spanish/consultants/avalonix.wml: 1.1 -> 1.2 spanish/consultants/beeznest.wml: 1.1 -> 1.2 spanish/consultants/ben_b.wml: 1.1 -> 1.2 spanish/consultants/bryan_b.wml: 1.1 -> 1.2 spanish/consultants/catalyst.wml: 1.5 -> 1.6 spanish/consultants/charles_s.wml: 1.1 -> 1.2 spanish/consultants/coderscorp.wml: 1.1 -> 1.2 spanish/consultants/con_z.wml: 1.5 -> 1.6 spanish/consultants/cory_p.wml: 1.1 -> 1.2 spanish/consultants/douglas_h.wml: 1.2 -> 1.3 spanish/consultants/heureka.wml: 1.2 -> 1.3 spanish/consultants/inittab.wml: 1.1 -> 1.2 spanish/consultants/ivan_k.wml: 1.1 -> 1.2 spanish/consultants/jaume_t.wml: 1.2 -> 1.3 spanish/consultants/javier_v.wml: 1.2 -> 1.3 spanish/consultants/jeremy_r.wml: 1.3 -> 1.4 spanish/consultants/joerg_w.wml: 1.2 -> 1.3 spanish/consultants/linux_mania.wml: 1.1 -> 1.2 spanish/consultants/murphy_soft.wml: 1.1 -> 1.2 spanish/consultants/rafez_n.wml: 1.1 -> 1.2 spanish/consultants/robert_millan.wml: 1.1 -> 1.2 spanish/consultants/stuart_t.wml: 1.1 -> 1.2 spanish/consultants/ultreia.wml: 1.5 -> 1.6 spanish/consultants/vivek_k.wml: 1.1 -> 1.2 spanish/consultants/xsto.info.wml: 1.2 -> 1.3 swedish/consultants/aerasec.wml: 1.2 -> 1.3 swedish/consultants/alex_r.wml: 1.1 -> 1.2 swedish/consultants/andreu_i.wml: 1.1 -> 1.2 swedish/consultants/avalonix.wml: 1.1 -> 1.2 swedish/consultants/ben_b.wml: 1.1 -> 1.2 swedish/consultants/charles_s.wml: 1.1 -> 1.2 swedish/consultants/credativ.wml: 1.1 -> 1.2 swedish/consultants/datalink_internet.wml: 1.3 -> 1.4 swedish/consultants/deeproot.wml: 1.3 -> 1.4 swedish/consultants/et_computer.wml: 1.2 -> 1.3 swedish/consultants/eugene_g.wml: 1.1 -> 1.2 swedish/consultants/heureka.wml: 1.2 -> 1.3 swedish/consultants/indus_net_technologies.wml: 1.1 -> 1.2 swedish/consultants/ivan_k.wml: 1.1 -> 1.2 swedish/consultants/jaume_t.wml: 1.1 -> 1.2 swedish/consultants/jean_p.wml: 1.1 -> 1.2 swedish/consultants/jim_w.wml: 1.1 -> 1.2 swedish/consultants/joan_l.wml: 1.1 -> 1.2 swedish/consultants/joe_m.wml: 1.1 -> 1.2 swedish/consultants/joerg_w.wml: 1.2 -> 1.3 swedish/consultants/kaarlo_m.wml: 1.1 -> 1.2 swedish/consultants/kevin_l.wml: 1.1 -> 1.2 swedish/consultants/kevin_t.wml: 1.1 -> 1.2 swedish/consultants/lawrence_c.wml: 1.2 -> 1.3 swedish/consultants/linux_box.wml: 1.1 -> 1.2 swedish/consultants/michaeljohn_c.wml: 1.1 -> 1.2 swedish/consultants/mind.wml: 1.1 -> 1.2 swedish/consultants/minihub.wml: 1.1 -> 1.2 swedish/consultants/murphy_soft.wml: 1.1 -> 1.2 swedish/consultants/nikolai_l.wml: 1.2 -> 1.3 swedish/consultants/ns_computing.wml: 1.2 -> 1.3 swedish/consultants/opentechnologies.wml: 1.1 -> 1.2 swedish/consultants/pete_b.wml: 1.1 -> 1.2 swedish/consultants/peter_d.wml: 1.1 -> 1.2 swedish/consultants/prosa.wml: 1.2 -> 1.3 swedish/consultants/r_w_r.wml: 1.1 -> 1.2 swedish/consultants/rafez_n.wml: 1.1 -> 1.2 swedish/consultants/samantha_s.wml: 1.2 -> 1.3 swedish/consultants/sergio_a.wml: 1.1 -> 1.2 swedish/consultants/shannon_d.wml: 1.2 -> 1.3 swedish/consultants/sosa.wml: 1.1 -> 1.2 swedish/consultants/steve_l.wml: 1.1 -> 1.2 swedish/consultants/stuart_t.wml: 1.1 -> 1.2 swedish/consultants/ted_j.wml: 1.1 -> 1.2 swedish/consultants/tim_o.wml: 1.2 -> 1.3 swedish/consultants/toni_m.wml: 1.1 -> 1.2 swedish/consultants/vivek_k.wml: 1.1 -> 1.2
-rw-r--r--catalan/consultants/alex_r.wml10
-rw-r--r--catalan/consultants/ben_b.wml6
-rw-r--r--catalan/consultants/catalyst.wml38
-rw-r--r--catalan/consultants/charles_s.wml30
-rw-r--r--catalan/consultants/con_z.wml79
-rw-r--r--croatian/consultants/alex_r.wml11
-rw-r--r--croatian/consultants/charles_s.wml30
-rw-r--r--croatian/consultants/jim_w.wml10
-rw-r--r--croatian/consultants/jurgen_l.wml8
-rw-r--r--croatian/consultants/marques_j.wml8
-rw-r--r--croatian/consultants/nikolai_l.wml8
-rw-r--r--croatian/consultants/prosa.wml14
-rw-r--r--croatian/consultants/tim_o.wml13
-rw-r--r--czech/consultants/credativ.wml14
-rw-r--r--danish/consultants/757_technologies.wml6
-rw-r--r--danish/consultants/ace_technology_group.wml10
-rw-r--r--danish/consultants/aerasec.wml13
-rw-r--r--danish/consultants/alex_r.wml10
-rw-r--r--danish/consultants/andreu_i.wml10
-rw-r--r--danish/consultants/antonio_cosenza.wml10
-rw-r--r--danish/consultants/avalonix.wml10
-rw-r--r--danish/consultants/beeznest.wml10
-rw-r--r--danish/consultants/ben_b.wml5
-rw-r--r--danish/consultants/bryan_b.wml10
-rw-r--r--danish/consultants/charles_s.wml30
-rw-r--r--danish/consultants/clue_inc.wml10
-rw-r--r--danish/consultants/cory_p.wml10
-rw-r--r--danish/consultants/credativ.wml15
-rw-r--r--danish/consultants/datalink_internet.wml25
-rw-r--r--danish/consultants/delicate.ch.wml10
-rw-r--r--danish/consultants/et_computer.wml10
-rw-r--r--danish/consultants/eugene_g.wml10
-rw-r--r--danish/consultants/fai-cluster.wml10
-rw-r--r--danish/consultants/filippo_giunchedi.wml10
-rw-r--r--danish/consultants/forlinux.wml10
-rw-r--r--danish/consultants/heureka.wml8
-rw-r--r--danish/consultants/indus_net_technologies.wml10
-rw-r--r--danish/consultants/it_service_drillich.wml10
-rw-r--r--danish/consultants/ivan_k.wml10
-rw-r--r--danish/consultants/jarno_saarinen.wml10
-rw-r--r--danish/consultants/jaume_t.wml10
-rw-r--r--danish/consultants/jean_p.wml10
-rw-r--r--danish/consultants/jh_networks.wml10
-rw-r--r--danish/consultants/jim_w.wml10
-rw-r--r--danish/consultants/joan_l.wml10
-rw-r--r--danish/consultants/joe_m.wml10
-rw-r--r--danish/consultants/joerg_w.wml6
-rw-r--r--danish/consultants/kaarlo_m.wml10
-rw-r--r--danish/consultants/kevin_l.wml10
-rw-r--r--danish/consultants/kevin_t.wml12
-rw-r--r--danish/consultants/kotarba.wml10
-rw-r--r--danish/consultants/linux_box.wml10
-rw-r--r--danish/consultants/linux_certified.wml10
-rw-r--r--danish/consultants/linux_consultancy.wml10
-rw-r--r--danish/consultants/linuxmagic.wml10
-rw-r--r--danish/consultants/linuxworks.wml22
-rw-r--r--danish/consultants/michaeljohn_c.wml10
-rw-r--r--danish/consultants/mind.wml13
-rw-r--r--danish/consultants/minihub.wml10
-rw-r--r--danish/consultants/murphy_soft.wml6
-rw-r--r--danish/consultants/norrix.wml10
-rw-r--r--danish/consultants/opentechnologies.wml10
-rw-r--r--danish/consultants/opentrend.wml10
-rw-r--r--danish/consultants/orbit.wml10
-rw-r--r--danish/consultants/pete_b.wml6
-rw-r--r--danish/consultants/peter_d.wml6
-rw-r--r--danish/consultants/peter_naulls.wml10
-rw-r--r--danish/consultants/produktivit.wml10
-rw-r--r--danish/consultants/r_w_r.wml10
-rw-r--r--danish/consultants/rafez_n.wml6
-rw-r--r--danish/consultants/robert_millan.wml10
-rw-r--r--danish/consultants/sergio_a.wml10
-rw-r--r--danish/consultants/shannon_d.wml6
-rw-r--r--danish/consultants/sine_nomine.wml10
-rw-r--r--danish/consultants/sosa.wml10
-rw-r--r--danish/consultants/steve_l.wml10
-rw-r--r--danish/consultants/stuart_t.wml6
-rw-r--r--danish/consultants/ted_j.wml6
-rw-r--r--danish/consultants/tim_o.wml13
-rw-r--r--danish/consultants/toni_m.wml16
-rw-r--r--danish/consultants/turo_technology.wml10
-rw-r--r--danish/consultants/vivek_k.wml6
-rw-r--r--dutch/consultants/credativ.wml14
-rw-r--r--english/consultants/757_technologies.wml4
-rw-r--r--english/consultants/abv.wml4
-rw-r--r--english/consultants/ace_technology_group.wml8
-rw-r--r--english/consultants/aerasec.wml10
-rw-r--r--english/consultants/agentbob.wml4
-rw-r--r--english/consultants/aleph1.wml4
-rw-r--r--english/consultants/alex_r.wml8
-rw-r--r--english/consultants/amazon.wml4
-rw-r--r--english/consultants/anderson.wml4
-rw-r--r--english/consultants/andreu_i.wml8
-rw-r--r--english/consultants/anmsoft.wml8
-rw-r--r--english/consultants/antonio_cosenza.wml8
-rw-r--r--english/consultants/ants-art.wml4
-rw-r--r--english/consultants/applepie-solutions.wml8
-rw-r--r--english/consultants/apsis.wml8
-rw-r--r--english/consultants/avalonix.wml8
-rw-r--r--english/consultants/baton_rouge.wml8
-rw-r--r--english/consultants/beeznest.wml8
-rw-r--r--english/consultants/beil.wml13
-rw-r--r--english/consultants/ben_b.wml4
-rw-r--r--english/consultants/bentosolutions.wml8
-rw-r--r--english/consultants/bitpusher.wml4
-rw-r--r--english/consultants/bitspot.wml4
-rw-r--r--english/consultants/brainalliance.wml10
-rw-r--r--english/consultants/bryan_b.wml8
-rw-r--r--english/consultants/buici.wml8
-rw-r--r--english/consultants/buttersideup.wml4
-rw-r--r--english/consultants/cargol.wml4
-rw-r--r--english/consultants/catalyst.wml36
-rw-r--r--english/consultants/charles_s.wml28
-rw-r--r--english/consultants/cits.wml4
-rw-r--r--english/consultants/clockwork.wml4
-rw-r--r--english/consultants/clue_inc.wml8
-rw-r--r--english/consultants/coderscorp.wml8
-rw-r--r--english/consultants/coherent_light.wml8
-rw-r--r--english/consultants/con_z.wml91
-rw-r--r--english/consultants/cory_p.wml8
-rw-r--r--english/consultants/credativ.wml13
-rw-r--r--english/consultants/csinetworks.wml4
-rw-r--r--english/consultants/custom_engineering.wml8
-rw-r--r--english/consultants/datalay.wml8
-rw-r--r--english/consultants/datalink_internet.wml22
-rw-r--r--english/consultants/davonet.wml4
-rw-r--r--english/consultants/deeproot.wml12
-rw-r--r--english/consultants/delemar.wml4
-rw-r--r--english/consultants/delicate.ch.wml8
-rw-r--r--english/consultants/disoft.wml4
-rw-r--r--english/consultants/douglas_h.wml4
-rw-r--r--english/consultants/eauzone.wml8
-rw-r--r--english/consultants/emergya.wml4
-rw-r--r--english/consultants/enterux.wml53
-rw-r--r--english/consultants/et_computer.wml8
-rw-r--r--english/consultants/eugene_g.wml8
-rw-r--r--english/consultants/extralogix.wml8
-rw-r--r--english/consultants/fai-cluster.wml8
-rw-r--r--english/consultants/federico_sevilla.wml7
-rw-r--r--english/consultants/fensterkitt.wml8
-rw-r--r--english/consultants/fff_managed.wml12
-rw-r--r--english/consultants/filippo_giunchedi.wml8
-rw-r--r--english/consultants/firman.wml21
-rw-r--r--english/consultants/forlinux.wml8
-rw-r--r--english/consultants/fortuitous.wml8
-rw-r--r--english/consultants/fotopic.wml4
-rw-r--r--english/consultants/freesoft.wml4
-rw-r--r--english/consultants/gbcomputers.wml4
-rw-r--r--english/consultants/genilto_dallo.wml8
-rw-r--r--english/consultants/gnulinux.wml8
-rw-r--r--english/consultants/guillermo_rico.wml8
-rw-r--r--english/consultants/gurunetwork.wml8
-rw-r--r--english/consultants/harmuth.wml4
-rw-r--r--english/consultants/heureka.wml6
-rw-r--r--english/consultants/hornfordassociates.wml10
-rw-r--r--english/consultants/houdek.wml6
-rw-r--r--english/consultants/hp_germany.wml4
-rw-r--r--english/consultants/hytechpro.wml4
-rw-r--r--english/consultants/ideal.wml8
-rw-r--r--english/consultants/imagin.wml4
-rw-r--r--english/consultants/incipit.wml18
-rw-r--r--english/consultants/indus_net_technologies.wml8
-rw-r--r--english/consultants/inittab.wml4
-rw-r--r--english/consultants/inl.wml4
-rw-r--r--english/consultants/integrics.wml4
-rw-r--r--english/consultants/internet_solutions.wml8
-rw-r--r--english/consultants/ipodion.wml4
-rw-r--r--english/consultants/it_service_drillich.wml8
-rw-r--r--english/consultants/itsecuritymn.wml13
-rw-r--r--english/consultants/ivan_k.wml8
-rw-r--r--english/consultants/jarno_saarinen.wml8
-rw-r--r--english/consultants/jaume_t.wml14
-rw-r--r--english/consultants/javier_v.wml8
-rw-r--r--english/consultants/jean_p.wml8
-rw-r--r--english/consultants/jeremy_r.wml4
-rw-r--r--english/consultants/jfranken.wml16
-rw-r--r--english/consultants/jh_networks.wml11
-rw-r--r--english/consultants/jibsystems.wml8
-rw-r--r--english/consultants/jim_w.wml8
-rw-r--r--english/consultants/joan_l.wml8
-rw-r--r--english/consultants/joe_m.wml8
-rw-r--r--english/consultants/joerg_w.wml6
-rw-r--r--english/consultants/joeyh.wml4
-rw-r--r--english/consultants/jurgen_l.wml8
-rw-r--r--english/consultants/kaarlo_m.wml8
-rw-r--r--english/consultants/karsten_m_self.wml13
-rw-r--r--english/consultants/kevin_l.wml8
-rw-r--r--english/consultants/kevin_t.wml10
-rw-r--r--english/consultants/knaepper.wml8
-rw-r--r--english/consultants/koenigsmann.wml8
-rw-r--r--english/consultants/kotarba.wml8
-rw-r--r--english/consultants/kring.wml11
-rw-r--r--english/consultants/lawrence_c.wml4
-rw-r--r--english/consultants/lcs.wml4
-rw-r--r--english/consultants/leos.wml8
-rw-r--r--english/consultants/liberobit.wml8
-rw-r--r--english/consultants/libhertz.wml7
-rw-r--r--english/consultants/libren.wml4
-rw-r--r--english/consultants/linbit.wml4
-rw-r--r--english/consultants/linbox.wml4
-rw-r--r--english/consultants/linux_ag.wml4
-rw-r--r--english/consultants/linux_box.wml10
-rw-r--r--english/consultants/linux_certified.wml8
-rw-r--r--english/consultants/linux_consultancy.wml8
-rw-r--r--english/consultants/linux_mania.wml4
-rw-r--r--english/consultants/linuxcare.wml4
-rw-r--r--english/consultants/linuxmagic.wml8
-rw-r--r--english/consultants/linuxworks.wml20
-rw-r--r--english/consultants/logilab.wml8
-rw-r--r--english/consultants/mark_stanislav.wml8
-rw-r--r--english/consultants/markoer.wml8
-rw-r--r--english/consultants/maroonpoint.wml8
-rw-r--r--english/consultants/marques_j.wml8
-rw-r--r--english/consultants/mathias_kettner.wml8
-rw-r--r--english/consultants/michaeljohn_c.wml8
-rw-r--r--english/consultants/miju.wml8
-rw-r--r--english/consultants/mind.wml11
-rw-r--r--english/consultants/minihub.wml8
-rw-r--r--english/consultants/mivitec.wml20
-rw-r--r--english/consultants/mladen_adamovic.wml8
-rw-r--r--english/consultants/murphy_soft.wml4
-rw-r--r--english/consultants/netdigix.wml8
-rw-r--r--english/consultants/nikolai_l.wml8
-rw-r--r--english/consultants/norrix.wml8
-rw-r--r--english/consultants/novochip.wml4
-rw-r--r--english/consultants/ns_computing.wml8
-rw-r--r--english/consultants/openbizz.wml8
-rw-r--r--english/consultants/openit.wml4
-rw-r--r--english/consultants/opentechnologies.wml8
-rw-r--r--english/consultants/opentrend.wml8
-rw-r--r--english/consultants/orbit.wml8
-rw-r--r--english/consultants/osourcery.wml4
-rw-r--r--english/consultants/ossafrica.wml4
-rw-r--r--english/consultants/ouattara.wml4
-rw-r--r--english/consultants/oxalide.wml9
-rw-r--r--english/consultants/pahne.wml4
-rw-r--r--english/consultants/parreiras_m.wml8
-rw-r--r--english/consultants/penguintechs.wml4
-rw-r--r--english/consultants/pete_b.wml20
-rw-r--r--english/consultants/peter_d.wml8
-rw-r--r--english/consultants/peter_naulls.wml8
-rw-r--r--english/consultants/picone.wml4
-rw-r--r--english/consultants/pits.wml4
-rw-r--r--english/consultants/porcacchia.wml4
-rw-r--r--english/consultants/praksys.wml8
-rw-r--r--english/consultants/produktivit.wml8
-rw-r--r--english/consultants/prolibre.wml8
-rw-r--r--english/consultants/prosa.wml14
-rw-r--r--english/consultants/python_byte.wml8
-rw-r--r--english/consultants/qualsoftservices.wml6
-rw-r--r--english/consultants/qulix.wml12
-rw-r--r--english/consultants/r3deng.wml4
-rw-r--r--english/consultants/r_w_r.wml8
-rw-r--r--english/consultants/rafez_n.wml4
-rw-r--r--english/consultants/researchut.wml4
-rw-r--r--english/consultants/robert_millan.wml8
-rw-r--r--english/consultants/sam_solutions.wml4
-rw-r--r--english/consultants/samantha_s.wml4
-rw-r--r--english/consultants/samurai.wml4
-rw-r--r--english/consultants/scheeder.wml6
-rw-r--r--english/consultants/seattlelinux.wml4
-rw-r--r--english/consultants/sergio_a.wml8
-rw-r--r--english/consultants/serverflow.wml4
-rw-r--r--english/consultants/servitux.wml4
-rw-r--r--english/consultants/shannon_d.wml9
-rw-r--r--english/consultants/simone_giustetti.wml4
-rw-r--r--english/consultants/sine_nomine.wml8
-rw-r--r--english/consultants/sniffer.wml4
-rw-r--r--english/consultants/softitaly.wml4
-rw-r--r--english/consultants/soleyman.wml4
-rw-r--r--english/consultants/solutionsfirst.wml16
-rw-r--r--english/consultants/sosa.wml8
-rw-r--r--english/consultants/steve_l.wml8
-rw-r--r--english/consultants/storitback.wml4
-rw-r--r--english/consultants/stuart_t.wml6
-rw-r--r--english/consultants/syscovery.wml4
-rw-r--r--english/consultants/tagfl.wml4
-rw-r--r--english/consultants/tecexperts.wml4
-rw-r--r--english/consultants/ted_j.wml4
-rw-r--r--english/consultants/tegtmeier.wml4
-rw-r--r--english/consultants/terran_universal_systems.wml4
-rw-r--r--english/consultants/thoughtprocess.wml8
-rw-r--r--english/consultants/tim_o.wml10
-rw-r--r--english/consultants/togaware.wml8
-rw-r--r--english/consultants/toni_m.wml8
-rw-r--r--english/consultants/transparen.wml54
-rw-r--r--english/consultants/triona.wml8
-rw-r--r--english/consultants/trisinus.wml4
-rw-r--r--english/consultants/trusted.wml4
-rw-r--r--english/consultants/trustsec.wml4
-rw-r--r--english/consultants/turinglabs.wml17
-rw-r--r--english/consultants/turo_technology.wml8
-rw-r--r--english/consultants/udslinux.wml4
-rw-r--r--english/consultants/ullrich-it-consult.wml8
-rw-r--r--english/consultants/ultreia.wml4
-rw-r--r--english/consultants/unimedgv.wml4
-rw-r--r--english/consultants/uslinux.wml4
-rw-r--r--english/consultants/viridiansun.wml4
-rw-r--r--english/consultants/vivek_k.wml4
-rw-r--r--english/consultants/webspacestation.wml8
-rw-r--r--english/consultants/welters.wml8
-rw-r--r--english/consultants/woods.wml4
-rw-r--r--english/consultants/xsto.info.wml4
-rw-r--r--english/template/debian/consultant.wml2
-rw-r--r--finnish/consultants/credativ.wml14
-rw-r--r--french/consultants/757_technologies.wml6
-rw-r--r--french/consultants/abv.wml6
-rw-r--r--french/consultants/ace_technology_group.wml10
-rw-r--r--french/consultants/aerasec.wml15
-rw-r--r--french/consultants/agentbob.wml8
-rw-r--r--french/consultants/aleph1.wml6
-rw-r--r--french/consultants/alex_r.wml12
-rw-r--r--french/consultants/amazon.wml8
-rw-r--r--french/consultants/anderson.wml6
-rw-r--r--french/consultants/andreu_i.wml12
-rw-r--r--french/consultants/anmsoft.wml12
-rw-r--r--french/consultants/antonio_cosenza.wml10
-rw-r--r--french/consultants/ants-art.wml8
-rw-r--r--french/consultants/applepie-solutions.wml12
-rw-r--r--french/consultants/apsis.wml12
-rw-r--r--french/consultants/avalonix.wml7
-rw-r--r--french/consultants/baton_rouge.wml10
-rw-r--r--french/consultants/beeznest.wml10
-rw-r--r--french/consultants/beil.wml17
-rw-r--r--french/consultants/ben_b.wml6
-rw-r--r--french/consultants/bentosolutions.wml14
-rw-r--r--french/consultants/bitpusher.wml8
-rw-r--r--french/consultants/bitspot.wml8
-rw-r--r--french/consultants/brainalliance.wml14
-rw-r--r--french/consultants/bryan_b.wml12
-rw-r--r--french/consultants/buici.wml10
-rw-r--r--french/consultants/buttersideup.wml8
-rw-r--r--french/consultants/cargol.wml8
-rw-r--r--french/consultants/catalyst.wml43
-rw-r--r--french/consultants/charles_s.wml29
-rw-r--r--french/consultants/cits.wml8
-rw-r--r--french/consultants/clockwork.wml8
-rw-r--r--french/consultants/clue_inc.wml10
-rw-r--r--french/consultants/coderscorp.wml12
-rw-r--r--french/consultants/coherent_light.wml12
-rw-r--r--french/consultants/con_z.wml112
-rw-r--r--french/consultants/cory_p.wml10
-rw-r--r--french/consultants/credativ.wml14
-rw-r--r--french/consultants/csinetworks.wml6
-rw-r--r--french/consultants/custom_engineering.wml12
-rw-r--r--french/consultants/datalay.wml12
-rw-r--r--french/consultants/datalink_internet.wml26
-rw-r--r--french/consultants/davonet.wml8
-rw-r--r--french/consultants/deeproot.wml15
-rw-r--r--french/consultants/delemar.wml6
-rw-r--r--french/consultants/delicate.ch.wml10
-rw-r--r--french/consultants/disoft.wml6
-rw-r--r--french/consultants/douglas_h.wml6
-rw-r--r--french/consultants/eauzone.wml12
-rw-r--r--french/consultants/emergya.wml8
-rw-r--r--french/consultants/enterux.wml91
-rw-r--r--french/consultants/et_computer.wml13
-rw-r--r--french/consultants/eugene_g.wml10
-rw-r--r--french/consultants/extralogix.wml12
-rw-r--r--french/consultants/fai-cluster.wml16
-rw-r--r--french/consultants/federico_sevilla.wml6
-rw-r--r--french/consultants/fensterkitt.wml14
-rw-r--r--french/consultants/fff_managed.wml12
-rw-r--r--french/consultants/filippo_giunchedi.wml12
-rw-r--r--french/consultants/firman.wml27
-rw-r--r--french/consultants/forlinux.wml10
-rw-r--r--french/consultants/fortuitous.wml12
-rw-r--r--french/consultants/fotopic.wml8
-rw-r--r--french/consultants/freesoft.wml8
-rw-r--r--french/consultants/gbcomputers.wml8
-rw-r--r--french/consultants/genilto_dallo.wml12
-rw-r--r--french/consultants/gnulinux.wml12
-rw-r--r--french/consultants/guillermo_rico.wml12
-rw-r--r--french/consultants/gurunetwork.wml12
-rw-r--r--french/consultants/harmuth.wml6
-rw-r--r--french/consultants/heureka.wml8
-rw-r--r--french/consultants/hornfordassociates.wml6
-rw-r--r--french/consultants/houdek.wml8
-rw-r--r--french/consultants/hp_germany.wml6
-rw-r--r--french/consultants/hytechpro.wml8
-rw-r--r--french/consultants/ideal.wml10
-rw-r--r--french/consultants/imagin.wml8
-rw-r--r--french/consultants/incipit.wml26
-rw-r--r--french/consultants/indus_net_technologies.wml8
-rw-r--r--french/consultants/inittab.wml8
-rw-r--r--french/consultants/inl.wml8
-rw-r--r--french/consultants/integrics.wml8
-rw-r--r--french/consultants/internet_solutions.wml12
-rw-r--r--french/consultants/ipodion.wml8
-rw-r--r--french/consultants/it_service_drillich.wml10
-rw-r--r--french/consultants/itsecuritymn.wml8
-rw-r--r--french/consultants/ivan_k.wml10
-rw-r--r--french/consultants/jarno_saarinen.wml10
-rw-r--r--french/consultants/jaume_t.wml12
-rw-r--r--french/consultants/javier_v.wml18
-rw-r--r--french/consultants/jean_p.wml10
-rw-r--r--french/consultants/jeremy_r.wml6
-rw-r--r--french/consultants/jfranken.wml10
-rw-r--r--french/consultants/jh_networks.wml10
-rw-r--r--french/consultants/jibsystems.wml12
-rw-r--r--french/consultants/jim_w.wml10
-rw-r--r--french/consultants/joan_l.wml10
-rw-r--r--french/consultants/joe_m.wml10
-rw-r--r--french/consultants/joerg_w.wml6
-rw-r--r--french/consultants/joeyh.wml8
-rw-r--r--french/consultants/jurgen_l.wml12
-rw-r--r--french/consultants/kaarlo_m.wml14
-rw-r--r--french/consultants/karsten_m_self.wml15
-rw-r--r--french/consultants/kevin_l.wml10
-rw-r--r--french/consultants/kevin_t.wml15
-rw-r--r--french/consultants/knaepper.wml12
-rw-r--r--french/consultants/koenigsmann.wml12
-rw-r--r--french/consultants/kotarba.wml10
-rw-r--r--french/consultants/kring.wml8
-rw-r--r--french/consultants/lawrence_c.wml6
-rw-r--r--french/consultants/lcs.wml8
-rw-r--r--french/consultants/leos.wml11
-rw-r--r--french/consultants/liberobit.wml10
-rw-r--r--french/consultants/libhertz.wml8
-rw-r--r--french/consultants/libren.wml6
-rw-r--r--french/consultants/linbit.wml6
-rw-r--r--french/consultants/linbox.wml6
-rw-r--r--french/consultants/linux_ag.wml6
-rw-r--r--french/consultants/linux_box.wml10
-rw-r--r--french/consultants/linux_certified.wml10
-rw-r--r--french/consultants/linux_consultancy.wml7
-rw-r--r--french/consultants/linux_mania.wml8
-rw-r--r--french/consultants/linuxcare.wml8
-rw-r--r--french/consultants/linuxmagic.wml16
-rw-r--r--french/consultants/linuxworks.wml22
-rw-r--r--french/consultants/logilab.wml12
-rw-r--r--french/consultants/mark_stanislav.wml12
-rw-r--r--french/consultants/markoer.wml12
-rw-r--r--french/consultants/maroonpoint.wml12
-rw-r--r--french/consultants/marques_j.wml12
-rw-r--r--french/consultants/mathias_kettner.wml12
-rw-r--r--french/consultants/michaeljohn_c.wml10
-rw-r--r--french/consultants/miju.wml11
-rw-r--r--french/consultants/mind.wml15
-rw-r--r--french/consultants/minihub.wml10
-rw-r--r--french/consultants/mivitec.wml26
-rw-r--r--french/consultants/mladen_adamovic.wml12
-rw-r--r--french/consultants/murphy_soft.wml6
-rw-r--r--french/consultants/netdigix.wml12
-rw-r--r--french/consultants/nikolai_l.wml12
-rw-r--r--french/consultants/norrix.wml10
-rw-r--r--french/consultants/novochip.wml8
-rw-r--r--french/consultants/ns_computing.wml12
-rw-r--r--french/consultants/openbizz.wml12
-rw-r--r--french/consultants/openit.wml8
-rw-r--r--french/consultants/opentechnologies.wml10
-rw-r--r--french/consultants/opentrend.wml12
-rw-r--r--french/consultants/orbit.wml10
-rw-r--r--french/consultants/osourcery.wml8
-rw-r--r--french/consultants/ossafrica.wml8
-rw-r--r--french/consultants/ouattara.wml6
-rw-r--r--french/consultants/oxalide.wml6
-rw-r--r--french/consultants/pahne.wml6
-rw-r--r--french/consultants/parreiras_m.wml12
-rw-r--r--french/consultants/penguintechs.wml8
-rw-r--r--french/consultants/pete_b.wml18
-rw-r--r--french/consultants/peter_d.wml10
-rw-r--r--french/consultants/peter_naulls.wml10
-rw-r--r--french/consultants/picone.wml6
-rw-r--r--french/consultants/pits.wml8
-rw-r--r--french/consultants/porcacchia.wml8
-rw-r--r--french/consultants/praksys.wml12
-rw-r--r--french/consultants/produktivit.wml10
-rw-r--r--french/consultants/prolibre.wml12
-rw-r--r--french/consultants/prosa.wml16
-rw-r--r--french/consultants/python_byte.wml16
-rw-r--r--french/consultants/qualsoftservices.wml13
-rw-r--r--french/consultants/qulix.wml6
-rw-r--r--french/consultants/r3deng.wml8
-rw-r--r--french/consultants/r_w_r.wml10
-rw-r--r--french/consultants/rafez_n.wml6
-rw-r--r--french/consultants/researchut.wml8
-rw-r--r--french/consultants/robert_millan.wml10
-rw-r--r--french/consultants/sam_solutions.wml8
-rw-r--r--french/consultants/samantha_s.wml8
-rw-r--r--french/consultants/samurai.wml8
-rw-r--r--french/consultants/scheeder.wml8
-rw-r--r--french/consultants/seattlelinux.wml8
-rw-r--r--french/consultants/sergio_a.wml10
-rw-r--r--french/consultants/serverflow.wml8
-rw-r--r--french/consultants/servitux.wml8
-rw-r--r--french/consultants/shannon_d.wml6
-rw-r--r--french/consultants/simone_giustetti.wml8
-rw-r--r--french/consultants/sine_nomine.wml10
-rw-r--r--french/consultants/sniffer.wml6
-rw-r--r--french/consultants/softitaly.wml8
-rw-r--r--french/consultants/soleyman.wml8
-rw-r--r--french/consultants/solutionsfirst.wml8
-rw-r--r--french/consultants/sosa.wml10
-rw-r--r--french/consultants/steve_l.wml16
-rw-r--r--french/consultants/storitback.wml8
-rw-r--r--french/consultants/stuart_t.wml6
-rw-r--r--french/consultants/syscovery.wml8
-rw-r--r--french/consultants/tagfl.wml6
-rw-r--r--french/consultants/tecexperts.wml6
-rw-r--r--french/consultants/ted_j.wml6
-rw-r--r--french/consultants/tegtmeier.wml8
-rw-r--r--french/consultants/terran_universal_systems.wml9
-rw-r--r--french/consultants/thoughtprocess.wml6
-rw-r--r--french/consultants/tim_o.wml16
-rw-r--r--french/consultants/togaware.wml12
-rw-r--r--french/consultants/toni_m.wml16
-rw-r--r--french/consultants/transparen.wml58
-rw-r--r--french/consultants/triona.wml12
-rw-r--r--french/consultants/trisinus.wml8
-rw-r--r--french/consultants/trusted.wml6
-rw-r--r--french/consultants/trustsec.wml6
-rw-r--r--french/consultants/turinglabs.wml18
-rw-r--r--french/consultants/turo_technology.wml10
-rw-r--r--french/consultants/udslinux.wml8
-rw-r--r--french/consultants/ullrich-it-consult.wml14
-rw-r--r--french/consultants/ultreia.wml8
-rw-r--r--french/consultants/unimedgv.wml6
-rw-r--r--french/consultants/uslinux.wml6
-rw-r--r--french/consultants/viridiansun.wml6
-rw-r--r--french/consultants/vivek_k.wml6
-rw-r--r--french/consultants/webspacestation.wml8
-rw-r--r--french/consultants/welters.wml12
-rw-r--r--french/consultants/woods.wml8
-rw-r--r--french/consultants/xsto.info.wml8
-rw-r--r--german/consultants/757_technologies.wml6
-rw-r--r--german/consultants/abv.wml6
-rw-r--r--german/consultants/ace_technology_group.wml10
-rw-r--r--german/consultants/aerasec.wml13
-rw-r--r--german/consultants/agentbob.wml6
-rw-r--r--german/consultants/aleph1.wml6
-rw-r--r--german/consultants/alex_r.wml6
-rw-r--r--german/consultants/amazon.wml6
-rw-r--r--german/consultants/anderson.wml6
-rw-r--r--german/consultants/andreu_i.wml10
-rw-r--r--german/consultants/anmsoft.wml10
-rw-r--r--german/consultants/antonio_cosenza.wml10
-rw-r--r--german/consultants/ants-art.wml6
-rw-r--r--german/consultants/applepie-solutions.wml10
-rw-r--r--german/consultants/apsis.wml10
-rw-r--r--german/consultants/avalonix.wml10
-rw-r--r--german/consultants/baton_rouge.wml10
-rw-r--r--german/consultants/beeznest.wml10
-rw-r--r--german/consultants/beil.wml15
-rw-r--r--german/consultants/ben_b.wml6
-rw-r--r--german/consultants/bentosolutions.wml10
-rw-r--r--german/consultants/bitpusher.wml6
-rw-r--r--german/consultants/bitspot.wml6
-rw-r--r--german/consultants/brainalliance.wml12
-rw-r--r--german/consultants/bryan_b.wml10
-rw-r--r--german/consultants/buici.wml10
-rw-r--r--german/consultants/buttersideup.wml6
-rw-r--r--german/consultants/cargol.wml6
-rw-r--r--german/consultants/catalyst.wml38
-rw-r--r--german/consultants/charles_s.wml30
-rw-r--r--german/consultants/cits.wml6
-rw-r--r--german/consultants/clockwork.wml6
-rw-r--r--german/consultants/clue_inc.wml10
-rw-r--r--german/consultants/coderscorp.wml10
-rw-r--r--german/consultants/coherent_light.wml10
-rw-r--r--german/consultants/con_z.wml94
-rw-r--r--german/consultants/cory_p.wml10
-rw-r--r--german/consultants/credativ.wml12
-rw-r--r--german/consultants/csinetworks.wml6
-rw-r--r--german/consultants/custom_engineering.wml10
-rw-r--r--german/consultants/datalay.wml10
-rw-r--r--german/consultants/datalink_internet.wml25
-rw-r--r--german/consultants/davonet.wml6
-rw-r--r--german/consultants/deeproot.wml13
-rw-r--r--german/consultants/delemar.wml6
-rw-r--r--german/consultants/delicate.ch.wml10
-rw-r--r--german/consultants/disoft.wml6
-rw-r--r--german/consultants/douglas_h.wml6
-rw-r--r--german/consultants/eauzone.wml10
-rw-r--r--german/consultants/emergya.wml6
-rw-r--r--german/consultants/enterux.wml57
-rw-r--r--german/consultants/et_computer.wml10
-rw-r--r--german/consultants/eugene_g.wml10
-rw-r--r--german/consultants/extralogix.wml10
-rw-r--r--german/consultants/fai-cluster.wml10
-rw-r--r--german/consultants/federico_sevilla.wml6
-rw-r--r--german/consultants/fensterkitt.wml10
-rw-r--r--german/consultants/fff_managed.wml10
-rw-r--r--german/consultants/filippo_giunchedi.wml10
-rw-r--r--german/consultants/firman.wml23
-rw-r--r--german/consultants/forlinux.wml10
-rw-r--r--german/consultants/fortuitous.wml10
-rw-r--r--german/consultants/fotopic.wml6
-rw-r--r--german/consultants/freesoft.wml6
-rw-r--r--german/consultants/gbcomputers.wml6
-rw-r--r--german/consultants/genilto_dallo.wml10
-rw-r--r--german/consultants/gnulinux.wml10
-rw-r--r--german/consultants/guillermo_rico.wml10
-rw-r--r--german/consultants/gurunetwork.wml10
-rw-r--r--german/consultants/harmuth.wml6
-rw-r--r--german/consultants/heureka.wml8
-rw-r--r--german/consultants/hornfordassociates.wml6
-rw-r--r--german/consultants/houdek.wml8
-rw-r--r--german/consultants/hp_germany.wml6
-rw-r--r--german/consultants/hytechpro.wml6
-rw-r--r--german/consultants/ideal.wml10
-rw-r--r--german/consultants/imagin.wml6
-rw-r--r--german/consultants/incipit.wml20
-rw-r--r--german/consultants/indus_net_technologies.wml10
-rw-r--r--german/consultants/inittab.wml6
-rw-r--r--german/consultants/inl.wml6
-rw-r--r--german/consultants/integrics.wml6
-rw-r--r--german/consultants/internet_solutions.wml10
-rw-r--r--german/consultants/ipodion.wml6
-rw-r--r--german/consultants/it_service_drillich.wml10
-rw-r--r--german/consultants/itsecuritymn.wml6
-rw-r--r--german/consultants/ivan_k.wml10
-rw-r--r--german/consultants/jarno_saarinen.wml10
-rw-r--r--german/consultants/jaume_t.wml10
-rw-r--r--german/consultants/javier_v.wml10
-rw-r--r--german/consultants/jean_p.wml10
-rw-r--r--german/consultants/jeremy_r.wml6
-rw-r--r--german/consultants/jfranken.wml18
-rw-r--r--german/consultants/jh_networks.wml10
-rw-r--r--german/consultants/jibsystems.wml10
-rw-r--r--german/consultants/jim_w.wml10
-rw-r--r--german/consultants/joan_l.wml10
-rw-r--r--german/consultants/joe_m.wml10
-rw-r--r--german/consultants/joerg_w.wml6
-rw-r--r--german/consultants/joeyh.wml6
-rw-r--r--german/consultants/jurgen_l.wml10
-rw-r--r--german/consultants/kaarlo_m.wml10
-rw-r--r--german/consultants/karsten_m_self.wml15
-rw-r--r--german/consultants/kevin_l.wml10
-rw-r--r--german/consultants/kevin_t.wml13
-rw-r--r--german/consultants/knaepper.wml10
-rw-r--r--german/consultants/koenigsmann.wml10
-rw-r--r--german/consultants/kotarba.wml10
-rw-r--r--german/consultants/kring.wml6
-rw-r--r--german/consultants/lawrence_c.wml6
-rw-r--r--german/consultants/lcs.wml6
-rw-r--r--german/consultants/leos.wml9
-rw-r--r--german/consultants/liberobit.wml10
-rw-r--r--german/consultants/libhertz.wml6
-rw-r--r--german/consultants/libren.wml6
-rw-r--r--german/consultants/linbit.wml6
-rw-r--r--german/consultants/linbox.wml6
-rw-r--r--german/consultants/linux_ag.wml6
-rw-r--r--german/consultants/linux_box.wml10
-rw-r--r--german/consultants/linux_certified.wml10
-rw-r--r--german/consultants/linux_consultancy.wml10
-rw-r--r--german/consultants/linux_mania.wml6
-rw-r--r--german/consultants/linuxcare.wml6
-rw-r--r--german/consultants/linuxmagic.wml10
-rw-r--r--german/consultants/linuxworks.wml22
-rw-r--r--german/consultants/logilab.wml10
-rw-r--r--german/consultants/mark_stanislav.wml10
-rw-r--r--german/consultants/markoer.wml10
-rw-r--r--german/consultants/maroonpoint.wml10
-rw-r--r--german/consultants/marques_j.wml10
-rw-r--r--german/consultants/mathias_kettner.wml10
-rw-r--r--german/consultants/michaeljohn_c.wml10
-rw-r--r--german/consultants/miju.wml10
-rw-r--r--german/consultants/mind.wml13
-rw-r--r--german/consultants/minihub.wml10
-rw-r--r--german/consultants/mivitec.wml22
-rw-r--r--german/consultants/mladen_adamovic.wml10
-rw-r--r--german/consultants/murphy_soft.wml6
-rw-r--r--german/consultants/netdigix.wml10
-rw-r--r--german/consultants/nikolai_l.wml10
-rw-r--r--german/consultants/norrix.wml10
-rw-r--r--german/consultants/novochip.wml6
-rw-r--r--german/consultants/ns_computing.wml10
-rw-r--r--german/consultants/openbizz.wml10
-rw-r--r--german/consultants/openit.wml6
-rw-r--r--german/consultants/opentechnologies.wml10
-rw-r--r--german/consultants/opentrend.wml10
-rw-r--r--german/consultants/orbit.wml10
-rw-r--r--german/consultants/osourcery.wml6
-rw-r--r--german/consultants/ossafrica.wml6
-rw-r--r--german/consultants/ouattara.wml6
-rw-r--r--german/consultants/oxalide.wml5
-rw-r--r--german/consultants/pahne.wml6
-rw-r--r--german/consultants/parreiras_m.wml10
-rw-r--r--german/consultants/penguintechs.wml6
-rw-r--r--german/consultants/pete_b.wml6
-rw-r--r--german/consultants/peter_d.wml6
-rw-r--r--german/consultants/peter_naulls.wml10
-rw-r--r--german/consultants/picone.wml6
-rw-r--r--german/consultants/pits.wml6
-rw-r--r--german/consultants/porcacchia.wml6
-rw-r--r--german/consultants/praksys.wml10
-rw-r--r--german/consultants/produktivit.wml10
-rw-r--r--german/consultants/prolibre.wml10
-rw-r--r--german/consultants/prosa.wml16
-rw-r--r--german/consultants/python_byte.wml10
-rw-r--r--german/consultants/qualsoftservices.wml11
-rw-r--r--german/consultants/qulix.wml6
-rw-r--r--german/consultants/r3deng.wml6
-rw-r--r--german/consultants/r_w_r.wml10
-rw-r--r--german/consultants/rafez_n.wml6
-rw-r--r--german/consultants/researchut.wml6
-rw-r--r--german/consultants/robert_millan.wml10
-rw-r--r--german/consultants/sam_solutions.wml6
-rw-r--r--german/consultants/samantha_s.wml6
-rw-r--r--german/consultants/samurai.wml6
-rw-r--r--german/consultants/scheeder.wml8
-rw-r--r--german/consultants/seattlelinux.wml6
-rw-r--r--german/consultants/sergio_a.wml10
-rw-r--r--german/consultants/serverflow.wml6
-rw-r--r--german/consultants/servitux.wml6
-rw-r--r--german/consultants/shannon_d.wml6
-rw-r--r--german/consultants/simone_giustetti.wml6
-rw-r--r--german/consultants/sine_nomine.wml10
-rw-r--r--german/consultants/sniffer.wml6
-rw-r--r--german/consultants/softitaly.wml6
-rw-r--r--german/consultants/soleyman.wml6
-rw-r--r--german/consultants/solutionsfirst.wml6
-rw-r--r--german/consultants/sosa.wml10
-rw-r--r--german/consultants/steve_l.wml10
-rw-r--r--german/consultants/storitback.wml6
-rw-r--r--german/consultants/stuart_t.wml8
-rw-r--r--german/consultants/syscovery.wml6
-rw-r--r--german/consultants/tagfl.wml6
-rw-r--r--german/consultants/tecexperts.wml6
-rw-r--r--german/consultants/ted_j.wml6
-rw-r--r--german/consultants/tegtmeier.wml6
-rw-r--r--german/consultants/terran_universal_systems.wml6
-rw-r--r--german/consultants/thoughtprocess.wml6
-rw-r--r--german/consultants/tim_o.wml13
-rw-r--r--german/consultants/togaware.wml10
-rw-r--r--german/consultants/toni_m.wml16
-rw-r--r--german/consultants/transparen.wml56
-rw-r--r--german/consultants/triona.wml10
-rw-r--r--german/consultants/trisinus.wml6
-rw-r--r--german/consultants/trusted.wml6
-rw-r--r--german/consultants/trustsec.wml6
-rw-r--r--german/consultants/turinglabs.wml19
-rw-r--r--german/consultants/turo_technology.wml10
-rw-r--r--german/consultants/udslinux.wml6
-rw-r--r--german/consultants/ullrich-it-consult.wml10
-rw-r--r--german/consultants/ultreia.wml6
-rw-r--r--german/consultants/unimedgv.wml6
-rw-r--r--german/consultants/uslinux.wml6
-rw-r--r--german/consultants/viridiansun.wml6
-rw-r--r--german/consultants/vivek_k.wml6
-rw-r--r--german/consultants/webspacestation.wml6
-rw-r--r--german/consultants/welters.wml10
-rw-r--r--german/consultants/woods.wml6
-rw-r--r--german/consultants/xsto.info.wml6
-rw-r--r--italian/consultants/apsis.wml10
-rw-r--r--italian/consultants/credativ.wml14
-rw-r--r--italian/consultants/incipit.wml22
-rw-r--r--italian/consultants/r3deng.wml9
-rw-r--r--italian/consultants/simone_giustetti.wml6
-rw-r--r--japanese/consultants/credativ.wml6
-rw-r--r--polish/consultants/757_technologies.wml10
-rw-r--r--polish/consultants/abv.wml6
-rw-r--r--polish/consultants/aerasec.wml13
-rw-r--r--polish/consultants/alex_r.wml10
-rw-r--r--polish/consultants/andreu_i.wml10
-rw-r--r--polish/consultants/avalonix.wml10
-rw-r--r--polish/consultants/beeznest.wml10
-rw-r--r--polish/consultants/ben_b.wml6
-rw-r--r--polish/consultants/bryan_b.wml10
-rw-r--r--polish/consultants/catalyst.wml38
-rw-r--r--polish/consultants/filippo_giunchedi.wml10
-rw-r--r--polish/consultants/heureka.wml8
-rw-r--r--polish/consultants/kotarba.wml10
-rw-r--r--polish/consultants/lawrence_c.wml4
-rw-r--r--polish/consultants/rafez_n.wml6
-rw-r--r--polish/consultants/sosa.wml10
-rw-r--r--polish/consultants/stuart_t.wml8
-rw-r--r--polish/consultants/turo_technology.wml10
-rw-r--r--polish/consultants/vivek_k.wml6
-rw-r--r--portuguese/consultants/757_technologies.wml6
-rw-r--r--portuguese/consultants/ace_technology_group.wml10
-rw-r--r--portuguese/consultants/credativ.wml14
-rw-r--r--portuguese/consultants/genilto_dallo.wml10
-rw-r--r--portuguese/consultants/guillermo_rico.wml10
-rw-r--r--portuguese/consultants/samurai.wml6
-rw-r--r--portuguese/consultants/unimedgv.wml6
-rw-r--r--romanian/consultants/credativ.wml12
-rw-r--r--spanish/consultants/757_technologies.wml6
-rw-r--r--spanish/consultants/aerasec.wml13
-rw-r--r--spanish/consultants/alex_r.wml10
-rw-r--r--spanish/consultants/andreu_i.wml10
-rw-r--r--spanish/consultants/antonio_cosenza.wml10
-rw-r--r--spanish/consultants/applepie-solutions.wml10
-rw-r--r--spanish/consultants/avalonix.wml10
-rw-r--r--spanish/consultants/beeznest.wml10
-rw-r--r--spanish/consultants/ben_b.wml6
-rw-r--r--spanish/consultants/bryan_b.wml10
-rw-r--r--spanish/consultants/catalyst.wml38
-rw-r--r--spanish/consultants/charles_s.wml30
-rw-r--r--spanish/consultants/coderscorp.wml10
-rw-r--r--spanish/consultants/con_z.wml93
-rw-r--r--spanish/consultants/cory_p.wml10
-rw-r--r--spanish/consultants/douglas_h.wml6
-rw-r--r--spanish/consultants/heureka.wml8
-rw-r--r--spanish/consultants/inittab.wml6
-rw-r--r--spanish/consultants/ivan_k.wml10
-rw-r--r--spanish/consultants/jaume_t.wml10
-rw-r--r--spanish/consultants/javier_v.wml10
-rw-r--r--spanish/consultants/jeremy_r.wml8
-rw-r--r--spanish/consultants/joerg_w.wml6
-rw-r--r--spanish/consultants/linux_mania.wml6
-rw-r--r--spanish/consultants/murphy_soft.wml6
-rw-r--r--spanish/consultants/rafez_n.wml6
-rw-r--r--spanish/consultants/robert_millan.wml10
-rw-r--r--spanish/consultants/stuart_t.wml8
-rw-r--r--spanish/consultants/ultreia.wml6
-rw-r--r--spanish/consultants/vivek_k.wml6
-rw-r--r--spanish/consultants/xsto.info.wml6
-rw-r--r--swedish/consultants/aerasec.wml13
-rw-r--r--swedish/consultants/alex_r.wml10
-rw-r--r--swedish/consultants/andreu_i.wml10
-rw-r--r--swedish/consultants/avalonix.wml10
-rw-r--r--swedish/consultants/ben_b.wml6
-rw-r--r--swedish/consultants/charles_s.wml31
-rw-r--r--swedish/consultants/credativ.wml15
-rw-r--r--swedish/consultants/datalink_internet.wml25
-rw-r--r--swedish/consultants/deeproot.wml13
-rw-r--r--swedish/consultants/et_computer.wml10
-rw-r--r--swedish/consultants/eugene_g.wml10
-rw-r--r--swedish/consultants/heureka.wml8
-rw-r--r--swedish/consultants/indus_net_technologies.wml10
-rw-r--r--swedish/consultants/ivan_k.wml10
-rw-r--r--swedish/consultants/jaume_t.wml10
-rw-r--r--swedish/consultants/jean_p.wml10
-rw-r--r--swedish/consultants/jim_w.wml10
-rw-r--r--swedish/consultants/joan_l.wml10
-rw-r--r--swedish/consultants/joe_m.wml10
-rw-r--r--swedish/consultants/joerg_w.wml8
-rw-r--r--swedish/consultants/kaarlo_m.wml10
-rw-r--r--swedish/consultants/kevin_l.wml10
-rw-r--r--swedish/consultants/kevin_t.wml8
-rw-r--r--swedish/consultants/lawrence_c.wml6
-rw-r--r--swedish/consultants/linux_box.wml10
-rw-r--r--swedish/consultants/michaeljohn_c.wml10
-rw-r--r--swedish/consultants/mind.wml13
-rw-r--r--swedish/consultants/minihub.wml10
-rw-r--r--swedish/consultants/murphy_soft.wml6
-rw-r--r--swedish/consultants/nikolai_l.wml10
-rw-r--r--swedish/consultants/ns_computing.wml10
-rw-r--r--swedish/consultants/opentechnologies.wml10
-rw-r--r--swedish/consultants/pete_b.wml16
-rw-r--r--swedish/consultants/peter_d.wml8
-rw-r--r--swedish/consultants/prosa.wml16
-rw-r--r--swedish/consultants/r_w_r.wml10
-rw-r--r--swedish/consultants/rafez_n.wml6
-rw-r--r--swedish/consultants/samantha_s.wml6
-rw-r--r--swedish/consultants/sergio_a.wml10
-rw-r--r--swedish/consultants/shannon_d.wml8
-rw-r--r--swedish/consultants/sosa.wml10
-rw-r--r--swedish/consultants/steve_l.wml10
-rw-r--r--swedish/consultants/stuart_t.wml8
-rw-r--r--swedish/consultants/ted_j.wml6
-rw-r--r--swedish/consultants/tim_o.wml12
-rw-r--r--swedish/consultants/toni_m.wml14
-rw-r--r--swedish/consultants/vivek_k.wml6
856 files changed, 3651 insertions, 5024 deletions
diff --git a/catalan/consultants/alex_r.wml b/catalan/consultants/alex_r.wml
index 19a0862a730..d7856ac1c0f 100644
--- a/catalan/consultants/alex_r.wml
+++ b/catalan/consultants/alex_r.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Breakthrough LTD"
+#use wml::debian::translation-check translation="1.2"
-<H1>Breakthrough LTD</H1>
-<HR>
-<PRE>
+<p>
Muntem servidors d'Internet/Intranet per a cobrir totes les necessitats
LAN de la companyia: Connectivitat RDSI a Internet, accés remot,
servidor de fitxers de Windows, NFS, DNS, servidor Web, servidor FTP,
servidor de correu, ...
-</PRE>
+</p>
diff --git a/catalan/consultants/ben_b.wml b/catalan/consultants/ben_b.wml
index ca99da539a4..340d3e67b51 100644
--- a/catalan/consultants/ben_b.wml
+++ b/catalan/consultants/ben_b.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
-
-<h1>Ben Bell</h1>
+#use wml::debian::consultant name="Ben Bell"
+#use wml::debian::translation-check translation="1.2"
<p>Estic especialitzat en el disseny i implementació d'infraestructura:
xarxa, servidor i programari. Disposo d'una àmplia experiència en
diff --git a/catalan/consultants/catalyst.wml b/catalan/consultants/catalyst.wml
index 7f3bda4bffb..9bc9c11cf2c 100644
--- a/catalan/consultants/catalyst.wml
+++ b/catalan/consultants/catalyst.wml
@@ -1,33 +1,33 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Catalyst IT Ltd"
#use wml::debian::translation-check translation="1.3"
-<H1>Catalyst IT Ltd</H1>
-<HR>
-<PRE>
+<p>
Serveis ofertats:
-* Suport per telèfon, correu electrònic o in situ (en Wellington i Auckland).
-* Consultoria i suport de Debian GNU/Linux: - Suport de la
+</p>
+<ul>
+<li>Suport per telèfon, correu electrònic o in situ (en Wellington i
+Auckland).</li>
+<li>Consultoria i suport de Debian GNU/Linux: - Suport de la
instal·lació/actualització, organització de NFS/Samba/DNS/DHCP,
- configuració del sendmail, depuració de PPP.
-* Suport de desenvolupament: - Tenim disponibles a programadors amb
+ configuració del sendmail, depuració de PPP.</li>
+<li>Suport de desenvolupament: - Tenim disponibles a programadors amb
experiència en un gran ventall de llenguatges i utilitats, incloguen el
- C, C++, Java, Perl, bash, Visual Basic i molts més...
-* Hospedatge de llocs web: - Tenim els nostre propis servidor d'Internet amb
- una línia de connexió de 10MB.
-* Passarel·les d'Internet i tallafocs: - Creats en base a Debian GNU/Linux.
+ C, C++, Java, Perl, bash, Visual Basic i molts més...</li>
+<li>Hospedatge de llocs web: - Tenim els nostre propis servidor d'Internet amb
+ una línia de connexió de 10MB.</li>
+<li>Passarel·les d'Internet i tallafocs: - Creats en base a Debian GNU/Linux.
Usant l'emmascarament d'IP i marcat sota demanda, per a que pugueu
connectar simultàniament a tota la vostra oficina a la Internet usant
una sola connexió estàndard a la Internet amb el compte d'accés del
- vostre ISP.
-* Administració remota de sistemes: - Si no disposeu de temps per a mantindre
+ vostre ISP.</li>
+<li>Administració remota de sistemes: - Si no disposeu de temps per a mantindre
una xarxa, Intranet o Extranet, amb dotzenes de màquines GNU/Linux, o
potser esteu començant a aprendre Unix (o no desitgeu aprendre-lo), però
desitgeu una màquina GNU/Linux per a la vostra oficina ARA! Catalyst
pot configurar i actualitzar remotament la vostra màquina mitjançant la
- Internet (usant connexions encriptades) o línies telefòniques.
-* D'altres serveis de consultoria de TI: - Catalyst disposa d'un equip amb
+ Internet (usant connexions encriptades) o línies telefòniques.</li>
+<li>D'altres serveis de consultoria de TI: - Catalyst disposa d'un equip amb
experiència que va des del modelat estratègic a la programació en
ensamblador, el qual us podem proveir amb uns serveis de qualitat i
- preus competitius.
-</PRE>
-
+ preus competitius.</li>
+</ul>
diff --git a/catalan/consultants/charles_s.wml b/catalan/consultants/charles_s.wml
index 87d6e450bb7..242a846c92e 100644
--- a/catalan/consultants/charles_s.wml
+++ b/catalan/consultants/charles_s.wml
@@ -1,21 +1,25 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Suport de sistemes multiusuari actiu"
+#use wml::debian::translation-check translation="1.3"
-<H1>Suport de sistemes multiusuari actiu</H1>
-<HR>
-<PRE>
+<p>
Ens especialitzem en Ingenyieria de xarxes en Unix i suport de
missions crítiques.
+</p>
+<p>
Donem suport per a:
-Debian
-Caldera
-Red Hat
-SCO
-Cisco
-Bay networks
-Microsoft
+</p>
+<ul>
+<li>Debian</li>
+<li>Caldera</li>
+<li>Red Hat</li>
+<li>SCO</li>
+<li>Cisco</li>
+<li>Bay networks</li>
+<li>Microsoft</li>
+</ul>
+<p>
Contacteu amb nosaltres per a informar-vos e contractes de manteniment i de
consulta telefònica.
-</PRE>
+</p>
diff --git a/catalan/consultants/con_z.wml b/catalan/consultants/con_z.wml
index eba2768d796..58adfda1118 100644
--- a/catalan/consultants/con_z.wml
+++ b/catalan/consultants/con_z.wml
@@ -1,47 +1,58 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Cybersource Pty Ltd"
#use wml::debian::translation-check translation="1.1"
-<H1>Cybersource Pty Ltd</H1>
-<HR>
-<PRE>
+<p>
Som la empresa australiana capdavantera en serveis Linux i programari
lliure/opensource, amb més de nou anys de experiència en el negoci i 25 membres
en plantilla. Hem suportat la cominutat Linux durant molt de temps (Grup
-d'Usuaris de Victoria.)
-
+d'Usuaris de Victoria.)</p>
+<p>
Proveïm el següents serveis per a GNU/Linux
+</p>
+<ul>
+<li>Les nostres principals àrees d'experiència són:
+ <ul>
+ <li>Administració i posta a punt d'un sistema Linux</li>
+ <li>Centre australià de suport per a Linux</li>
+ <li>Integració de les plataformes Linux i MS-Windows</li>
+ <li>Planficació de xarxes, topologia i disseny del sistemes de
+ seguretat</li>
+ <li>Experiència en Internet i tallafocs</li>
+ </ul>
+</li>
+<li>Els nostres serveis:
+ <ul>
+ <li>Serveis proactius de administració de sistemes, per a suavitzar
+ o eliminar els problemes associats amb un gran creiximent</li>
+ <li>24 hores de suport remot de sistemes i xarxa, per a que pogueu
+ proveir un servei garantitzat als seus clients</li>
+ <li>Administradors de sistemes que reemplacen a la plantilla durant
+ un curt periode de temps</li>
+ <li>Reemplaçament de servidors NT per servidors SAMBA i Linux</li>
+ <li>Instal·lacions de servidors web segurs</li>
+ <li>Suport de taula d'ajuda de Linux davant qualsevol incident</li>
+ </ul>
+</li>
+</ul>
- Les nostres principals àrees d'experiència són:
- * Administració i posta a punt d'un sistema Linux
- * Centre australià de suport per a Linux
- * Integració de les plataformes Linux i MS-Windows
- * Planficació de xarxes, topologia i disseny del sistemes de seguretat
- * Experiència en Internet i tallafocs
-
- Els nostres serveis:
- * Serveis proactius de administració de sistemes, per a suavitzar o
-eliminar els problemes associats amb un gran creiximent
- * 24 hores de suport remot de sistemes i xarxa, per a que pogueu proveir
-un servei garantitzat als seus clients
- * Administradors de sistemes que reemplacen a la plantilla durant un curt
-periode de temps
- * Reemplaçament de servidors NT per servidors SAMBA i Linux
- * Instal·lacions de servidors web segurs
- * Suport de taula d'ajuda de Linux davant qualsevol incident
-
+<p>
També podem fer desenvolupament basat en Linux
- * C/C++
- * Perl
- * Java
- * Python
- * PHP amb integració de la base de dades al web
- * MySQL
- * PostgresSQL
- * XBasic
+</p>
+<ul>
+ <li>C/C++</li>
+ <li>Perl</li>
+ <li>Java</li>
+ <li>Python</li>
+ <li>PHP amb integració de la base de dades al web</li>
+ <li>MySQL</li>
+ <li>PostgresSQL</li>
+ <li>XBasic</li>
+</ul>
+<p>
Desenvolupament de les aplicacions GPL
Cybersource també és coordinadora del sistema d'aplicació web Cyborg,
llançament sota la GPL:
- <A href="http://www.cyber.com.au/cyber/product/cyborg/">http://www.cyber.com.au/cyber/product/cyborg/</A>
-</PRE>
+ <a href="http://www.cyber.com.au/cyber/product/cyborg/">http://www.cyber.com.au/cyber/product/cyborg/</a>
+</p>
diff --git a/croatian/consultants/alex_r.wml b/croatian/consultants/alex_r.wml
index ce3ea3919ce..be753b853dc 100644
--- a/croatian/consultants/alex_r.wml
+++ b/croatian/consultants/alex_r.wml
@@ -1,12 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Breakthrough LTD"
+#use wml::debian::translation-check translation="1.2"
-<H1>Breakthrough LTD</H1>
-<HR>
-<PRE>
+<p>
Izgraðujemo Internet/Intranet poslu¾itelje koji pru¾aju sve ¹to LAN-u
tvrtke treba: Internet povezivost ISDN-om, udaljeni pristup, Windows
datoteèni poslu¾itelj, NFS, DNS, WWW poslu¾itelj, FTP poslu¾itelj,
e-mail poslu¾itelj...
-</PRE>
-
+</p>
diff --git a/croatian/consultants/charles_s.wml b/croatian/consultants/charles_s.wml
index 14a48a2fdf2..2b3488de923 100644
--- a/croatian/consultants/charles_s.wml
+++ b/croatian/consultants/charles_s.wml
@@ -1,21 +1,25 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Aktiviranje podr¹ke vi¹ekorisnièkim sustavima"
+#use wml::debian::translation-check translation="1.3"
-<H1>Aktiviranje podr¹ke vi¹ekorisnièkim sustavima</H1>
-<HR>
-<PRE>
+<p>
Specijalizirani u Unix mre¾ama i podr¹ci kritiènim sustavima.
+</p>
+<p>
Podr¾avamo:
-- Debian
-- Caldera
-- Red Hat
-- SCO
-- Cisco
-- Bay networks
-- Microsoft
+</p>
+<ul>
+<li>Debian</li>
+<li>Caldera</li>
+<li>Red Hat</li>
+<li>SCO</li>
+<li>Cisco</li>
+<li>Bay networks</li>
+<li>Microsoft</li>
+<ul>
+<p>
Cijene ugovora o odr¾avanju i telefonskih konzultacija dajemo na
zahtjev.
-</PRE>
+</p>
diff --git a/croatian/consultants/jim_w.wml b/croatian/consultants/jim_w.wml
index e4d23e2c36d..d64574fce41 100644
--- a/croatian/consultants/jim_w.wml
+++ b/croatian/consultants/jim_w.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="LAN Comp Systems"
+#use wml::debian::translation-check translation="1.3"
-<H1>LAN Comp Systems</H1>
-<HR>
-<PRE>
+<p>
LAN Comp Systems obavlja planiranje mre¾nih sustava, instaliranje
te podr¹ku upravljanja projektima za klijent/poslu¾itelj OLTP sustave
koji koriste UNIX ili vlasnièke operativne platforme. Za veæinu
mre¾nih poslu¾itelja preporuèamo Linux (toènije, Debian).
-</PRE>
+</p>
diff --git a/croatian/consultants/jurgen_l.wml b/croatian/consultants/jurgen_l.wml
index 6b6a31b2d01..7274a28c255 100644
--- a/croatian/consultants/jurgen_l.wml
+++ b/croatian/consultants/jurgen_l.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Osmi¹ljavanje Intranetova"
#use wml::debian::translation-check translation="1.2"
-<H1>Osmi¹ljavanje Intranetova</H1>
-<HR>
-<PRE>
+<p>
Ja sam ovjereni struènjak za sustave i aplikacije na polju
procesiranja informacija.
-</PRE>
+</p>
diff --git a/croatian/consultants/marques_j.wml b/croatian/consultants/marques_j.wml
index 8474f0805e6..e6018203775 100644
--- a/croatian/consultants/marques_j.wml
+++ b/croatian/consultants/marques_j.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Marques Johansson"
#use wml::debian::translation-check translation="1.2"
-<H1>Marques Johansson</H1>
-<HR>
-<PRE>
+<p>
Cijene odreðuje vrsta problema i oèekivano/utro¹eno vrijeme.
Administriram Linux 3 godine, uz 2 godine odr¾avanja vi¹estrukih
Debian poslu¾itelja. Meðu specijalnostima su mi pode¹avanje radnih
@@ -12,5 +10,5 @@ ukljuèivanjem Debiana (ili bilo kojeg drugog Linuxa -- kao i nekih
drugih unixa) u radno okru¾je. Za sada, spreman sam pru¾iti jedino
e-mail i lokalnu podr¹ku. Nastavljajuæi trend -- dio sve zarade æe
biti doniran Debianu -- OS-u bogova (i korisnika Deitya).
-</PRE>
+</p>
diff --git a/croatian/consultants/nikolai_l.wml b/croatian/consultants/nikolai_l.wml
index 6ac23781283..d465ef6b3b0 100644
--- a/croatian/consultants/nikolai_l.wml
+++ b/croatian/consultants/nikolai_l.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Nikolai Luzan"
#use wml::debian::translation-check translation="1.2"
-<H1>Nikolai Luzan</H1>
-<HR>
-<PRE>
+<p>
Ja sam student na Sveuèili¹tu Queenslanda koji se priprema za
bakalaureat iz informacijskih tehnologija i iz umjetnosti uz povijest
kao dvostruki glavni predmet. Specijaliziran sam u postavljanju i
@@ -11,5 +9,5 @@ administriranju unix strojeva, u rasponu od jednog stroja do cijelih
mre¾a. U kuæi ili uredu, udovoljit æu va¹im potrebama na
najdjelotvorniji naèin, ukljuèujuæi pripremu suèelja za unix
poslu¾itelje na Windows 95/NT desktopima.
-</PRE>
+</p>
diff --git a/croatian/consultants/prosa.wml b/croatian/consultants/prosa.wml
index 1e12fb3053a..3aacad796ac 100644
--- a/croatian/consultants/prosa.wml
+++ b/croatian/consultants/prosa.wml
@@ -1,17 +1,17 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="PROSA Progettazione Sviluppo Aperto"
#use wml::debian::translation-check translation="1.1"
-<H1>PROSA Progettazione Sviluppo Aperto</H1>
-<HR>
-<PRE>
+<p>
Prodajemo preinstalirane Debian Linux sustave. Pru¾amo komercijalnu
podr¹ku za Debian Linux; veæina na¹ih uposlenika su takoðer Debian
razvijatelji.
-
+</p>
+<p>
Autori smo PROSA/Debiana, talijanske verzije Debiana, koja se
isporuèuje s na¹im sustavima.
-
+</p>
+<p>
PROSA koristi, stvara i prodaje samo rje¹enja zasnovana na slobodnom
softveru.
-</PRE>
+</p>
diff --git a/croatian/consultants/tim_o.wml b/croatian/consultants/tim_o.wml
index e72094a65f0..19e29e9d562 100644
--- a/croatian/consultants/tim_o.wml
+++ b/croatian/consultants/tim_o.wml
@@ -1,17 +1,16 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="OASys Engineering"
+#use wml::debian::translation-check translation="1.3"
-<H1>OASys Engineering</H1>
-<HR>
-<PRE>
+<p>
Dodatne informacije: OASys je specijaliziran u poslu¾ivanju tvrtki
manje do srednje velièine u svim njihovim raèunalnim potrebama.
Kombinaciju Debian Linuxa i Sambe preporuèamo ispred Windows NT
Servera, zahvaljujuæi Debianovoj stabilnosti, robustnom radu i
nedostatku glavobolja s licenciranjem. Uz to, uslu¾ujemo veæinu
varijanti Unixa, kao i Windows 95, 98 te NT.
-
+</p>
+<p>
OASys takoðer pru¾a obuku i predavanja o osnovnoj administraciji po
zahtjevu/posebnom ugovoru.
-</PRE>
+</p>
diff --git a/czech/consultants/credativ.wml b/czech/consultants/credativ.wml
index ec072b4360a..588c422e1ca 100644
--- a/czech/consultants/credativ.wml
+++ b/czech/consultants/credativ.wml
@@ -1,17 +1,17 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="credativ GmbH"
+#use wml::debian::translation-check translation="1.2"
-<h1>credativ GmbH</h1>
-<hr/>
-<pre>
+<p>
credativ GmbH má mezi svými zamìstnanci osm vývojáøù, kteøí mají práci pro
Debian jako souèást svého zamìstnání. Pravidelnì také sponzorují CD a dal¹í
materiály pro LinuxTag a v¹eobecnì pomáhají Debianu v Nìmecku.
+</p>
+<p>
credativ je na dodavatelích nezávislá konzultaèní a servisní spoleènost
specializující se na zaji¹tìní kvality IT projektù, správu systému a Open
Source slu¾by. Ve spolupráci se svými zákazníky implementuje zakázková Open
Source øe¹ení (pokud mo¾no úplnì zalo¾ená na volnì ¹iøitelném software),
která mají vysoký potenciál v oblasti sni¾ování nákladù, migrace systémù a
která nabízejí specializovanou podporu pro celé sítì. Více informací
-naleznete na http://www.credativ.de/.
-</pre>
+naleznete na <a href="http://www.credativ.de/">http://www.credativ.de/</a>.
+</p>
diff --git a/danish/consultants/757_technologies.wml b/danish/consultants/757_technologies.wml
index 123428feb01..229f20e4458 100644
--- a/danish/consultants/757_technologies.wml
+++ b/danish/consultants/757_technologies.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="757 Technologies"
+#use wml::debian::translation-check translation="1.3"
-<h1>757 Technologies</h1>
-<hr />
<p>
Vi tilbyder installation og integration af Debian GNU/Linux, foruden
"co-location" og vedligehold af GNU/Linux. Vi dækker Hampton Roads-området
diff --git a/danish/consultants/ace_technology_group.wml b/danish/consultants/ace_technology_group.wml
index d26ef740496..38b3f8aa135 100644
--- a/danish/consultants/ace_technology_group.wml
+++ b/danish/consultants/ace_technology_group.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="ACE Technology Group"
+#use wml::debian::translation-check translation="1.2"
-<h1>ACE Technology Group</h1>
-<hr>
-<pre>
+<p>
Styret infrastruktur, Windows til Linux-migrering, generel
Linux-konsulentbistand.
-</pre>
+</p>
diff --git a/danish/consultants/aerasec.wml b/danish/consultants/aerasec.wml
index 2449ebbfd25..9f7194b444c 100644
--- a/danish/consultants/aerasec.wml
+++ b/danish/consultants/aerasec.wml
@@ -1,10 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="AERAsec GmbH"
+#use wml::debian::translation-check translation="1.3"
-<h1>AERAsec GmbH</h1>
-<hr>
-<pre>
+<p>
Sikkerhed, kompleksenetværksløsninger, serverstrategier.
-
+</p>
+<p>
Også: München/Tyskland.
-</pre>
+</p>
diff --git a/danish/consultants/alex_r.wml b/danish/consultants/alex_r.wml
index 62dd6b6df2d..63cb1e0492e 100644
--- a/danish/consultants/alex_r.wml
+++ b/danish/consultants/alex_r.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Breakthrough LTD"
+#use wml::debian::translation-check translation="1.2"
-<h1>Breakthrough LTD</h1>
-<hr>
-<pre>
+<p>
Opbygning af Internet-/intranetservere som sørge for alle netværksbehov i
virksomheden: Internet-forbindelse via ISDN, fjernadgang, Windows-filserver,
NFS, DNS, webserver, ftpserver, e-mail-server, ...
-</pre>
+</p>
diff --git a/danish/consultants/andreu_i.wml b/danish/consultants/andreu_i.wml
index 6533bae0b0b..a35d24a0775 100644
--- a/danish/consultants/andreu_i.wml
+++ b/danish/consultants/andreu_i.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Internet Web Serveis"
+#use wml::debian::translation-check translation="1.2"
-<h1>Internet Web Serveis</h1>
-<hr>
-<pre>
+<p>
IWS har siden 1995 tilbudt alle former for Linux- og Debian-relaterede
tjenesteydelser. Konsulentarbejde, udvikling, implementering, support,
kurser og så videre.
-</pre>
+</p>
diff --git a/danish/consultants/antonio_cosenza.wml b/danish/consultants/antonio_cosenza.wml
index a32eaf37829..686ac747756 100644
--- a/danish/consultants/antonio_cosenza.wml
+++ b/danish/consultants/antonio_cosenza.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Antonio Cosenza"
+#use wml::debian::translation-check translation="1.3"
-<h1>Antonio Cosenza</h1>
-<hr>
-<pre>
+<p>
Open Source- og GIS/web gis-programmer baseret på Debian GNU/Linux
-</pre>
+</p>
diff --git a/danish/consultants/avalonix.wml b/danish/consultants/avalonix.wml
index abaddc22010..ae40c978978 100644
--- a/danish/consultants/avalonix.wml
+++ b/danish/consultants/avalonix.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="AVALONIX Linux Systems Support"
+#use wml::debian::translation-check translation="1.2"
-<h1>AVALONIX Linux Systems Support</h1>
-<hr>
-<pre>
+<p>
Specialiseret i uddannelse, elektronisk publisering, dokumenthåndtering.
-</pre>
+</p>
diff --git a/danish/consultants/beeznest.wml b/danish/consultants/beeznest.wml
index 79a2d490bf8..1f2eb2c0725 100644
--- a/danish/consultants/beeznest.wml
+++ b/danish/consultants/beeznest.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="BeezNest"
+#use wml::debian::translation-check translation="1.2"
-<h1>BeezNest</h1>
-<hr>
-<pre>
+<p>
Kan arbejde overalt i Europa mellem Holland og Spanien, også
Tyskland og andre steder hvis nødvendigt.
-</pre>
+</p>
diff --git a/danish/consultants/ben_b.wml b/danish/consultants/ben_b.wml
index e36be15835c..8c7e2f69ebb 100644
--- a/danish/consultants/ben_b.wml
+++ b/danish/consultants/ben_b.wml
@@ -1,7 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Ben Bell"
+#use wml::debian::translation-check translation="1.2"
-<h1>Ben Bell</h1>
<p>Jeg har specialiseret mig i design og implementering af infrastruktur -
netværk, server og programmel. Jeg har en bred erfaring efter at have haft
stillinger fra netværk- og systemarkitekturer for en international
diff --git a/danish/consultants/bryan_b.wml b/danish/consultants/bryan_b.wml
index 7532ca74371..199f7e072d2 100644
--- a/danish/consultants/bryan_b.wml
+++ b/danish/consultants/bryan_b.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Netsolus Consulting"
+#use wml::debian::translation-check translation="1.2"
-<h1>Netsolus Consulting</h1>
-<hr>
-<pre>
+<p>
Netsolus Consulting tilbyder Linux- og Windows-integration uden forudfattede
meninger om en bestemt leverandør eller produkt. Vores leverandør- og
produktneutrale holdning garanterer den rigtige løsning til din virksomhed.
Komplet fjernsupport og support på stedet for Linux og de fleste Open
Source-produkter er tilgængelig.
-</pre>
+</p>
diff --git a/danish/consultants/charles_s.wml b/danish/consultants/charles_s.wml
index 2aa8756580e..9124f78ec94 100644
--- a/danish/consultants/charles_s.wml
+++ b/danish/consultants/charles_s.wml
@@ -1,20 +1,24 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Activate Multi User System Support"
+#use wml::debian::translation-check translation="1.3"
-<h1>Activate Multi User System Support</h1>
-<hr>
-<pre>
+<p>
Specialiceret i Unix-netværk og virksomhedskritisk support.
+</p>
+<p>
Vi yder support til
-Debian
-Caldera
-Red Hat
-SCO
-Cisco
-Bay networks
-Microsoft
+</p>
+<ul>
+<li>Debian</li>
+<li>Caldera</li>
+<li>Red Hat</li>
+<li>SCO</li>
+<li>Cisco</li>
+<li>Bay networks</li>
+<li>Microsoft</li>
+</ul>
+<p>
Vedligeholdelseskontrakter og telefonkonsultationspriser på forlangende.
-</PRE>
+</p>
diff --git a/danish/consultants/clue_inc.wml b/danish/consultants/clue_inc.wml
index a382cb8a8c9..2f633c42cdc 100644
--- a/danish/consultants/clue_inc.wml
+++ b/danish/consultants/clue_inc.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="clue inc"
+#use wml::debian::translation-check translation="1.2"
-<h1>clue inc</h1>
-<hr>
-<pre>
+<p>
clue inc tilbyder udvikling af skræddersyet programmel ved hjælp af Open
Source og frit tilgængelige teknologier. Vi er specialiserede i
udvikling og installering af Debian, men har et godt kendskab til de fleste
miljøer. Vi tilbyder også systemadministration, vedligeholdelse og
sikkerhedskonsultentbistand.
-</pre>
+</p>
diff --git a/danish/consultants/cory_p.wml b/danish/consultants/cory_p.wml
index 2c6977c5fc7..092f720b548 100644
--- a/danish/consultants/cory_p.wml
+++ b/danish/consultants/cory_p.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Uversa Consulting"
+#use wml::debian::translation-check translation="1.2"
-<h1>Uversa Consulting</h1>
-<hr>
-<pre>
+<p>
Vi tilbyder konsulttjenesteydelser til virksomheder med fokus på Linux og Open
Source-programmer. Vi tilbyder også sikkhedskonsultarbejde, generel Linux- og
Debian-support, udvikling af skræddersyede programmer og
netværkskonsultentarbejde til priser som små og mellemstore virksomheder kan
overkomme.
-</pre>
+</p>
diff --git a/danish/consultants/credativ.wml b/danish/consultants/credativ.wml
index 5f1ffc29de4..7809a91dac7 100644
--- a/danish/consultants/credativ.wml
+++ b/danish/consultants/credativ.wml
@@ -1,17 +1,18 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="credativ GmbH"
+#use wml::debian::translation-check translation="1.2"
-<h1>credativ GmbH</h1>
-<hr/>
-<pre>
+<p>
credativ GmbH har otte Debian-udviklere blandt deres ansatte, som laver
Debian-arbejde som en del af deres arbejde. De sponserer også jævnligt cd'er
og andre ting for LinuxTag og hjælper generelt Debian i Tyskland.
+</p>
+<p>
credativ er en forhandleruafhængig konsulent- og tjenesteydelsesvirksomhed,
specialiseret i kvalitetssikring i it-projekter, systemvedligeholdelse og
Open Source-tjenesteydelser. Sammen med vore kunder implementerer vi
skræddersyede Open Source-løsninger (helst udelukkende bestående af fri
software), der har et højt potentiale hvad angår reduktion af omkostninger,
systemmirgrering og tilbyder specialiseret support for komplette netværk.
-Besøg http://www.credativ.de/ for flere oplysninger.
-</pre>
+Besøg <a href="http://www.credativ.de/">http://www.credativ.de/</a>
+for flere oplysninger.
+</p>
diff --git a/danish/consultants/datalink_internet.wml b/danish/consultants/datalink_internet.wml
index 2ab333738b9..8f548f848a2 100644
--- a/danish/consultants/datalink_internet.wml
+++ b/danish/consultants/datalink_internet.wml
@@ -1,13 +1,18 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Datalink Internet"
+#use wml::debian::translation-check translation="1.4"
-<h1>Datalink Internet</h1>
-<hr>
-<pre>
-Datalink Internet leverer tre former for tjenesteydelser: 1) Konsulenttjenster
-i forbindelse med UNIX, særligt Debian, 2) systemudvikling på UNIX, særligt
-TCP-baserede netværk med Debian som platform, 3) Internet-tjenester, bl.a.
-webhotel, virksomheds-e-mail og Internet-adgang. Datalink sælger også flere
+<p>
+Datalink Internet leverer tre former for tjenesteydelser:
+</p>
+<ol>
+<li>Konsulenttjenster i forbindelse med UNIX, særligt Debian,</li>
+<li>systemudvikling på UNIX, særligt TCP-baserede netværk med Debian som
+ platform,</li>
+<li>Internet-tjenester, bl.a. webhotel, virksomheds-e-mail og
+ Internet-adgang.</li>
+</ol>
+<p>
+Datalink sælger også flere
forskelligere servermærker, prækonfigureret med Debian og typiske tjenester
såsom post, web, proxy, database, groupware osv.
-</pre>
+</p>
diff --git a/danish/consultants/delicate.ch.wml b/danish/consultants/delicate.ch.wml
index 7932d34e2fd..67d4f16d64d 100644
--- a/danish/consultants/delicate.ch.wml
+++ b/danish/consultants/delicate.ch.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="delicate.ch"
+#use wml::debian::translation-check translation="1.2"
-<h1>delicate.ch</h1>
-<hr>
-<pre>
+<p>
konsulentarbejde, uddannelse, support
-</pre>
+</p>
diff --git a/danish/consultants/et_computer.wml b/danish/consultants/et_computer.wml
index f1ade5685ae..765342149c2 100644
--- a/danish/consultants/et_computer.wml
+++ b/danish/consultants/et_computer.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="ET Computer"
+#use wml::debian::translation-check translation="1.4"
-<h1>ET Computer</h1>
-<hr>
-<pre>
+<p>
Kun professionelt arbejde. Har F-skattebevis.
-</pre>
+</p>
diff --git a/danish/consultants/eugene_g.wml b/danish/consultants/eugene_g.wml
index fc7c8cc4827..f5c37c010a4 100644
--- a/danish/consultants/eugene_g.wml
+++ b/danish/consultants/eugene_g.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="DataArt"
+#use wml::debian::translation-check translation="1.2"
-<h1>DataArt</h1>
-<hr>
-<pre>
+<p>
Softwareudviklings- og outsourcingvirksomhed med Microsoft .NET
(ASP.Net)-erfaring.
-</pre>
+</p>
diff --git a/danish/consultants/fai-cluster.wml b/danish/consultants/fai-cluster.wml
index 09719573505..e25a75833f3 100644
--- a/danish/consultants/fai-cluster.wml
+++ b/danish/consultants/fai-cluster.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="fai-cluster.de"
+#use wml::debian::translation-check translation="1.2"
-<h1>fai-cluster.de</h1>
-<hr>
-<pre>
+<p>
Vi yder kun support og har kun tjenesteydelser i sammenhæng med FAI, Debians
fuldautomatiske installationsprogram. Vi er eksperter i at installere
Beowulf-klynger.
-</pre>
+</p>
diff --git a/danish/consultants/filippo_giunchedi.wml b/danish/consultants/filippo_giunchedi.wml
index 54bf8c6a2ba..b7694ef65fa 100644
--- a/danish/consultants/filippo_giunchedi.wml
+++ b/danish/consultants/filippo_giunchedi.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Filippo Giunchedi"
+#use wml::debian::translation-check translation="1.2"
-<h1>Filippo Giunchedi</h1>
-<hr>
-<pre>
+<p>
GNU/PG-nøgle: 6B79D401
-</pre>
+</p>
diff --git a/danish/consultants/forlinux.wml b/danish/consultants/forlinux.wml
index 2e4ba980011..2016d83290c 100644
--- a/danish/consultants/forlinux.wml
+++ b/danish/consultants/forlinux.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="ForLinux"
+#use wml::debian::translation-check translation="1.3"
-<h1>ForLinux</h1>
-<hr>
-<pre>
+<p>
ForLinux tilbyder en række tjenesteydelser bestående af supportløsninger
(blandt andre totalt styrede tjenester, individuelt tilpassede
supportløsninger og support til nødssituationer), katastrofegenopretning og
@@ -11,4 +9,4 @@ and individuelt tilpassede projekter. ForLinux tilbyder effektive og
økonomiske løsninger til alle jeres krav. ForLinux ændrer ikke sine kunders
behov så de passer til løsningen, men tilbyder den løsning som opfylder
kravene.
-</pre>
+</p>
diff --git a/danish/consultants/heureka.wml b/danish/consultants/heureka.wml
index 171ec29b6bd..8ce642bc415 100644
--- a/danish/consultants/heureka.wml
+++ b/danish/consultants/heureka.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Heureka GmbH"
+#use wml::debian::translation-check translation="1.3"
-<h1>Heureka GmbH</h1>
-<hr>
-Første kontakt er gratis.
+<p>Første kontakt er gratis.</p>
diff --git a/danish/consultants/indus_net_technologies.wml b/danish/consultants/indus_net_technologies.wml
index 49cd6861539..71309ee66c9 100644
--- a/danish/consultants/indus_net_technologies.wml
+++ b/danish/consultants/indus_net_technologies.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Indus Net Technologies"
+#use wml::debian::translation-check translation="1.2"
-<h1>Indus Net Technologies</h1>
-<hr>
-<pre>
+<p>
Indus Net Technologies er en ISO 9001:2000-virksomhed der leverer konsultent-
og supporttjenesteydelser på Open Source-platforme.
-</pre>
+</p>
diff --git a/danish/consultants/it_service_drillich.wml b/danish/consultants/it_service_drillich.wml
index b9922848234..e9c78bd6788 100644
--- a/danish/consultants/it_service_drillich.wml
+++ b/danish/consultants/it_service_drillich.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="IT-Service Drillich"
+#use wml::debian::translation-check translation="1.2"
-<h1>IT-Service Drillich</h1>
-<hr>
-<pre>
+<p>
Opsætning og administrering af Unix-systemer, individuel software,
IT-konsultydelser.
-</pre>
+</p>
diff --git a/danish/consultants/ivan_k.wml b/danish/consultants/ivan_k.wml
index 4d5c132352d..2abd8496add 100644
--- a/danish/consultants/ivan_k.wml
+++ b/danish/consultants/ivan_k.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Freeside Internet Services, LLC"
+#use wml::debian::translation-check translation="1.2"
-<h1>Freeside Internet Services, LLC</h1>
-<hr>
-<pre>
+<p>
Specialiseret i Perl, databaser og funktioner til Internet-udbydere.
-</pre>
+</p>
diff --git a/danish/consultants/jarno_saarinen.wml b/danish/consultants/jarno_saarinen.wml
index 45966988337..e2f8c51fa6f 100644
--- a/danish/consultants/jarno_saarinen.wml
+++ b/danish/consultants/jarno_saarinen.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="JS Tietotuki"
+#use wml::debian::translation-check translation="1.3"
-<h1>JS Tietotuki</h1>
-<hr>
-<pre>
+<p>
Arbejder pt. primært i det sydkarelske område.
-</pre>
+</p>
diff --git a/danish/consultants/jaume_t.wml b/danish/consultants/jaume_t.wml
index aacd069b2c4..bcbaf6e8a9a 100644
--- a/danish/consultants/jaume_t.wml
+++ b/danish/consultants/jaume_t.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Jaume Teixi"
+#use wml::debian::translation-check translation="1.3"
-<h1>Jaume Teixi</h1>
-<hr>
-<pre>
+<p>
Kommunikation på tværs af platforme og LAN til WAN-miljøer.
Dedikerede Debian-servere (fjernadgang, firewall, proxy, web, e-mail, DNS,
database). E-mail-support tilgængelig. Mere end seks års dokumenterbar
erfaring med Debian Linux. En del af indtægterne doneres til
Debian-udviklernes fællesskab.
-</pre>
+</p>
diff --git a/danish/consultants/jean_p.wml b/danish/consultants/jean_p.wml
index 7cf28804b47..086c2901b6b 100644
--- a/danish/consultants/jean_p.wml
+++ b/danish/consultants/jean_p.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Linuz.it"
+#use wml::debian::translation-check translation="1.2"
-<h1>Linuz.it</h1>
-<hr>
-<pre>
+<p>
Enterprise Linux Systems, højsikkerheds firewalls, Linux-baserede
antivirussystemer, højt tilgængelige og pålidelige Linux-servere,
specialiceret Linux-, *BSD-, Sun*- og *NIX-konsulentarbejde.
-</pre>
+</p>
diff --git a/danish/consultants/jh_networks.wml b/danish/consultants/jh_networks.wml
index 1bf99a547a7..4762599c666 100644
--- a/danish/consultants/jh_networks.wml
+++ b/danish/consultants/jh_networks.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="JH-Networks / Telebistro"
+#use wml::debian::translation-check translation="1.3"
-<h1>JH-Networks / Telebistro</h1>
-<hr>
-<pre>
+<p>
Call-shops og Internet-cafer, firewalls, beskyttelse af mindreårige,
alle GNU/Linux-systemer.
-</pre>
+</p>
diff --git a/danish/consultants/jim_w.wml b/danish/consultants/jim_w.wml
index 0a830342f36..c11fbd165d8 100644
--- a/danish/consultants/jim_w.wml
+++ b/danish/consultants/jim_w.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="LAN Comp Systems"
+#use wml::debian::translation-check translation="1.3"
-<h1>LAN Comp Systems</h1>
-<hr>
-<pre>
+<p>
LAN Comp Systems tilbyder design, installering og projekthåndteringsupport i
forbindelse med netværkssystemer til OLTP-klient-/serversystemer med anvendelse
af Unix eller propritære styresystemsplatforme. Vi specificerer Linux
(specifikt Debian) til de fleste netværksservere.
-</pre>
+</p>
diff --git a/danish/consultants/joan_l.wml b/danish/consultants/joan_l.wml
index 355f720f383..ed22cb86cab 100644
--- a/danish/consultants/joan_l.wml
+++ b/danish/consultants/joan_l.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Digibel"
+#use wml::debian::translation-check translation="1.2"
-<h1>Digibel</h1>
-<hr>
-<pre>
+<p>
Digibel Open Source support (Belgien) anvender sin kompetence indenfor Open
Source-programmer til at levere løsninger, konsulentydelser, udvikling,
fjernadministration, undervisning og support med et særligt fokus på sikkerhed.
Alle vore konsulenter har anvendt Linux siden 1995 og har omfattende erfaringer
med Open Source.
-</pre>
+</p>
diff --git a/danish/consultants/joe_m.wml b/danish/consultants/joe_m.wml
index 4d48db63bd2..e409302bad1 100644
--- a/danish/consultants/joe_m.wml
+++ b/danish/consultants/joe_m.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Tangent Computer Research"
+#use wml::debian::translation-check translation="1.2"
-<h1>Tangent Computer Research</h1>
-<hr>
-<pre>
+<p>
20 års erfaring med Unix/Linux
-</pre>
+</p>
diff --git a/danish/consultants/joerg_w.wml b/danish/consultants/joerg_w.wml
index 73da80abc05..803ed0479ce 100644
--- a/danish/consultants/joerg_w.wml
+++ b/danish/consultants/joerg_w.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
-
-<h1>Scan Plus GmbH</h1>
+#use wml::debian::consultant name="Scan Plus GmbH"
+#use wml::debian::translation-check translation="1.3"
<p>Egen Debian GNU/Linux-baseret firewall-distribution.</p>
diff --git a/danish/consultants/kaarlo_m.wml b/danish/consultants/kaarlo_m.wml
index 5d602ceb4f0..be2240d38ce 100644
--- a/danish/consultants/kaarlo_m.wml
+++ b/danish/consultants/kaarlo_m.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Arvanet"
+#use wml::debian::translation-check translation="1.3"
-<h1>Arvanet</h1>
-<hr>
-<pre>
+<p>
Yderligere oplysninger: Vores primære område er hovedstadsområdet
(Helsinki, Vantaa, Espoo, Kauniainen, Tuusula, Järvempää).
Der har været undtagelser: Oulu &amp; Jyväslylä.
-</pre>
+</p>
diff --git a/danish/consultants/kevin_l.wml b/danish/consultants/kevin_l.wml
index a5e7857b86d..4a792e24063 100644
--- a/danish/consultants/kevin_l.wml
+++ b/danish/consultants/kevin_l.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Obsidian Consulting Group"
+#use wml::debian::translation-check translation="1.2"
-<h1>Obsidian Consulting Group</h1>
-<hr>
-<pre>
+<p>
Hotel- og regningstjenester er også tilgængelige.
-</pre>
+</p>
diff --git a/danish/consultants/kevin_t.wml b/danish/consultants/kevin_t.wml
index 702e9a0848b..a09055f543b 100644
--- a/danish/consultants/kevin_t.wml
+++ b/danish/consultants/kevin_t.wml
@@ -1,16 +1,16 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Superior Software Services"
+#use wml::debian::translation-check translation="1.2"
-<h1>Superior Software Services</h1>
-<hr>
-<pre>
+<p>
Jeg har ti års erfaring med Unix (syv med Debian GNU/Linux), specialiseret i
administration af styresystemer, netværkssikkerhed, katastroferedninger og
opgaveautomatisering. Jeg har også mere end fem års erfaring med
webudvikling og supporttjenester ved hjælp af PHP/Perl, Javascript/CSS (DHTML),
PostgreSQL/MySQL, Apache og andet Open Source-programmel efter behov.
+</p>
+<p>
Oplys venligst at du fandt mig på debian.org og jeg vil donere ti procent af
din betaling til Debian-projektet.
-</pre>
+</p>
diff --git a/danish/consultants/kotarba.wml b/danish/consultants/kotarba.wml
index 9db73b088bc..a5f595cf629 100644
--- a/danish/consultants/kotarba.wml
+++ b/danish/consultants/kotarba.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Kotarba.NET"
+#use wml::debian::translation-check translation="1.2"
-<h1>Kotarba.NET</h1>
-<hr>
-<pre>
+<p>
Kun polsk og engelsk.
-</pre>
+</p>
diff --git a/danish/consultants/linux_box.wml b/danish/consultants/linux_box.wml
index 6cc0f5b2cd9..193b8e01bf4 100644
--- a/danish/consultants/linux_box.wml
+++ b/danish/consultants/linux_box.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="The Linux Box Corporation"
+#use wml::debian::translation-check translation="1.2"
-<h1>The Linux Box Corporation</h1>
-<hr>
-<pre>
+<p>
The Linux Box Corporation er en konsult-, udviklings-, integrations-,
support- og uddannelsesvirksomhed med fokus på overførsel af viden og
specialiseret i Open Source og Linux-miljøet.
-</pre>
+</p>
diff --git a/danish/consultants/linux_certified.wml b/danish/consultants/linux_certified.wml
index 6a306dba39a..087dc252e1d 100644
--- a/danish/consultants/linux_certified.wml
+++ b/danish/consultants/linux_certified.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="LinuxCertified, Inc."
+#use wml::debian::translation-check translation="1.4"
-<h1>LinuxCertified, Inc.</h1>
-<hr>
-<pre>
+<p>
Debian-konsulenter på forskellige steder.
-</pre>
+</p>
diff --git a/danish/consultants/linux_consultancy.wml b/danish/consultants/linux_consultancy.wml
index 5bef201935d..869122fc800 100644
--- a/danish/consultants/linux_consultancy.wml
+++ b/danish/consultants/linux_consultancy.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="The Linux Consultancy"
+#use wml::debian::translation-check translation="1.2"
-<h1>The Linux Consultancy</h1>
-<hr>
-<pre>
+<p>
Uanset om du bare har brug for nogen til at hjælpe dig med at få styr på et
Linux-system eller hvis du er på udkig efter nogen til at levere og
vedligeholde en Linux-server, så kan vi hjælpe dig. En af vores ydelser er
"Office Server" (konterserver), som håndterer al e-mail (deriblandt også
opdagelse af spam og virus), filopbevaring, automatiseret sikkerhedskopiering
til et andet sted, interne websider og mere.
-</pre>
+</p>
diff --git a/danish/consultants/linuxmagic.wml b/danish/consultants/linuxmagic.wml
index b0fab93113d..0a3fbd85edf 100644
--- a/danish/consultants/linuxmagic.wml
+++ b/danish/consultants/linuxmagic.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="LinuxMagic"
+#use wml::debian::translation-check translation="1.2"
-<h1>LinuxMagic</h1>
-<hr>
-<pre>
+<p>
Det nordvestlige stillehavsområdes førende Linux-supportfirma; andre
Debian-baserede produkter, "LinuxMagic Workplace", "LinuxMagic Mail Server"
-</pre>
+</p>
diff --git a/danish/consultants/linuxworks.wml b/danish/consultants/linuxworks.wml
index ea684fa35c2..f534e8d9389 100644
--- a/danish/consultants/linuxworks.wml
+++ b/danish/consultants/linuxworks.wml
@@ -1,31 +1,33 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Linuxworks"
+#use wml::debian::translation-check translation="1.3"
-<h1>Linuxworks</h1>
-<hr />
-<pre>
+<p>
Vores arbejde er at få computere og Internet-teknologi til at fungere bedre for
dig. Det vil sige, at vi vurderer hvordan du anvender computere, lytter til
hvad du ønsker og kommer med løsninger, der opfylder dine behov. Disse kan
være lettere at anvende, hurtigere, have flere funktioner, være mere
pålidelige og koste mindre.
-
+</p>
+<p>
Vi fremstiller Debian-baserede løsninger, primært til mindre organisationer.
Vi kan udskifte eller udvide andre systemer, både på arbejdspladsen og i
bagkontoreret/server rummet. Vi kan fremstille et komponent til en bestemt
opgave, men foretrækker at se på hele systemet, fordi fordelene er større når
det hele tages i betragtning.
-
+</p>
+<p>
Vores medarbejdere er eksperter i teknologier såsom Debian, Linux, exim,
sendmail, squid, apache, thttpd, samba, netatalk, c/c++, Java, python,
scripting, webware, mysql, postgres, gnome, ældre (Windows) programløsninger
og 802.11-trådløs. Vi lærer altid nyt og vil tage enhver Open Source-løsning i
brug, som du vil have fordel af.
-
+</p>
+<p>
Du kan selv tage et grundigt kig på dine systemer og give os detaljerede
oplysninger om, hvordan det skal se ud. Alternativt kan du overlade det hele
til os, og vi vil levere en løsning der "bare virker". Vi vil med glæde
samarbejde med dig, uanset hvad du ønsker.
-
+</p>
+<p>
Vi ser frem til at høre fra dig.
-</pre>
+</p>
diff --git a/danish/consultants/michaeljohn_c.wml b/danish/consultants/michaeljohn_c.wml
index 3a1a371add5..ea8633eec01 100644
--- a/danish/consultants/michaeljohn_c.wml
+++ b/danish/consultants/michaeljohn_c.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Michaeljohn Clement"
+#use wml::debian::translation-check translation="1.2"
-<h1>Michaeljohn Clement</h1>
-<hr>
-<pre>
+<p>
udvikling, udrulning af GNU/Linux og *BSD i virksomheder, webudvikling og
-design, design og implmentering af brugergrænseflader. C/C++/Java, Perl, SQL,
PHP osv. Komplette løsninger baseret på Open Source og fri software til din
virksomhed.
-</pre>
+</p>
diff --git a/danish/consultants/mind.wml b/danish/consultants/mind.wml
index 3333838f1c8..cbdac784d2a 100644
--- a/danish/consultants/mind.wml
+++ b/danish/consultants/mind.wml
@@ -1,15 +1,14 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Mind nv"
+#use wml::debian::translation-check translation="1.4"
-<h1>Mind nv</h1>
-<hr>
-<pre>
+<p>
Mind Linux Solutions (Leuven, Belgien) anvender sin kompetence i Open Source-
software og systemdesign til at levere løsninger, konsultentbistand, udvikling,
uddannelse og support indenfor "embedded"-systemudviklig.
-
+</p>
+<p>
Vi anvender programmel med Open Source (for eksempel Linux, RTLinux, RTAI,
eCos, Wonka, gcc, gdb, ...) til at oprette en grundlæggende infrastruktur til
nye "embedded" systemer (blandt andre "System on Chip") og hjælper kunder med
udvikling af disse infrastrukturer.
-</pre>
+</p>
diff --git a/danish/consultants/minihub.wml b/danish/consultants/minihub.wml
index 69526d1d778..51b6b60a32b 100644
--- a/danish/consultants/minihub.wml
+++ b/danish/consultants/minihub.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Minihub Communications Incorporated"
+#use wml::debian::translation-check translation="1.2"
-<h1>Minihub Communications Incorporated</h1>
-<hr>
-<pre>
+<p>
Ikke-regeringsorganisationer (NGO'er) involveret i fællesskabsinteresser,
menneskerettigheder, miljø og sociale rettigheder har brug for
kommunikationssystemer, der svarer til deres behov. Debian Linux tilbyder
sikre og prisbillige løsninger der kan udvides, som kører fint med minimale
hardwarekrav. Minihub tilbyder også konsultydelser til virksomheder og
arbejder over hele Sydøstasien.
-</pre>
+</p>
diff --git a/danish/consultants/murphy_soft.wml b/danish/consultants/murphy_soft.wml
index a0f3d200661..98186b2afae 100644
--- a/danish/consultants/murphy_soft.wml
+++ b/danish/consultants/murphy_soft.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Murphy Software BV"
+#use wml::debian::translation-check translation="1.2"
-<h1>Murphy Software BV</h1>
-<hr>
<p>En del af de Debian-relaterede indtægter doneres til Debian-projektet.</p>
diff --git a/danish/consultants/norrix.wml b/danish/consultants/norrix.wml
index 498fcd7ceb2..bd491b781d7 100644
--- a/danish/consultants/norrix.wml
+++ b/danish/consultants/norrix.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Norrix Associates"
+#use wml::debian::translation-check translation="1.3"
-<h1>Norrix Associates</h1>
-<hr>
-<pre>
+<p>
Norrix Associates tilbyder fjern- og på stedet-netværksløsninger
over hele verden. Alle produkter er baseret på Debian.
-</pre>
+</p>
diff --git a/danish/consultants/opentechnologies.wml b/danish/consultants/opentechnologies.wml
index 0bff36758a6..02a97bd7e71 100644
--- a/danish/consultants/opentechnologies.wml
+++ b/danish/consultants/opentechnologies.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="OpenTechnologies"
+#use wml::debian::translation-check translation="1.2"
-<h1>OpenTechnologies</h1>
-<hr>
-<pre>
+<p>
Arbejder med FreeBSD and OpenBSD, samt Debian, Gentoo, SuSE, Red Hat og
Mandrake. Etablering af firewalls. Sikkerhedskonsulent. Integration af LAN/WAN
og Internet/intranet. RDBMS'er. Internet-tilstedeværelse.
-</pre>
+</p>
diff --git a/danish/consultants/opentrend.wml b/danish/consultants/opentrend.wml
index 6041bc531d2..ebd596c3ff2 100644
--- a/danish/consultants/opentrend.wml
+++ b/danish/consultants/opentrend.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="OpenTrend Solutions Ltd"
+#use wml::debian::translation-check translation="1.2"
-<h1>OpenTrend Solutions Ltd</h1>
-<hr>
-<pre>
+<p>
Vi donerer to procent af vores overskud til støtte af Open Source-software.
Vi er gået i partnerskab med organisationer i USA og Australien, for bedre
at kunne understøtte multinationale klienter.
-</pre>
+</p>
diff --git a/danish/consultants/orbit.wml b/danish/consultants/orbit.wml
index f5da4f8219e..5530c1052f1 100644
--- a/danish/consultants/orbit.wml
+++ b/danish/consultants/orbit.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="ORBIT Technologies, Inc."
+#use wml::debian::translation-check translation="1.2"
-<h1>ORBIT Technologies, Inc.</h1>
-<hr>
-<pre>
+<p>
ORBIT Technologies tilbyder tjenesteydelser og produkter til indkapslede og
distribuerede systemer, samt systemer der virker på tværs af platforme.
-</pre>
+</p>
diff --git a/danish/consultants/pete_b.wml b/danish/consultants/pete_b.wml
index bd279af343f..258188c4b31 100644
--- a/danish/consultants/pete_b.wml
+++ b/danish/consultants/pete_b.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
-
-<h1>ELB Internet Services</h1>
+#use wml::debian::consultant name="ELB Internet Services"
+#use wml::debian::translation-check translation="1.2"
<p>ELB har specialiseret sig i at levere komplette Internet-løsninger til
virksomheder og myndigheder - alt fra enkele e-mail- og webstedsløsninger til
diff --git a/danish/consultants/peter_d.wml b/danish/consultants/peter_d.wml
index c44642b251c..15d4fd01682 100644
--- a/danish/consultants/peter_d.wml
+++ b/danish/consultants/peter_d.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
-
-<h1>Kangaroot Linux Solutions</h1>
+#use wml::debian::consultant name="Kangaroot Linux Solutions"
+#use wml::debian::translation-check translation="1.2"
<p>Belgiske Linux-konsulenter der fokuserer på Debian-support og
-installationer. E-mail-, fil-, webservere, firewalls, groupware-servere,
diff --git a/danish/consultants/peter_naulls.wml b/danish/consultants/peter_naulls.wml
index d83f57c9ab9..da2caf686bb 100644
--- a/danish/consultants/peter_naulls.wml
+++ b/danish/consultants/peter_naulls.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Peter Naulls"
+#use wml::debian::translation-check translation="1.2"
-<h1>Peter Naulls</h1>
-<hr>
-<pre>
+<p>
Jeg er specialiseret i ARM Linux, blandt andet kerne-udvikling, og har også
ekspertise indenfor mange Linux-områder, særligt udrulning af Debian-systemer.
Jeg har også ydet væsentlig tid til at hjælpe Debian-projekt.
-</pre>
+</p>
diff --git a/danish/consultants/produktivit.wml b/danish/consultants/produktivit.wml
index 741fc929d2f..8e01e8d79bb 100644
--- a/danish/consultants/produktivit.wml
+++ b/danish/consultants/produktivit.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="produktivIT"
+#use wml::debian::translation-check translation="1.2"
-<h1>produktivIT</h1>
-<hr>
-<pre>
+<p>
Særligt fokus på nedsættelse af omkostningerne indenfor it, gevinster på
investeringsberegninger, samt migrering til open source-teknologier.
Omfattende ekspertise indenfor afdelings-arbejdsgruppeservere i heterogene
netværksmiljøer og indholdshåndteringssystemet. produktivIT sponserer
Debian- og OpenGroupware-projekterne med hardware, KDE Debian Enterprise-
projektet med mandskab og OpenOffice.orgs KDE-integrering økonomisk.
-</pre>
+</p>
diff --git a/danish/consultants/r_w_r.wml b/danish/consultants/r_w_r.wml
index 8433d1cb9f8..b1bea4b8db6 100644
--- a/danish/consultants/r_w_r.wml
+++ b/danish/consultants/r_w_r.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Daily Data, Inc."
+#use wml::debian::translation-check translation="1.2"
-<h1>Daily Data, Inc.</h1>
-<hr>
-<pre>
+<p>
Vi opfylder alle behov, som individer til store virksomheder kan have, med
ydelser der spænder fra opsætning af hjemmebaserede systemer til webhoteller,
oprettelse af små virksomhedsnetværk og udvikling af skræddersyede programmer.
@@ -13,4 +11,4 @@ specialiserede i at integrede netværk indeholdende dem alle (vi kan endda
understøtte Novell-servere hvis du vrider armen om på os og betaler en masse
penge). Hvis vi ikke selv kan klare det, kender vi nogen der kan og vil
henvise til dem (uden at tage penge for henvisningen).
-</pre>
+</p>
diff --git a/danish/consultants/rafez_n.wml b/danish/consultants/rafez_n.wml
index 72e2abcd59d..decedd27bd9 100644
--- a/danish/consultants/rafez_n.wml
+++ b/danish/consultants/rafez_n.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
-
-<h1>Gazelle Informatics Ltd</h1>
+#use wml::debian::consultant name="Gazelle Informatics Ltd"
+#use wml::debian::translation-check translation="1.2"
<p>Specialister indenfor Lotus Domino på Debian.</p>
diff --git a/danish/consultants/robert_millan.wml b/danish/consultants/robert_millan.wml
index 6ad28b59bba..efd4b2b5f06 100644
--- a/danish/consultants/robert_millan.wml
+++ b/danish/consultants/robert_millan.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Robert Millan"
+#use wml::debian::translation-check translation="1.2"
-<h1>Robert Millan</h1>
-<hr>
-<pre>
+<p>
Vedligeholdelse og administration af Debian-servere og arbejdsmaskienr.
Maintainance / Administration of Debian servers and workstations.
Ethernet, TCP/IP, routing, firewall, httpd, post, samba osv.
-</pre>
+</p>
diff --git a/danish/consultants/sergio_a.wml b/danish/consultants/sergio_a.wml
index c90384274e0..d94fc98d9b7 100644
--- a/danish/consultants/sergio_a.wml
+++ b/danish/consultants/sergio_a.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Sergio Arias"
+#use wml::debian::translation-check translation="1.2"
-<h1>Sergio Arias</h1>
-<hr>
-<pre>
+<p>
udvikling til mange formål
-</pre>
+</p>
diff --git a/danish/consultants/shannon_d.wml b/danish/consultants/shannon_d.wml
index 558f3c0f71d..4fe6efd77bb 100644
--- a/danish/consultants/shannon_d.wml
+++ b/danish/consultants/shannon_d.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
-
-<h1>DeaTech Research Inc.</h1>
+#use wml::debian::consultant name="DeaTech Research Inc."
+#use wml::debian::translation-check translation="1.3"
<p>Specialister i realtidssystemer, devicedrivere og "embedded" systemer.
Omfattende erfaringer med systemadministration, webudvikling og mange andre
diff --git a/danish/consultants/sine_nomine.wml b/danish/consultants/sine_nomine.wml
index 96d2eade4a5..0faebb53e56 100644
--- a/danish/consultants/sine_nomine.wml
+++ b/danish/consultants/sine_nomine.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Sine Nomine Associates"
+#use wml::debian::translation-check translation="1.2"
-<h1>Sine Nomine Associates</h1>
-<hr>
-<pre>
+<p>
Sine Nomine Associates er en forsknings- og udviklingsvirksomhed med det
mål, at anvende udviklende teknologier i praktiske forretningsløsninger.
-</pre>
+</p>
diff --git a/danish/consultants/sosa.wml b/danish/consultants/sosa.wml
index 7b9d33d8b9b..dec593f5aae 100644
--- a/danish/consultants/sosa.wml
+++ b/danish/consultants/sosa.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Corporaci&oacute;n Sosa &amp; Sosa C.A."
+#use wml::debian::translation-check translation="1.3"
-<h1>Corporaci&oacute;n Sosa &amp; Sosa C.A.</h1>
-<hr>
-<pre>
+<p>
Styresystemer, netværk og sikkerhed.
-</pre>
+</p>
diff --git a/danish/consultants/steve_l.wml b/danish/consultants/steve_l.wml
index 93b4c08ddac..97b5b80710f 100644
--- a/danish/consultants/steve_l.wml
+++ b/danish/consultants/steve_l.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="David Goodenough &amp; Associates Limited (DGA)"
+#use wml::debian::translation-check translation="1.2"
-<h1>David Goodenough &amp; Associates Limited (DGA)</h1>
-<hr>
-<pre>
+<p>
Flere oplysninger: DGA er specialiseret i "forbindelser" og er blevet beskrevet
som "fremstillere af teknisk lim". Vi har erfaringer med virksomhedssystemer
og har arbejdet meget med Lotus Domino, Websphere og Tomcat-webservere, samt
Java-programmering. Vi arbejder også med virksomehedspostsystemer, bygger broer
mellem eksisterende og SMTP-systemer, samt foretager migreringer.
-</pre>
+</p>
diff --git a/danish/consultants/stuart_t.wml b/danish/consultants/stuart_t.wml
index 054bcde522d..f83148b74ca 100644
--- a/danish/consultants/stuart_t.wml
+++ b/danish/consultants/stuart_t.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
-
-<h1>Linux Labs</h1>
+#use wml::debian::consultant name="Linux Labs"
+#use wml::debian::translation-check translation="1.2"
<p>LinuxBIOS- og klyngespecialister.</p>
diff --git a/danish/consultants/ted_j.wml b/danish/consultants/ted_j.wml
index 176a4bf5d80..dec7260f277 100644
--- a/danish/consultants/ted_j.wml
+++ b/danish/consultants/ted_j.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
-
-<h1>JordanTeam IT Training</h1>
+#use wml::debian::consultant name="JordanTeam IT Training"
+#use wml::debian::translation-check translation="1.3"
<p>Speciliceret i uddannelse indenfor Unix, Linux og Solaris. Blandt
konsultydelserne findes datasikkerhed, katastrofehåndtering og tilpasning af
diff --git a/danish/consultants/tim_o.wml b/danish/consultants/tim_o.wml
index 2eff895fdd6..605b0253e45 100644
--- a/danish/consultants/tim_o.wml
+++ b/danish/consultants/tim_o.wml
@@ -1,15 +1,14 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="OASys Engineering"
+#use wml::debian::translation-check translation="1.3"
-<h1>OASys Engineering</h1>
-<hr>
-<pre>
+<p>
Flere oplysninger: OASys har specialiseret sig i at dække alle edb-behov i
små og mellemstore virksomheder. Vi anbefaler kombinationer af Debian Linux og
Samba fremfor Windows NT-servere på grund af Debians stabilitet, robuste
udførelse og fraværet af licenseringsproblemer. Desuden servicerer vi de fleste
Unix-varianter foruden Windows 95, 98 og NT.
-
+</p>
+<p>
OASys tilbyder uddannelse og grundlæggende administreringskurser efter ønske
eller særlig aftale.
-</pre>
+</p>
diff --git a/danish/consultants/toni_m.wml b/danish/consultants/toni_m.wml
index 7184fd24b72..a4573e74000 100644
--- a/danish/consultants/toni_m.wml
+++ b/danish/consultants/toni_m.wml
@@ -1,20 +1,20 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Oeko.neT"
+#use wml::debian::translation-check translation="1.2"
-<h1>Oeko.neT</h1>
-<hr>
-<pre>
+<p>
Toni har en universitetsgrad i datalogi (Dipl.-Inf.) og har omkring ti års
erfaring som konsult på netværksområdet. Kunder der er så store som PLC'er,
nyder godt af funktionelle projekter der også afleveres til tiden og til den
aftalte pris.
-
+</p>
+<p>
Jeg har tendens til at specificere, designe og implementere i retning af
robuste, skalérbarte og sikre løsninger, som kan håndtere den forventede
belastning hvis klienten tillader det, måske på grund af min baggrund som
Internet-udbyder.
-
+</p>
+<p>
Tilgængelig til alle opgaver, også i andre lande, afhængigt af
omstændighederne. Vi tilbyder Debian i webhotel-tjenester, både vedligeholdt
og ikke-vedligeholdt.
-</pre>
+</p>
diff --git a/danish/consultants/turo_technology.wml b/danish/consultants/turo_technology.wml
index 9abbb5f96f9..c2514e267ca 100644
--- a/danish/consultants/turo_technology.wml
+++ b/danish/consultants/turo_technology.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Turo Technology LLP"
+#use wml::debian::translation-check translation="1.2"
-<h1>Turo Technology LLP</h1>
-<hr>
-<pre>
+<p>
Debian-udvikler. Foretrækker fri software. GPG-e-mails foretrækkes.
Primært systemadministration, fejlsøgning og webbaseret programudvikling
og -installering. Esperantisto.
-</pre>
+</p>
diff --git a/danish/consultants/vivek_k.wml b/danish/consultants/vivek_k.wml
index f2d330993fe..7f6df0a69dc 100644
--- a/danish/consultants/vivek_k.wml
+++ b/danish/consultants/vivek_k.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
-
-<h1>Vivek Kumar</h1>
+#use wml::debian::consultant name="Vivek Kumar"
+#use wml::debian::translation-check translation="1.2"
<p>Specialiseret i at udvikle devicedrivere og startkode.</p>
diff --git a/dutch/consultants/credativ.wml b/dutch/consultants/credativ.wml
index f60a8fab8b2..3ca0b567b01 100644
--- a/dutch/consultants/credativ.wml
+++ b/dutch/consultants/credativ.wml
@@ -1,17 +1,17 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="credativ GmbH"
+#use wml::debian::translation-check translation="1.2"
-<h1>credativ GmbH</h1>
-<hr/>
-<pre>
+<p>
credativ GmbH heeft acht Debian-ontwikkelaars in hun kader, die Debian-werk
doen als deel van hun jobs. Ze sponsoren ook regelmatig CD's en andere zaken
voor LinuxTag en helpen Debian in het algemeen in Duitsland.
+</p>
+<p>
credativ is een verkoperonafhankelijke consulting- en dienstenbedrijf
gespecialiseerd in kwaliteitsbewaking in IT-projecten, systeembeheer en Open
Source diensten. Samen met onze klanten implementeren we aangepaste open
source oplossingen (liefst volledig Vrije Software) die een hoog potentieel
aan kostenreductie hebben, migreren systemen en bieden gespecialiseerde
ondersteuning voor volledige netwerken. Voor meer informatie, bezoek
-http://www.credativ.de/.
-</pre>
+<a href="http://www.credativ.de/">http://www.credativ.de/</a>.
+</p>
diff --git a/english/consultants/757_technologies.wml b/english/consultants/757_technologies.wml
index a6cf4bed327..186d8fed65f 100644
--- a/english/consultants/757_technologies.wml
+++ b/english/consultants/757_technologies.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="757 Technologies"
-<h1>757 Technologies</h1>
-<hr />
<p>
We offer installation and integration of Debian
GNU/Linux, as well as GNU/Linux co-location and maintenance. Serving the
diff --git a/english/consultants/abv.wml b/english/consultants/abv.wml
index a236997f889..48e68008019 100644
--- a/english/consultants/abv.wml
+++ b/english/consultants/abv.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="ABV - Integrator System&oacute;w i Sieci Komputerowych"
-<h1>ABV - Integrator System&oacute;w i Sieci Komputerowych</h1>
-<hr>
<ul>
<li>Service Level Agreement - <url http://www.abv.pl/sla.html></li>
<li>Outsourcing</li>
diff --git a/english/consultants/ace_technology_group.wml b/english/consultants/ace_technology_group.wml
index b8ab280b9ef..37a9d61deca 100644
--- a/english/consultants/ace_technology_group.wml
+++ b/english/consultants/ace_technology_group.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="ACE Technology Group"
-<H1>ACE Technology Group</H1>
-<HR>
-<PRE>
+<p>
Managed infrastructure, Windows to linux migration, general Linux
consulting.
-</PRE>
+</p>
diff --git a/english/consultants/aerasec.wml b/english/consultants/aerasec.wml
index 42581acb7cf..ae8dc48cf57 100644
--- a/english/consultants/aerasec.wml
+++ b/english/consultants/aerasec.wml
@@ -1,9 +1,9 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="AERAsec GmbH"
-<H1>AERAsec GmbH</H1>
-<HR>
-<PRE>
+<p>
Security, complex network scenarios, server strategies.
+</p>
+<p>
Also: Munich/Germany.
-</PRE>
+</p>
diff --git a/english/consultants/agentbob.wml b/english/consultants/agentbob.wml
index b7922dbae01..0de2767bcd5 100644
--- a/english/consultants/agentbob.wml
+++ b/english/consultants/agentbob.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Dipl.-Ing.(BA) Jochen Seifarth"
# $Id$
-<h1>Dipl.-Ing.(BA) Jochen Seifarth</h1>
-<hr />
<p>
Besides Debian specializing in Oracle /
PeopleSoft, Java, XML development, integration and tuning
diff --git a/english/consultants/aleph1.wml b/english/consultants/aleph1.wml
index f94a5c5bf8e..ac107881edc 100644
--- a/english/consultants/aleph1.wml
+++ b/english/consultants/aleph1.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Aleph One Ltd"
# $Id$
-<h1>Aleph One Ltd</h1>
-
<p>
We specialise in Embedded/Small systems and the ARM architecture, but most
of this expertise generalises to embedded systems in general. We can
diff --git a/english/consultants/alex_r.wml b/english/consultants/alex_r.wml
index 18a3c261367..bd8f74fb277 100644
--- a/english/consultants/alex_r.wml
+++ b/english/consultants/alex_r.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Breakthrough LTD"
-<H1>Breakthrough LTD</H1>
-<HR>
-<PRE>
+<p>
Building Internet/Intranet servers providing all company LAN needs:
ISDN Internet Connectivity, Remote Access, Windows File Server, NFS,
DNS, Web Server, FTP Server, E-mail Server, ....
-</PRE>
+</p>
diff --git a/english/consultants/amazon.wml b/english/consultants/amazon.wml
index d3937abd882..b8459aadfaa 100644
--- a/english/consultants/amazon.wml
+++ b/english/consultants/amazon.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Pedro Ivo Lima"
-<h1>Pedro Ivo Lima</h1>
-<hr />
<p>
LCP - Linux Certified Professional - SAIR -
<a href="http://www.linuxcertification.org">www.linuxcertification.org</a>
diff --git a/english/consultants/anderson.wml b/english/consultants/anderson.wml
index 2518d0859fb..048f9bb3850 100644
--- a/english/consultants/anderson.wml
+++ b/english/consultants/anderson.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Anderson Carlos Daniel Sanches"
# $Id$
-<h1>Anderson Carlos Daniel Sanches</h1>
-
<p>
Development under GPL, server configuration and administration, training.
</p>
diff --git a/english/consultants/andreu_i.wml b/english/consultants/andreu_i.wml
index ac5ec3fbb26..3745541e253 100644
--- a/english/consultants/andreu_i.wml
+++ b/english/consultants/andreu_i.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Internet Web Serveis"
-<H1>Internet Web Serveis</H1>
-<HR>
-<PRE>
+<p>
IWS offers all kind of Linux and Debian related services from 1995:
Consulting, Development, implementation, support, training, and so on.
-</PRE>
+</p>
diff --git a/english/consultants/anmsoft.wml b/english/consultants/anmsoft.wml
index 451e8a0e689..e99dd787d21 100644
--- a/english/consultants/anmsoft.wml
+++ b/english/consultants/anmsoft.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="ANMsoft Technologies"
-<H1>ANMsoft Technologies</H1>
-<HR>
-<PRE>
+<p>
ANMsoft Technologies focuses on offshore software development and has
acquired strong domain expertise in the banking, credit/debit/smart
card, and financial services industry. MVC based J2EE Architecture is
used for development.
-</PRE>
+</p>
diff --git a/english/consultants/antonio_cosenza.wml b/english/consultants/antonio_cosenza.wml
index 9ada96d9d84..437a2d820fe 100644
--- a/english/consultants/antonio_cosenza.wml
+++ b/english/consultants/antonio_cosenza.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Antonio Cosenza"
-<H1>Antonio Cosenza</H1>
-<HR>
-<PRE>
+<p>
Open Source and GIS/ Web gis Applications based on Debian GNU/Linux
-</PRE>
+</p>
diff --git a/english/consultants/ants-art.wml b/english/consultants/ants-art.wml
index e9a05954a21..8501eddf7bb 100644
--- a/english/consultants/ants-art.wml
+++ b/english/consultants/ants-art.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="ants-art"
-<h1>ants-art</h1>
-<hr />
<p>
ants-art... the art to do it like ants.
</p>
diff --git a/english/consultants/applepie-solutions.wml b/english/consultants/applepie-solutions.wml
index b60a1ab6370..f853c188ce0 100644
--- a/english/consultants/applepie-solutions.wml
+++ b/english/consultants/applepie-solutions.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Applepie Solutions"
-<H1>Applepie Solutions</H1>
-<HR>
-<PRE>
+<p>
We've been using and developing on Linux for over
10 years and have lots of experience in a number of distributions
including Debian, Red Hat and SuSE on both the PC and platforms such as
Alpha and Itanium. Available for consulting work anywhere in Ireland. We
also provide a number of Linux training courses.
-</PRE>
+</p>
diff --git a/english/consultants/apsis.wml b/english/consultants/apsis.wml
index 84afd37e818..381dfd74ef0 100644
--- a/english/consultants/apsis.wml
+++ b/english/consultants/apsis.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Apsis S.r.l."
-<h1>Apsis S.r.l.</h1>
-<hr/>
-<pre>
+<p>
We develop software and provide support for the Debian GNU/Linux
platform.
-</pre>
+</p>
diff --git a/english/consultants/avalonix.wml b/english/consultants/avalonix.wml
index 5518ced8d0d..e1b9dadf9cd 100644
--- a/english/consultants/avalonix.wml
+++ b/english/consultants/avalonix.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="AVALONIX Linux Systems Support"
-<H1>AVALONIX Linux Systems Support</H1>
-<HR>
-<PRE>
+<p>
specialising in training; e-publishing; document engineering
-</PRE>
+</p>
diff --git a/english/consultants/baton_rouge.wml b/english/consultants/baton_rouge.wml
index 8807d8019d3..bf146cf2d88 100644
--- a/english/consultants/baton_rouge.wml
+++ b/english/consultants/baton_rouge.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Baton Rouge Free Computing"
-<H1>Baton Rouge Free Computing</H1>
-<HR>
-<PRE>
+<p>
Desktop Linux.
-</PRE>
+</p>
diff --git a/english/consultants/beeznest.wml b/english/consultants/beeznest.wml
index 22c2144b3c2..1e884d6e14d 100644
--- a/english/consultants/beeznest.wml
+++ b/english/consultants/beeznest.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="BeezNest"
-<H1>BeezNest</H1>
-<HR>
-<PRE>
+<p>
Can work anywhere in Europe between The Netherlands and Spain,
including Germany, and more if necessary.
-</PRE>
+</p>
diff --git a/english/consultants/beil.wml b/english/consultants/beil.wml
index fd055e432e3..75f6ec6feb8 100644
--- a/english/consultants/beil.wml
+++ b/english/consultants/beil.wml
@@ -1,9 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Beil Problem Solutions"
-<H1>Beil Problem Solutions</H1>
-<HR>
-<PRE>
+<p>
Being notary in the Thawte's Web-of-Trust: meaning S/MIME eMail
-certificates for personal use for free....http://www.thawte.com/wot/
-or http://www.lugg.de/zertifikate.php
-</PRE>
+certificates for personal use for free....
+<a href="http://www.thawte.com/wot/">http://www.thawte.com/wot/</a> or
+<a href="http://www.lugg.de/zertifikate.php">http://www.lugg.de/zertifikate.php</a>
+</p>
diff --git a/english/consultants/ben_b.wml b/english/consultants/ben_b.wml
index e2f64419779..ee172e30b38 100644
--- a/english/consultants/ben_b.wml
+++ b/english/consultants/ben_b.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-
-<h1>Ben Bell</h1>
+#use wml::debian::consultant name="Ben Bell"
<p>I specialise in design and implementation of infrastructure -- network,
server and software. I have a wide range of experience having worked in
diff --git a/english/consultants/bentosolutions.wml b/english/consultants/bentosolutions.wml
index 7f241fd7ea6..68cf99921f5 100644
--- a/english/consultants/bentosolutions.wml
+++ b/english/consultants/bentosolutions.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Bento Solutions"
-<H1>Bento Solutions</H1>
-<HR>
-<PRE>
+<p>
Bento Solutions: Complete integrated information
management solutions for small business and government
using Open Source software. Bento is Japanese for a
boxed lunch. A complete lunch in a box. A Bento
Solution is a complete information management system
for public and private entities all in one box.
-</PRE>
+</p>
diff --git a/english/consultants/bitpusher.wml b/english/consultants/bitpusher.wml
index cd1abc0fd68..69b4c1e2d1a 100644
--- a/english/consultants/bitpusher.wml
+++ b/english/consultants/bitpusher.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="BitPusher, LLC"
-<h1>BitPusher, LLC</h1>
-<hr>
<p>
BitPusher, LLC provides a set of high caliber Linux consulting services to aid in the implementation and on-going maintenance of Linux into enterprises. BitPusher's Linux service offerings includes systems administration &amp; maintenance, monitoring project management, infrastructure planning, custom application design, network performance tuning.
</p>
diff --git a/english/consultants/bitspot.wml b/english/consultants/bitspot.wml
index ad7c44fb9e5..9b5221b385d 100644
--- a/english/consultants/bitspot.wml
+++ b/english/consultants/bitspot.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Bitspot AG"
-<h1>Bitspot AG</h1>
-<hr>
<p>
long experience in IT Security,
Networking, Software Development
diff --git a/english/consultants/brainalliance.wml b/english/consultants/brainalliance.wml
index ebf5c4b33ac..aa6c840eb0a 100644
--- a/english/consultants/brainalliance.wml
+++ b/english/consultants/brainalliance.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Brain Alliance Solutions Oy / Ltd"
-<H1>Brain Alliance Solutions Oy / Ltd</H1>
-<HR>
-<PRE>
+<p>
Brain Alliance Solutions Oy / Ltd is located in Espoo, Finland. We offer
professional Debian GNU/Linux installation, support, consulting, server and
workstation solutions. For more information, please visit our website at
-http://www.brainalliance.com
-</PRE>
+<a href="http://www.brainalliance.com">http://www.brainalliance.com</a>
+</p>
diff --git a/english/consultants/bryan_b.wml b/english/consultants/bryan_b.wml
index d79fae82cf2..180720fcd06 100644
--- a/english/consultants/bryan_b.wml
+++ b/english/consultants/bryan_b.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Netsolus Consulting"
-<H1>Netsolus Consulting</H1>
-<HR>
-<PRE>
+<p>
Netsolus Consulting offers Linux and Windows Integration without bias
for any particular vendor or product. Our vendor and product neutral
approach guarantees the right solution for your business.
Full remote and on-site support for Linux and most Open Source products
available.
-</PRE>
+</p>
diff --git a/english/consultants/buici.wml b/english/consultants/buici.wml
index 5670e93cb26..5348b2ce74f 100644
--- a/english/consultants/buici.wml
+++ b/english/consultants/buici.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="The Buici Company"
-<H1>The Buici Company</H1>
-<HR>
-<PRE>
+<p>
References available
-</PRE>
+</p>
diff --git a/english/consultants/buttersideup.wml b/english/consultants/buttersideup.wml
index 3613db39c99..75d5df7b6f0 100644
--- a/english/consultants/buttersideup.wml
+++ b/english/consultants/buttersideup.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="WDAP Limited"
-<h1>WDAP Limited</h1>
-<hr />
<p>
I am willing to work throughout the UK, and overseas. For longer engagements
(&gt;1 week), I will prefer to work within a commutable distance of
diff --git a/english/consultants/cargol.wml b/english/consultants/cargol.wml
index f0e4af1f868..e9fe66c7e83 100644
--- a/english/consultants/cargol.wml
+++ b/english/consultants/cargol.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Cargol.net Solucions Lliures"
-<h1>Cargol.net Solucions Lliures</h1>
-<hr />
<p>
We are a young company started by experienced and knowledgeable
computer professionals. We offer a wide range of services focused
diff --git a/english/consultants/catalyst.wml b/english/consultants/catalyst.wml
index 2d49ba97068..c9a73c08a5c 100644
--- a/english/consultants/catalyst.wml
+++ b/english/consultants/catalyst.wml
@@ -1,28 +1,28 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Catalyst IT Ltd"
-<h1>Catalyst IT Ltd</h1>
-<hr/>
-<pre>
+<p>
Services Provided:
-* Support via phone, e-mail, remote access or on-site (primarily
- Wellington and Auckland).
-* Debian GNU/Linux consulting &amp; support - installation/upgrade support,
+</p>
+<ul>
+<li>Support via phone, e-mail, remote access or on-site (primarily
+ Wellington and Auckland).</li>
+<li>Debian GNU/Linux consulting &amp; support - installation/upgrade support,
NFS/Samba/DNS/DHCP/LDAP/EMail/Spam filtering, customised Debian
- builds.
-* Development Support - we have over 30 programmers available who are
+ builds.</li>
+<li>Development Support - we have over 30 programmers available who are
experienced with a wide range of languages and tools, including
- C, C++, Java, Perl, PHP, PostgreSQL, MySQL and many more...
-* Web Site Hosting - we have our own Internet servers, and a 100MB pipe
+ C, C++, Java, Perl, PHP, PostgreSQL, MySQL and many more...</li>
+<li>Web Site Hosting - we have our own Internet servers, and a 100MB pipe
to the internet with UPS and generator backup and redundant sites if
- desired.
-* Internet Gateways and Firewalls - built from Debian GNU/Linux.
-* Remote System Administration - if you don't have the time to maintain
+ desired.</li>
+<li>Internet Gateways and Firewalls - built from Debian GNU/Linux.</li>
+<li>Remote System Administration - if you don't have the time to maintain
a network of dozens of GNU/Linux machines on your Intranet or
Extranet, or maybe you are just learning Unix (or don't want to
learn Unix), but want a GNU/Linux machine for your office NOW!
Catalyst can remotely configure and upgrade your machine via the
- Internet (using encrypted connections).
-* Other IT Consulting Services - Catalyst have a team with experience
+ Internet (using encrypted connections).</li>
+<li>Other IT Consulting Services - Catalyst have a team with experience
from Strategic Modelling to Assembler Programming who can provide
- you with quality services at a competitive price.
-</pre>
+ you with quality services at a competitive price.</li>
+</ul>
diff --git a/english/consultants/charles_s.wml b/english/consultants/charles_s.wml
index c8dc248be51..b53eb6c3782 100644
--- a/english/consultants/charles_s.wml
+++ b/english/consultants/charles_s.wml
@@ -1,19 +1,23 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Activate Multi User System Support"
-<H1>Activate Multi User System Support</H1>
-<HR>
-<PRE>
+<p>
Specializing in Unix Network Engineering and Mission critical support
+</p>
+<p>
We support
-Debian
-Caldera
-Red Hat
-SCO
-Cisco
-Bay networks
-Microsoft
+</p>
+<ul>
+<li>Debian</li>
+<li>Caldera</li>
+<li>Red Hat</li>
+<li>SCO</li>
+<li>Cisco</li>
+<li>Bay networks</li>
+<li>Microsoft</li>
+</ul>
+<p>
Maintenance Contracts and telephone consultation prices by request
-</PRE>
+</p>
diff --git a/english/consultants/cits.wml b/english/consultants/cits.wml
index a7d639616c6..b5fccffbcb2 100644
--- a/english/consultants/cits.wml
+++ b/english/consultants/cits.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Commercial IT Services"
-<h1>Commercial IT Services</h1>
-<hr>
<p>
Commercial IT Services provide support for various open source products
and we are Linux integration specialists. We offer New Zealand
diff --git a/english/consultants/clockwork.wml b/english/consultants/clockwork.wml
index 40c21f7ef68..9e2d13abde5 100644
--- a/english/consultants/clockwork.wml
+++ b/english/consultants/clockwork.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Clockwork Software Systems"
-<h1>Clockwork Software Systems</h1>
-<hr />
<p>
Clockwork Software Systems are GNU/Linux business specialists. We
specialise in Debian-based managed desktop solutions, with customer
diff --git a/english/consultants/clue_inc.wml b/english/consultants/clue_inc.wml
index abdc63b822e..a02a8808f5b 100644
--- a/english/consultants/clue_inc.wml
+++ b/english/consultants/clue_inc.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="clue inc"
-<H1>clue inc</H1>
-<HR>
-<PRE>
+<p>
clue inc provides custom application development using Open Source and
freely-available technologies. We specialize in developing and
deploying on Debian, but are well-versed in most environments. We are
also available for systems administration, maintenance and security
consulting.
-</PRE>
+</p>
diff --git a/english/consultants/coderscorp.wml b/english/consultants/coderscorp.wml
index 46d8aca8f86..b89783e3100 100644
--- a/english/consultants/coderscorp.wml
+++ b/english/consultants/coderscorp.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="CodersCorp"
-<h1>CodersCorp</h1>
-<hr/>
-<pre>
+<p>
We do consulting with Linux and are specialized in Debian, currently having
a portfolio of severals ISP's and companies.
-</pre>
+</p>
diff --git a/english/consultants/coherent_light.wml b/english/consultants/coherent_light.wml
index fe222ec4894..a99f28411b8 100644
--- a/english/consultants/coherent_light.wml
+++ b/english/consultants/coherent_light.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Coherent Light"
-<H1>Coherent Light</H1>
-<HR>
-<PRE>
+<p>
Specialist in web hosting, mail management and internet networking.
-</PRE>
+</p>
diff --git a/english/consultants/con_z.wml b/english/consultants/con_z.wml
index ccdbddf5595..e4ad1a7f1f7 100644
--- a/english/consultants/con_z.wml
+++ b/english/consultants/con_z.wml
@@ -1,50 +1,65 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Cybersource Pty Ltd"
-<h1>Cybersource Pty Ltd</h1>
-<hr/>
-<pre>
+<p>
We are Australia's leading Linux and Free/Open Source solutions company,
with over 14 years in business and 25 staff. We have been long-time
supporters of the Linux community, helping to establish Open Source
Victoria and Open Source Industry Australia.
+</p>
+<p>
We can provide the following services for GNU/Linux
-
- Our core areas of expertise are:
- * Linux system administration, support and tuning
- * Australia's leading Linux Solutions Company
- * Linux to MS-Windows platform integration
- * Linux system and application (LAMP) development
- * Appliance development using Linux/FOSS components
-
+</p>
+<ul>
+<li>
+ Our core areas of expertise are:
+ <ul>
+ <li>Linux system administration, support and tuning</li>
+ <li>Australia's leading Linux Solutions Company</li>
+ <li>Linux to MS-Windows platform integration</li>
+ <li>Linux system and application (LAMP) development</li>
+ <li>Appliance development using Linux/FOSS components</li>
+ </ul>
+</li>
+<li>
Our Services:
- * Proactive systems administration services.
- * 24 Hour remote systems and network monitoring
- * Short term, staff replacement sys-admins
- * SAMBA and Linux Server replacement of NT servers
- * Secure Web Server installations
- * Per Incident Linux Help desk support
- * Network planning, topology and system security design
- * Internet expertise and firewalls
-
+ <ul>
+ <li>Proactive systems administration services.</li>
+ <li>24 Hour remote systems and network monitoring</li>
+ <li>Short term, staff replacement sys-admins</li>
+ <li>SAMBA and Linux Server replacement of NT servers</li>
+ <li>Secure Web Server installations</li>
+ <li>Per Incident Linux Help desk support</li>
+ <li>Network planning, topology and system security design</li>
+ <li>Internet expertise and firewalls</li>
+ </ul>
+</li>
+<li>
Our Products (built on Linux/FOSS):
- * Cybersource/DATASAFE: Takes snapshots of your servers, daily
- * Cybersource Small Business Linux Server: The best value small
+ <ul>
+ <li>Cybersource/DATASAFE: Takes snapshots of your servers, daily</li>
+ <li>Cybersource Small Business Linux Server: The best value small
business server on the market and 75% less expensive than the
- Microsoft alternative.
- * Cybersource Trim Client: All the advantages of a Thin Client with
- none of the disadvantages.
- * The Safe Internet Computer: The Safest Way to Use the Internet.
- * Warm Spare Server Replicator: Duplicates your important servers.
- * LiveLAMP: LAMP LiveCD project.
+ Microsoft alternative.</li>
+ <li>Cybersource Trim Client: All the advantages of a Thin Client with
+ none of the disadvantages.</li>
+ <li>The Safe Internet Computer: The Safest Way to Use the Internet.</li>
+ <li>Warm Spare Server Replicator: Duplicates your important servers.</li>
+ <li>LiveLAMP: LAMP LiveCD project.</li>
+ </ul>
+</li>
+</ul>
+<p>
We can also do development based on Linux
- * C/C++
- * Perl
- * Java
- * Python
- * PHP Web Database Integration
- * MySQL
- * PostgreSQL
- * VB &amp; VBA Migration to Linux
-</pre>
+</p>
+<ul>
+ <li>C/C++</li>
+ <li>Perl</li>
+ <li>Java</li>
+ <li>Python</li>
+ <li>PHP Web Database Integration</li>
+ <li>MySQL</li>
+ <li>PostgreSQL</li>
+ <li>VB &amp; VBA Migration to Linux</li>
+</ul>
diff --git a/english/consultants/cory_p.wml b/english/consultants/cory_p.wml
index a86369fa964..450142b42ca 100644
--- a/english/consultants/cory_p.wml
+++ b/english/consultants/cory_p.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Uversa Consulting"
-<H1>Uversa Consulting</H1>
-<HR>
-<PRE>
+<p>
We provide consulting services to businesses with a focus on Linux and open
source software. We also provide security consulting, general Linux and Debian
support, custom development and network consulting with prices that are
affordable for small and medium sized businesses.
-</PRE>
+</p>
diff --git a/english/consultants/credativ.wml b/english/consultants/credativ.wml
index ea0a8a97b4e..7bed96f9465 100644
--- a/english/consultants/credativ.wml
+++ b/english/consultants/credativ.wml
@@ -1,15 +1,16 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="credativ GmbH"
-<h1>credativ GmbH</h1>
-<hr/>
-<pre>
+<p>
credativ GmbH has eight Debian developers on their staff, which do Debian work
as part of their jobs. They also regularly sponsor CDs and other stuff for
LinuxTag and generally help Debian in Germany.
+</p>
+<p>
credativ is a vendor independent consulting and service company specialized in
quality assurance in IT projects, systems management, and Open Source
services. Together with our customers we implement custom-made open source
solutions (preferably completely Free Software) that have high potential in
cost reduction, migrate systems and offer specialized support for complete
-networks. For more information please visit http://www.credativ.co.uk/.
-</pre>
+networks. For more information please visit
+<a href="http://www.credativ.co.uk/">http://www.credativ.co.uk/</a>.
+</p>
diff --git a/english/consultants/csinetworks.wml b/english/consultants/csinetworks.wml
index 5c77eff8730..232a6323a00 100644
--- a/english/consultants/csinetworks.wml
+++ b/english/consultants/csinetworks.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="CSI Networks"
# $Id$
-<h1>CSI Networks</h1>
-
<p>
Network, security, VPN, VoIP, storage, terminal services,
high avaliability and high scalability consultancy.
diff --git a/english/consultants/custom_engineering.wml b/english/consultants/custom_engineering.wml
index ff26b7e3996..d6a6a83d04f 100644
--- a/english/consultants/custom_engineering.wml
+++ b/english/consultants/custom_engineering.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Custom Engineering"
-<H1>Custom Engineering</H1>
-<HR>
-<PRE>
+<p>
I'll help you in and around the Albuquerque area.
-</PRE>
+</p>
diff --git a/english/consultants/datalay.wml b/english/consultants/datalay.wml
index 7768161efc7..31f187d722f 100644
--- a/english/consultants/datalay.wml
+++ b/english/consultants/datalay.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Datay Soluciones Inform&aacute;ticas"
-<H1>Datay Soluciones Inform&aacute;ticas</H1>
-<HR>
-<PRE>
+<p>
When Debian is used in our work, we donate a percentage of our income to the Debian project.
-</PRE>
+</p>
diff --git a/english/consultants/datalink_internet.wml b/english/consultants/datalink_internet.wml
index d016e413a06..630556b5608 100644
--- a/english/consultants/datalink_internet.wml
+++ b/english/consultants/datalink_internet.wml
@@ -1,12 +1,16 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Datalink Internet"
-<H1>Datalink Internet</H1>
-<HR>
-<PRE>
-Datalink Internet provides three types of services: 1) Consultant
-services in UNIX specially in DEBIAN 2) System Development on UNIX
-specially the network based on TCP and DEBIAN as the platform. 3)
-Internet services: Webhosting, Corporate e-mail, and access to Internet.
+<p>
+Datalink Internet provides three types of services:
+</p>
+<ol>
+<li>Consultant services in UNIX specially in DEBIAN</li>
+<li>System Development on UNIX specially the network based on TCP and
+ DEBIAN as the platform.</li>
+<li>Internet services: Webhosting, Corporate e-mail, and access to
+ Internet.</li>
+</ol>
+<p>
Datalink also sells several brands of servers preconfigured with Debian
and typical services MAIL, WEB, PROXY, DATABASE, GROPWARE SERVICES, ETC
-</PRE>
+</p>
diff --git a/english/consultants/davonet.wml b/english/consultants/davonet.wml
index b2f02876590..0cf2133ee2b 100644
--- a/english/consultants/davonet.wml
+++ b/english/consultants/davonet.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="DAVOnet GmbH"
-<h1>DAVOnet GmbH</h1>
-<hr />
<p>
DAVOnet is concentrating on consulting and software development with
Linux and OpenSource Systems. Our focus is on solutions for AAA within
diff --git a/english/consultants/deeproot.wml b/english/consultants/deeproot.wml
index c8d93486ac9..9398da37022 100644
--- a/english/consultants/deeproot.wml
+++ b/english/consultants/deeproot.wml
@@ -1,15 +1,15 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="DeepRoot Linux Pvt. Ltd."
-<H1>DeepRoot Linux Pvt. Ltd.</H1>
-<HR>
-<PRE>
+<p>
DeepRoot Linux is one of the largest
gnu/Linux product companies in India. Headquartered at Bangalore, we
develop cutting edge products and solutions to "get gnu/Linux to
work for you - faster, better, today, every way."
-
+</p>
+<p>
Our products include small office servers, messaging servers, file
servers, firewall and vpn appliances and bandwidth management and link
management solutions. We also provide commercial support for Free
Software and the Debian gnu/Linux distribution. Support is available
-over phone, email, remote login and on-site.</PRE>
+over phone, email, remote login and on-site.
+</p>
diff --git a/english/consultants/delemar.wml b/english/consultants/delemar.wml
index 5413aa5df50..96745cde6d2 100644
--- a/english/consultants/delemar.wml
+++ b/english/consultants/delemar.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Olivier Delemar"
-<h1>Olivier Delemar</h1>
-<hr />
<p>
I'm looking for partnership in Grenoble's area. Please contact me.
</p>
diff --git a/english/consultants/delicate.ch.wml b/english/consultants/delicate.ch.wml
index ae8ec2f4c37..7f2307ade51 100644
--- a/english/consultants/delicate.ch.wml
+++ b/english/consultants/delicate.ch.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="delicate.ch"
-<H1>delicate.ch</H1>
-<HR>
-<PRE>
+<p>
consulting, education, support
-</PRE>
+</p>
diff --git a/english/consultants/disoft.wml b/english/consultants/disoft.wml
index b2ec9a4aee1..e04c4fd37d9 100644
--- a/english/consultants/disoft.wml
+++ b/english/consultants/disoft.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="MonoLab Consulting S.L."
# $Id$
-<h1>MonoLab Consulting S.L.</h1>
-
<p>
Our company has a proved and recognized experience in the Linux world
of more than six years.
diff --git a/english/consultants/douglas_h.wml b/english/consultants/douglas_h.wml
index 35832c7536e..18072081894 100644
--- a/english/consultants/douglas_h.wml
+++ b/english/consultants/douglas_h.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="B. Douglas Hilton"
# $Id$
-<h1>B. Douglas Hilton</h1>
-
<ul>
<li>8 years experience with Debian on many systems.</li>
<li>2 years experience with Gentoo on X86 machines.</li>
diff --git a/english/consultants/eauzone.wml b/english/consultants/eauzone.wml
index c5e45251d4d..222d1f4d4c5 100644
--- a/english/consultants/eauzone.wml
+++ b/english/consultants/eauzone.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="EauZone"
-<H1>EauZone</H1>
-<HR>
-<PRE>
+<p>
Belgian linux consultants focussed on Debian GNU/Linux support and
installations. Specialized in a lot of services (Mail, Web, filesharing,
groupware, firewalls, vpn, e-commerce, application development, monitoring,
...). We offer remote management, on-site support, auditing and trainings...
-</PRE>
+</p>
diff --git a/english/consultants/emergya.wml b/english/consultants/emergya.wml
index f26300f7b5d..b82b1c90548 100644
--- a/english/consultants/emergya.wml
+++ b/english/consultants/emergya.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Emergya Consultor&iacute;a"
-<h1>Emergya Consultor&iacute;a</h1>
-<hr />
<p>
We have been specialized in give solutions out-of-the-box based
on Debian GNU/Linux. We have developed various distributions based on
diff --git a/english/consultants/enterux.wml b/english/consultants/enterux.wml
index 7e776d63bf4..ad8035babcf 100644
--- a/english/consultants/enterux.wml
+++ b/english/consultants/enterux.wml
@@ -1,58 +1,93 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Enterux Solutions"
-<H1>Enterux Solutions</H1>
-<HR>
-<PRE>
+<p>
We can offer a full range of services listed on our website a few which I can
write here,
+</p>
+<ul>
+<li>
<a href="http://www.enterux.com/en/services/application-services/">\
Applications Services</a>
+</li>
+<li>
<a href="http://www.enterux.com/en/services/product-engineering-services/">\
Product Engineering Services</a>
+</li>
+<li>
<a href="http://www.enterux.com/en/services/web-services/">Web Services</a>
+</li>
+<li>
<a href="http://www.enterux.com/en/services/infrastructure-services/">\
Infrastructure Services</a>
+</li>
+<li>
<a href="http://www.enterux.com/services/technology-consulting/">\
Technology Consulting</a>
+</li>
+</ul>
-And the solutions which we can provide are :
+<p>
+And the solutions which we can provide are:
+</p>
+<ul>
+<li>
<a href="http://www.enterux.com/en/solutions/enterprise-email-solutions/">\
Enterprise Email Solutions</a>
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/enterprise-instant-messaging-solutions/">\
Enterprise Instant Messaging Solutions</a>
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/enterprise-security-firewall-solutions/">\
Enterprise Security / Firewall Solutions</a>
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/network-optimization-solutions/">\
Network Optimization Solutions</a>
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/load-balancing-high-volume-solutions/">\
Load Balancing / High Volume Solutions</a>
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/high-availability-solutions/">\
High Availability Solutions</a>
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/embedded-gnu-linux-solutions/">\
Embedded GNU/Linux Solutions</a>
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/server-migration-solutions/">\
Server Migration Solutions</a>
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/thin-client-solutions/">\
Thin Client Solutions</a>
+</li>
+</ul>
-We are also have this product named Resty :
+<p>
+We are also have this product named Resty:
What is Resty?
Resty is a Web Application Framework distributed under the terms of the GNU
General Public License by Enterux. Please check out the documentation to find
-out more about Resty
-More relative information available from : <a href="http://www.resty.org/">Resty Homepage</a>
-</PRE>
+out more about Resty.
+More relative information available from:
+<a href="http://www.resty.org/">Resty Homepage</a>
+</p>
diff --git a/english/consultants/et_computer.wml b/english/consultants/et_computer.wml
index 72f0346e779..8fbfa4c3aad 100644
--- a/english/consultants/et_computer.wml
+++ b/english/consultants/et_computer.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="ET Computer"
# $Id$
-<H1>ET Computer</H1>
-<HR>
-<PRE>
+<p>
Only professional work. Have a F-tax clearance certificate ("F-skattebevis").
-</PRE>
+</p>
diff --git a/english/consultants/eugene_g.wml b/english/consultants/eugene_g.wml
index 4ba73a3033d..70681949578 100644
--- a/english/consultants/eugene_g.wml
+++ b/english/consultants/eugene_g.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="DataArt"
-<H1>DataArt</H1>
-<HR>
-<PRE>
+<p>
Offshore software development and outsourcing company skilled in Microsoft .NET (ASP.Net)
-</PRE>
+</p>
diff --git a/english/consultants/extralogix.wml b/english/consultants/extralogix.wml
index 78fe6a47e61..ecd069f5cf4 100644
--- a/english/consultants/extralogix.wml
+++ b/english/consultants/extralogix.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Extralogix Solutions"
-<H1>Extralogix Solutions</H1>
-<HR>
-<PRE>
+<p>
We also provide free advice/consultancy
to non profit organizations on Open Source projects and products. For other
projects, we provide a no obligation cost and time estimate.
-</PRE>
+</p>
diff --git a/english/consultants/fai-cluster.wml b/english/consultants/fai-cluster.wml
index ddd3f58a0d9..fbcfd6e9cd5 100644
--- a/english/consultants/fai-cluster.wml
+++ b/english/consultants/fai-cluster.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="fai-cluster.de"
-<H1>fai-cluster.de</H1>
-<HR>
-<PRE>
+<p>
We only do support and service around FAI, the fully automatic
installation for Debian. We are experts on installing Beowulf
Clusters.
-</PRE>
+</p>
diff --git a/english/consultants/federico_sevilla.wml b/english/consultants/federico_sevilla.wml
index 8d4ada9817a..e614a841bb1 100644
--- a/english/consultants/federico_sevilla.wml
+++ b/english/consultants/federico_sevilla.wml
@@ -1,9 +1,8 @@
-#use wml::debian::consultant
-
-<h1>Federico Sevilla III</h1>
+#use wml::debian::consultant name="Federico Sevilla III"
<p>
My Curriculum Vitae is available online at
-<a href="http://jijo.free.net.ph/files/cv.pdf">http://jijo.free.net.ph/files/cv.pdf</a>
+<a href="http://jijo.free.net.ph/files/cv.pdf">\
+http://jijo.free.net.ph/files/cv.pdf</a>
and contains up-to-date information about projects I've worked on.
</p>
diff --git a/english/consultants/fensterkitt.wml b/english/consultants/fensterkitt.wml
index 6a6d961d171..e2addef36f5 100644
--- a/english/consultants/fensterkitt.wml
+++ b/english/consultants/fensterkitt.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Fensterkitt Computer Support"
-<H1>Fensterkitt Computer Support</H1>
-<HR>
-<PRE>
+<p>
Languages: german, french and a bit of italian and english
-</PRE>
+</p>
diff --git a/english/consultants/fff_managed.wml b/english/consultants/fff_managed.wml
index cf6b62c47f2..82e7d185ca2 100644
--- a/english/consultants/fff_managed.wml
+++ b/english/consultants/fff_managed.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="FFF Managed Technology"
-<H1>FFF Managed Technology</H1>
-<HR>
-<PRE>
-Provider of services-based computing solutions, we are strong proponents of Open
-Source software within business environments.
-</PRE>
+<p>
+Provider of services-based computing solutions, we are strong proponents of
+Open Source software within business environments.
+</p>
diff --git a/english/consultants/filippo_giunchedi.wml b/english/consultants/filippo_giunchedi.wml
index 1869e4a9ecd..cab729aaa8d 100644
--- a/english/consultants/filippo_giunchedi.wml
+++ b/english/consultants/filippo_giunchedi.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Filippo Giunchedi"
-<H1>Filippo Giunchedi</H1>
-<HR>
-<PRE>
+<p>
GNU/PG key: 6B79D401
-</PRE>
+</p>
diff --git a/english/consultants/firman.wml b/english/consultants/firman.wml
index 1e09a9f50ec..1d17187e0a9 100644
--- a/english/consultants/firman.wml
+++ b/english/consultants/firman.wml
@@ -1,15 +1,20 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Firman Consulting, LLC"
-<H1>Firman Consulting, LLC</H1>
-<HR>
-<PRE>
+<p>
I specialize in installing new Debian GNU/Linux
workstations and servers for small businesses.
I am CompTIA Linux+ and LPI Linux certified.
Contact me for testimonials and references.
+</p>
+<p>
Some details of my Debian based offerings here in PDF format:
-http://www.firman.us/LinuxSmallBusinessServer.pdf
-http://www.firman.us/LinuxSmallBusinessDesktop.pdf
-http://www.firman.us/Linux-MS.pdf
-</PRE>
+</p>
+<ul>
+<li><a href="http://www.firman.us/LinuxSmallBusinessServer.pdf">\
+http://www.firman.us/LinuxSmallBusinessServer.pdf</a></li>
+<li><a href="http://www.firman.us/LinuxSmallBusinessDesktop.pdf">\
+http://www.firman.us/LinuxSmallBusinessDesktop.pdf</a></li>
+<li><a href="http://www.firman.us/Linux-MS.pdf">\
+http://www.firman.us/Linux-MS.pdf</a></li>
+</ul>
diff --git a/english/consultants/forlinux.wml b/english/consultants/forlinux.wml
index ab11178d0b6..c974d4173be 100644
--- a/english/consultants/forlinux.wml
+++ b/english/consultants/forlinux.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="ForLinux"
-<H1>ForLinux</H1>
-<HR>
-<PRE>
+<p>
ForLinux provides a range of services comprising of Support Solutions
(including Total Managed Services, Bespoke Support Solutions and
emergency support), Disaster recovery solutions, and Bespoke
@@ -10,4 +8,4 @@ projects. ForLinux can provide an effective and cost efficient
solution whatever your requirement. ForLinux will not change its
customers need to fit the solution but will provide the solution to
meet the requirement.
-</PRE>
+</p>
diff --git a/english/consultants/fortuitous.wml b/english/consultants/fortuitous.wml
index a36c7025684..49e0b626f07 100644
--- a/english/consultants/fortuitous.wml
+++ b/english/consultants/fortuitous.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Fortuitous Technologies"
-<h1>Fortuitous Technologies</h1>
-<hr/>
-<pre>
+<p>
Fortuitous provides Linux consulting, training, networking, and security
services for Texas, Louisiana, New Mexico, and continental USA.
We support all Linux distributions including Debian, RHEL, Fedora,
Mandriva, and SuSE. We provide support for FreeBSD, OpenBSD, and Mac OSX.
We offer monthly and quartly support contracts.
-</pre>
+</p>
diff --git a/english/consultants/fotopic.wml b/english/consultants/fotopic.wml
index ba68bf57b64..316cd64759d 100644
--- a/english/consultants/fotopic.wml
+++ b/english/consultants/fotopic.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Fotopic Limited"
-<h1>Fotopic Limited</h1>
-<hr />
<p>
Debian Developer, systems administration, custom software, hardware and systems.
</p>
diff --git a/english/consultants/freesoft.wml b/english/consultants/freesoft.wml
index ea60d1ecdd4..d4134b02e5d 100644
--- a/english/consultants/freesoft.wml
+++ b/english/consultants/freesoft.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="freesoft technologies ltd"
-<h1>freesoft technologies ltd</h1>
-<hr />
<p>
Willing to provide service across the Arab
countries.
diff --git a/english/consultants/gbcomputers.wml b/english/consultants/gbcomputers.wml
index aaee40d0bc8..a8e8cc453fb 100644
--- a/english/consultants/gbcomputers.wml
+++ b/english/consultants/gbcomputers.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="GB Computers"
-<h1>GB Computers</h1>
-<hr />
<p>
Please see our website for any further details, and contact information.
</p>
diff --git a/english/consultants/genilto_dallo.wml b/english/consultants/genilto_dallo.wml
index 395d647ffac..73163555ac4 100644
--- a/english/consultants/genilto_dallo.wml
+++ b/english/consultants/genilto_dallo.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Genilto Dallo"
-<h1>Genilto Dallo</h1>
-<hr/>
-<pre>
+<p>
Connectivity systems and project development, security and open source
systems.
Installation, configuration and maintainance of Debian Linux Servers.
Consultancy to Internet Providers, connectivity, wireless networks, and
servers.
-</pre>
+</p>
diff --git a/english/consultants/gnulinux.wml b/english/consultants/gnulinux.wml
index 695ea3a9757..2885b9431a3 100644
--- a/english/consultants/gnulinux.wml
+++ b/english/consultants/gnulinux.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Stichting Software Libre"
-<H1>Stichting Software Libre</H1>
-<HR>
-<PRE>
+<p>
A zero-profit company, specialised in the Debian GNU/Linux operating system.
-</PRE>
+</p>
diff --git a/english/consultants/guillermo_rico.wml b/english/consultants/guillermo_rico.wml
index b50b7d52e5b..bcaad687c97 100644
--- a/english/consultants/guillermo_rico.wml
+++ b/english/consultants/guillermo_rico.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Guillermo Rico"
-<H1>Guillermo Rico</H1>
-<HR>
-<PRE>
+<p>
LPIC2 certification.
-</PRE>
+</p>
diff --git a/english/consultants/gurunetwork.wml b/english/consultants/gurunetwork.wml
index 55216b82545..b1e07cfedd1 100644
--- a/english/consultants/gurunetwork.wml
+++ b/english/consultants/gurunetwork.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="GuruNetwork"
-<H1>GuruNetwork</H1>
-<HR>
-<PRE>
+<p>
Enterprise Linux Systems, High-security Firewalls, Auditing,
Linux/*NIX Consulting. Sell/support Cisco product (CCNA Certificate)
with network troubleshooting and planning Lan/Wan solutions.
-</PRE>
+</p>
diff --git a/english/consultants/harmuth.wml b/english/consultants/harmuth.wml
index 98d821515c3..594d7e70bf4 100644
--- a/english/consultants/harmuth.wml
+++ b/english/consultants/harmuth.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-
-<h1>IT-Gesamtl&ouml;sungen</h1>
+#use wml::debian::consultant name="IT-Gesamtl&ouml;sungen"
<p>
Security Consulting, Network Design, ... and implementation also available.
diff --git a/english/consultants/heureka.wml b/english/consultants/heureka.wml
index 521a608a1e3..2f7f6394d76 100644
--- a/english/consultants/heureka.wml
+++ b/english/consultants/heureka.wml
@@ -1,6 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Heureka GmbH"
# $Id
-<H1>Heureka GmbH</H1>
-<HR>
+<p>
First contact free.
+</p>
diff --git a/english/consultants/hornfordassociates.wml b/english/consultants/hornfordassociates.wml
index c331f88d0eb..aec5a9c4ef3 100644
--- a/english/consultants/hornfordassociates.wml
+++ b/english/consultants/hornfordassociates.wml
@@ -1,7 +1,9 @@
-#use wml::debian::consultant
-
-<h1>Hornford Associates</h1>
+#use wml::debian::consultant name="Hornford Associates"
<p>
-We provide professional services aligning Information Technology with business goals. Enterprise architecture, IT Strategy, project management and operational efficiency support 6 focus areas including Linux/Open Source. This focus area provides analysis, implementation and support services.
+We provide professional services aligning Information Technology with
+business goals. Enterprise architecture, IT Strategy, project management
+and operational efficiency support 6 focus areas including Linux/Open
+Source. This focus area provides analysis, implementation and support
+services.
</p>
diff --git a/english/consultants/houdek.wml b/english/consultants/houdek.wml
index fd12d30ebeb..a91a9918b8d 100644
--- a/english/consultants/houdek.wml
+++ b/english/consultants/houdek.wml
@@ -1,8 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="HOUDEK-it"
-<h1>HOUDEK-it</h1>
-<hr />
+<p>
Skills:
+</p>
<ul>
<li>Debian (installation, administration, using)</li>
<li>Networking (LAN, WLAN, VPN)</li>
diff --git a/english/consultants/hp_germany.wml b/english/consultants/hp_germany.wml
index ae6217b71a8..bec78a9eb26 100644
--- a/english/consultants/hp_germany.wml
+++ b/english/consultants/hp_germany.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Hewlett-Packard"
# $Id$
-<h1>Hewlett-Packard</h1>
-
<p>
HP Services Consulting&amp;Integration Germany Open Source project
group is focused on specification, development and implementation
diff --git a/english/consultants/hytechpro.wml b/english/consultants/hytechpro.wml
index 89b5ecab112..17228d50ec3 100644
--- a/english/consultants/hytechpro.wml
+++ b/english/consultants/hytechpro.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Hytech Professionals"
-<h1>Hytech Professionals</h1>
-<hr />
<p>
Hytech Professionals is a US based company with
offices in the US, Germany and software development center in India.
diff --git a/english/consultants/ideal.wml b/english/consultants/ideal.wml
index 98cf0424cfe..d2f4f4d291f 100644
--- a/english/consultants/ideal.wml
+++ b/english/consultants/ideal.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="I.D.E.A.L. Technology Corporation"
-<H1>I.D.E.A.L. Technology Corporation</H1>
-<HR>
-<PRE>
+<p>
Successfully deployed Debian GNU/Linux in the data centers for enterprise customers like General Electric and the US Army.
-</PRE>
+</p>
diff --git a/english/consultants/imagin.wml b/english/consultants/imagin.wml
index 334b7a33c34..db32c0d7790 100644
--- a/english/consultants/imagin.wml
+++ b/english/consultants/imagin.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Imagin"
-<h1>Imagin</h1>
-<hr />
<p>
Projects outside Poland are accepted as well.
</p>
diff --git a/english/consultants/incipit.wml b/english/consultants/incipit.wml
index 2020b627c14..0faeef90201 100644
--- a/english/consultants/incipit.wml
+++ b/english/consultants/incipit.wml
@@ -1,20 +1,22 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Incipit - Informatica Reti Sicurezza"
-<h1>Incipit - Informatica Reti Sicurezza</h1>
-<hr/>
-<pre>
-Incipit: the client in the center
+<h3>Incipit: the client in the center</h3>
+<p>
Our approach is forthright: we try to understand the real needs of the
client and to provide an efficient solution, fastly and at low costs.
+</p>
-Incipit: complete services
+<h3>Incipit: complete services</h3>
+<p>
We can provide computer services and networking solutions all-in-one:
we plan the solution, sell the product, implement the project, configure
all the machines, provide the training and support ponctually or under a
continuous contract.
+</p>
-Incipit: a single consultant
+<h3>Incipit: a single consultant</h3>
+<p>
We think that a single technological consultant is an advantage for the
client. Only one name and one phone number for all the needs of computer,
networking and security solutions.
-</pre>
+</p>
diff --git a/english/consultants/indus_net_technologies.wml b/english/consultants/indus_net_technologies.wml
index f2f1fe6f479..c2803200652 100644
--- a/english/consultants/indus_net_technologies.wml
+++ b/english/consultants/indus_net_technologies.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Indus Net Technologies"
-<H1>Indus Net Technologies</H1>
-<HR>
-<PRE>
+<p>
Indus Net Technologies is an ISO 9001:2000 software service company
providing consultancy and support on open source platforms.
-</PRE>
+</p>
diff --git a/english/consultants/inittab.wml b/english/consultants/inittab.wml
index 6dc7009e797..b0504775452 100644
--- a/english/consultants/inittab.wml
+++ b/english/consultants/inittab.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Alberto Gonzalez Iniesta"
-<h1>Alberto Gonzalez Iniesta</h1>
-<hr />
<p>
Debian Developer offering Free Software training (GNU/Linux,
Apache, Mysql, Samba, security) and consulting. GNU/Linux
diff --git a/english/consultants/inl.wml b/english/consultants/inl.wml
index 39d21f5fd51..83ffef0a6eb 100644
--- a/english/consultants/inl.wml
+++ b/english/consultants/inl.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="INL"
-<h1>INL</h1>
-<hr />
<p>
INL provides Open Source solutions for companies and organisations
looking for reliable, secure services and products. We provide high
diff --git a/english/consultants/integrics.wml b/english/consultants/integrics.wml
index a07af9c22b9..d20330dd90b 100644
--- a/english/consultants/integrics.wml
+++ b/english/consultants/integrics.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Clavib"
-<h1>Clavib</h1>
-<hr />
<p>
Specialists in VoIP, Databases, and Perl.
</p>
diff --git a/english/consultants/internet_solutions.wml b/english/consultants/internet_solutions.wml
index 284e06fd9fb..b8d53787e3f 100644
--- a/english/consultants/internet_solutions.wml
+++ b/english/consultants/internet_solutions.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="internet solutions! gmbh"
-<H1>internet solutions! gmbh</H1>
-<HR>
-<PRE>
+<p>
internet solution! gmbh is an internet service provider since 1997.
We build solutions - based on linux - since 1998, including debian since 2002.
-</PRE>
+</p>
diff --git a/english/consultants/ipodion.wml b/english/consultants/ipodion.wml
index 8a0aa8aa402..9ae4bd2e3f5 100644
--- a/english/consultants/ipodion.wml
+++ b/english/consultants/ipodion.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="iPodion GmbH"
-<h1>iPodion GmbH</h1>
-<hr />
<p>
General Debian/Linux support, preconfigured server and workstation computers,
development of customized distributions for server and workstation use.
diff --git a/english/consultants/it_service_drillich.wml b/english/consultants/it_service_drillich.wml
index 48bfdfcb23a..85e8caa5dc1 100644
--- a/english/consultants/it_service_drillich.wml
+++ b/english/consultants/it_service_drillich.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="IT-Service Drillich"
-<H1>IT-Service Drillich</H1>
-<HR>
-<PRE>
+<p>
Configuration and administration of unix-systems, indiviual software,
it-consulting
-</PRE>
+</p>
diff --git a/english/consultants/itsecuritymn.wml b/english/consultants/itsecuritymn.wml
index 15ef07e49d7..7555bfeada5 100644
--- a/english/consultants/itsecuritymn.wml
+++ b/english/consultants/itsecuritymn.wml
@@ -1,7 +1,12 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="IT Security Services"
-<h1>IT Security Services</h1>
-<hr />
<p>
-IT Security Services is based in Minneapolis, Minnesota and serves the Twin Cities. We provide a complete line of IT services with emphasis on security, such as audits, secure servers, and new network installations. We are highly skilled with Debian Linux, and can use it to run extremely fast and reliable Servers and Desktops using all popular services, including WWW, Secure WWW, PHP, SQL, DHCP, DNS, EMAIL, FTP, Firewalls, PF, SSH, VPN (Remote Access), Streaming Media and much more. Any size project welcome, very affordable, free estimates.
+IT Security Services is based in Minneapolis, Minnesota and serves the
+Twin Cities. We provide a complete line of IT services with emphasis on
+security, such as audits, secure servers, and new network installations.
+We are highly skilled with Debian Linux, and can use it to run extremely
+fast and reliable Servers and Desktops using all popular services,
+including WWW, Secure WWW, PHP, SQL, DHCP, DNS, EMAIL, FTP, Firewalls,
+PF, SSH, VPN (Remote Access), Streaming Media and much more. Any size
+project welcome, very affordable, free estimates.
</p>
diff --git a/english/consultants/ivan_k.wml b/english/consultants/ivan_k.wml
index 257931ee699..298fdc96f96 100644
--- a/english/consultants/ivan_k.wml
+++ b/english/consultants/ivan_k.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Freeside Internet Services, LLC"
-<H1>Freeside Internet Services, LLC</H1>
-<HR>
-<PRE>
+<p>
Specializing in Perl, databases and ISP operations.
-</PRE>
+</p>
diff --git a/english/consultants/jarno_saarinen.wml b/english/consultants/jarno_saarinen.wml
index 95cbbc6fd18..09825640f27 100644
--- a/english/consultants/jarno_saarinen.wml
+++ b/english/consultants/jarno_saarinen.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="JS Tietotuki"
-<H1>JS Tietotuki</H1>
-<HR>
-<PRE>
+<p>
Currently working mainly on South-Carelia area.
-</PRE>
+</p>
diff --git a/english/consultants/jaume_t.wml b/english/consultants/jaume_t.wml
index 20be12d10ae..d78bb10d3f9 100644
--- a/english/consultants/jaume_t.wml
+++ b/english/consultants/jaume_t.wml
@@ -1,11 +1,11 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Jaume Teixi"
-<H1>Jaume Teixi</H1>
-<HR>
-<PRE>
+<p>
Cross platform communications and lan to wide network environments.
-Dedicated Debian servers: ( remote access, firewall, proxy, web, email, dns, database ).
-Email support available. More than 6 years of Debian Linux demonstrable experience.
+Dedicated Debian servers: ( remote access, firewall, proxy, web, email,
+dns, database ).
+Email support available. More than 6 years of Debian Linux demonstrable
+experience.
A portion of the profits will be donated to the Debian developers community.
-</PRE>
+</p>
diff --git a/english/consultants/javier_v.wml b/english/consultants/javier_v.wml
index a319c8325c7..392055ecf70 100644
--- a/english/consultants/javier_v.wml
+++ b/english/consultants/javier_v.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Yaco"
-<h1>Yaco</h1>
-<hr/>
-<pre>
+<p>
Experts in Debian GNU/Linux (2 Debian developers in our team).
Solutions development and information systems migration to solutions
based on free and open standard and software.
Development of embedded systems with GNU/Linux.
-</pre>
+</p>
diff --git a/english/consultants/jean_p.wml b/english/consultants/jean_p.wml
index a32d205c16d..6f827b22511 100644
--- a/english/consultants/jean_p.wml
+++ b/english/consultants/jean_p.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Linuz.it"
-<H1>Linuz.it</H1>
-<HR>
-<PRE>
+<p>
Enterprise Linux Systems, High-security Firewalls, Linux-based Antivirus
Systems, High-availability/reliability Linux Servers, Specialised
Linux/*BSD/Sun*/*NIX Consulting.
-</PRE>
+</p>
diff --git a/english/consultants/jeremy_r.wml b/english/consultants/jeremy_r.wml
index 6701c6af2e3..214ad490ab5 100644
--- a/english/consultants/jeremy_r.wml
+++ b/english/consultants/jeremy_r.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-
-<h1>Puget Sound Technology</h1>
+#use wml::debian::consultant name="Puget Sound Technology"
<p>BSD &lt;-&gt; Linux migrations; on-site, customized training.
We do Apache, Postfix, Linux security, Unix shell essentials training for
diff --git a/english/consultants/jfranken.wml b/english/consultants/jfranken.wml
index d1fb8a383b9..84fe05a9a87 100644
--- a/english/consultants/jfranken.wml
+++ b/english/consultants/jfranken.wml
@@ -1,12 +1,12 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="FRANKEN IT-CONCEPTS"
-<h1>FRANKEN IT-CONCEPTS</h1>
-<hr />
<p>
Since 1992, the companies of Johannes Franken have been known for the
extraordinary realization of complex IT projects.
</p>
+<p>
Our focus areas are:
+</p>
<ul>
<li>IT-service and consulting, specializing on TCP/IP</li>
<li>Software development (web, enterprise and desktop
@@ -14,12 +14,16 @@ applications) in practically all languages and technologies
known today, for all environments and operating systems.</li>
<li>IT-seminars</li>
</ul>
+<p>
Current project:
+</p>
<ul>
<li>Writing the "Debian Server Handbook"
(ISBN: 3-8266-1587-5, will be published in Q1/2006)</li>
</ul>
+<p>
Johannes' publications and certifications:
+</p>
<ul>
<li>a list of his papers, talks, books and opensource projects
can be found on http://www.jfranken.de/homepages/johannes.en.html</li>
@@ -32,4 +36,8 @@ can be found on http://www.jfranken.de/homepages/johannes.en.html</li>
<li>CompTIA i-Net+</li>
<li>SAIR GNU/Linux Certified Administrator (LCA)</li>
</ul>
-For details, see http://www.jfranken.de/unternehmen.en.html
+<p>
+For details, see
+<a href="http://www.jfranken.de/unternehmen.en.html">\
+http://www.jfranken.de/unternehmen.en.html</a>
+</p>
diff --git a/english/consultants/jh_networks.wml b/english/consultants/jh_networks.wml
index 2f46aebba70..95bed23825d 100644
--- a/english/consultants/jh_networks.wml
+++ b/english/consultants/jh_networks.wml
@@ -1,7 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="JH-Networks / Telebistro"
-<H1>JH-Networks / Telebistro</H1>
-<HR>
-<PRE>
-Call-Shops and Internet-Cafes, Firewalls, Protection of minors, all GNU/LINUX-Systems
-</PRE>
+<p>
+Call-Shops and Internet-Cafes, Firewalls, Protection of minors, all
+GNU/LINUX-Systems
+</p>
diff --git a/english/consultants/jibsystems.wml b/english/consultants/jibsystems.wml
index 4a92bb0528d..4c8548d0ffc 100644
--- a/english/consultants/jibsystems.wml
+++ b/english/consultants/jibsystems.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Jib Systems Oy"
-<H1>Jib Systems Oy</H1>
-<HR>
-<PRE>
+<p>
We work mostly in the Helsinki metropolitan area but we are constantly looking
for possibilities to expand elsewhere. One of our major clients since 2003
has been the <a href="http://www.fmi.fi/">Finnish Meteorological Institute</a>.
-</PRE>
+</p>
diff --git a/english/consultants/jim_w.wml b/english/consultants/jim_w.wml
index 0e6e18ef56c..55564ba3411 100644
--- a/english/consultants/jim_w.wml
+++ b/english/consultants/jim_w.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="LAN Comp Systems"
-<H1>LAN Comp Systems</H1>
-<HR>
-<PRE>
+<p>
LAN Comp Systems provides network systems design, installation, and project
management support for client server OLTP systems utilizing UNIX or
proprietary operating platforms. We specify Linux, (specifically Debian)
for most network servers.
-</PRE>
+</p>
diff --git a/english/consultants/joan_l.wml b/english/consultants/joan_l.wml
index 556a5dd22df..36547f05e30 100644
--- a/english/consultants/joan_l.wml
+++ b/english/consultants/joan_l.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Digibel"
-<H1>Digibel</H1>
-<HR>
-<PRE>
+<p>
Digibel Open Source support (Belgium) uses its competence in Open Source
software to deliver solutions, consultancy, development, remote
administration, training and support with a strong focus on security.
All our consultants have been using Linux since 1995 and have extensive
Open Source experience.
-</PRE>
+</p>
diff --git a/english/consultants/joe_m.wml b/english/consultants/joe_m.wml
index b2281fda392..dd75eb81d08 100644
--- a/english/consultants/joe_m.wml
+++ b/english/consultants/joe_m.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Tangent Computer Research"
-<H1>Tangent Computer Research</H1>
-<HR>
-<PRE>
+<p>
20 years unix/linux experience
-</PRE>
+</p>
diff --git a/english/consultants/joerg_w.wml b/english/consultants/joerg_w.wml
index ddd26b42805..2f42e991a0b 100644
--- a/english/consultants/joerg_w.wml
+++ b/english/consultants/joerg_w.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Scan Plus GmbH"
-<h1>Scan Plus GmbH</h1>
-
-<p>own Debian GNU/Linux based firewall distribution
+<p>own Debian GNU/Linux based firewall distribution</p>
diff --git a/english/consultants/joeyh.wml b/english/consultants/joeyh.wml
index 0df763a7c96..cdfa5af433f 100644
--- a/english/consultants/joeyh.wml
+++ b/english/consultants/joeyh.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Joey Hess"
-<h1>Joey Hess</h1>
-<hr />
<p>
Contributor to Debian for ten years. Development team lead for new
Debian installer. Specializes in large-scale Debian installation and
diff --git a/english/consultants/jurgen_l.wml b/english/consultants/jurgen_l.wml
index d983c0d10ce..2587360c627 100644
--- a/english/consultants/jurgen_l.wml
+++ b/english/consultants/jurgen_l.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Intranet Engineering"
-<h1>Intranet Engineering</h1>
-<hr/>
-<pre>
+<p>
I am a sworn and certified expert for systems and applications in the
field of information processing.
-</pre>
+</p>
diff --git a/english/consultants/kaarlo_m.wml b/english/consultants/kaarlo_m.wml
index 2a1b7b16962..6743661f694 100644
--- a/english/consultants/kaarlo_m.wml
+++ b/english/consultants/kaarlo_m.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Arvanet"
-<H1>Arvanet</H1>
-<HR>
-<PRE>
+<p>
Additional information: Our district is mainly in the
metropolitan area (Helsinki, Vantaa, Espoo, Kauniainen, Tuusula,
Järvempää).
There has been exceptions example: Oulu &amp; Jyväslylä.
-</PRE>
+</p>
diff --git a/english/consultants/karsten_m_self.wml b/english/consultants/karsten_m_self.wml
index c9bdfff8849..e2a5dd662cb 100644
--- a/english/consultants/karsten_m_self.wml
+++ b/english/consultants/karsten_m_self.wml
@@ -1,8 +1,9 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Karsten M. Self"
-<h1>Karsten M. Self</h1>
-<hr/>
-<pre>
+<p>
Sysadmin, network, security, desktop, SAS
-Further information: http://kmself.home.netcom.com/
-</pre>
+</p>
+<p>
+Further information:
+<a href="http://kmself.home.netcom.com/">http://kmself.home.netcom.com/</a>
+</p>
diff --git a/english/consultants/kevin_l.wml b/english/consultants/kevin_l.wml
index f6e71b604ac..499a18535aa 100644
--- a/english/consultants/kevin_l.wml
+++ b/english/consultants/kevin_l.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Obsidian Consulting Group"
-<H1>Obsidian Consulting Group</H1>
-<HR>
-<PRE>
+<p>
hosting and billing services also available.
-</PRE>
+</p>
diff --git a/english/consultants/kevin_t.wml b/english/consultants/kevin_t.wml
index dffcdd3baf8..a56d10c914b 100644
--- a/english/consultants/kevin_t.wml
+++ b/english/consultants/kevin_t.wml
@@ -1,15 +1,15 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Superior Software Services"
-<H1>Superior Software Services</H1>
-<HR>
-<PRE>
+<p>
I have 10 years experience with Unix (7 with Debian GNU/Linux) specializing
in operating system administration, network security, disaster recovery, and
task automation. I also have 5+ years of experience in web application
development and support services using PHP/Perl, Javascript/CSS (DHTML),
PostgreSQL/MySQL, Apache, or other open source applications as required.
+</p>
+<p>
Please mention that you found me on debian.org and I will donate 10% of your
fee back to the Debian project.
-</PRE>
+</p>
diff --git a/english/consultants/knaepper.wml b/english/consultants/knaepper.wml
index d0814547dc8..b2cca51abbf 100644
--- a/english/consultants/knaepper.wml
+++ b/english/consultants/knaepper.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="IT Kn&auml;pper"
-<H1>IT Kn&auml;pper</H1>
-<HR>
-<PRE>
+<p>
We are experts in implementing Domino and IBM
Websphere services on Linux.Samba, HylaFax and Network-services included.
Enhance your business using Debian-Linux.
-</PRE>
+</p>
diff --git a/english/consultants/koenigsmann.wml b/english/consultants/koenigsmann.wml
index 5292315368d..fbed51c2963 100644
--- a/english/consultants/koenigsmann.wml
+++ b/english/consultants/koenigsmann.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Koenigsmann-Ingenieure"
-<H1>Koenigsmann-Ingenieure</H1>
-<HR>
-<PRE>
+<p>
We are authors of a linux-administration course
based an Debian Woody, which you can book at www.fernschule-weber.de
from begin of the year 2005.
-</PRE>
+</p>
diff --git a/english/consultants/kotarba.wml b/english/consultants/kotarba.wml
index 49cfe7affff..5ac47bc45c3 100644
--- a/english/consultants/kotarba.wml
+++ b/english/consultants/kotarba.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Kotarba.NET"
-<h1>Kotarba.NET</H1>
-<hr/>
-<pre>
+<p>
Polish and english only.
-</pre>
+</p>
diff --git a/english/consultants/kring.wml b/english/consultants/kring.wml
index 4e8935f41ff..36afcfa0c39 100644
--- a/english/consultants/kring.wml
+++ b/english/consultants/kring.wml
@@ -1,7 +1,10 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Kring Technologies India pvt Ltd"
-<h1>Kring Technologies India pvt Ltd</h1>
-<hr />
<p>
-Kring Technologies is an Offshore Software Development company based in Gurgoan, which is into customized software development services &amp; solutions and undertakes outsourced software application development &amp; maintenance projects. We also offer services in Application Development for Mobile, wireless application, Smart Cards, Java Cards, Web Services and EAI.
+Kring Technologies is an Offshore Software Development company based in
+Gurgoan, which is into customized software development services &amp;
+solutions and undertakes outsourced software application development &amp;
+maintenance projects. We also offer services in Application Development
+for Mobile, wireless application, Smart Cards, Java Cards, Web Services
+and EAI.
</p>
diff --git a/english/consultants/lawrence_c.wml b/english/consultants/lawrence_c.wml
index f32374ec660..bd4a74dda34 100644
--- a/english/consultants/lawrence_c.wml
+++ b/english/consultants/lawrence_c.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-
-<h1>Major Chai M J</h1>
+#use wml::debian::consultant name="Major Chai M J"
<p>
Availablity: Asia Pacific region (including China and Japan)
diff --git a/english/consultants/lcs.wml b/english/consultants/lcs.wml
index 04f895dd80a..4d994156eda 100644
--- a/english/consultants/lcs.wml
+++ b/english/consultants/lcs.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Linux Computing Services (A division of Alreg Scientific)"
-<h1>Linux Computing Services (A division of Alreg Scientific)</h1>
-<hr />
<p>We specialize in networked servers, Internet services, communication
software, systems development, systems integration and data security.</p>
diff --git a/english/consultants/leos.wml b/english/consultants/leos.wml
index dd29f82576b..4de0e23513b 100644
--- a/english/consultants/leos.wml
+++ b/english/consultants/leos.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Leonardo Buffa"
-<h1>Leonardo Buffa</h1>
-<hr />
<p>
Additional information, if any: Experiences in network security,
security assessment, network analysis and infrastructure review and
optimization. Creator of a slack-based live distribution
-(www.malignuz.org) actually used in some italian universities for system
-administration.
+(<a href="http://www.malignuz.org">www.malignuz.org</a>) actually used in
+some italian universities for system administration.
</p>
diff --git a/english/consultants/liberobit.wml b/english/consultants/liberobit.wml
index e0c5524dd78..36243dcfbe1 100644
--- a/english/consultants/liberobit.wml
+++ b/english/consultants/liberobit.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Studio Associato Liberobit"
-<H1>Studio Associato Liberobit</H1>
-<HR>
-<PRE>
+<p>
We made and support only Debian servers, workstation
and lan managed by Debian box
-</PRE>
+</p>
diff --git a/english/consultants/libhertz.wml b/english/consultants/libhertz.wml
index 028e3591a61..0c7e0e945b6 100644
--- a/english/consultants/libhertz.wml
+++ b/english/consultants/libhertz.wml
@@ -1,7 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Studio Associato Liberobit"
-<h1>Studio Associato Liberobit</h1>
-<hr>
<p>
-Operates almost in the whole country (Lissabon, Aveiro, Porto, Portalegre, Beja, etc.).
+Operates almost in the whole country (Lissabon, Aveiro, Porto, Portalegre,
+Beja, etc.).
</p>
diff --git a/english/consultants/libren.wml b/english/consultants/libren.wml
index ef9b1410a1e..e5d80873c9b 100644
--- a/english/consultants/libren.wml
+++ b/english/consultants/libren.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-
-<h1>Libren Informatika</h1>
+#use wml::debian::consultant name="Libren Informatika"
<p>
Full support for Debian GNU/Linux and UNIX-like
diff --git a/english/consultants/linbit.wml b/english/consultants/linbit.wml
index de7191d0aa9..31f3772b132 100644
--- a/english/consultants/linbit.wml
+++ b/english/consultants/linbit.wml
@@ -1,5 +1,3 @@
-#use wml::debian::consultant
-
-<h1>LINBIT Information Technologies GmbH</h1>
+#use wml::debian::consultant name="LINBIT Information Technologies GmbH"
<p>Specialized in HA-Clustering and Security Solutions.</p>
diff --git a/english/consultants/linbox.wml b/english/consultants/linbox.wml
index a69ce0f0691..53421e3ba77 100644
--- a/english/consultants/linbox.wml
+++ b/english/consultants/linbox.wml
@@ -1,5 +1,3 @@
-#use wml::debian::consultant
-
-<h1>Free&amp;ALter Soft / Linbox</h1>
+#use wml::debian::consultant name="Free&amp;ALter Soft / Linbox"
<p>We have several DDs in our staff.</p>
diff --git a/english/consultants/linux_ag.wml b/english/consultants/linux_ag.wml
index b1e7f219770..09d2ea66ccf 100644
--- a/english/consultants/linux_ag.wml
+++ b/english/consultants/linux_ag.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-
-<h1>Linux Information Systems AG</h1>
+#use wml::debian::consultant name="Linux Information Systems AG"
<p>The Linux Information Systems AG is specialized in working with
small and medium-sized businesses as well as authorities. Its focus
diff --git a/english/consultants/linux_box.wml b/english/consultants/linux_box.wml
index 516a7311008..13e49ac14fe 100644
--- a/english/consultants/linux_box.wml
+++ b/english/consultants/linux_box.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="The Linux Box Corporation"
-<H1>The Linux Box Corporation</H1>
-<HR>
-<PRE>
+<p>
The Linux Box Corporation is a
consulting, development, integration, support and training company,
focused on knowledge transfer, specializing in the open source and Linux
-environment.
-</PRE>
+environment.
+</p>
diff --git a/english/consultants/linux_certified.wml b/english/consultants/linux_certified.wml
index 900f5007ef5..12234ad6072 100644
--- a/english/consultants/linux_certified.wml
+++ b/english/consultants/linux_certified.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="LinuxCertified, Inc."
-<H1>LinuxCertified, Inc.</H1>
-<HR>
-<PRE>
+<p>
Debian consultants in various geographies.
-</PRE>
+</p>
diff --git a/english/consultants/linux_consultancy.wml b/english/consultants/linux_consultancy.wml
index ecce88a0b23..1d3f9791d15 100644
--- a/english/consultants/linux_consultancy.wml
+++ b/english/consultants/linux_consultancy.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="The Linux Consultancy"
-<H1>The Linux Consultancy</H1>
-<HR>
-<PRE>
+<p>
Whether you just want someone to help you sort out a Linux system, or
whether you are looking for someone to supply and maintain a Linux
server, we can help. One of our offerings is an "Office Server", which
handles all email (including spam and virus detection), file storage,
automated off-site backups, internal web pages and more.
-</PRE>
+</p>
diff --git a/english/consultants/linux_mania.wml b/english/consultants/linux_mania.wml
index 21e2fce67cc..0a100a1d476 100644
--- a/english/consultants/linux_mania.wml
+++ b/english/consultants/linux_mania.wml
@@ -1,5 +1,3 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Linux Mania"
-<h1>Linux Mania</h1>
-<hr />
<p>Linux support, installation and training.</p>
diff --git a/english/consultants/linuxcare.wml b/english/consultants/linuxcare.wml
index f250ca84da4..c8fdde33a02 100644
--- a/english/consultants/linuxcare.wml
+++ b/english/consultants/linuxcare.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Linuxcare Systems"
-<h1>Linuxcare Systems</h1>
-<hr />
<p>
Linux based networking and computing solutions for business. Linux consulting
and support for Server and business desktop systems and applications. Global
diff --git a/english/consultants/linuxmagic.wml b/english/consultants/linuxmagic.wml
index 25022164911..8924a32a4b3 100644
--- a/english/consultants/linuxmagic.wml
+++ b/english/consultants/linuxmagic.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="LinuxMagic"
-<H1>LinuxMagic</H1>
-<HR>
-<PRE>
+<p>
Pacific Northwest's Premier Linux Support House; Other Debian
based products, "LinuxMagic Workplace", "LinuxMagic Mail Server"
-</PRE>
+</p>
diff --git a/english/consultants/linuxworks.wml b/english/consultants/linuxworks.wml
index 690f8522f2d..734abe5683c 100644
--- a/english/consultants/linuxworks.wml
+++ b/english/consultants/linuxworks.wml
@@ -1,31 +1,33 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Linuxworks"
# $Id$
-<h1>Linuxworks</h1>
-<hr />
-<pre>
+<p>
Our business is to make computers and internet technology work better
for you. That is, to evaluate your computer use, listen to what you
want, and then come up with solutions that meet your needs. They may be
easier to use, quicker, have more features, be more reliable and cost
less.
-
+</p>
+<p>
We produce Debian based solutions, mainly for small organisations. We
can replace or augment other systems, both on the desktop and in the
back office/ server room. We can create a single component for a
specific task, but prefer to take a whole systems view because benefits
are greater when the whole picture is taken into account.
-
+</p>
+<p>
Our team includes experts in technologies such as Debian, Linux, exim,
sendmail, squid, apache, thttpd, samba, netatalk, c/c++, Java, python,
scripting, webware, mysql, postgres, gnome, legacy (windows) application
solutions and 802.11 wireless. We're always learning new stuff, and
we'll pick up any open source technology that will benefit you.
-
+</p>
+<p>
You may want to take a hands-on approach to your systems and give us
detailed instructions on how you want things to look. Alternatively,
you may want us leave it all to us to come up with a solution that "just
works". We're happy to work with you whatever you want.
-
+</p>
+<p>
We look forward to your call.
-</pre>
+</p>
diff --git a/english/consultants/logilab.wml b/english/consultants/logilab.wml
index dff35fa570e..87fcbdfbc4a 100644
--- a/english/consultants/logilab.wml
+++ b/english/consultants/logilab.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="LOGILAB"
-<h1>LOGILAB</h1>
-<hr/>
-<pre>
+<p>
We have DD in our staff and publish all our free software as Debian
packages, see www.logilab.org. Furthermore, we have a course about
Debian administration and a course about packaging software for Debian.
Other courses will appear on our website once written.
-</pre>
+</p>
diff --git a/english/consultants/mark_stanislav.wml b/english/consultants/mark_stanislav.wml
index 8c21f109e49..f6ddb9a9050 100644
--- a/english/consultants/mark_stanislav.wml
+++ b/english/consultants/mark_stanislav.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Mark Stanislav"
-<H1>Mark Stanislav</H1>
-<HR>
-<PRE>
+<p>
CompTIA Linux+ Certified, Linux server administration
-</PRE>
+</p>
diff --git a/english/consultants/markoer.wml b/english/consultants/markoer.wml
index 9601776dcb7..91518352060 100644
--- a/english/consultants/markoer.wml
+++ b/english/consultants/markoer.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Marco Ermini"
-<H1>Marco Ermini</H1>
-<HR>
-<PRE>
+<p>
I am a senior freelance consultant working with many GNU/Linux distributions
and many flavour of Unix. Please have a look at my resume at
<a href="http://www.markoer.org/cv/">http://www.markoer.org/cv/</a>
-</PRE>
+</p>
diff --git a/english/consultants/maroonpoint.wml b/english/consultants/maroonpoint.wml
index aa2798ea973..fde08b0c946 100644
--- a/english/consultants/maroonpoint.wml
+++ b/english/consultants/maroonpoint.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="MaroonPoint Polska Sp.J."
-<H1>MaroonPoint Polska Sp.J.</H1>
-<HR>
-<PRE>
+<p>
We are working with Debian for about 5 years. We are planning to
distribute Debian CDs in Poland, and to donate part of our income to
Debian Project.
-</PRE>
+</p>
diff --git a/english/consultants/marques_j.wml b/english/consultants/marques_j.wml
index 348b41675a7..538a83afa3c 100644
--- a/english/consultants/marques_j.wml
+++ b/english/consultants/marques_j.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Marques Johansson"
-<h1>Marques Johansson</h1>
-<hr/>
-<pre>
+<p>
An early adopter of Debian/GNU Linux, Marques Johansson, has managed Debian
systems in E-commerce, Industrial, and Research facilities since 1996. Located
in South Jersey, he offers consultation and support services throughout the
greater Philadelphia area. Contract rates will be determined by expected
resolution time and costs. A portion of proceeds will be donated to Software
in the Public Interest.
-</pre>
+</p>
diff --git a/english/consultants/mathias_kettner.wml b/english/consultants/mathias_kettner.wml
index 936a19ae098..c6f3f60e1d7 100644
--- a/english/consultants/mathias_kettner.wml
+++ b/english/consultants/mathias_kettner.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Mathias Kettner"
-<H1>Mathias Kettner</H1>
-<HR>
-<PRE>
+<p>
large scale automated installation and software
distribution, experience in other high end projects
-</PRE>
+</p>
diff --git a/english/consultants/michaeljohn_c.wml b/english/consultants/michaeljohn_c.wml
index fca655f10cd..bb0ef067861 100644
--- a/english/consultants/michaeljohn_c.wml
+++ b/english/consultants/michaeljohn_c.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Michaeljohn Clement"
-<H1>Michaeljohn Clement</H1>
-<HR>
-<PRE>
+<p>
programming, business deployment of GNU/Linux and *BSD, Web programming and
design, user interface design and implementation. C/C++/Java, Perl, SQL, PHP,
etc. End-to-end Open Source/Free Software-based solutions for your
business.
-</PRE>
+</p>
diff --git a/english/consultants/miju.wml b/english/consultants/miju.wml
index 8907056a34d..209ee80e42b 100644
--- a/english/consultants/miju.wml
+++ b/english/consultants/miju.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Miju Systems"
-<H1>Miju Systems</H1>
-<HR>
-<PRE>
+<p>
Miju Systems primarily operates in the server support area with clients
ranging from small business to large corporate users. Miju Systems
supports networked servers throughout Australia, Europe, Canada and the
USA. We are developing a standardised desktop based on Debian KDE and
also support opensource initiatives to develop Linux based financial
applications.
-</PRE>
+</p>
diff --git a/english/consultants/mind.wml b/english/consultants/mind.wml
index 2f8c371ca35..d42468dc2f7 100644
--- a/english/consultants/mind.wml
+++ b/english/consultants/mind.wml
@@ -1,14 +1,13 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Mind nv"
-<H1>Mind nv</H1>
-<HR>
-<PRE>
+<p>
Mind Linux Solutions (Leuven, Belgium) uses its competence in Open Source
software and system design to deliver solutions, consulting, development,
training and support in the field of Embedded System Development.
-
+</p>
+<p>
We use Open Source software (e.g. Linux, RTLinux, RTAI, eCos, Wonka,
gcc, gdb,...) to set up basic infrastructure for new embedded systems
(including System on Chip) and help customers with development on these
infrastructures.
-</PRE>
+</p>
diff --git a/english/consultants/minihub.wml b/english/consultants/minihub.wml
index 1176a1ffd5c..8799ba1bdc0 100644
--- a/english/consultants/minihub.wml
+++ b/english/consultants/minihub.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Minihub Communications Incorporated"
-<H1>Minihub Communications Incorporated</H1>
-<HR>
-<PRE>
+<p>
Non-government organisations (NGOs) involved in community interest,
human rights, environment and social justice issues need communication
systems which are appropriate to their needs. Debian Linux provides
secure, inexpensive, expandable solutions that run well on minimal
hardware requirements. Minihub also provides corporate consulting, and
does work all over South East Asia.
-</PRE>
+</p>
diff --git a/english/consultants/mivitec.wml b/english/consultants/mivitec.wml
index 5460a782165..dda920b2ca5 100644
--- a/english/consultants/mivitec.wml
+++ b/english/consultants/mivitec.wml
@@ -1,13 +1,15 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="MIVITEC GmbH"
-<H1>MIVITEC GmbH</H1>
-<HR>
-<PRE>
+<p>
We offer linux-based solutions for your company.
Other areas of interest:
-- we offer hosting of your linux-based servers in our datacenters in Frankfurt,
-Munich and Duesseldorf
-- webhosting (with Zope, JBoss, Typo3, Tomcat etc)
-- programming
+</p>
+<ul>
+<li>we offer hosting of your linux-based servers in our datacenters in
+ Frankfurt, Munich and Duesseldorf</li>
+<li>webhosting (with Zope, JBoss, Typo3, Tomcat etc)</li>
+<li>programming</li>
+</ul>
+<p>
Contact us for more information.
-</PRE>
+</p>
diff --git a/english/consultants/mladen_adamovic.wml b/english/consultants/mladen_adamovic.wml
index 90dd3263945..442de4361fb 100644
--- a/english/consultants/mladen_adamovic.wml
+++ b/english/consultants/mladen_adamovic.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Mladen Adamovic"
-<H1>Mladen Adamovic</H1>
-<HR>
-<PRE>
+<p>
I'm teaching assistant at Department of Computer Engineering
-</PRE>
+</p>
diff --git a/english/consultants/murphy_soft.wml b/english/consultants/murphy_soft.wml
index 805406ce21d..f230b974171 100644
--- a/english/consultants/murphy_soft.wml
+++ b/english/consultants/murphy_soft.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Murphy Software BV"
-<H1>Murphy Software BV</H1>
-<hr>
<p>
A portion of Debian-related revenues will be donated to the Debian project.
</p>
diff --git a/english/consultants/netdigix.wml b/english/consultants/netdigix.wml
index cbbc86732f3..980d8d1f876 100644
--- a/english/consultants/netdigix.wml
+++ b/english/consultants/netdigix.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Netdigix Computer and Networking solutions"
-<H1>Netdigix Computer and Networking solutions</H1>
-<HR>
-<PRE>
+<p>
out of town projects welcome
-</PRE>
+</p>
diff --git a/english/consultants/nikolai_l.wml b/english/consultants/nikolai_l.wml
index 82800daedd4..7b70bfd5f7b 100644
--- a/english/consultants/nikolai_l.wml
+++ b/english/consultants/nikolai_l.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Nikolai Lusan"
-<h1>Nikolai Lusan</h1>
-<hr/>
-<pre>
+<p>
Focusing on infrastructure I provide full solutions for small to
medium sized enterprises. Network, database and desktop solutions to
suit your needs. Solutions that use the best available technology to
service your needs.
-</pre>
+</p>
diff --git a/english/consultants/norrix.wml b/english/consultants/norrix.wml
index 4337fd79513..0261baaf23b 100644
--- a/english/consultants/norrix.wml
+++ b/english/consultants/norrix.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Norrix Associates"
-<H1>Norrix Associates</H1>
-<HR>
-<PRE>
+<p>
Norrix Associates provides remote and on site
networking solutions around the globe.
All products are based on Debian.
-</PRE>
+</p>
diff --git a/english/consultants/novochip.wml b/english/consultants/novochip.wml
index 50fafbc8944..e8af7e53bc6 100644
--- a/english/consultants/novochip.wml
+++ b/english/consultants/novochip.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Novochip Soluciones Informaticas"
-<h1>Novochip Soluciones Informaticas</h1>
-<hr />
<p>
General Consulting in Inter Intranetworking, OS's, Relational
Databases. Our flagship: Integrated LAN&amp;WAN systems with Linux.
diff --git a/english/consultants/ns_computing.wml b/english/consultants/ns_computing.wml
index b4a99d0acaf..f4258213868 100644
--- a/english/consultants/ns_computing.wml
+++ b/english/consultants/ns_computing.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="NS Computing"
-<h1>NS Computing</h1>
-<hr/>
-<pre>
+<p>
NS Computing provides custom Intranet/Internet development, network systems
design, installation and support. We use GNU/Linux (specifically Debian) for
most network servers. We offer Debian based small business servers with a
custom multiuser/multibranch Intranet web application (Email, Fax, Document
Management System, and Customer Management System). Monthly/Yearly support
contracts available.
-</pre>
+</p>
diff --git a/english/consultants/openbizz.wml b/english/consultants/openbizz.wml
index c6c87750d9e..8e9d58d7dd9 100644
--- a/english/consultants/openbizz.wml
+++ b/english/consultants/openbizz.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="OpenBizz BV"
-<H1>OpenBizz BV</H1>
-<HR>
-<PRE>
+<p>
We specialize in office environments for small and medium
sized companies.
-</PRE>
+</p>
diff --git a/english/consultants/openit.wml b/english/consultants/openit.wml
index 7b3a18cc1fc..93056161974 100644
--- a/english/consultants/openit.wml
+++ b/english/consultants/openit.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Open IT"
-<h1>Open IT</h1>
-<hr />
<p>
I use linux from 1993 and I do always System Administration/Integration
with Debian, of course.
diff --git a/english/consultants/opentechnologies.wml b/english/consultants/opentechnologies.wml
index d3cfff3cd64..1bd964eca62 100644
--- a/english/consultants/opentechnologies.wml
+++ b/english/consultants/opentechnologies.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="OpenTechnologies"
-<H1>OpenTechnologies</H1>
-<HR>
-<PRE>
+<p>
Work with FreeBSD and OpenBSD. Also works with Debian,
Gentoo, SuSE, Red Hat and Mandrake. Firewall construction. Security
consultant. LAN/WAN, Internet/Intranet integration. RDBMS's. Internet
presence.
-</PRE>
+</p>
diff --git a/english/consultants/opentrend.wml b/english/consultants/opentrend.wml
index a1b249ad2bf..689e2d45674 100644
--- a/english/consultants/opentrend.wml
+++ b/english/consultants/opentrend.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="OpenTrend Solutions Ltd"
-<H1>OpenTrend Solutions Ltd</H1>
-<HR>
-<PRE>
+<p>
We donate 2% of all gross profits to the support of open source
software. We have partnered with organisations in the United States
and Australia to better support multi-national clients.
-</PRE>
+</p>
diff --git a/english/consultants/orbit.wml b/english/consultants/orbit.wml
index 0b8f2f04527..321ecba330d 100644
--- a/english/consultants/orbit.wml
+++ b/english/consultants/orbit.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="ORBIT Technologies, Inc."
-<H1>ORBIT Technologies, Inc.</H1>
-<HR>
-<PRE>
+<p>
ORBIT Technologies provides services and products targeted at
embedded, distributed, and cross platform systems.
-</PRE>
+</p>
diff --git a/english/consultants/osourcery.wml b/english/consultants/osourcery.wml
index 27ba19ed4d7..4ae6078e256 100644
--- a/english/consultants/osourcery.wml
+++ b/english/consultants/osourcery.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="OpenSourcery, LLC"
-<h1>OpenSourcery, LLC</h1>
-<hr />
<p>Software development, GNU/Linux/BSD servers, and network
design/installation/security</p>
diff --git a/english/consultants/ossafrica.wml b/english/consultants/ossafrica.wml
index 7ca99600b3e..7d41aee7b67 100644
--- a/english/consultants/ossafrica.wml
+++ b/english/consultants/ossafrica.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="OSS Africa"
-<h1>OSS Africa</h1>
-<hr />
<p>
Specialised in server installation and management.
</p>
diff --git a/english/consultants/ouattara.wml b/english/consultants/ouattara.wml
index ea0c325c8b4..2f584bfd593 100644
--- a/english/consultants/ouattara.wml
+++ b/english/consultants/ouattara.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Sefie Janvier OUATTARA"
# $Id$
-<h1>Sefie Janvier OUATTARA</h1>
-
<p>
Databases and Applications servers Expert.
</p>
diff --git a/english/consultants/oxalide.wml b/english/consultants/oxalide.wml
index 3e5d62b7673..50631fc0332 100644
--- a/english/consultants/oxalide.wml
+++ b/english/consultants/oxalide.wml
@@ -1,4 +1,7 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Oxalide"
-<h1>Oxalide</h1>
-<p>Oxalide is a french consultancy firm and solution provider. Our fields of expertise include UNIX software system deployment such as secure mail systems (SMTP, POP, IMAP), advanced Web server configurations, high-availability firewalling, etc. Our knowledge of Debian Linux, *BSD, Commercial Unix and Linux is thorough.</p>
+<p>Oxalide is a french consultancy firm and solution provider. Our fields
+of expertise include UNIX software system deployment such as secure mail
+systems (SMTP, POP, IMAP), advanced Web server configurations,
+high-availability firewalling, etc. Our knowledge of Debian Linux, *BSD,
+Commercial Unix and Linux is thorough.</p>
diff --git a/english/consultants/pahne.wml b/english/consultants/pahne.wml
index 82a9bec6085..d71296766c5 100644
--- a/english/consultants/pahne.wml
+++ b/english/consultants/pahne.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-
-<h1>IT-Service Andy Pahne</h1>
+#use wml::debian::consultant name="IT-Service Andy Pahne"
<p>
Linux and Open Source working experience since 1996.
diff --git a/english/consultants/parreiras_m.wml b/english/consultants/parreiras_m.wml
index 72fdf055c19..8f1ce400e0a 100644
--- a/english/consultants/parreiras_m.wml
+++ b/english/consultants/parreiras_m.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="M&aacute;rcio H. Parreiras"
-<H1>M&aacute;rcio H. Parreiras</H1>
-<HR>
-<PRE>
+<p>
Servers, workstations, networking, etc.
-</PRE>
+</p>
diff --git a/english/consultants/penguintechs.wml b/english/consultants/penguintechs.wml
index 85c9782bbf2..c3996c37ae3 100644
--- a/english/consultants/penguintechs.wml
+++ b/english/consultants/penguintechs.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Penguin Techs"
-<h1>Penguin Techs</h1>
-<hr />
<p>
Penguin Techs specializes in Asterisk PBX deployments and
integrating free and open source software into existing information
diff --git a/english/consultants/pete_b.wml b/english/consultants/pete_b.wml
index d0b74c9e78c..9cfcf98abca 100644
--- a/english/consultants/pete_b.wml
+++ b/english/consultants/pete_b.wml
@@ -1,25 +1,27 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="ELB Internet Services"
-<h1>ELB Internet Services</h1>
-
-<p>ELB specializes in providing complete end-to-end Internet solutions
+<p>
+ELB specializes in providing complete end-to-end Internet solutions
to business and government - from simple email to Web solutions to
enterprise wide Internet connectivity.
+</p>
-<p>ELB's areas of expertise include:
+<p>
+ELB's areas of expertise include:
+</p>
<ul>
<li> The installation, upgrade and support of Debian Linux for
DNS, mail servers, firewalls, routers, Web servers,
- database solutions, fax broadcasting...
+ database solutions, fax broadcasting...</li>
<li> Web Site Development and Hosting - Complete Debian based
- Web solutions. Contact us for a list of current customers.
+ Web solutions. Contact us for a list of current customers.</li>
<li> Providing small and medium sized businesses with affordable
answers to their technology needs and the on-going support
- to maximize their investment.
+ to maximize their investment.</li>
<li> Please mention that you found us through Debian.org. We will
pay to Debian our standard 5% referral fee for all jobs
- originating here.
+ originating here.</li>
</ul>
diff --git a/english/consultants/peter_d.wml b/english/consultants/peter_d.wml
index 0175d27cac5..c137aa75902 100644
--- a/english/consultants/peter_d.wml
+++ b/english/consultants/peter_d.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-
-<h1>Kangaroot Linux Solutions</h1>
+#use wml::debian::consultant name="Kangaroot Linux Solutions"
<p>Belgian Linux consultants focussed on Debian support and
installations. Mail, File, Webservers, Firewalls, Groupwareservers, VPN,
-e-commerce, ...
+e-commerce, ...</p>
<p>We monitor your machines from our NOC and fix before problems
arise. Remote management, on-site support, auditing and training for
-Debian, other Linuxes, Samba, Sendmail, proftpd, Apache, ...
+Debian, other Linuxes, Samba, Sendmail, proftpd, Apache, ...</p>
diff --git a/english/consultants/peter_naulls.wml b/english/consultants/peter_naulls.wml
index 878e6461904..4a338eb2476 100644
--- a/english/consultants/peter_naulls.wml
+++ b/english/consultants/peter_naulls.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Peter Naulls"
-<H1>Peter Naulls</H1>
-<HR>
-<PRE>
+<p>
I specialise in ARM Linux, including kernel development, but also have
experitise in many areas of Linux, especially deployment of Debian
systems. I also have contributed significant time to helping the
Debian project.
-</PRE>
+</p>
diff --git a/english/consultants/picone.wml b/english/consultants/picone.wml
index 241eeebbda9..8d79440781b 100644
--- a/english/consultants/picone.wml
+++ b/english/consultants/picone.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Ants S.p.a."
-<h1>Ants S.p.a.</h1>
-<hr>
<p>
UNIX (Debian, Linux), LAN, WAN, Internet technologies (WWW, FTP,
DNS, email, etc..), server farm load-balancing, high availability,
diff --git a/english/consultants/pits.wml b/english/consultants/pits.wml
index cef5ca6ebd4..7ff81b4e5aa 100644
--- a/english/consultants/pits.wml
+++ b/english/consultants/pits.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="PiTS - Peruzzi Thomas D.I.(FH)"
-<h1>PiTS - Peruzzi Thomas D.I.(FH)</h1>
-<hr />
<p>
OTRS, ITIL, OpenGroupware
</p>
diff --git a/english/consultants/porcacchia.wml b/english/consultants/porcacchia.wml
index 3c38223da0f..902d1e8174f 100644
--- a/english/consultants/porcacchia.wml
+++ b/english/consultants/porcacchia.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Alessio Porcacchia"
-<h1>Alessio Porcacchia</h1>
-<hr />
<p>
Senior Linux and Unix Sysadmin
IT security specialist (hardening and auditing)
diff --git a/english/consultants/praksys.wml b/english/consultants/praksys.wml
index f4e7237c530..a021210aa83 100644
--- a/english/consultants/praksys.wml
+++ b/english/consultants/praksys.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="PraKsys"
-<H1>PraKsys</H1>
-<HR>
-<PRE>
+<p>
Migration of complete information systems to Debian.
The Praksys distribution is available, provided you own a woody system and some skills,
on gna.prg/pkaksys.
PraKsys (Guillaume Pernot) was present at the Debconf in Porto Allegre.
-</PRE>
+</p>
diff --git a/english/consultants/produktivit.wml b/english/consultants/produktivit.wml
index 62565d0dcbc..061e1f48f49 100644
--- a/english/consultants/produktivit.wml
+++ b/english/consultants/produktivit.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="produktivIT"
-<H1>produktivIT</H1>
-<HR>
-<PRE>
+<p>
Special focus on cost savings within IT, return on investment calculation,
migration to Open Source technologies. Thorough expertise in departmental
workgroup servers within heterogenous network environment and content
management systems. produktivIT sponsors the Debian and the OpenGroupware
projects with hardware donations, the KDE Debian Enterprise project with
manpower and the OpenOffice.org KDE integration with financial support.
-</PRE>
+</p>
diff --git a/english/consultants/prolibre.wml b/english/consultants/prolibre.wml
index 94a0694f45e..2a8b1b18238 100644
--- a/english/consultants/prolibre.wml
+++ b/english/consultants/prolibre.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="ProLibre"
-<H1>ProLibre</H1>
-<HR>
-<PRE>
+<p>
Linux server installations of Debian, migration to Linux, development, support,
maintenance and training since 2000.
-</PRE>
+</p>
diff --git a/english/consultants/prosa.wml b/english/consultants/prosa.wml
index c21bd07af0f..e6a21951998 100644
--- a/english/consultants/prosa.wml
+++ b/english/consultants/prosa.wml
@@ -1,14 +1,14 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="PROSA Progettazione Sviluppo Aperto"
-<h1>PROSA Progettazione Sviluppo Aperto</h1>
-<hr/>
-<pre>
+<p>
We sell pre-installed Debian Linux systems. We give commercial
support on Debian Linux.
-
+</p>
+<p>
We are the author of PROSA/Debian, an italian version of
Debian, which is sell on our systems.
-
+</p>
+<p>
PROSA uses, produces, and sells only free software based solutions.
-</pre>
+</p>
diff --git a/english/consultants/python_byte.wml b/english/consultants/python_byte.wml
index 6d0e293c303..242f6ff9bac 100644
--- a/english/consultants/python_byte.wml
+++ b/english/consultants/python_byte.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Python Byte Solutions"
-<H1>Python Byte Solutions</H1>
-<HR>
-<PRE>
+<p>
We are a full-service IT consulting company providing services
including: software development, software installation/support, system
administration, and hosting. Our specialties include open source
technologies such as GNU/Linux, Zope, and Python. If you let us know
that Debian.org sent you, we will donate 5% of all revenue we receive
from you to Debian!!
-</PRE>
+</p>
diff --git a/english/consultants/qualsoftservices.wml b/english/consultants/qualsoftservices.wml
index 7ef0bdb6e91..e38659e16d0 100644
--- a/english/consultants/qualsoftservices.wml
+++ b/english/consultants/qualsoftservices.wml
@@ -1,11 +1,11 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="QualSoft Services"
-<h1>QualSoft Services</h1>
-<hr />
<p>
QualSoft Services, offshore software development company offering
offshore software development services for its customers worldwide and
producing own software products.
+</p>
+<p>
Specialized in customized software development, web based applications,
e-Commerce solutions, PDA based applications, Client server
applications. Desktop applications. Our focus is software testing,
diff --git a/english/consultants/qulix.wml b/english/consultants/qulix.wml
index 712258893ff..fb8e2c6f9b4 100644
--- a/english/consultants/qulix.wml
+++ b/english/consultants/qulix.wml
@@ -1,11 +1,13 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Qulix Systems"
# $Id$
-<h1>Qulix Systems</h1>
-
<p>
-Qulix is an offshore software development company headquartered in Minsk, Belarus.
+Qulix is an offshore software development company headquartered in Minsk,
+Belarus.
</p>
<p>
-One of our primary areas of expertise is system-level programming / administration of Linux based applications. From years of experience we have accumulated significant knowledge of working with Debian Linux, so we would be very happy to share it with community.
+One of our primary areas of expertise is system-level
+programming / administration of Linux based applications. From years of
+experience we have accumulated significant knowledge of working with
+Debian Linux, so we would be very happy to share it with community.
</p>
diff --git a/english/consultants/r3deng.wml b/english/consultants/r3deng.wml
index 22ba68a3b34..def51f4c086 100644
--- a/english/consultants/r3deng.wml
+++ b/english/consultants/r3deng.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="R3dEngineering"
-<h1>R3dEngineering</h1>
-<hr />
<p>
Supplies software in J2EE (Tomcat, JSP, Mysql, Oracle, Web services) and Php.
Supports the Debian platform: webmanagement, email, ftp, database, etc.
diff --git a/english/consultants/r_w_r.wml b/english/consultants/r_w_r.wml
index c6254e92a52..dfb49d97507 100644
--- a/english/consultants/r_w_r.wml
+++ b/english/consultants/r_w_r.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Daily Data, Inc."
-<H1>Daily Data, Inc.</H1>
-<HR>
-<PRE>
+<p>
We are a one-stop shop serving everyone from individuals to large
corporations, with help ranging from setting up home based systems to web
site hosting and creation to small business networks and writing custom
@@ -12,4 +10,4 @@ Windows, Mac's and specialize in integrated networks containing all of
them (we'll even throw in a Novell server if you twist our arms and pay
lots of money). If we can't do it, we know someone who can and will refer
you to them (no referral fee).
-</PRE>
+</p>
diff --git a/english/consultants/rafez_n.wml b/english/consultants/rafez_n.wml
index 833f942c0a3..147c87c4b78 100644
--- a/english/consultants/rafez_n.wml
+++ b/english/consultants/rafez_n.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Gazelle Informatics Ltd"
# $Id$
-<H1>Gazelle Informatics Ltd</H1>
-
<p>Specialists in Lotus Domino on Debian</p>
diff --git a/english/consultants/researchut.wml b/english/consultants/researchut.wml
index 3aa4a2dc761..b870c7b9889 100644
--- a/english/consultants/researchut.wml
+++ b/english/consultants/researchut.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="RESEARCHUT"
-<h1>RESEARCHUT</h1>
-<hr>
<p>
RESEARCHUT provides customized remote and limited
on-site network and maintenance solutions around the globe.
diff --git a/english/consultants/robert_millan.wml b/english/consultants/robert_millan.wml
index ddc1896f547..85845326330 100644
--- a/english/consultants/robert_millan.wml
+++ b/english/consultants/robert_millan.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Robert Millan"
-<H1>Robert Millan</H1>
-<HR>
-<PRE>
+<p>
Maintainance / Administration of Debian servers and workstations.
Ethernet, TCP/IP, routing, firewalling, httpd, mail, samba, etc.
-</PRE>
+</p>
diff --git a/english/consultants/sam_solutions.wml b/english/consultants/sam_solutions.wml
index f5d98bbedaf..d3f0cde139c 100644
--- a/english/consultants/sam_solutions.wml
+++ b/english/consultants/sam_solutions.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="SaM Solutions"
-<h1>SaM Solutions</h1>
-<hr />
<p>Located in the USA, Western and Eastern Europe, SaM Solutions offers
offshore software development &amp; BPO services enabling leading US and
European businesses to optimize their costs on, and ensure the quality of
diff --git a/english/consultants/samantha_s.wml b/english/consultants/samantha_s.wml
index 5d2f7ba71ec..11015c90d80 100644
--- a/english/consultants/samantha_s.wml
+++ b/english/consultants/samantha_s.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Femtech"
-<h1>Femtech</h1>
-<hr>
<ul>
<li>ISP Solutions</li>
<li>Business Solutions</li>
diff --git a/english/consultants/samurai.wml b/english/consultants/samurai.wml
index 54f0fb9c36c..43364b62b8b 100644
--- a/english/consultants/samurai.wml
+++ b/english/consultants/samurai.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Samurai - Projetos Especiais"
-<h1>Samurai - Projetos Especiais</h1>
-<hr />
<p>Debian Linux, Plone, Zope, Samurai Linux.</p>
<p>Clients and Partners: APTEL, CESAR, Sun Microsystems, Siemens,
T-Systems.</p>
diff --git a/english/consultants/scheeder.wml b/english/consultants/scheeder.wml
index 92037c6a450..6a78f550453 100644
--- a/english/consultants/scheeder.wml
+++ b/english/consultants/scheeder.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Scheeder &amp; Partner GmbH"
-<h1>Scheeder &amp; Partner GmbH</h1>
-<hr />
<p>
We support Debian servers in industry and health care since 1995,
we support the full Debian range, samba, freeswan, postgresql and
others. We are familiar with several open source applications.
Please feel free to ask us your questions!
-</p> \ No newline at end of file
+</p>
diff --git a/english/consultants/seattlelinux.wml b/english/consultants/seattlelinux.wml
index 7e667ce7894..7d80a283fa8 100644
--- a/english/consultants/seattlelinux.wml
+++ b/english/consultants/seattlelinux.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Seattle Linux, Inc"
-<h1>Seattle Linux, Inc</h1>
-<hr />
<p>
Linux and Open Source services for small business
</p>
diff --git a/english/consultants/sergio_a.wml b/english/consultants/sergio_a.wml
index 564726f4354..c8a506e1612 100644
--- a/english/consultants/sergio_a.wml
+++ b/english/consultants/sergio_a.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Sergio Arias"
-<H1>Sergio Arias</H1>
-<HR>
-<PRE>
+<p>
multipurpose developments
-</PRE>
+</p>
diff --git a/english/consultants/serverflow.wml b/english/consultants/serverflow.wml
index 09859194ae4..4fa2e55387a 100644
--- a/english/consultants/serverflow.wml
+++ b/english/consultants/serverflow.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Serverflow consulting, d.o.o."
-<h1>Serverflow consulting, d.o.o.</h1>
-<hr />
<p>
Can telecomute for jobs elsewhere.
</p>
diff --git a/english/consultants/servitux.wml b/english/consultants/servitux.wml
index 55541985b64..85d5f6d38ea 100644
--- a/english/consultants/servitux.wml
+++ b/english/consultants/servitux.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="ServiTux Servicios Inform&aacute;ticos S.L"
-<h1>ServiTux Servicios Inform&aacute;ticos S.L</h1>
-<hr />
<p>
In ServiTux we develop and implement all solutions with Debian Linux.
We offer Debian support and training too.
diff --git a/english/consultants/shannon_d.wml b/english/consultants/shannon_d.wml
index 5459b1dceb3..c00a5b3495f 100644
--- a/english/consultants/shannon_d.wml
+++ b/english/consultants/shannon_d.wml
@@ -1,13 +1,14 @@
-#use wml::debian::consultant
-
-<h1>DeaTech Research Inc.</h1>
+#use wml::debian::consultant name="DeaTech Research Inc."
<p>Real-time, device driver, and embedded systems specialist.
Extensive experience in system administration, web development, and many
other areas as well. Eleven years Linux experience (mostly Debian),
seventeen years UNIX experience. BS Computer Science, 22 years
professional experience, 17 years in business. For more detailed
-information, please visit website at: <a href="http://www.deatech.com/">www.deatech.com</a>
+information, please visit website at:
+<a href="http://www.deatech.com/">www.deatech.com</a>
+</p>
<p>Reference the Debian web site and five percent of the proceeds for labor
related charges on your project will be donated to Debian.
+</p>
diff --git a/english/consultants/simone_giustetti.wml b/english/consultants/simone_giustetti.wml
index 64749d2c4f3..11f8df87c46 100644
--- a/english/consultants/simone_giustetti.wml
+++ b/english/consultants/simone_giustetti.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Studio Simone Giustetti"
-<h1>Studio Simone Giustetti</h1>
-<hr />
<p>
We are an engineering studio with focus on IT consulting and software or system
engineering services to businesses of all sizes. We have many year experience of
diff --git a/english/consultants/sine_nomine.wml b/english/consultants/sine_nomine.wml
index 01820b373fc..d56e3703ce3 100644
--- a/english/consultants/sine_nomine.wml
+++ b/english/consultants/sine_nomine.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Sine Nomine Associates"
-<H1>Sine Nomine Associates</H1>
-<HR>
-<PRE>
+<p>
Sine Nomine Associates is a research and development company focused
on bringing developing technology to practical business solutions.
-</PRE>
+</p>
diff --git a/english/consultants/sniffer.wml b/english/consultants/sniffer.wml
index c24fefe537f..bb5f0916661 100644
--- a/english/consultants/sniffer.wml
+++ b/english/consultants/sniffer.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-
-<h1>Sniffer Networks Ltda.</h1>
+#use wml::debian::consultant name="Sniffer Networks Ltda."
<p>
Specialized in Web Applications Server and Crash Recovery
diff --git a/english/consultants/softitaly.wml b/english/consultants/softitaly.wml
index 33f65caed39..73f5cdc3a35 100644
--- a/english/consultants/softitaly.wml
+++ b/english/consultants/softitaly.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Softitaly S.n.c."
-<h1>Softitaly S.n.c.</h1>
-<hr />
<p>
Available in north Italy
</p>
diff --git a/english/consultants/soleyman.wml b/english/consultants/soleyman.wml
index a6fbaf4a76b..174f12785f5 100644
--- a/english/consultants/soleyman.wml
+++ b/english/consultants/soleyman.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="The Soleyman Group"
-<h1>The Soleyman Group</h1>
-<hr />
<p>
Provide managed services and business technical consulting to
prospective clients in addition to system and network administration,
diff --git a/english/consultants/solutionsfirst.wml b/english/consultants/solutionsfirst.wml
index bff9f8e15a4..77f5fae62b7 100644
--- a/english/consultants/solutionsfirst.wml
+++ b/english/consultants/solutionsfirst.wml
@@ -1,9 +1,11 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Solutions First"
-<h1>Solutions First</h1>
-<hr />
<p>
-Solutions First is a Sydney based information technology consultancy. We provide a wide range of services and support to a large variety of businesses, spanning medium sized enterprise through to home offices. Our focus is to provide prompt, cost effective services that suit your requirements. Some examples of our specialties are:
+Solutions First is a Sydney based information technology consultancy. We
+provide a wide range of services and support to a large variety of businesses,
+spanning medium sized enterprise through to home offices. Our focus is to
+provide prompt, cost effective services that suit your requirements. Some
+examples of our specialties are:
</p>
<ul>
<li>Linux consultancy</li>
@@ -14,4 +16,8 @@ Solutions First is a Sydney based information technology consultancy. We provide
<li>Domain, web &amp; email hosting</li>
</ul>
<p>
-We are personable people and emphasise simplicity in the way we carry out our services for clients. We make sure you understand the why, what, when and how of every situation. Our job is to relieve you of technology problems so you can get back to what you do best. </p>
+We are personable people and emphasise simplicity in the way we carry out our
+services for clients. We make sure you understand the why, what, when and how
+of every situation. Our job is to relieve you of technology problems so you can
+get back to what you do best.
+</p>
diff --git a/english/consultants/sosa.wml b/english/consultants/sosa.wml
index 20929b6cb78..c67f3fee757 100644
--- a/english/consultants/sosa.wml
+++ b/english/consultants/sosa.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Corporaci&oacute;n Sosa &amp; Sosa C.A."
-<H1>Corporaci&oacute;n Sosa &amp; Sosa C.A.</H1>
-<HR>
-<PRE>
+<p>
OS, Networks and Security.
-</PRE>
+</p>
diff --git a/english/consultants/steve_l.wml b/english/consultants/steve_l.wml
index 2ab2a8dcfa6..acb911e6fa3 100644
--- a/english/consultants/steve_l.wml
+++ b/english/consultants/steve_l.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="David Goodenough &amp; Associates Limited (DGA)"
-<H1>David Goodenough &amp; Associates Limited (DGA)</H1>
-<HR>
-<PRE>
+<p>
Additional Information: DGA specialise in connectivity, and have been
described as "Technical Glue manufacturers". We have experience with
Enterprise systems, and have worked extensively with Lotus Domino,
Websphere and Tomcat Web servers and Java programming. We also work with
corporate eMail systems, building bridges between legacy and SMTP systems
and doing migrations.
-</PRE>
+</p>
diff --git a/english/consultants/storitback.wml b/english/consultants/storitback.wml
index faaf2a9c58a..ed7b392744e 100644
--- a/english/consultants/storitback.wml
+++ b/english/consultants/storitback.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Stor IT Back, GbR"
-<h1>Stor IT Back, GbR</h1>
-<hr />
<p>
Support for Storage and Backup, Debian and SAN, Debian and iSCSI, Debian and
Backup, Cluster, NAS and Filesystems.
diff --git a/english/consultants/stuart_t.wml b/english/consultants/stuart_t.wml
index b2b075f1346..07da0526f9f 100644
--- a/english/consultants/stuart_t.wml
+++ b/english/consultants/stuart_t.wml
@@ -1,5 +1,3 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Linux Labs"
-<h1>Linux Labs</h1>
-
-<p>LinuxBIOS and Cluster specialists
+<p>LinuxBIOS and Cluster specialists</p>
diff --git a/english/consultants/syscovery.wml b/english/consultants/syscovery.wml
index ed3c355c0af..8314e77a771 100644
--- a/english/consultants/syscovery.wml
+++ b/english/consultants/syscovery.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="syscovery network services GmbH"
-<h1>syscovery network services GmbH</h1>
-<hr />
<p>
syscovery can work for you on regional and
nationwide projects.
diff --git a/english/consultants/tagfl.wml b/english/consultants/tagfl.wml
index e484800f22e..2d442bb00d3 100644
--- a/english/consultants/tagfl.wml
+++ b/english/consultants/tagfl.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Technology Associates Group"
# $Id$
-<h1>Technology Associates Group</h1>
-
<p>
Technology Associates Group (TAG) is a computer network consulting and service
firm located in Ocala, Florida.
diff --git a/english/consultants/tecexperts.wml b/english/consultants/tecexperts.wml
index 644ee29b83f..854c29ae523 100644
--- a/english/consultants/tecexperts.wml
+++ b/english/consultants/tecexperts.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="TecExpers"
# $Id$
-<h1>TecExpers</h1>
-
<p>
We have expertise in these areas.
</p>
diff --git a/english/consultants/ted_j.wml b/english/consultants/ted_j.wml
index 3ad034d64e5..cdbff05d6f4 100644
--- a/english/consultants/ted_j.wml
+++ b/english/consultants/ted_j.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="JordanTeam IT Training"
# $Id$
-<h1>JordanTeam IT Training</h1>
-
<p>Specialize in Unix, Linux, and Solaris Training.
Consulting includes Data Security, Disaster Recovery,
and Porting Applications to Unix/Linux.</p>
diff --git a/english/consultants/tegtmeier.wml b/english/consultants/tegtmeier.wml
index d31ca23defc..9536998cdd8 100644
--- a/english/consultants/tegtmeier.wml
+++ b/english/consultants/tegtmeier.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Tegtmeier Internet Solutions e.K."
-<h1>Tegtmeier Internet Solutions e.K.</h1>
-<hr />
<p>
Planning, realization, development and maintenance of internet projects
running on Debian. Focused on internet-security, performance/optimization
diff --git a/english/consultants/terran_universal_systems.wml b/english/consultants/terran_universal_systems.wml
index ac579e17347..d0696e38569 100644
--- a/english/consultants/terran_universal_systems.wml
+++ b/english/consultants/terran_universal_systems.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Terran Univeral Systems"
-<h1>Terran Univeral Systems</h1>
-<hr/>
<h2>
Terran Universal Systems -&gt; Quality - Nothing Less!
</h2>
diff --git a/english/consultants/thoughtprocess.wml b/english/consultants/thoughtprocess.wml
index 3534ccdbac4..b57f8baf525 100644
--- a/english/consultants/thoughtprocess.wml
+++ b/english/consultants/thoughtprocess.wml
@@ -1,8 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="ThoughtProcess.net, Inc."
# $Id$
-<h1>ThoughtProcess.net, Inc.</h1>
-
<p>
-We offer Windows and Novell migration to linux. We also develop custom integrated systems for all applications. Debian linux is our preferred platform but we can work with any linux based distribution.
+We offer Windows and Novell migration to linux. We also develop custom
+integrated systems for all applications. Debian linux is our preferred platform
+but we can work with any linux based distribution.
</p>
diff --git a/english/consultants/tim_o.wml b/english/consultants/tim_o.wml
index 8bcde290222..2b124ac1a06 100644
--- a/english/consultants/tim_o.wml
+++ b/english/consultants/tim_o.wml
@@ -1,15 +1,15 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="OASys Engineering"
-<H1>OASys Engineering</H1>
-<HR>
-<PRE>
+<p>
Additional Information: OASys specializes in serving the small to medium
size business community in all their computing needs. We recommend the
Debian Linux and Samba combination over Windows NT Server due to Debian's
stability, robust operation, and absence of licensing headaches. In
addition, we service most Unix variants as well as Windows 95, 98, and NT.
+</p>
+<p>
OASys also offers training and basic administration classes upon
request/special arrangement.
-</PRE>
+</p>
diff --git a/english/consultants/togaware.wml b/english/consultants/togaware.wml
index dcd7d144b18..659bc23878a 100644
--- a/english/consultants/togaware.wml
+++ b/english/consultants/togaware.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Togaware"
-<h1>Togaware</h1>
-<hr/>
-<pre>
+<p>
Togaware has over 10 years experience in installing Debian GNU/Linux
systems for both industry and government, as well as home users. Our
Debian GNU/Linux Desktop Survival Guide is widely referenced and
continually updated. We also make available the Debian package wajig
which simplifies system and package management for Debian.
-</pre>
+</p>
diff --git a/english/consultants/toni_m.wml b/english/consultants/toni_m.wml
index 2316aaafdb0..0957d7680eb 100644
--- a/english/consultants/toni_m.wml
+++ b/english/consultants/toni_m.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Oeko.neT"
-<H1>Oeko.neT</H1>
-<HR>
-<PRE>
+<p>
Toni holds a University degree in computer science (Dipl.-Inf.)
and has now some 10 years experience as a consultant in the
networking area. Customers as large as PLCs enjoy projects
@@ -16,4 +14,4 @@ ISP background there.
Available for tasks in other countries as well, depending
on the specifics. We offer Debian housing &amp; hosting, both
managed and unmanaged.
-</PRE>
+</p>
diff --git a/english/consultants/transparen.wml b/english/consultants/transparen.wml
index 5eebbc1b620..83693e2f9cb 100644
--- a/english/consultants/transparen.wml
+++ b/english/consultants/transparen.wml
@@ -1,57 +1,69 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Transparen Corporation"
-<h1>Transparen Corporation</h1>
-<hr/>
-<pre>
+<p>
Transparen Corporation incorporated within Canada with offices physically
located in the province of British Columbia (BC), Canada.
Transparen Corporation provides services to businesses in Canada,
the United States (USA), the United Kingdom, and many other parts of the
world. Transparen Corporation can accept credit card payments and can
deliver custom software anywhere that has Internet access.
-
+</p>
+<p>
Transparen Corporation makes use of a global network of support
professionals, including programmers in Canada, the United States, Russia,
and Ukraine. Transparen's consultants are located in Canada and the
United States.
-
+</p>
+<p>
Transparen has several principle service areas, which include:
-- Linux and Windows technical support
-- Linux customization
-- Technical Writing
-- Custom Software Projects
-
+</p>
+<ul>
+<li>Linux and Windows technical support</li>
+<li>Linux customization</li>
+<li>Technical Writing</li>
+<li>Custom Software Projects</li>
+</ul>
+<p>
Clients in India and Pakistan make use of Transparen's technical writing
services, while clients in Canada and the United States make use of
Transparen's Linux customization capabilities, or other custom software
projects.
-
+</p>
+<p>
Transparen's average project size is 12,000 USD, with some projects as
large as 100,000 USD, and some as small as 2,000 USD.
-
+</p>
+<p>
Transparen provides commercial Debian
support to clients requesting web or email servers for business
applications. Service is provide on-site or by remote methods, as
appropriate.
-
+</p>
+<p>
Transparen Corporation supports clients in their use of Debian to
replace Microsoft Windows domain controllers, where appropriate.
-
+</p>
+<p>
Transparen Corporation provides Linux customization services to
clients who wish to produce Debian-based kiosks for retail locations.
-
+</p>
+<p>
Transparen Corporation employs a computer running Debian as part of a
custom hard drive data recovery process.
-
+</p>
+<p>
Transparen Corporation supports Debian and uses Debian for desktop and
server functions, and supports commercial clients who use Debian.
-
+</p>
+<p>
Transparen can assist clients with scripting and decision
support tools that utilize the Debian system as an underlying technology.
-
+</p>
+<p>
Transparen can provide insights into how to use Debian to make a
wide variety of businesses more efficient and profitable.
-
+</p>
+<p>
Transparen uses computers with the Debian operating system in its research
into optimizing business processes and decision support processes.
-</pre>
+</p>
diff --git a/english/consultants/triona.wml b/english/consultants/triona.wml
index 852271f3b60..74414174168 100644
--- a/english/consultants/triona.wml
+++ b/english/consultants/triona.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Triona - Information und Technologie GmbH"
-<h1>Triona - Information und Technologie GmbH</h1>
-<hr/>
-<pre>
+<p>
Unix systems installation and administration, customized software,
IT consulting.
-</pre>
+</p>
diff --git a/english/consultants/trisinus.wml b/english/consultants/trisinus.wml
index 5d74772f74c..763c6f5f8d2 100644
--- a/english/consultants/trisinus.wml
+++ b/english/consultants/trisinus.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Trisinus GmbH &amp; Co KG"
-<h1>Trisinus GmbH &amp; Co KG</h1>
-<hr>
<p>
We are offering commercial support for Linux since 1995. While our
main focus is on Debian and SuSE distributions we are willing and able
diff --git a/english/consultants/trusted.wml b/english/consultants/trusted.wml
index c9ac004d75b..35128c7ca82 100644
--- a/english/consultants/trusted.wml
+++ b/english/consultants/trusted.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Trusted Solutions s.r.o."
# $Id$
-<h1>Trusted Solutions s.r.o.</h1>
-
<p>
Trusted Solutions is young and progressive company oriented on
delivering sophisticated solutions. Our solutions are often based on
diff --git a/english/consultants/trustsec.wml b/english/consultants/trustsec.wml
index 4fc47fe42f7..20a8759bb08 100644
--- a/english/consultants/trustsec.wml
+++ b/english/consultants/trustsec.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-
-<h1>trustsec IT solutions GmbH</h1>
+#use wml::debian::consultant name="trustsec IT solutions GmbH"
<p>trustsec is a Debian development partner and pays two Debian
developers to work on the S/390 port of Debian.
diff --git a/english/consultants/turinglabs.wml b/english/consultants/turinglabs.wml
index 9ca32b36f94..c7b4f12c87c 100644
--- a/english/consultants/turinglabs.wml
+++ b/english/consultants/turinglabs.wml
@@ -1,15 +1,16 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Turing Labs, LLC"
-<H1>Turing Labs, LLC</H1>
-<HR>
-<PRE>
+<p>
GNU/Linux Network security integration,
redundant firewalls, IDS, WAN routers, security assessment and onsite
support for Connecticut/Massachusetts, USA. Web/database application
programming.
-
+</p>
+<p>
Debian is our preferred server platform.
-
+</p>
+<p>
We also provide Internet/phone support, and free support through the Greater
-Hartford GNU/Linux User's Group (http://ghglug.org) meetings and forums.
-</PRE>
+Hartford GNU/Linux User's Group
+(<a href="http://ghglug.org">http://ghglug.org</a>) meetings and forums.
+</p>
diff --git a/english/consultants/turo_technology.wml b/english/consultants/turo_technology.wml
index 859b2155bf7..ea90ec7d789 100644
--- a/english/consultants/turo_technology.wml
+++ b/english/consultants/turo_technology.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Turo Technology LLP"
-<H1>Turo Technology LLP</H1>
-<HR>
-<PRE>
+<p>
Debian developer. Free software preferred. GPG email preferred.
Primarily system administration, troubleshooting and web-based
application development/deployment. Esperantisto.
-</PRE>
+</p>
diff --git a/english/consultants/udslinux.wml b/english/consultants/udslinux.wml
index 96f79e840e2..6e6984655c9 100644
--- a/english/consultants/udslinux.wml
+++ b/english/consultants/udslinux.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="UDS Linux"
-<h1>UDS Linux</h1>
-<hr />
<p>
Specialist for Groupware, Security, OpenOffice, Samba
</p>
diff --git a/english/consultants/ullrich-it-consult.wml b/english/consultants/ullrich-it-consult.wml
index bb095a4d193..5b538154e46 100644
--- a/english/consultants/ullrich-it-consult.wml
+++ b/english/consultants/ullrich-it-consult.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Ullrich-IT-Consult"
-<H1>Ullrich-IT-Consult</H1>
-<HR>
-<PRE>
+<p>
For further information: please look at my homepage, send e-mail or phone
directly.
All solutions will be made exclusive with free software (according to GPL and
"Debian"-rules).
-</PRE>
+</p>
diff --git a/english/consultants/ultreia.wml b/english/consultants/ultreia.wml
index 13dbb0a468d..e057cb61dee 100644
--- a/english/consultants/ultreia.wml
+++ b/english/consultants/ultreia.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Ultreia Comunicaciones S.L."
-<h1>Ultreia Comunicaciones S.L.</h1>
-<hr />
<p>
Ultreia Comunicaciones is an engineering consultant devoted to the
development of Linux and other unices based projects. We do work with
diff --git a/english/consultants/unimedgv.wml b/english/consultants/unimedgv.wml
index 443a26eac6a..a297872850b 100644
--- a/english/consultants/unimedgv.wml
+++ b/english/consultants/unimedgv.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Unimed Governador Valadares"
# $Id$
-<h1>Unimed Governador Valadares</h1>
-
<p>
Installation and configuration of servers and desktops
</p>
diff --git a/english/consultants/uslinux.wml b/english/consultants/uslinux.wml
index d4de7037063..e100e2639f2 100644
--- a/english/consultants/uslinux.wml
+++ b/english/consultants/uslinux.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="U.S. Linux Networks"
# $Id$
-<h1>U.S. Linux Networks</h1>
-
<p>
Long term support agreement available.
</p>
diff --git a/english/consultants/viridiansun.wml b/english/consultants/viridiansun.wml
index 3a4c6332bad..4fdc8839901 100644
--- a/english/consultants/viridiansun.wml
+++ b/english/consultants/viridiansun.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Viridian Sun"
# $Id$
-<h1>Viridian Sun</h1>
-
<p>We have our own dedicated helpdesk team and field engineers, and offer
tailor made support and maintenance contracts and run many debian boxes
ourselves and for our customers.
diff --git a/english/consultants/vivek_k.wml b/english/consultants/vivek_k.wml
index 492a9e7300b..2924f8c8824 100644
--- a/english/consultants/vivek_k.wml
+++ b/english/consultants/vivek_k.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Vivek Kumar"
# $Id$
-<h1>Vivek Kumar</h1>
-
<p>Specializing in developing device drivers and
boot-up code</p>
diff --git a/english/consultants/webspacestation.wml b/english/consultants/webspacestation.wml
index 4f91442425e..7e4af9c96ad 100644
--- a/english/consultants/webspacestation.wml
+++ b/english/consultants/webspacestation.wml
@@ -1,7 +1,7 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Web Space Station"
-<H1>Web Space Station</H1>
-<HR>
<P>
-Offshore custom software development and web development company. All areas of custom software development, web development, database design, ecommerce solutions. Featured service: Offshore Dedicated Development Teams.
+Offshore custom software development and web development company. All areas of
+custom software development, web development, database design, ecommerce
+solutions. Featured service: Offshore Dedicated Development Teams.
</P>
diff --git a/english/consultants/welters.wml b/english/consultants/welters.wml
index 493d6dcb9eb..c7e35148dc4 100644
--- a/english/consultants/welters.wml
+++ b/english/consultants/welters.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Welters Datentechnik"
-<H1>Welters Datentechnik</H1>
-<HR>
-<PRE>
+<p>
Debian Linux as M$ Replacement
Exim, Sendmail, Samba, DHCP, Bind, MySQL Installation and Operation,
Small to Medium Networks, Hosting and Support
-</PRE>
+</p>
diff --git a/english/consultants/woods.wml b/english/consultants/woods.wml
index 0e0b44f109b..3b1fc751f9f 100644
--- a/english/consultants/woods.wml
+++ b/english/consultants/woods.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Woods Networking Consultants"
-<h1>Woods Networking Consultants</h1>
-<hr />
<p>
We can work in the USA, Canada, and Europe. We are US-based, however.
An EU office will open in the near future.
diff --git a/english/consultants/xsto.info.wml b/english/consultants/xsto.info.wml
index 34b31c4e6b1..694e58cfa0c 100644
--- a/english/consultants/xsto.info.wml
+++ b/english/consultants/xsto.info.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="xsto.info S. Coop. Mad."
-<h1>xsto.info S. Coop. Mad.</h1>
-<hr />
<p>
Company specialized in free software, accessibility, networking and content
management.
diff --git a/english/template/debian/consultant.wml b/english/template/debian/consultant.wml
index 693f0062d55..1fa93cf1b07 100644
--- a/english/template/debian/consultant.wml
+++ b/english/template/debian/consultant.wml
@@ -15,6 +15,8 @@
{#check_trans#}
+<h1>$(name)</h1>
+
{#pre_footer#:
<hrlinehidden/>
diff --git a/finnish/consultants/credativ.wml b/finnish/consultants/credativ.wml
index 7991acafd88..7074b720d11 100644
--- a/finnish/consultants/credativ.wml
+++ b/finnish/consultants/credativ.wml
@@ -1,13 +1,13 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="credativ GmbH"
+#use wml::debian::translation-check translation="1.2"
-<h1>credativ GmbH</h1>
-<hr/>
-<pre>
+<p>
credativ GmbH:lla on palkkalistoillaan kahdeksan Debian-kehittäjää, jotka
työskentelevät Debianin parissa osana työtään. Yritys sponsoroi
säännöllisesti CD-levyjä ja muuta oheistavaraa LinuxTag-tapahtumaan ja
avustaa muutenkin Debiania Saksassa.
+</p>
+<p>
credativ on toimittajariippumaton konsultointi- ja palveluyhtiö, joka on
erikoistunut IT-projektien laadunvalvontaan, järjestelmien hallintaan ja
avoimeen lähdekoodiin perustuviin palveluihin. Yhdessä asiakkaidemme kanssa
@@ -15,5 +15,5 @@ toteutamme räätälöityjä avoimen lähdekoodin ratkaisuja (mieluummin täysin
vapaata ohjelmistoa) joilla on mahdollista saavuttaa suuria
kustannussäästöjä, järjestelmien siirrosratkaisuja ja tarjoamme
erikoistunutta tukea täydellisille verkoille. Lisätietoja löytyy osoitteesta
-http://www.credativ.de/.
-</pre>
+<a href="http://www.credativ.de/">http://www.credativ.de/</a>.
+</p>
diff --git a/french/consultants/757_technologies.wml b/french/consultants/757_technologies.wml
index 6749285ddab..3bc2685879e 100644
--- a/french/consultants/757_technologies.wml
+++ b/french/consultants/757_technologies.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="757 Technologies"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>757 Technologies</h1>
-<hr />
<p>
Nous proposons l'installation et l'intégration de Debian GNU/Linux, ainsi que
la maintenance et la colocation de serveurs GNU/Linux. Nous desservons la zone
diff --git a/french/consultants/abv.wml b/french/consultants/abv.wml
index 81778407172..de59a6a6f94 100644
--- a/french/consultants/abv.wml
+++ b/french/consultants/abv.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="ABV - Intégrateur de systèmes et de réseaux informatiques"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
-<h1>ABV - Intégrateur de systèmes et de réseaux informatiques</h1>
-<hr>
<ul>
<li>Certification de la qualité de service - <url http://www.abv.pl/sla.html></li>
<li>Impartition</li>
diff --git a/french/consultants/ace_technology_group.wml b/french/consultants/ace_technology_group.wml
index c69012cd293..2739aa7a152 100644
--- a/french/consultants/ace_technology_group.wml
+++ b/french/consultants/ace_technology_group.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="ACE Technology Group"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>ACE Technology Group</h1>
-<hr>
-<pre>
+<p>
infrastructure gérée<!-- Managed infrastructure -->, migration de Windows vers
Linux, conseil sur Linux en général.
-</pre>
+</p>
diff --git a/french/consultants/aerasec.wml b/french/consultants/aerasec.wml
index 26caa0c9426..2b2515674dd 100644
--- a/french/consultants/aerasec.wml
+++ b/french/consultants/aerasec.wml
@@ -1,10 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="AERAsec GmbH"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>AERAsec GmbH</h1>
-<hr>
-<pre>
+<p>
Sécurité, scénarios de réseaux complexes, stratégies de serveurs.
-
-Aussi : Munich, Allemagne.
-</pre>
+</p>
+<p>
+Aussi&nbsp;: Munich, Allemagne.
+</p>
diff --git a/french/consultants/agentbob.wml b/french/consultants/agentbob.wml
index 0be923d57c1..74d3fe1b086 100644
--- a/french/consultants/agentbob.wml
+++ b/french/consultants/agentbob.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>Dipl.-Ing.(BA) Jochen Seifarth</h1>
-
-<hr />
+#use wml::debian::consultant name="Dipl.-Ing.(BA) Jochen Seifarth"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
En plus de Debian je suis spécialisé dans le développement, l'intégration et le
diff --git a/french/consultants/aleph1.wml b/french/consultants/aleph1.wml
index bef69bd3437..6a874b4fd31 100644
--- a/french/consultants/aleph1.wml
+++ b/french/consultants/aleph1.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>Aleph One Ltd</h1>
+#use wml::debian::consultant name="Aleph One Ltd"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Nous sommes spécialisés dans les petits systèmes et les systèmes embarqués ainsi
diff --git a/french/consultants/alex_r.wml b/french/consultants/alex_r.wml
index 6d910ffe4c1..b6c321301b4 100644
--- a/french/consultants/alex_r.wml
+++ b/french/consultants/alex_r.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Breakthrough LTD"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Breakthrough LTD</h1>
-<hr>
-<pre>
+<p>
Construction de serveurs internet et intranet répondant à tous les besoins en
-réseau local d'une entreprise : connectivité internet RNIS, accès distant,
+réseau local d'une entreprise&nbsp;: connectivité internet RNIS, accès distant,
serveur de fichiers Windows, NFS, DNS, serveur web, serveur FTP, serveur de
courriels...
-</pre>
+</p>
diff --git a/french/consultants/amazon.wml b/french/consultants/amazon.wml
index e586599d9fb..7c61303650a 100644
--- a/french/consultants/amazon.wml
+++ b/french/consultants/amazon.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>Pedro Ivo Lima</h1>
-
-<hr />
+#use wml::debian::consultant name="Pedro Ivo Lima"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
LCP - Professionnel certifié Linux (<i>Linux Certified Professional</i>) - SAIR
diff --git a/french/consultants/anderson.wml b/french/consultants/anderson.wml
index b1627803809..ef076168635 100644
--- a/french/consultants/anderson.wml
+++ b/french/consultants/anderson.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Anderson Carlos Daniel Sanches</h1>
+#use wml::debian::consultant name="Anderson Carlos Daniel Sanches"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Développement sous GPL, configuration et administration de serveurs, formation.
diff --git a/french/consultants/andreu_i.wml b/french/consultants/andreu_i.wml
index 0fa6526e09a..ac9da6ce0af 100644
--- a/french/consultants/andreu_i.wml
+++ b/french/consultants/andreu_i.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Internet Web Serveis"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Internet Web Serveis</h1>
-<hr>
-<pre>
-IWS propose toute sorte de services liés à Linux et Debian depuis 1995 :
+<p>
+IWS propose toute sorte de services liés à Linux et Debian depuis 1995&nbsp;:
conseil, développement, mise en oeuvre, aide, formation, etc.
-</pre>
+</p>
diff --git a/french/consultants/anmsoft.wml b/french/consultants/anmsoft.wml
index f7f2ede1eb3..8483e586a56 100644
--- a/french/consultants/anmsoft.wml
+++ b/french/consultants/anmsoft.wml
@@ -1,13 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="ANMsoft Technologies"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>ANMsoft Technologies</h1>
-
-<hr />
-
-<pre>
+<p>
ANMsoft Technologies est centrée sur le développement externe de logiciels et a
acquis une forte expertise dans le domaine de la banque, des cartes de crédit
et de débit et l'industrie des services financiers. Le développement utilise
une architecture J2EE basée sur MVC.
-</pre>
+</p>
diff --git a/french/consultants/antonio_cosenza.wml b/french/consultants/antonio_cosenza.wml
index 95ed380628f..55963c9bc7f 100644
--- a/french/consultants/antonio_cosenza.wml
+++ b/french/consultants/antonio_cosenza.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Antonio Cosenza"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>Antonio Cosenza</h1>
-<hr>
-<pre>
+<p>
Système d'information géographique (SIG) à source ouvert et applications SIG
sur la Toile basés sur Debian GNU/Linux.
-</pre>
+</p>
diff --git a/french/consultants/ants-art.wml b/french/consultants/ants-art.wml
index 2ede55ec38a..1087ef5d56e 100644
--- a/french/consultants/ants-art.wml
+++ b/french/consultants/ants-art.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>ants-art</h1>
-
-<hr />
+#use wml::debian::consultant name="ants-art"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
ants-art (l'art fourmis)... l'art de faire comme les fourmis.
diff --git a/french/consultants/applepie-solutions.wml b/french/consultants/applepie-solutions.wml
index 39a8ddc6630..4ab6b0d0477 100644
--- a/french/consultants/applepie-solutions.wml
+++ b/french/consultants/applepie-solutions.wml
@@ -1,15 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Applepie Solutions"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Applepie Solutions</h1>
-
-<hr />
-
-<pre>
+<p>
Nous utilisons et développons sur Linux depuis plus de dix ans et nous avons
beaucoup d'expérience sur un certain nombre de distributions dont Debian, Red
Hat et SuSE à la fois sur PC et des plates-formes comme les architectures Alpha
et Itanium. Nous sommes disponibles pour tout travail de conseil partout en
Irlande. Nous proposons également un certain nombre de cours de formation à
Linux.
-</pre>
+</p>
diff --git a/french/consultants/apsis.wml b/french/consultants/apsis.wml
index b8e5ad2c1c7..6ea6abcf85c 100644
--- a/french/consultants/apsis.wml
+++ b/french/consultants/apsis.wml
@@ -1,11 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Apsis S.r.l."
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Apsis S.r.l.</h1>
-
-<hr />
-
-<pre>
+<p>
Nous développons des logiciel et fournissons de l'assistance sur la plate-forme
Debian GNU/Linux.
-</pre>
+</p>
diff --git a/french/consultants/avalonix.wml b/french/consultants/avalonix.wml
index d8502850363..c83fbf4153d 100644
--- a/french/consultants/avalonix.wml
+++ b/french/consultants/avalonix.wml
@@ -1,10 +1,9 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="AVALONIX Linux Systems Support"
#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
<h1>AVALONIX Linux Systems Support<br>
<small>AVALONIX, support pour systèmes Linux</small></h1>
-<hr>
-<pre>
+<p>
Spécialisation en formation, publication électronique et conception de
documents.
-</pre>
+</p>
diff --git a/french/consultants/baton_rouge.wml b/french/consultants/baton_rouge.wml
index 8185f5e471c..b948eadd5ff 100644
--- a/french/consultants/baton_rouge.wml
+++ b/french/consultants/baton_rouge.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Baton Rouge Free Computing"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Baton Rouge Free Computing</h1>
-<hr/>
-<pre>
+<p>
Bureau Linux.
-</pre>
+</p>
diff --git a/french/consultants/beeznest.wml b/french/consultants/beeznest.wml
index 91e794f7a75..6fcccc75770 100644
--- a/french/consultants/beeznest.wml
+++ b/french/consultants/beeznest.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="BeezNest"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>BeezNest</h1>
-<hr>
-<pre>
+<p>
Travail possible partout en Europe, des Pays-Bas à l'Espagne, en passant par
l'Allemagne, et plus si nécessaire.
-</pre>
+</p>
diff --git a/french/consultants/beil.wml b/french/consultants/beil.wml
index 9d2eaf8776d..5ffbf729bb5 100644
--- a/french/consultants/beil.wml
+++ b/french/consultants/beil.wml
@@ -1,12 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Beil Problem Solutions"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>Beil Problem Solutions</h1>
-
-<hr />
-
-<pre>
-Être notaire du réseau de confiance Thawte : cela signifie fournir gratuitement
+<p>
+Être notaire du réseau de confiance Thawte&nbsp;: cela signifie fournir gratuitement
des certificats de courriel S/MIME eMail pour un usage personnel...
-http://www.thawte.com/wot/ ou http://www.lugg.de/zertifikate.php
-</pre>
+<a href="http://www.thawte.com/wot/">http://www.thawte.com/wot/</a> ou
+<a href="http://www.lugg.de/zertifikate.php">http://www.lugg.de/zertifikate.php</a>
+</p>
diff --git a/french/consultants/ben_b.wml b/french/consultants/ben_b.wml
index 9e4a9a6b362..6bbcc7f9dbb 100644
--- a/french/consultants/ben_b.wml
+++ b/french/consultants/ben_b.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Ben Bell</h1>
+#use wml::debian::consultant name="Ben Bell"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>Je suis spécialisé dans la conception et la mise en oeuvre d'infrastructures
&mdash;&nbsp;réseau, serveurs et logiciels. J'ai une expérience étendue en
diff --git a/french/consultants/bentosolutions.wml b/french/consultants/bentosolutions.wml
index 3f059d7fce1..cdde3215598 100644
--- a/french/consultants/bentosolutions.wml
+++ b/french/consultants/bentosolutions.wml
@@ -1,14 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Bento Solutions"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>Bento Solutions</h1>
-
-<hr />
-
-<pre>
-Bento Solutions : solutions complètes de gestion intégrée d'informations pour
+<p>
+Bento Solutions&nbsp;: solutions complètes de gestion intégrée d'informations pour
les petites entreprises et les organismes gouvernementaux qui utilisent des
logiciels à source ouvert. Bento fournit un outil tout-en-un. Une solution
Bento est un système complet de gestion d'informations tout-en-un pour des
organismes publiques et privés.
-</pre>
+</p>
diff --git a/french/consultants/bitpusher.wml b/french/consultants/bitpusher.wml
index 0f12b88cee3..4d7ee197b96 100644
--- a/french/consultants/bitpusher.wml
+++ b/french/consultants/bitpusher.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>BitPusher, LLC</h1>
-
-<hr />
+#use wml::debian::consultant name="BitPusher, LLC"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
BitPusher, LLC fournit un ensemble de services de conseil pour Linux de haute
diff --git a/french/consultants/bitspot.wml b/french/consultants/bitspot.wml
index abfe3ea6b76..47c9283270d 100644
--- a/french/consultants/bitspot.wml
+++ b/french/consultants/bitspot.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Bitspot AG</h1>
-
-<hr />
+#use wml::debian::consultant name="Bitspot AG"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Grande expérience dans la sécurité des technologies de l'information, le réseau
diff --git a/french/consultants/brainalliance.wml b/french/consultants/brainalliance.wml
index 614b225107c..16254c8d338 100644
--- a/french/consultants/brainalliance.wml
+++ b/french/consultants/brainalliance.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Brain Alliance Solutions Oy / Ltd"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Brain Alliance Solutions Oy / Ltd</h1>
-
-<hr />
-<pre>
+<p>
Brain Alliance Solutions Oy / Ltd a son siège à Espoo en Finlande. Nous
proposons des solutions professionnelles d'installation, d'aide, de conseil, de
serveur et de station de travail Debian GNU/Linux. Pour de plus amples
-informations, veuillez visiter notre site http://www.brainalliance.com.
-</pre>
+informations, veuillez visiter notre site
+<a href="http://www.brainalliance.com">http://www.brainalliance.com</a>.
+</p>
diff --git a/french/consultants/bryan_b.wml b/french/consultants/bryan_b.wml
index 0341c34d006..d6c414bbc31 100644
--- a/french/consultants/bryan_b.wml
+++ b/french/consultants/bryan_b.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Netsolus Consulting"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Netsolus Consulting</h1>
-<hr>
-<pre>
+<p>
Netsolus Consulting propose l'intégration de Linux et de Windows sans parti
pris pour un produit ou un fournisseur particulier. Notre approche neutre vis à
vis du fournisseur et du produit garantit une solution adaptée pour votre
entreprise. Une aide complète à distance et sur site pour Linux et la plupart
-des produits « open source » est disponible.
-</pre>
+des produits «&nbsp;open source&nbsp;» est disponible.
+</p>
diff --git a/french/consultants/buici.wml b/french/consultants/buici.wml
index 48eff1eaa86..6afd77d4cb6 100644
--- a/french/consultants/buici.wml
+++ b/french/consultants/buici.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="The Buici Company"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>The Buici Company</h1>
-<hr/>
-<pre>
+<p>
Des références sont disponibles.
-</pre>
+</p>
diff --git a/french/consultants/buttersideup.wml b/french/consultants/buttersideup.wml
index 83b6dd0c033..57b25db7a2b 100644
--- a/french/consultants/buttersideup.wml
+++ b/french/consultants/buttersideup.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>WDAP Limited</h1>
-
-<hr />
+#use wml::debian::consultant name="WDAP Limited"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Je souhaite travailler à travers tout le Royaume-Uni et outre-mer. Pour de
diff --git a/french/consultants/cargol.wml b/french/consultants/cargol.wml
index a0f1f7d26e5..fae68b4d04e 100644
--- a/french/consultants/cargol.wml
+++ b/french/consultants/cargol.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>Cargol.net Solucions Lliures</h1>
-
-<hr />
+#use wml::debian::consultant name="Cargol.net Solucions Lliures"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Nous somme une jeune compagnie montée par des professionnels de l'informatique
diff --git a/french/consultants/catalyst.wml b/french/consultants/catalyst.wml
index 9de3c5bc930..aaaeb56119b 100644
--- a/french/consultants/catalyst.wml
+++ b/french/consultants/catalyst.wml
@@ -1,34 +1,33 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Catalyst IT Ltd"
+#use wml::debian::translation-check translation="1.5" maintainer="Nicolas Bertolissio"
-<h1>Catalyst IT Ltd</h1>
-
-<hr />
-
-<pre>
-Services fournis :
-- aide par téléphone, courriel, par accès à distance ou sur site
- (principalement à Wellington et Auckland) ;
-- conseil et aide pour Debian GNU/Linux &mdash; aide à l'installation et à la
+<p>
+Services fournis&nbsp;:
+</p>
+<ul>
+<li>aide par téléphone, courriel, par accès à distance ou sur site
+ (principalement à Wellington et Auckland)&nbsp;;</li>
+<li>conseil et aide pour Debian GNU/Linux &mdash; aide à l'installation et à la
mise à jour, paramétrage de NFS, Samba, DNS, DHCP, LDAP, filtrage de
- courriels et pourriels, constructions personnalisées de Debian ;
-- aide au développement &mdash; nous avons plus de trente programmeurs avec une
+ courriels et pourriels, constructions personnalisées de Debian&nbsp;;</li>
+<li>aide au développement &mdash; nous avons plus de trente programmeurs avec une
expérience dans un grand choix de langages et d'outils, dont C, C++, Java,
- Perl, PHP, PostgreSQL, MySQL et et beaucoup d'autres...
-- hébergement de sites web &mdash; nous avons nos propres serveurs internet, et
+ Perl, PHP, PostgreSQL, MySQL et et beaucoup d'autres...</li>
+<li>hébergement de sites web &mdash; nous avons nos propres serveurs internet, et
une connexion à 100 Mo à l'Internet avec des onduleurs ainsi qu'un générateur
- de sauvegarde et une redondance de sites si nécessaire ;
-- passerelles et pare-feu internet &mdash; construits sur Debian GNU/Linux.
-- administration de systèmes distants &mdash; si vous n'avez pas le temps de
+ de sauvegarde et une redondance de sites si nécessaire&nbsp;;</li>
+<li>passerelles et pare-feu internet &mdash; construits sur Debian GNU/Linux.
+<li>administration de systèmes distants &mdash; si vous n'avez pas le temps de
vous occuper d'un réseau de douzaines de machines GNU/Linux sur votre
intranet ou votre extranet, ou simplement si vous commencez tout juste à
connaître Unix (ou ne voulez pas l'apprendre), mais que vous souhaitez des
machines GNU/Linux dans votre service tout de suite, Catalyst peut configurer
et mettre à jour vos machines à distance via l'Internet (en utilisant des
- connexions chiffrées) ;
-- autres services de conseil en technologies de l'information &mdash; Catalyst
+ connexions chiffrées)&nbsp;;</li>
+<li>autres services de conseil en technologies de l'information &mdash; Catalyst
a une équipe expérimentée de la modélisation stratégique à la programmation
en assembleur, qui peut vous fournir des services de qualité à un tarif
- compétitif.
-</pre>
+ compétitif.</li>
+</ul>
+</p>
diff --git a/french/consultants/charles_s.wml b/french/consultants/charles_s.wml
index 8c67459ab97..21fcaaccb09 100644
--- a/french/consultants/charles_s.wml
+++ b/french/consultants/charles_s.wml
@@ -1,21 +1,26 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Activate Multi User System Support"
#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<h1>Activate Multi User System Support<br>
<small>Support pour systèmes multiutilisateurs actifs</small></h1>
-<hr>
-<pre>
+<p>
Spécialisation en support critique de création et de contrôle de réseau Unix.
+</p>
-Nous supportons :
-- Debian ;
-- Caldera ;
-- Red Hat ;
-- SCO ;
-- Cisco ;
-- Bay networks ;
-- Microsoft.
+<p>
+Nous supportons&nbsp;:
+</p>
+<ul>
+<li>Debian&nbsp;;</li>
+<li>Caldera&nbsp;;</li>
+<li>Red Hat&nbsp;;</li>
+<li>SCO&nbsp;;</li>
+<li>Cisco&nbsp;;</li>
+<li>Bay networks&nbsp;;</li>
+<li>Microsoft.</li>
+</ul>
+<p>
Contrats de maintenance et tarif de consultation par téléphone sur demande.
-</pre>
+</p>
diff --git a/french/consultants/cits.wml b/french/consultants/cits.wml
index 165ee565734..bec1eb3bbde 100644
--- a/french/consultants/cits.wml
+++ b/french/consultants/cits.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-
-<h1>Commercial IT Services</h1>
-
-<hr />
+#use wml::debian::consultant name="Commercial IT Services"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
<p>
Commercial IT Services fournit de l'aide pour divers produits à code source
diff --git a/french/consultants/clockwork.wml b/french/consultants/clockwork.wml
index e1add3b1e30..0efe4cc09b7 100644
--- a/french/consultants/clockwork.wml
+++ b/french/consultants/clockwork.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>Clockwork Software Systems</h1>
-
-<hr />
+#use wml::debian::consultant name="Clockwork Software Systems"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Clockwork Software Systems est une entreprise spécialiste de GNU/Linux. Nous
diff --git a/french/consultants/clue_inc.wml b/french/consultants/clue_inc.wml
index d992aaa4ed5..c49275c6a8b 100644
--- a/french/consultants/clue_inc.wml
+++ b/french/consultants/clue_inc.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="clue inc."
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>clue inc.</h1>
-<hr>
-<pre>
+<p>
clue inc. fournit du développement d'applications personnalisées en utilisant
des technologies disponibles librement et open source. Nous sommes spécialisés
dans le développement et le déploiement sur Debian, mais nous connaissons bien
la plupart des environnements. Nous sommes aussi disponibles pour de
l'administration de systèmes, de la maintenance et des conseils de sécurité.
-</pre>
+</p>
diff --git a/french/consultants/coderscorp.wml b/french/consultants/coderscorp.wml
index cce1f5fc070..9ed8550f308 100644
--- a/french/consultants/coderscorp.wml
+++ b/french/consultants/coderscorp.wml
@@ -1,12 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="CodersCorp"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>CodersCorp</h1>
-
-<hr />
-
-<pre>
+<p>
Nous faisons du conseil pour Linux et sommes spécialisés sur Debian, nous avons
actuellement un carnet d'adresses avec plusieurs entreprises et fournisseurs de
services internet.
-</pre>
+</p>
diff --git a/french/consultants/coherent_light.wml b/french/consultants/coherent_light.wml
index fb31fb18b17..237ed828283 100644
--- a/french/consultants/coherent_light.wml
+++ b/french/consultants/coherent_light.wml
@@ -1,11 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Coherent Light"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Coherent Light</h1>
-
-<hr />
-
-<pre>
+<p>
Spécialistes de l'hébergement sur la Toile, de la gestion de courriels et du
travail en réseau sur l'Internet.
-</pre>
+</p>
diff --git a/french/consultants/con_z.wml b/french/consultants/con_z.wml
index 78d0050b227..a3340e0404b 100644
--- a/french/consultants/con_z.wml
+++ b/french/consultants/con_z.wml
@@ -1,58 +1,70 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.5" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Cybersource Pty Ltd"
+#use wml::debian::translation-check translation="1.6" maintainer="Nicolas Bertolissio"
-<h1>Cybersource Pty Ltd</h1>
-
-<hr />
-
-<pre>
+<p>
Nous sommes la principale entreprise de solutions Linux, de logiciel libre et
d'Open Source d'Australie, avec plus de quatorze années d'expérience et
25 employés. Nous soutenons de longue date la communauté Linux en contribuant à
-développer Open Source Victoria et Open Source Industry Australia.
-
-
-Nous pouvons fournir les services suivants pour GNU/Linux :
-
- Nos principaux domaines d'expertise sont :
- - l'administration, l'aide et la mise au point de systèmes Linux,
- - la principale entreprise de solutions Linux en Australie,
- - l'intégration de Linux au sein d'un réseau Windows,
- - le développement d'applications (LAMP) et de systèmes Linux,
- - le développement d'équipements utilisant des composants logiciels libres
- et à code source ouvert Linux ;
-
- Nos services :
- - service d'administration proactive de systèmes,
- - surveillance à distance 24 h / 24 de systèmes et de réseaux,
- - remplacement rapide du personnel d'administration système
- - remplacement de serveurs NT par Samba et Linux,
- - installation de serveur web sécurisé,
- - support d'aide pour Linux pour chaque incident,
- - conception de réseau, topologie et sécurité système,
- - expertise internet et pare-feu ;
+développer Open Source Victoria et Open Source Industry Australia.</p>
+<p>
+Nous pouvons fournir les services suivants pour GNU/Linux&nbsp;:
+</p>
+<ul>
+ <li>
+ Nos principaux domaines d'expertise sont&nbsp;:
+ <ul>
+ <li>l'administration, l'aide et la mise au point de systèmes Linux,</li>
+ <li>la principale entreprise de solutions Linux en Australie,</li>
+ <li>l'intégration de Linux au sein d'un réseau Windows,</li>
+ <li>le développement d'applications (LAMP) et de systèmes Linux,</li>
+ <li>le développement d'équipements utilisant des composants logiciels libres
+ et à code source ouvert Linux&nbsp;;</li>
+ </ul>
+ </li>
+ <li>
+ Nos services&nbsp;:
+ <ul>
+ <li>service d'administration proactive de systèmes,</li>
+ <li>surveillance à distance 24 h / 24 de systèmes et de réseaux,</li>
+ <li>remplacement rapide du personnel d'administration système,</li>
+ <li>remplacement de serveurs NT par Samba et Linux,</li>
+ <li>installation de serveur web sécurisé,</li>
+ <li>support d'aide pour Linux pour chaque incident,</li>
+ <li>conception de réseau, topologie et sécurité système,</li>
+ <li>expertise internet et pare-feu&nbsp;;</li>
+ </ul>
+ </li>
+ <li>
Nos produits (construits avec des logiciels libres et à code source ouvert
- Linux) :
- - Cybersource/DATASAFE : réalise des copies quotidiennes de vos serveurs,
- - serveur Linux pour les petites entreprises Cybersource : le meilleur des
- serveurs pour les petites entreprises sur le marché et 75 % moins cher
- que l'alternative de Microsoft,
- - client Cybersource : tous les avantages d'un client léger sans les
- inconvénients,
- - ordinateur sûr pour internet : la manière la plus sûre d'utiliser
- internet,
- - réplicateur de serveur Warm Spare : duplique vos serveurs importants,
- - LiveLAMP : projet de CD direct LAMP.
+ Linux)&nbsp;:
+ <ul>
+ <li>Cybersource/DATASAFE&nbsp;: réalise des copies quotidiennes de vos serveurs,</li>
+ <li>serveur Linux pour les petites entreprises Cybersource&nbsp;: le meilleur des
+ serveurs pour les petites entreprises sur le marché et 75&nbsp;% moins cher
+ que l'alternative de Microsoft,</li>
+ <li>client Cybersource&nbsp;: tous les avantages d'un client léger sans les
+ inconvénients,</li>
+ <li>ordinateur sûr pour internet&nbsp;: la manière la plus sûre d'utiliser
+ internet,</li>
+ <li>réplicateur de serveur Warm Spare&nbsp;: duplique vos serveurs importants,</li>
+ <li>LiveLAMP&nbsp;: projet de CD direct LAMP.</li>
+ </ul>
+ </li>
+</ul>
-Nous pouvons aussi faire du développement basé sur Linux :
- - C/C++ ;
- - Perl ;
- - Java ;
- - Python ;
- - intégration de base de données pour la Toile en PHP ;
- - MySQL ;
- - PostgreSQL ;
- - VisualBasic et migration de VisualBasic pour application vers Linux.
-</pre>
+<p>
+Nous pouvons aussi faire du développement basé sur Linux&nbsp;:
+</p>
+ <ul>
+ <li>C/C++&nbsp;;</li>
+ <li>Perl&nbsp;;</li>
+ <li>Java&nbsp;;</li>
+ <li>Python&nbsp;;</li>
+ <li>intégration de base de données pour la Toile en PHP&nbsp;;</li>
+ <li>MySQL&nbsp;;</li>
+ <li>PostgreSQL&nbsp;;</li>
+ <li>VisualBasic et migration de VisualBasic pour application vers Linux.</li>
+ </ul>
+</p>
diff --git a/french/consultants/cory_p.wml b/french/consultants/cory_p.wml
index 84ff4eebc91..1f44ca99572 100644
--- a/french/consultants/cory_p.wml
+++ b/french/consultants/cory_p.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Uversa Consulting"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Uversa Consulting</h1>
-<hr>
-<pre>
+<p>
Nous fournissons des services de conseil aux entreprises en mettant l'accent
sur Linux et mes logiciels open source. Nous fournissons aussi des conseils
en sécurité, de l'aide générale sur Linux et Debian, des développements
personnalisés et des conseils sur les réseaux avec des prix abordables pour
des entreprises de taille moyenne ou faible.
-</pre>
+</p>
diff --git a/french/consultants/credativ.wml b/french/consultants/credativ.wml
index c90a20f49d6..055eae9f6b4 100644
--- a/french/consultants/credativ.wml
+++ b/french/consultants/credativ.wml
@@ -1,13 +1,13 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="credativ GmbH"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>credativ GmbH</h1>
-<hr/>
-<pre>
+<p>
credativ GmbH emploie huit développeurs Debian dans leur équipe, qui
travaillent pour Debian dans le cadre de leurs emploi. Ils sponsorisent
également des CD et d'autres choses pour LinuxTag, et plus généralement,
aident Debian en Allemagne.
+</p>
+<p>
credativ est une entreprise indépendante des marchands de conseil et de
service, spécialisée dans l'assurance qualité des projets de TIC, la gestion
des systèmes et les services Open Source. En concordance avec nos clients,
@@ -15,6 +15,6 @@ nous implémentons des solutions à source ouvert personnalisées (si possible
intégralement composées de logiciels libres) qui offrent des potentiels
élevés pour la réduction des coûts, nous migrons des systèmes et proposons de
l'aide spécialisée pour les réseaux complets. Pour plus d'informations,
-visitez http://www.credativ.de/.
-</pre>
+visitez <a href="http://www.credativ.de/">http://www.credativ.de/</a>.
+</p>
diff --git a/french/consultants/csinetworks.wml b/french/consultants/csinetworks.wml
index cd5849e8dda..abb3cb0e33e 100644
--- a/french/consultants/csinetworks.wml
+++ b/french/consultants/csinetworks.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>CSI Networks</h1>
+#use wml::debian::consultant name="CSI Networks"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Conseils réseau, sécurité, réseaux privés virtuels, voix sur IP, stockage,
diff --git a/french/consultants/custom_engineering.wml b/french/consultants/custom_engineering.wml
index f74d769a899..b43d5f9d12b 100644
--- a/french/consultants/custom_engineering.wml
+++ b/french/consultants/custom_engineering.wml
@@ -1,10 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Custom Engineering"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Custom Engineering</h1>
-
-<hr />
-
-<pre>
+<p>
Je peux vous aider à Albuquerque, États-Unis, et dans sa région.
-</pre>
+</p>
diff --git a/french/consultants/datalay.wml b/french/consultants/datalay.wml
index f1549a70603..d096957aa4a 100644
--- a/french/consultants/datalay.wml
+++ b/french/consultants/datalay.wml
@@ -1,11 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Datay Soluciones Inform&aacute;ticas"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Datay Soluciones Inform&aacute;ticas</h1>
-
-<hr />
-
-<pre>
+<p>
Lorsque nous utilisons Debian pour notre travail, nous faisons don d'une partie
de notre revenu au projet Debian.
-</pre>
+</p>
diff --git a/french/consultants/datalink_internet.wml b/french/consultants/datalink_internet.wml
index 1c127b778e9..6d61fe6c91f 100644
--- a/french/consultants/datalink_internet.wml
+++ b/french/consultants/datalink_internet.wml
@@ -1,16 +1,18 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Datalink Internet"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
-<h1>Datalink Internet</h1>
-<hr>
-<pre>
-Datalink Internet fournit trois types de services :
-1. Des services de conseil sur Unix et en particulier sur Debian ;
-2. Le développement système sur Unix et en particulier les réseaux basés sur TCP
- et sur plate-forme Debian ;
-3. Des services internet : hébergement, courriel d'entreprise et accès à
- l'Internet.
+<p>
+Datalink Internet fournit trois types de services&nbsp;:
+</p>
+<ol>
+<li>Des services de conseil sur Unix et en particulier sur Debian&nbsp;;</li>
+<li>Le développement système sur Unix et en particulier les réseaux basés sur TCP
+ et sur plate-forme Debian&nbsp;;</li>
+<li>Des services internet&nbsp;: hébergement, courriel d'entreprise et accès à
+ l'Internet.</li>
+</ol>
+<p>
Datalink vend également plusieurs marques de serveurs préconfigurés avec Debian
et les services usuels de courriel, web, base de données, travail en groupe,
etc.
-</pre>
+</p>
diff --git a/french/consultants/davonet.wml b/french/consultants/davonet.wml
index 39f72691a73..85816822fb1 100644
--- a/french/consultants/davonet.wml
+++ b/french/consultants/davonet.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>DAVOnet GmbH</h1>
-
-<hr />
+#use wml::debian::consultant name="DAVOnet GmbH"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
DAVOnet se concentre sur le conseil et le développement logiciel pour Linux et
diff --git a/french/consultants/deeproot.wml b/french/consultants/deeproot.wml
index 477cd3cde43..e05ce1461da 100644
--- a/french/consultants/deeproot.wml
+++ b/french/consultants/deeproot.wml
@@ -1,20 +1,17 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="DeepRoot Linux Pvt. Ltd."
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
-<h1>DeepRoot Linux Pvt. Ltd.</h1>
-
-<hr />
-
-<pre>
+<p>
DeepRoot Linux est l'une des entreprises les plus importantes d'Inde sur les
produits GNU/Linux. Basée à Bangalore, nous développons des produits et des
solutions pointus pour «&nbsp;faire travailler GNU/Linux pour vous
&mdash;&nbsp;plus vite, mieux, maintenant, pour tout.&nbsp;»
-
+</p>
+<p>
Nos produits comprennent des petits serveurs de bureautique, des serveurs de
messagerie, des serveurs de fichiers, des machines pare-feu et de réseau privé
virtuel et des solutions de gestion de bande passante et de gestion de
liaisons. Nous fournissons également de l'aide payante pour les logiciels
libres et la distribution Debian GNU/Linux. Cette aide est disponible par
téléphone, courriel, connexion à distance et sur site.
-</pre>
+</p>
diff --git a/french/consultants/delemar.wml b/french/consultants/delemar.wml
index bf31c4e5c53..fa9c06905d5 100644
--- a/french/consultants/delemar.wml
+++ b/french/consultants/delemar.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Olivier Delemar"
+#use wml::debian::translation-check translation="1.2"
-<h1>Olivier Delemar</h1>
-<hr />
<p>
Je suis à la recherche de partenariats dans la région de Grenoble.
</p>
diff --git a/french/consultants/delicate.ch.wml b/french/consultants/delicate.ch.wml
index f29e86ce8d5..8a157efaacf 100644
--- a/french/consultants/delicate.ch.wml
+++ b/french/consultants/delicate.ch.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="delicate.ch"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>delicate.ch</h1>
-<hr>
-<pre>
+<p>
conseil, formation, aide
-</pre>
+</p>
diff --git a/french/consultants/disoft.wml b/french/consultants/disoft.wml
index 17a35b4aa7f..8dece53970e 100644
--- a/french/consultants/disoft.wml
+++ b/french/consultants/disoft.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>MonoLab Consulting S.L.</h1>
+#use wml::debian::consultant name="MonoLab Consulting S.L."
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Nous entreprise a une expérience démontrée et reconnue dans le monde Linux
diff --git a/french/consultants/douglas_h.wml b/french/consultants/douglas_h.wml
index d0d7790d775..6f93f74a472 100644
--- a/french/consultants/douglas_h.wml
+++ b/french/consultants/douglas_h.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>B. Douglas Hilton</h1>
+#use wml::debian::consultant name="B. Douglas Hilton"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<ul>
<li>8&nbsp;années d'expérience de Debian sur de nombreux système&nbsp;;</li>
diff --git a/french/consultants/eauzone.wml b/french/consultants/eauzone.wml
index f414ad02bb8..040358255c3 100644
--- a/french/consultants/eauzone.wml
+++ b/french/consultants/eauzone.wml
@@ -1,14 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="EauZone"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>EauZone</h1>
-
-<hr />
-
-<pre>
+<p>
Consultants Linux belges orientés sur l'aide et l'installation de Debian
GNU/Linux. Spécialisés dans beaucoup de services (Courriel, Toile, partage de
fichiers, travail collaboratif, pare-feu, réseaux privés virtuels, commerce
électronique, développement d'applications, surveillance...). Nous proposons de
la gestion à distance, de l'aide sur site, de l'audit et de la formation...
-</pre>
+</p>
diff --git a/french/consultants/emergya.wml b/french/consultants/emergya.wml
index 6b945f461c7..009802a6c5c 100644
--- a/french/consultants/emergya.wml
+++ b/french/consultants/emergya.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>Emergya Consultor&iacute;a</h1>
-
-<hr />
+#use wml::debian::consultant name="Emergya Consultor&iacute;a"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Nous sommes spécialisés dans la fourniture de solutions sur étagère basées sur
diff --git a/french/consultants/enterux.wml b/french/consultants/enterux.wml
index 9c1f86eb3db..4f77d252b62 100644
--- a/french/consultants/enterux.wml
+++ b/french/consultants/enterux.wml
@@ -1,61 +1,80 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.5" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Enterux Solutions"
+#use wml::debian::translation-check translation="1.6" maintainer="Nicolas Bertolissio"
-<h1>Enterux Solutions</h1>
-
-<hr />
-
-<pre>
-Nous pouvons fournir la totalité des services listés sur notre site dont je reprends certains ici :
+<p>
+Nous pouvons fournir la totalité des services listés sur notre site dont je reprends certains ici&nbsp;:
+<ul>
+<li>
<a href="http://www.enterux.com/en/services/application-services/">\
-Services d'applications</a> ;
-
+Services d'applications</a>&nbsp;;
+</li>
+<li>
<a href="http://www.enterux.com/en/services/product-engineering-services/">\
-Services de conception de produits</a> ;
-
+Services de conception de produits</a>&nbsp;;
+</li>
+<li>
<a href="http://www.enterux.com/en/services/web-services/">\
-Services sur la Toile</a> ;
-
+Services sur la Toile</a>&nbsp;;
+</li>
+<li>
<a href="http://www.enterux.com/en/services/infrastructure-services/">\
-Services d'infrastructure</a> ;
-
+Services d'infrastructure</a>&nbsp;;
+</li>
+<li>
<a href="http://www.enterux.com/services/technology-consulting/">\
Conseil technologique</a>.
+</li>
+</ul>
-Et les solutions que nous pouvons fournir sont :
+<p>
+Et les solutions que nous pouvons fournir sont&nbsp;:
+</p>
+<ul>
+<li>
<a href="http://www.enterux.com/en/solutions/enterprise-email-solutions/">\
-Solutions professionnelles de courriel</a> ;
-
+Solutions professionnelles de courriel</a>&nbsp;;
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/enterprise-instant-messaging-solutions/">\
-Solutions professionnelles de messagerie instantanée</a> ;
-
+Solutions professionnelles de messagerie instantanée</a>&nbsp;;
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/enterprise-security-firewall-solutions/">\
-Solutions professionnelles de sécurité et de pare-feu</a> ;
-
+Solutions professionnelles de sécurité et de pare-feu</a>&nbsp;;
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/network-optimization-solutions/">\
-Solution d'optimisation de réseaux</a> ;
-
+Solution d'optimisation de réseaux</a>&nbsp;;
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/load-balancing-high-volume-solutions/">\
-Solutions d'équilibrage de charge et de forts volumes</a> ;
-
+Solutions d'équilibrage de charge et de forts volumes</a>&nbsp;;
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/high-availability-solutions/">\
-Solutions de haute disponibilité</a> ;
-
+Solutions de haute disponibilité</a>&nbsp;;
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/embedded-gnu-linux-solutions/">\
-Solutions embarquées GNU/Linux</a> ;
-
+Solutions embarquées GNU/Linux</a>&nbsp;;
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/server-migration-solutions/">\
-Solutions de migration de serveurs</a> ;
-
+Solutions de migration de serveurs</a>&nbsp;;
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/thin-client-solutions/">\
Solutions de clients légers</a>.
+</li>
+</ul>
-Nous disposons également de ce produit nommé Resty :
-Qu'est-ce que Resty ?
+<p>
+Nous disposons également de ce produit nommé Resty&nbsp;:
+Qu'est-ce que Resty&nbsp;?
Resty est une structure d'application sur la Toile distribuée par Enterux sous
les termes de la licence publique générale GNU. Veuillez regarder la
documentation pour en savoir plus sur Resty.
De plus amples informations sont disponibles sur la <a href="http://www.resty.org/">page d'accueil de Resty</a>.
-</pre>
+</p>
diff --git a/french/consultants/et_computer.wml b/french/consultants/et_computer.wml
index 7ecc2317ac9..91385ced7d4 100644
--- a/french/consultants/et_computer.wml
+++ b/french/consultants/et_computer.wml
@@ -1,8 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="ET Computer"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
-<h1>ET Computer</h1>
-<hr>
-<pre>
-Travail professionnel uniquement. Possibilité hors-taxes (« F-skattebevis »).
-</pre>
+<p>
+Travail professionnel uniquement. Possibilité hors-taxes
+(«&nbsp;F-skattebevis&nbsp;»).
+</p>
diff --git a/french/consultants/eugene_g.wml b/french/consultants/eugene_g.wml
index 1e7d7df5b63..2fdf6fa8e71 100644
--- a/french/consultants/eugene_g.wml
+++ b/french/consultants/eugene_g.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="DataArt"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>DataArt</h1>
-<hr>
-<pre>
+<p>
Entreprise de développement externalisé de logiciel offshore spécialisée dans
.NET de Microsoft (ASP.Net).
-</pre>
+</p>
diff --git a/french/consultants/extralogix.wml b/french/consultants/extralogix.wml
index dea7fb12075..842a379b90b 100644
--- a/french/consultants/extralogix.wml
+++ b/french/consultants/extralogix.wml
@@ -1,13 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Extralogix Solutions"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Extralogix Solutions</h1>
-
-<hr />
-
-<pre>
+<p>
Nous fournissons des avis et des conseils gratuits aux organismes à but non
lucratif sur les projets et les produits à source ouvert. Pour d'autres
projets, nous fournissons une estimation de coût et de temps de travail sans
engagement.
-</pre>
+</p>
diff --git a/french/consultants/fai-cluster.wml b/french/consultants/fai-cluster.wml
index cfae0e13634..3de0e776c29 100644
--- a/french/consultants/fai-cluster.wml
+++ b/french/consultants/fai-cluster.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="fai-cluster.de"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>fai-cluster.de</h1>
-<hr>
-<pre>
-Nous ne fournissons de l'aide et des services qu'autour de FAI (« fully
-automatic installation », installation totalement automatique) pour Debian.
-Nous sommes experts de l'installation de grappes Beowulf.
-</pre>
+<p>
+Nous ne fournissons de l'aide et des services qu'autour de FAI («&nbsp;fully
+automatic installation&nbsp;», installation totalement automatique) pour
+Debian. Nous sommes experts de l'installation de grappes Beowulf.
+</p>
diff --git a/french/consultants/federico_sevilla.wml b/french/consultants/federico_sevilla.wml
index 2c5edd2436a..aa4ec2f0888 100644
--- a/french/consultants/federico_sevilla.wml
+++ b/french/consultants/federico_sevilla.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>Federico Sevilla III</h1>
+#use wml::debian::consultant name="Federico Sevilla III"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Mon <i>curriculum vitæ</i> est disponible en ligne à <a
diff --git a/french/consultants/fensterkitt.wml b/french/consultants/fensterkitt.wml
index e8757e5f0cb..848b993ef22 100644
--- a/french/consultants/fensterkitt.wml
+++ b/french/consultants/fensterkitt.wml
@@ -1,10 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Fensterkitt Computer Support"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Fensterkitt Computer Support</h1>
-
-<hr>
-
-<pre>
-Langues : allemand, français et un peu d'italien et d'anglais
-</pre>
+<p>
+Langues&nbsp;: allemand, français et un peu d'italien et d'anglais
+</p>
diff --git a/french/consultants/fff_managed.wml b/french/consultants/fff_managed.wml
index 48b1e57db4e..257b5852e8e 100644
--- a/french/consultants/fff_managed.wml
+++ b/french/consultants/fff_managed.wml
@@ -1,11 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="FFF Managed Technology"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
-<h1>FFF Managed Technology</h1>
-
-<hr />
-
-<pre>
+<p>
Fournisseur de solutions informatiques basées sur les services, nous sommes
adeptes du logiciel à source ouvert dans les environnements d'entreprise.
-</pre>
+</p>
diff --git a/french/consultants/filippo_giunchedi.wml b/french/consultants/filippo_giunchedi.wml
index cd27138bf49..54569015fc3 100644
--- a/french/consultants/filippo_giunchedi.wml
+++ b/french/consultants/filippo_giunchedi.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Filippo Giunchedi"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Filippo Giunchedi</h1>
-<hr>
-<pre>
-Clé GnuPG : 6B79D401
-</pre>
+<p>
+Clé GnuPG&nbsp;: 6B79D401
+</p>
diff --git a/french/consultants/firman.wml b/french/consultants/firman.wml
index 5e0010ad019..882f25591e9 100644
--- a/french/consultants/firman.wml
+++ b/french/consultants/firman.wml
@@ -1,19 +1,22 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Firman Consulting, LLC"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>Firman Consulting, LLC</h1>
-
-<hr />
-
-<pre>
+<p>
Je suis spécialisé dans l'installation de nouvelles stations de travail et de
serveurs Debian GNU/Linux pour les petites entreprises. Je suis certifié
CompTIA Linux+ et LPI Linux. Veuillez me contacter pour obtenir des témoignages
et des références.
+</p>
+<p>
Certaines informations sur mes offres basées sur Debian sont disponibles au
-format PDF ici :
-http://www.firman.us/LinuxSmallBusinessServer.pdf
-http://www.firman.us/LinuxSmallBusinessDesktop.pdf
-http://www.firman.us/Linux-MS.pdf
-</pre>
+format PDF ici&nbsp;:
+</p>
+<ul>
+<li><a href="http://www.firman.us/LinuxSmallBusinessServer.pdf">\
+http://www.firman.us/LinuxSmallBusinessServer.pdf</a></li>
+<li><a href="http://www.firman.us/LinuxSmallBusinessDesktop.pdf">\
+http://www.firman.us/LinuxSmallBusinessDesktop.pdf</a></li>
+<li><a href="http://www.firman.us/Linux-MS.pdf">\
+http://www.firman.us/Linux-MS.pdf</a></li>
+</ul>
diff --git a/french/consultants/forlinux.wml b/french/consultants/forlinux.wml
index 1ad7f346170..4754d497c51 100644
--- a/french/consultants/forlinux.wml
+++ b/french/consultants/forlinux.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="ForLinux"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>ForLinux</h1>
-<hr>
-<pre>
+<p>
ForLinux fournit un ensemble de services comprenant des solutions d'aide (dont
des services de gestion complète, des solutions d'aide sur mesure et de l'aide
d'urgence), des solutions de récupération après sinistre et des projets sur
@@ -11,4 +9,4 @@ mesure. ForLinux peut fournir une solution efficace à un coût correct quelque
soit votre demande. ForLinux ne modifie pas les besoins de ses clients pour
qu'ils rentrent dans une solution tout prête mais fournit une solution pour
répondre à ces besoins.
-</pre>
+</p>
diff --git a/french/consultants/fortuitous.wml b/french/consultants/fortuitous.wml
index 164ea7fcd82..79744b4aee1 100644
--- a/french/consultants/fortuitous.wml
+++ b/french/consultants/fortuitous.wml
@@ -1,15 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Fortuitous Technologies"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
-<h1>Fortuitous Technologies</h1>
-
-<hr />
-
-<pre>
+<p>
Fortuitous fournit des services de conseil, de formation, de réseau et de
sécurité pour Linux au Texas, en Louisiane, au Nouveau Mexique et les
États-Unis continentaux. Nous supportons toutes les distributions Linux, dont
Debian, Red Hat pour entreprises, Fedora, Mandriva et SuSE. Nous fournissons de
l'aide pour FreeBSD, OpenBSD et Mac OS X. Nous proposons des contrats d'aide
mensuels et trimestriels.
-</pre>
+</p>
diff --git a/french/consultants/fotopic.wml b/french/consultants/fotopic.wml
index d7abee2c058..b8d6c775207 100644
--- a/french/consultants/fotopic.wml
+++ b/french/consultants/fotopic.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Fotopic Limited</h1>
-
-<hr />
+#use wml::debian::consultant name="Fotopic Limited"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Développeur Debian, administration système, logiciels, matériel et systèmes
diff --git a/french/consultants/freesoft.wml b/french/consultants/freesoft.wml
index 4bf267d701f..333aa6b08cd 100644
--- a/french/consultants/freesoft.wml
+++ b/french/consultants/freesoft.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>freesoft technologies ltd</h1>
-
-<hr />
+#use wml::debian::consultant name="freesoft technologies ltd"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Nous souhaitons fournir nos services dans les pays arabes.
diff --git a/french/consultants/gbcomputers.wml b/french/consultants/gbcomputers.wml
index 4a2cc97d30a..41ad6dea255 100644
--- a/french/consultants/gbcomputers.wml
+++ b/french/consultants/gbcomputers.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-
-<h1>GB Computers</h1>
-
-<hr />
+#use wml::debian::consultant name="GB Computers"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
<p>
Veuillez vous reporter à notre site pour de plus amples informations et pour
diff --git a/french/consultants/genilto_dallo.wml b/french/consultants/genilto_dallo.wml
index 7ec1810ef26..084df016df1 100644
--- a/french/consultants/genilto_dallo.wml
+++ b/french/consultants/genilto_dallo.wml
@@ -1,14 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Genilto Dallo"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Genilto Dallo</h1>
-
-<hr/>
-
-<pre>
+<p>
Systèmes de connectivité et développement de projets, systèmes de sécurité et à
code source ouvert.
Installation, configuration et entretien de serveurs Debian GNU/Linux.
Conseil aux fournisseurs d'accès internet, connectivité, réseaux sans fils et
serveurs.
-</pre>
+</p>
diff --git a/french/consultants/gnulinux.wml b/french/consultants/gnulinux.wml
index 1d35c7798cb..1f6e8656b32 100644
--- a/french/consultants/gnulinux.wml
+++ b/french/consultants/gnulinux.wml
@@ -1,11 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Stichting Software Libre"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Stichting Software Libre</h1>
-
-<hr />
-
-<pre>
+<p>
Une entreprise à but non lucratif spécialisée dans le système d'exploitation
Debian GNU/Linux.
-</pre>
+</p>
diff --git a/french/consultants/guillermo_rico.wml b/french/consultants/guillermo_rico.wml
index d2c8a4cd2c0..7ae46aee1ff 100644
--- a/french/consultants/guillermo_rico.wml
+++ b/french/consultants/guillermo_rico.wml
@@ -1,10 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Guillermo Rico"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>Guillermo Rico</h1>
-
-<hr />
-
-<pre>
+<p>
Certification LPIC2
-</pre>
+</p>
diff --git a/french/consultants/gurunetwork.wml b/french/consultants/gurunetwork.wml
index c43d72a0ab1..0c78898692e 100644
--- a/french/consultants/gurunetwork.wml
+++ b/french/consultants/gurunetwork.wml
@@ -1,12 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="GuruNetwork"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>GuruNetwork</h1>
-
-<hr />
-
-<pre>
+<p>
Systèmes Linux d'entreprise, pare-feu de haute sécurité, audit, conseil
Linux/*nix. Vente et support de produits Cisco (certificat CCNA), résolution de
problèmes de réseau et solutions d'organisation de réseaux locaux et étendus.
-</pre>
+</p>
diff --git a/french/consultants/harmuth.wml b/french/consultants/harmuth.wml
index d662f207921..387f01a108b 100644
--- a/french/consultants/harmuth.wml
+++ b/french/consultants/harmuth.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>IT-Gesamtl&ouml;sungen</h1>
+#use wml::debian::consultant name="IT-Gesamtl&ouml;sungen"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Conseil en sécurité, conception de réseau... et implantation également
diff --git a/french/consultants/heureka.wml b/french/consultants/heureka.wml
index 3ae7c65024c..c29dc65e201 100644
--- a/french/consultants/heureka.wml
+++ b/french/consultants/heureka.wml
@@ -1,6 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Heureka GmbH"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>Heureka GmbH</h1>
-<hr>
+<p>
Premier contact gratuit.
+</p>
diff --git a/french/consultants/hornfordassociates.wml b/french/consultants/hornfordassociates.wml
index ee4c2750a56..32b67395dc4 100644
--- a/french/consultants/hornfordassociates.wml
+++ b/french/consultants/hornfordassociates.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Hornford Associates</h1>
+#use wml::debian::consultant name="Hornford Associates"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Nous fournissons des services professionnels en faisant correspondre les
diff --git a/french/consultants/houdek.wml b/french/consultants/houdek.wml
index 4c327585258..663bf8fc5e6 100644
--- a/french/consultants/houdek.wml
+++ b/french/consultants/houdek.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>HOUDEK-it</h1>
-
-<hr />
+#use wml::debian::consultant name="HOUDEK-it"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Compétences&nbsp;:
diff --git a/french/consultants/hp_germany.wml b/french/consultants/hp_germany.wml
index 8202209a4a5..20abb75a70d 100644
--- a/french/consultants/hp_germany.wml
+++ b/french/consultants/hp_germany.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>Hewlett-Packard</h1>
+#use wml::debian::consultant name="Hewlett-Packard"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Le groupe du projet Open Source en Allemagne HP Services Consulting &amp;
diff --git a/french/consultants/hytechpro.wml b/french/consultants/hytechpro.wml
index 4219c0de2c3..56a6f0e7995 100644
--- a/french/consultants/hytechpro.wml
+++ b/french/consultants/hytechpro.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>Hytech professionals</h1>
-
-<hr />
+#use wml::debian::consultant name="Hytech professionals"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Hytech Professionals est une entreprise basée aux États-Unis avec des bureaux
diff --git a/french/consultants/ideal.wml b/french/consultants/ideal.wml
index e5d9113253e..5e1c1cffc68 100644
--- a/french/consultants/ideal.wml
+++ b/french/consultants/ideal.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="I.D.E.A.L. Technology Corporation"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>I.D.E.A.L. Technology Corporation</h1>
-<hr/>
-<pre>
+<p>
Nous avons déployé avec succès Debian GNU/Linux dans les centres de
données d'entreprises clientes comme General Electric ou l'armée des États-Unis
d'Amérique.
-</pre>
+</p>
diff --git a/french/consultants/imagin.wml b/french/consultants/imagin.wml
index 6bb06945279..54069014924 100644
--- a/french/consultants/imagin.wml
+++ b/french/consultants/imagin.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Imagin</h1>
-
-<hr />
+#use wml::debian::consultant name="Imagin"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Les projets hors de Pologne sont également acceptés.
diff --git a/french/consultants/incipit.wml b/french/consultants/incipit.wml
index a7debd5b5e2..b7273e89c4e 100644
--- a/french/consultants/incipit.wml
+++ b/french/consultants/incipit.wml
@@ -1,23 +1,23 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Incipit - Informatica Reti Sicurezza"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Incipit - Informatica Reti Sicurezza</h1>
-
-<hr />
-
-<pre>
-Incipit : le client est au centre
-Notre approche est directe : nous essayons de comprendre les besoins réels du
+<h3>Incipit&nbsp;: le client est au centre</h3>
+<p>
+Notre approche est directe&nbsp;: nous essayons de comprendre les besoins réels du
client et de lui fournir une solution efficace, rapide et à moindre coût.
+</p>
-Incipit : des services complets
+<h3>Incipit&nbsp;: des services complets</h3>
+<p>
Nous pouvons fournir des services informatiques et des solutions réseau
-tout-en-un : nous planifions la solution, nous vendons le produit, nous
+tout-en-un&nbsp;: nous planifions la solution, nous vendons le produit, nous
implémentons le projet, nous configurons toutes les machines, nous fournissons
la formation et l'aide de manière ponctuelle ou sous un contrat régulier.
+</p>
-Incipit : un conseiller unique
+<h3>Incipit&nbsp;: un conseiller unique</h3>
+<p>
Nous pensons qu'un unique conseiller technologique est un avantage pour le
client. Un seul nom et un seul numéro de téléphone pour tous les besoins de
solutions informatiques, réseau et de sécurité.
-</pre>
+</p>
diff --git a/french/consultants/indus_net_technologies.wml b/french/consultants/indus_net_technologies.wml
index 896fef198ce..435a6454285 100644
--- a/french/consultants/indus_net_technologies.wml
+++ b/french/consultants/indus_net_technologies.wml
@@ -1,10 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Indus Net Technologies"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<h1>Indus Net Technologies</h1>
<hr>
-<pre>
+<p>
Indus Net Technologies est une entreprise de services logiciels certifiée
ISO&nbsp; 9001:2000 qui fournit du conseil et de l'aide sur les plates-formes
open source.
-</pre>
+</p>
diff --git a/french/consultants/inittab.wml b/french/consultants/inittab.wml
index 16206f7ce59..124141dfafd 100644
--- a/french/consultants/inittab.wml
+++ b/french/consultants/inittab.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Alberto Gonzalez Iniesta</h1>
-
-<hr />
+#use wml::debian::consultant name="Alberto Gonzalez Iniesta"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Développeur Debian fournissant des formations sur les logiciels libres
diff --git a/french/consultants/inl.wml b/french/consultants/inl.wml
index 45b13e5a26b..8f2d5e5659e 100644
--- a/french/consultants/inl.wml
+++ b/french/consultants/inl.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>INL</h1>
-
-<hr />
+#use wml::debian::consultant name="INL"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
INL fournit des solutions à code source ouvert aux entreprises et aux
diff --git a/french/consultants/integrics.wml b/french/consultants/integrics.wml
index c09b6974ef4..838ae78ad0c 100644
--- a/french/consultants/integrics.wml
+++ b/french/consultants/integrics.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Clavib</h1>
-
-<hr />
+#use wml::debian::consultant name="Clavib"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Spécialistes en voix sur IP, bases de données et Perl.
diff --git a/french/consultants/internet_solutions.wml b/french/consultants/internet_solutions.wml
index 4b589b3b1f8..6ba2516d8af 100644
--- a/french/consultants/internet_solutions.wml
+++ b/french/consultants/internet_solutions.wml
@@ -1,12 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="internet solutions! gmbh"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>internet solutions! gmbh</h1>
-
-<hr />
-
-<pre>
+<p>
internet solution! gmbh est un fournisseur de services internet depuis 1997.
Nous construisons des solutions - basées sur Linux - depuis 1998, y compris
Debian depuis 2002.
-</pre>
+</p>
diff --git a/french/consultants/ipodion.wml b/french/consultants/ipodion.wml
index 4971d3ba5c9..bc46119d8db 100644
--- a/french/consultants/ipodion.wml
+++ b/french/consultants/ipodion.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>iPodion GmbH</h1>
-
-<hr />
+#use wml::debian::consultant name="iPodion GmbH"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Aide générale sur Debian GNU/Linux, ordinateurs pour serveurs et stations de
diff --git a/french/consultants/it_service_drillich.wml b/french/consultants/it_service_drillich.wml
index 83fec4d0714..83ec4bfbea9 100644
--- a/french/consultants/it_service_drillich.wml
+++ b/french/consultants/it_service_drillich.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="IT-Service Drillich"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>IT-Service Drillich</h1>
-<hr>
-<pre>
+<p>
Configuration et administration de systèmes Unix, logiciels particuliers,
conseil en technologies de l'information
-</pre>
+</p>
diff --git a/french/consultants/itsecuritymn.wml b/french/consultants/itsecuritymn.wml
index 1dd44a74e00..ee85e98ab6e 100644
--- a/french/consultants/itsecuritymn.wml
+++ b/french/consultants/itsecuritymn.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>IT Security Services</h1>
-
-<hr />
+#use wml::debian::consultant name="IT Security Services"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
IT Security Services est basée à Minneapolis, dans le Minnesota aux États-Unis
diff --git a/french/consultants/ivan_k.wml b/french/consultants/ivan_k.wml
index fff43c7cc30..2687f2ce7b7 100644
--- a/french/consultants/ivan_k.wml
+++ b/french/consultants/ivan_k.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Freeside Internet Services, LLC"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Freeside Internet Services, LLC</h1>
-<hr>
-<pre>
+<p>
Spécialisation en Perl, bases de données et service de FAI.
-</pre>
+</p>
diff --git a/french/consultants/jarno_saarinen.wml b/french/consultants/jarno_saarinen.wml
index b2d5ea1c7e9..d60a37b239c 100644
--- a/french/consultants/jarno_saarinen.wml
+++ b/french/consultants/jarno_saarinen.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="JS Tietotuki"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>JS Tietotuki</h1>
-<hr>
-<pre>
+<p>
Travail actuellement dans le sud de la Carélie principalement.
-</pre>
+</p>
diff --git a/french/consultants/jaume_t.wml b/french/consultants/jaume_t.wml
index cd01a0a93cf..4bb1cb0917f 100644
--- a/french/consultants/jaume_t.wml
+++ b/french/consultants/jaume_t.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Jaume Teixi"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>Jaume Teixi</h1>
-<hr>
-<pre>
+<p>
Communications entre plates-formes et environnements de réseaux locaux et étendus.
-Serveurs Debian dédiés : accès distant, pare-feu, mandataire, web, courriel,
+Serveurs Debian dédiés&nbsp;: accès distant, pare-feu, mandataire, web, courriel,
résolution de noms de domaine, bases de données. Aide par courriel disponible.
Plus de six années d'expérience démontrée de Debian Linux. Une partie des
bénéfices est données à la communauté des développeurs Debian.
-</pre>
+</p>
diff --git a/french/consultants/javier_v.wml b/french/consultants/javier_v.wml
index e4fb48fbfa6..bc14434cb8d 100644
--- a/french/consultants/javier_v.wml
+++ b/french/consultants/javier_v.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Yaco"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
-<H1>Yaco</H1>
-<HR>
-<PRE>
- Experts sur Debian GNU/Linux (2 développeurs Debian dans le groupe).
- Développement de solutions et migration de systèmes d'informations sur des solutions
- basées sur des logiciels et des standards ouverts et libres. Développement de systèmes
- embarqués avec GNU/Linux.
-</PRE>
+<p>
+Experts sur Debian GNU/Linux (2 développeurs Debian dans le groupe).
+Développement de solutions et migration de systèmes d'informations sur des solutions
+basées sur des logiciels et des standards ouverts et libres. Développement de systèmes
+embarqués avec GNU/Linux.
+</p>
diff --git a/french/consultants/jean_p.wml b/french/consultants/jean_p.wml
index f3fecb0fcb3..7ba2f5a836f 100644
--- a/french/consultants/jean_p.wml
+++ b/french/consultants/jean_p.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Linuz.it"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Linuz.it</h1>
-<hr>
-<pre>
+<p>
Système Linux pour l'entreprise, pare-feu de haute sécurité, systèmes
d'antivirus basés sur Linux, serveurs Linux à haute disponibilité et haute
fiabilité, conseils spécialisés pour Linux/*BSD/Sun*/*NIX.
-</pre>
+</p>
diff --git a/french/consultants/jeremy_r.wml b/french/consultants/jeremy_r.wml
index 0d63c1eab33..daa04864203 100644
--- a/french/consultants/jeremy_r.wml
+++ b/french/consultants/jeremy_r.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-
-<h1>Puget Sound Technology</h1>
+#use wml::debian::consultant name="Puget Sound Technology"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
<p>
Migrations BSD &lt;-&gt; Linux&nbsp;; formation personnalisée sur site. Nous
diff --git a/french/consultants/jfranken.wml b/french/consultants/jfranken.wml
index 129a2525497..d64b1f96693 100644
--- a/french/consultants/jfranken.wml
+++ b/french/consultants/jfranken.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>FRANKEN IT-CONCEPTS</h1>
-
-<hr />
+#use wml::debian::consultant name="FRANKEN IT-CONCEPTS"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Depuis&nbsp;1992, les entreprises de Johannes Franken sont connues pour leurs
@@ -57,4 +53,4 @@ Publications et certifications de Johannes&nbsp;:
<p>
Pour de plus amples informations, veuillez consulter
http://www.jfranken.de/unternehmen.en.html.
-</li>
+</p>
diff --git a/french/consultants/jh_networks.wml b/french/consultants/jh_networks.wml
index 708084c0eff..eb2011b2532 100644
--- a/french/consultants/jh_networks.wml
+++ b/french/consultants/jh_networks.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="JH-Networks / Telebistro"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>JH-Networks / Telebistro</h1>
-<hr>
-<pre>
+<p>
Bureaux téléphoniques et cafés internet, pare-feu, protection des mineurs,
tout système GNU/Linux.
-</pre>
+</p>
diff --git a/french/consultants/jibsystems.wml b/french/consultants/jibsystems.wml
index 4138cf9f5fd..39673e732d3 100644
--- a/french/consultants/jibsystems.wml
+++ b/french/consultants/jibsystems.wml
@@ -1,14 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Jib Systems Oy"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Jib Systems Oy</h1>
-
-<hr />
-
-<pre>
+<p>
Nous travaillons principalement dans les limites de l'agglomération d'Helsinki
mais nous cherchons toujours des occasions pour nous étendre ailleurs. L'un de
nos principaux clients depuis&nbsp;2003 est l'<a href="http://www.fmi.fi/">\
institut météorologique finlandais</a>.
-</pre>
+</p>
diff --git a/french/consultants/jim_w.wml b/french/consultants/jim_w.wml
index 2f46956c2bf..8099b4235ed 100644
--- a/french/consultants/jim_w.wml
+++ b/french/consultants/jim_w.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="LAN Comp Systems"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>LAN Comp Systems</h1>
-<hr>
-<pre>
+<p>
LAN Comp Systems fournit de l'aide à la conception, l'installation et la
gestion de projet de système en réseau pour des système OLTP client-serveur
utilisant Unix ou des plates-formes propriétaires. Nous préconisons Linux, et
particulièrement Debian, pour la plupart des serveurs en réseau.
-</pre>
+</p>
diff --git a/french/consultants/joan_l.wml b/french/consultants/joan_l.wml
index 37209a7b424..08a60718b63 100644
--- a/french/consultants/joan_l.wml
+++ b/french/consultants/joan_l.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Digibel"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Digibel</h1>
-<hr>
-<pre>
+<p>
L'aide open source Digibel (Belgique) utilise ses compétences en logiciels open
source pour délivrer des solutions, du conseil, du développement, de
l'administration à distance, de la formation et de l'aide en mettant fortement
l'accent sur la sécurité. Tous nos consultants utilisent Linux depuis 1995 et
ont une grande expérience de l'open source.
-</pre>
+</p>
diff --git a/french/consultants/joe_m.wml b/french/consultants/joe_m.wml
index 4bdda629367..295d23b09df 100644
--- a/french/consultants/joe_m.wml
+++ b/french/consultants/joe_m.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Tangent Computer Research"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Tangent Computer Research</h1>
-<hr>
-<pre>
+<p>
20 années d'expérience sur Unix et Linux.
-</pre>
+</p>
diff --git a/french/consultants/joerg_w.wml b/french/consultants/joerg_w.wml
index a8b0b62a5dd..48f400fabe4 100644
--- a/french/consultants/joerg_w.wml
+++ b/french/consultants/joerg_w.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>Scan Plus GmbH</h1>
+#use wml::debian::consultant name="Scan Plus GmbH"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>distribution propre de pare-feu basé sur Debian GNU/Linux.
diff --git a/french/consultants/joeyh.wml b/french/consultants/joeyh.wml
index 4d9e1b6784f..ac684e28aeb 100644
--- a/french/consultants/joeyh.wml
+++ b/french/consultants/joeyh.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Joey Hess</h1>
-
-<hr />
+#use wml::debian::consultant name="Joey Hess"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Contributeur à Debian depuis dix années. Responsable de l'équipe de
diff --git a/french/consultants/jurgen_l.wml b/french/consultants/jurgen_l.wml
index d43dcc293cb..da03f98cf69 100644
--- a/french/consultants/jurgen_l.wml
+++ b/french/consultants/jurgen_l.wml
@@ -1,12 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Intranet Engineering"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
-<h1>Intranet Engineering</h1>
-
-<hr />
-
-<pre>
+<p>
Je suis un expert certifié et assermenté dans les systèmes et les applications
de traitement de l'information.
-</pre>
+</p>
diff --git a/french/consultants/kaarlo_m.wml b/french/consultants/kaarlo_m.wml
index 884f0232ca1..03fa94cfb9d 100644
--- a/french/consultants/kaarlo_m.wml
+++ b/french/consultants/kaarlo_m.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Arvanet"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>Arvanet</h1>
-<hr>
-<pre>
-Informations complémentaires : nous travaillons principalement dans la zone
+<p>
+Informations complémentaires&nbsp;: nous travaillons principalement dans la zone
métropolitaine (Helsinki, Vantaa, Espoo, Kauniainen, Tuusula, Järvempää). Mais
-il y a déjà eu des exceptions : Oulu et Jyväslylä.
-</pre>
+il y a déjà eu des exceptions&nbsp;: Oulu et Jyväslylä.
+</p>
diff --git a/french/consultants/karsten_m_self.wml b/french/consultants/karsten_m_self.wml
index 45738e7ed57..10b5508a634 100644
--- a/french/consultants/karsten_m_self.wml
+++ b/french/consultants/karsten_m_self.wml
@@ -1,12 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Karsten M. Self"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>Karsten M. Self</h1>
-
-<hr />
-
-<pre>
+<p>
administration système, réseau, sécurité, bureautique, SAS<!-- j ai trouvé
« GIGN », mais ça doit pas être ça ! -->
-Pour de plus amples informations : http://kmself.home.netcom.com/
-</pre>
+Pour de plus amples informations&nbsp;:
+<a href="http://kmself.home.netcom.com/">http://kmself.home.netcom.com/</a>
+</p>
diff --git a/french/consultants/kevin_l.wml b/french/consultants/kevin_l.wml
index dd5969e4c87..fb04183246d 100644
--- a/french/consultants/kevin_l.wml
+++ b/french/consultants/kevin_l.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Obsidian Consulting Group"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Obsidian Consulting Group</h1>
-<hr>
-<pre>
+<p>
Services d'hébergement et de facturation disponible.
-</pre>
+</p>
diff --git a/french/consultants/kevin_t.wml b/french/consultants/kevin_t.wml
index e57eca7ff3e..6325825936e 100644
--- a/french/consultants/kevin_t.wml
+++ b/french/consultants/kevin_t.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Superior Software Services"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Superior Software Services</h1>
-<hr>
-<pre>
+<p>
J'ai dix années d'expérience avec Unix (dont sept sur Debian GNU/Linux)
particulièrement sur l'administration de systèmes d'exploitation, la sécurité
des réseaux, la récupération après un désastre, et l'automatisation des tâches.
@@ -11,8 +9,9 @@ J'ai également plus de cinq années d'expérience sur le développement
d'application pour la Toile et les services d'aide utilisant PHP/Perl,
Javascript/CSS (DHTML), PostgreSQL/MySQL, Apache, ou d'autres applications open
source si nécessaire.
-
+</p>
+<p>
Veuillez indiquez que vous m'avez trouvé via debian.org, ainsi je reverserai
-10 % de mes honoraires au projet Debian.
-</pre>
+10&nbsp;% de mes honoraires au projet Debian.
+</p>
diff --git a/french/consultants/knaepper.wml b/french/consultants/knaepper.wml
index f41abe7607d..3b555d650cc 100644
--- a/french/consultants/knaepper.wml
+++ b/french/consultants/knaepper.wml
@@ -1,12 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="IT Kn&auml;pper"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>IT Kn&auml;pper</h1>
-
-<hr />
-
-<pre>
+<p>
Nous sommes experts dans l'implantation de services Domino et IBM Websphere sur
Linux, y compris Samba, HylaFax et les services réseau. Améliorez votre
entreprise en utilisant Debian GNU/Linux.
-</pre>
+</p>
diff --git a/french/consultants/koenigsmann.wml b/french/consultants/koenigsmann.wml
index 5c4941168c2..784aa00f973 100644
--- a/french/consultants/koenigsmann.wml
+++ b/french/consultants/koenigsmann.wml
@@ -1,12 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Koenigsmann-Ingenieure"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Koenigsmann-Ingenieure</h1>
-
-<hr />
-
-<pre>
+<p>
Nous sommes les auteurs d'un cours d'administration Linux basé sur Debian
Woody, vous pouvez le réserver à partir de début 2005 sur
www.fernschule-weber.de.
-</pre>
+</p>
diff --git a/french/consultants/kotarba.wml b/french/consultants/kotarba.wml
index 9abf6eb2d04..5e5d15b64ad 100644
--- a/french/consultants/kotarba.wml
+++ b/french/consultants/kotarba.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Kotarba.NET"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Kotarba.NET</h1>
-<hr>
-<pre>
+<p>
Polonais et anglais seulement.
-</pre>
+</p>
diff --git a/french/consultants/kring.wml b/french/consultants/kring.wml
index db0f508c432..abe0618e1a9 100644
--- a/french/consultants/kring.wml
+++ b/french/consultants/kring.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>Kring Technologies India pvt Ltd</h1>
-
-<hr />
+#use wml::debian::consultant name="Kring Technologies India pvt Ltd"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Kring Technologies est une entreprise de développement externe de logiciels
diff --git a/french/consultants/lawrence_c.wml b/french/consultants/lawrence_c.wml
index 4ed852d47a7..86ff93a21e9 100644
--- a/french/consultants/lawrence_c.wml
+++ b/french/consultants/lawrence_c.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.5" maintainer="Nicolas Bertolissio"
-
-<h1>Major Chai M J</h1>
+#use wml::debian::consultant name="Major Chai M J"
+#use wml::debian::translation-check translation="1.6" maintainer="Nicolas Bertolissio"
<p>
Disponibilité&nbsp;: région du Pacifique asiatique (y compris la Chine et le
diff --git a/french/consultants/lcs.wml b/french/consultants/lcs.wml
index fd569c5af46..676c5110ec0 100644
--- a/french/consultants/lcs.wml
+++ b/french/consultants/lcs.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-
-<h1>Linux Computing Services (une division de Alreg Scientific)</h1>
-
-<hr />
+#use wml::debian::consultant name="Linux Computing Services (une division de Alreg Scientific)"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
<p>
Nous sommes spécialisés dans les serveurs en réseau, les services Internet, les
diff --git a/french/consultants/leos.wml b/french/consultants/leos.wml
index 6eb2dec01bc..9084b9e33ff 100644
--- a/french/consultants/leos.wml
+++ b/french/consultants/leos.wml
@@ -1,13 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Leonardo Buffa</h1>
-
-<hr />
+#use wml::debian::consultant name="Leonardo Buffa"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Informations complémentaire&nbsp;: expérience en sécurité réseau, évaluation de
sécurité, analyse réseau et revue et optimisation d'infrastructure. Créateur
-d'une distribution directe basée sur Slack (www.malignuz.org) actuellement
+d'une distribution directe basée sur Slack
+(<a href="http://www.malignuz.org">www.malignuz.org</a>) actuellement
utilisée dans certaines universités italiennes pour l'administration système.
</p>
diff --git a/french/consultants/liberobit.wml b/french/consultants/liberobit.wml
index fa3182d2ba0..b5b770c627a 100644
--- a/french/consultants/liberobit.wml
+++ b/french/consultants/liberobit.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Studio Associato Liberobit"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Studio Associato Liberobit</h1>
-<hr/>
-<pre>
+<p>
Nous faisons et supportons uniquement des serveurs Debian, des stations
de travail et des réseaux locaux gérés par des systèmes Debian.
-</pre>
+</p>
diff --git a/french/consultants/libhertz.wml b/french/consultants/libhertz.wml
index f9b073e1779..059cddf2632 100644
--- a/french/consultants/libhertz.wml
+++ b/french/consultants/libhertz.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Studio Associato Liberobit</h1>
-
-<hr />
+#use wml::debian::consultant name="Studio Associato Liberobit"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Nous opérons dans tout le pays (Lisbonne, Aveiro, Porto, Portalegre, Beja,
diff --git a/french/consultants/libren.wml b/french/consultants/libren.wml
index 90b3b6a3d4f..c7754c3ac07 100644
--- a/french/consultants/libren.wml
+++ b/french/consultants/libren.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Libren Informatika</h1>
+#use wml::debian::consultant name="Libren Informatika"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Aide complète pour Debian GNU/Linux et les systèmes Unix, jusqu'à deux réponses
diff --git a/french/consultants/linbit.wml b/french/consultants/linbit.wml
index 1a66b8d0226..3f0dd2d29ac 100644
--- a/french/consultants/linbit.wml
+++ b/french/consultants/linbit.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>LINBIT Information Technologies GmbH</h1>
+#use wml::debian::consultant name="LINBIT Information Technologies GmbH"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>Nous sommes spécialisés dans les grappes à haute disponibilité et dans
les solutions de sécurité.</p>
diff --git a/french/consultants/linbox.wml b/french/consultants/linbox.wml
index 7f49daafe2b..2630a45b1a1 100644
--- a/french/consultants/linbox.wml
+++ b/french/consultants/linbox.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Free&amp;ALter Soft / Linbox</h1>
+#use wml::debian::consultant name="Free&amp;ALter Soft / Linbox"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Notre équipe comporte plusieurs développeurs Debian.
diff --git a/french/consultants/linux_ag.wml b/french/consultants/linux_ag.wml
index 4812dd75d58..bce28bc506a 100644
--- a/french/consultants/linux_ag.wml
+++ b/french/consultants/linux_ag.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Linux Information Systems AG</h1>
+#use wml::debian::consultant name="Linux Information Systems AG"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Linux Information Systems AG est spécialisée dans le travail avec des petites
diff --git a/french/consultants/linux_box.wml b/french/consultants/linux_box.wml
index fdc3c4b32f6..d56632a61bb 100644
--- a/french/consultants/linux_box.wml
+++ b/french/consultants/linux_box.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="The Linux Box Corporation"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>The Linux Box Corporation</h1>
-<hr>
-<pre>
+<p>
The Linux Box Corporation est une société de conseil, de développement,
d'intégration, d'aide et de formation, qui se concentre sur le transfert de
connaissances, et spécialisée dans les environnements open source et Linux.
-</pre>
+</p>
diff --git a/french/consultants/linux_certified.wml b/french/consultants/linux_certified.wml
index 0033ecbd839..edea6fec475 100644
--- a/french/consultants/linux_certified.wml
+++ b/french/consultants/linux_certified.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="LinuxCertified, Inc."
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
-<h1>LinuxCertified, Inc.</h1>
-<hr />
-<pre>
+<p>
Conseillers sur Debian dans divers endroits.
-</pre>
+</p>
diff --git a/french/consultants/linux_consultancy.wml b/french/consultants/linux_consultancy.wml
index 604322bde8e..84301b31708 100644
--- a/french/consultants/linux_consultancy.wml
+++ b/french/consultants/linux_consultancy.wml
@@ -1,14 +1,13 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="The Linux Consultancy"
#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
<h1>The Linux Consultancy<br />
<small>Les services de conseil pour Linux</small></h1>
-<hr>
-<pre>
+<p>
Que vous cherchiez simplement quelqu'un pour vous aider à résoudre vos
problèmes sur un système Linux, ou que vous recherchiez quelqu'un pour vous
fournir et administrer un serveur Linux, nous pouvons vous aider. L'une de nos
offres est un «&nbsp;serveur d'entreprise&nbsp;», qui gère tous les courriels
(y compris la détection des virus et des pourriels), le stockage de fichiers,
la sauvegarde automatisée hors-site, des pages web internes et bien plus.
-</pre>
+</p>
diff --git a/french/consultants/linux_mania.wml b/french/consultants/linux_mania.wml
index b24540b7410..107cbdf3834 100644
--- a/french/consultants/linux_mania.wml
+++ b/french/consultants/linux_mania.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>Linux Mania</h1>
-
-<hr />
+#use wml::debian::consultant name="Linux Mania"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Support, installation et formation à Linux.
diff --git a/french/consultants/linuxcare.wml b/french/consultants/linuxcare.wml
index 31139a6d2fe..6cc6ee50922 100644
--- a/french/consultants/linuxcare.wml
+++ b/french/consultants/linuxcare.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Linuxcare Systems</h1>
-
-<hr />
+#use wml::debian::consultant name="Linuxcare Systems"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Solutions réseaux et informatiques basées sur Linux pour l'entreprise. Conseil
diff --git a/french/consultants/linuxmagic.wml b/french/consultants/linuxmagic.wml
index a4a279c2f25..89a9291d00f 100644
--- a/french/consultants/linuxmagic.wml
+++ b/french/consultants/linuxmagic.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="LinuxMagic"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>LinuxMagic</h1>
-<hr>
-<pre>
-Première entreprise d'aide pour Linux du nord-ouest du Pacifique ; autres
-produits basés sur Debian, « LinuxMagic Workplace » (bureau LinuxMagic),
-« LinuxMagic Mail Server » (serveur de courriels LinuxMagic).
-</pre>
+<p>
+Première entreprise d'aide pour Linux du nord-ouest du Pacifique&nbsp;; autres
+produits basés sur Debian, «&nbsp;LinuxMagic Workplace&nbsp;» (bureau LinuxMagic),
+«&nbsp;LinuxMagic Mail Server&nbsp;» (serveur de courriels LinuxMagic).
+</p>
diff --git a/french/consultants/linuxworks.wml b/french/consultants/linuxworks.wml
index 090cfaceb91..61ecabcf0ef 100644
--- a/french/consultants/linuxworks.wml
+++ b/french/consultants/linuxworks.wml
@@ -1,33 +1,35 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Linuxworks"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>Linuxworks</h1>
-<hr />
-<pre>
+<p>
Notre travail est de faire mieux travailler des ordinateurs et la technologie
internet pour vous. C'est-à-dire, d'évaluer votre utilisation des ordinateurs,
d'être à l'écoute de vos besoins, et de vous fournir des solutions pour
répondre à ces besoins. Ainsi votre ordinateurs seront plus facile à utiliser,
plus rapide, auront plus de possibilités, seront plus fiable et moins chers.
-
+</p>
+<p>
Nous produisons des solutions basées sur Debian, principalement pour de petites
organisations. Nous pouvons remplacer ou étendre d'autres systèmes, à la fois
sur les bureaux et dans l'arrière salle ou la salle des serveurs. Nous pouvons
créer un composant unique pour une tâche spécifique, mais nous préférons avoir
une vision large des système car les améliorations sont plus importantes
lorsque l'ensemble est pris en compte.
-
+</p>
+<p>
Notre équipe comprend des experts dans les technologies comme Debian, Linux,
exim, sendmail, squid, apache, thttpd, samba, netatalk, c/c++, Java, python,
l'écriture de scripts, webware, MySQL, PostgreSQL, gnome, les solutions
d'applications propriétaires (windows) et la norme sans fils 802.11. Nous
apprenons constamment et vous apporterons toute technologie open source qui
vous serait utile.
-
+</p>
+<p>
Vous pouvez souhaiter une approche maîtrisée de vos systèmes et nous donner des
instruction détallées sur ce que vous attendez. Vous pouvez également souhaiter
nous laisser faire l'ensemble et vous fournir une solution clé en mains. Nous
serons heureux de travailler avec vous quels que soient vos exigences.
-
+</p>
+<p>
Nous attendons votre appel.
-</pre>
+</p>
diff --git a/french/consultants/logilab.wml b/french/consultants/logilab.wml
index 8315a461a1d..46f294f67a3 100644
--- a/french/consultants/logilab.wml
+++ b/french/consultants/logilab.wml
@@ -1,14 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="LOGILAB"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
-<h1>LOGILAB</h1>
-
-<hr />
-
-<pre>
+<p>
Nous avons des développeurs Debian dans notre personnel et nous publions tous
nos logiciels libres sous forme de paquets Debian, voir www.logilab.org. De
plus, nous proposons des formations sur l'administration Debian et sur
l'empaquetage de logiciels pour Debian. D'autres formations apparaîtront sur
notre site lorsqu'elles seront disponibles.
-</pre>
+</p>
diff --git a/french/consultants/mark_stanislav.wml b/french/consultants/mark_stanislav.wml
index 34b9d1f8f04..277769dd911 100644
--- a/french/consultants/mark_stanislav.wml
+++ b/french/consultants/mark_stanislav.wml
@@ -1,10 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Mark Stanislav"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Mark Stanislav</h1>
-
-<hr />
-
-<pre>
+<p>
Certifié CompTIA Linux+, administration de serveurs Linux
-</pre>
+</p>
diff --git a/french/consultants/markoer.wml b/french/consultants/markoer.wml
index 8f1de334c6b..ca2d1f90eee 100644
--- a/french/consultants/markoer.wml
+++ b/french/consultants/markoer.wml
@@ -1,13 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Marco Ermini"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Marco Ermini</h1>
-
-<hr />
-
-<pre>
+<p>
Je suis un conseiller indépendant expérimenté qui travaille avec de nombreuses
distributions GNU/Linux et plusieurs versions d'Unix. Veuillez consulter mon CV
à <a href="http://www.markoer.org/cv/">http://www.markoer.org/cv/</a>.
-</pre>
+</p>
diff --git a/french/consultants/maroonpoint.wml b/french/consultants/maroonpoint.wml
index c0cd202c43b..7078035c134 100644
--- a/french/consultants/maroonpoint.wml
+++ b/french/consultants/maroonpoint.wml
@@ -1,12 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="MaroonPoint Polska Sp.J."
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>MaroonPoint Polska Sp.J.</h1>
-
-<hr />
-
-<pre>
+<p>
Nous travaillons avec Debian depuis environ cinq années. Nous prévoyons de
distribuer des CD Debian en Pologne et de faire don d'une partie de nos revenus
au projet Debian.
-</pre>
+</p>
diff --git a/french/consultants/marques_j.wml b/french/consultants/marques_j.wml
index e73711c88f5..75dddd411ea 100644
--- a/french/consultants/marques_j.wml
+++ b/french/consultants/marques_j.wml
@@ -1,16 +1,12 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Marques Johansson"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
-<h1>Marques Johansson</h1>
-
-<hr />
-
-<pre>
+<p>
Très tôt utilisateur de Debian GNU/Linux, Marques Johansson gère des systèmes
Debian dans le commerce électronique, l'industrie et les établissements de
recherche depuis 1996. Situé à South Jersey, il propose des services de conseil
et d'aide dans la grande banlieue de Philadelphie. Les tarifs sont fonction du
temps et du coût prévu du travail. Une partie des revenus est reversée à
Software in the Public Interest.
-</pre>
+</p>
diff --git a/french/consultants/mathias_kettner.wml b/french/consultants/mathias_kettner.wml
index b4d72e7279a..304b91a2ee3 100644
--- a/french/consultants/mathias_kettner.wml
+++ b/french/consultants/mathias_kettner.wml
@@ -1,11 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Mathias Kettner"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>Mathias Kettner</h1>
-
-<hr />
-
-<pre>
+<p>
Installation automatisée et distribution logicielle à grande échelle,
expérience dans d'autres projets évolués.
-</pre>
+</p>
diff --git a/french/consultants/michaeljohn_c.wml b/french/consultants/michaeljohn_c.wml
index 3aacf41d9cc..71d909df092 100644
--- a/french/consultants/michaeljohn_c.wml
+++ b/french/consultants/michaeljohn_c.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Michaeljohn Clement"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Michaeljohn Clement</h1>
-<hr>
-<pre>
+<p>
Programmation, déploiement commercial de GNU/Linux et *BSD, programmation et
conception pour la Toile, conception et mise en oeuvre d'interface utilisateur.
C/C++/Java, Perl, SQL, PHP, etc. Solutions basées totalement sur les logiciels
open source et libres pour votre entreprise.
-</pre>
+</p>
diff --git a/french/consultants/miju.wml b/french/consultants/miju.wml
index 547e036f806..37dbe94a658 100644
--- a/french/consultants/miju.wml
+++ b/french/consultants/miju.wml
@@ -1,14 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Miju Systems"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Miju Systems</h1>
-
-<hr>
-<pre />
+<p>
Miju Systems opère principalement dans le support de serveurs avec des clients
allant de petites entreprises à des grands comptes. Miju Systems supporte des
serveurs en réseau à travers l'Australie, l'Europe, le Canada et les
États-Unis. Nous développons une base bureautique standardisée basée sur Debian
KDE et nous supportons également des initiatives à source ouvert pour
développer des applications financières basées sur Linux.
-</pre>
+</p>
diff --git a/french/consultants/mind.wml b/french/consultants/mind.wml
index 8430fd62d3e..958f38dd117 100644
--- a/french/consultants/mind.wml
+++ b/french/consultants/mind.wml
@@ -1,16 +1,15 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Mind nv"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
-<h1>Mind nv</h1>
-<hr>
-<pre>
-Mind Linux Solutions (Leuven, Belgique) utilise ses compétences dans la
+<p>
+Mind Linux Solutions (Louvain, Belgique) utilise ses compétences dans la
conception de systèmes de logiciels open source pour fournir des solutions, du
conseil, du développement, de la formation et de l'aide pour le développement
de systèmes embarqués.
-
+</p>
+<p>
Nous utilisons des logiciels open source (par exemple Linux, RTLinux, RTAI,
eCos, Wonka, gcc, gdb,...) pour mettre en place une infrastructure de base pour
de nouveaux systèmes embarqués (y compris les systèmes sur puce) et aider les
clients au développement sur ces infrastructures.
-</pre>
+</p>
diff --git a/french/consultants/minihub.wml b/french/consultants/minihub.wml
index 1af311771a5..cdc15bb64a1 100644
--- a/french/consultants/minihub.wml
+++ b/french/consultants/minihub.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Minihub Communications Incorporated"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Minihub Communications Incorporated</h1>
-<hr>
-<pre>
+<p>
Les organisations non gouvernementales (ONG) impliquées dans problèmes
d'intérêts de la communauté, de droits de l'homme, d'environnement et de
justice sociale ont besoin de systèmes de communication qui soient appropriés à
@@ -11,4 +9,4 @@ leurs besoins. Debian GNU/Linux fournit des solutions sécurisés, bon marché et
extensibles qui fonctionnent bien avec des besoins en matériel faibles. Minihub
fournit aussi du conseil d'entreprise et travaille dans tout le sud-est de
l'Asie.
-</pre>
+</p>
diff --git a/french/consultants/mivitec.wml b/french/consultants/mivitec.wml
index cf7910c7d50..2bc0fdc805e 100644
--- a/french/consultants/mivitec.wml
+++ b/french/consultants/mivitec.wml
@@ -1,16 +1,16 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="MIVITEC GmbH"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>MIVITEC GmbH</h1>
-
-<hr />
-
-<pre>
+<p>
Nous proposons des solutions basées sur Linux pour votre entreprise.
-Autres zones d'intérêt :
-- nous proposons d'héberger vos serveurs basés sur Linux dans nos centres de
- données à Francfort, Munich et Dusseldorf (Allemagne) ;
-- hébergement sur la Toile (avec Zope, JBoss, Typo3, Tomcat etc.
-- programmation.
+Autres zones d'intérêt&nbsp;:
+</p>
+<ul>
+<li>nous proposons d'héberger vos serveurs basés sur Linux dans nos centres de
+ données à Francfort, Munich et Dusseldorf (Allemagne)&nbsp;;</li>
+<li>hébergement sur la Toile (avec Zope, JBoss, Typo3, Tomcat etc.</li>
+<li>programmation.</li>
+</ul>
+<p>
Veuillez nous contacter pour de plus amples informations.
-</pre>
+</p>
diff --git a/french/consultants/mladen_adamovic.wml b/french/consultants/mladen_adamovic.wml
index a9ac5361a7e..2c5f65827a9 100644
--- a/french/consultants/mladen_adamovic.wml
+++ b/french/consultants/mladen_adamovic.wml
@@ -1,10 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Mladen Adamovic"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Mladen Adamovic</h1>
-
-<hr />
-
-<pre>
+<p>
Je suis assistant de formation au département d'ingénierie de l'informatique.
-</pre>
+</p>
diff --git a/french/consultants/murphy_soft.wml b/french/consultants/murphy_soft.wml
index cc17ec2f57c..defa7bd243e 100644
--- a/french/consultants/murphy_soft.wml
+++ b/french/consultants/murphy_soft.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Murphy Software BV"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Murphy Software BV</h1>
-<hr>
<p>
Une partie de nos revenus liés à Debian est reversée au projet Debian.
</p>
diff --git a/french/consultants/netdigix.wml b/french/consultants/netdigix.wml
index be63328b35d..3330bff5097 100644
--- a/french/consultants/netdigix.wml
+++ b/french/consultants/netdigix.wml
@@ -1,10 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Netdigix solutions informatiques et réseau"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Netdigix solutions informatiques et réseau</h1>
-
-<hr />
-
-<pre>
+<p>
projets nouveaux bienvenus
-</pre>
+</p>
diff --git a/french/consultants/nikolai_l.wml b/french/consultants/nikolai_l.wml
index 83a024145ad..e958fcb4031 100644
--- a/french/consultants/nikolai_l.wml
+++ b/french/consultants/nikolai_l.wml
@@ -1,14 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Nikolai Luzan"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
-<h1>Nikolai Luzan</h1>
-
-<hr />
-
-<pre>
+<p>
En me concentrant sur l'infrastructure, je fournis des solutions complètes pour
les petites et moyennes entreprises. Des solutions réseau, bases de données et
bureautique à vos besoins. Des solutions qui utilisent la meilleure des
technologies disponibles à votre service.
-</pre>
+</p>
diff --git a/french/consultants/norrix.wml b/french/consultants/norrix.wml
index ff321173958..cc513d35872 100644
--- a/french/consultants/norrix.wml
+++ b/french/consultants/norrix.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Norrix Associates"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>Norrix Associates</h1>
-<hr>
-<pre>
+<p>
Norrix Associates fournit des solutions de réseau à distance et sur site tout
autour du monde. Tous nos produits sont basés sur Debian.
-</pre>
+</p>
diff --git a/french/consultants/novochip.wml b/french/consultants/novochip.wml
index 9040eee5d7c..60a5a897b77 100644
--- a/french/consultants/novochip.wml
+++ b/french/consultants/novochip.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>Solutions informatiques Novochip</h1>
-
-<hr />
+#use wml::debian::consultant name="Solutions informatiques Novochip"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Conseils généraux en réseaux Internet et intranet, systèmes d'exploitation et
diff --git a/french/consultants/ns_computing.wml b/french/consultants/ns_computing.wml
index 7c2bdf181bb..71ae6adbe10 100644
--- a/french/consultants/ns_computing.wml
+++ b/french/consultants/ns_computing.wml
@@ -1,11 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="NS Computing"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>NS Computing</h1>
-
-<hr />
-
-<pre>
+<p>
NS Computing réalise du développement internet et intranet personnalisé,
conçoit, installe et maintient des systèmes de réseau. Nous utilisons GNU/Linux
(et plus particulièrement Debian) pour la plupart des serveurs de réseau. Nous
@@ -13,4 +9,4 @@ proposons des petits serveurs d'entreprise basés sur Debian avec des
applications web intranet personnalisées multiutilisateurs et multibranches
(courriel, télécopie, système de gestion de documents et système de gestion de
clientèle). Des contrats de maintenance mensuelle ou annuelle sont disponibles.
-</pre>
+</p>
diff --git a/french/consultants/openbizz.wml b/french/consultants/openbizz.wml
index 0524807206d..07668288481 100644
--- a/french/consultants/openbizz.wml
+++ b/french/consultants/openbizz.wml
@@ -1,11 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="OpenBizz BV"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>OpenBizz BV</h1>
-
-<hr />
-
-<pre>
+<p>
Nous sommes spécialisés dans les environnements bureautiques pour les petites
et moyennes entreprises.
-</pre>
+</p>
diff --git a/french/consultants/openit.wml b/french/consultants/openit.wml
index 537d3cabe7e..045ae3c3c03 100644
--- a/french/consultants/openit.wml
+++ b/french/consultants/openit.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Open IT</h1>
-
-<hr />
+#use wml::debian::consultant name="Open IT"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
J'utilise Linux depuis&nbsp;1993 et je réalise toujours l'administration et
diff --git a/french/consultants/opentechnologies.wml b/french/consultants/opentechnologies.wml
index 01b64c6f1c3..b1dcd5dede0 100644
--- a/french/consultants/opentechnologies.wml
+++ b/french/consultants/opentechnologies.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="OpenTechnologies"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>OpenTechnologies</h1>
-<hr>
-<pre>
+<p>
Travail avec FreeBSD et OpenBSD. Ainsi que Debian, Gentoo, SuSE, Red Hat et
Mandrake. Construction de pare-feu. Conseil en sécurité. Intégration de réseaux
locaux ou étendu, d'Internet ou d'intranet. Système de gestion de bases de
données relationnelles. Présence sur la Toile.
-</pre>
+</p>
diff --git a/french/consultants/opentrend.wml b/french/consultants/opentrend.wml
index 8789d67a649..e3e9c9a101f 100644
--- a/french/consultants/opentrend.wml
+++ b/french/consultants/opentrend.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="OpenTrend Solutions Ltd"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>OpenTrend Solutions Ltd</h1>
-<hr>
-<pre>
-Nous reversons 2 % de nos bénéfices avant impôt à l'aide pour le logiciel open
+<p>
+Nous reversons 2&nbsp;% de nos bénéfices avant impôt à l'aide pour le logiciel open
source. Nous somme associés à des organismes aux États-Unis et en Australie
pour améliorer le support de clients internationaux.
-</pre>
+</p>
diff --git a/french/consultants/orbit.wml b/french/consultants/orbit.wml
index 0f07c536a1d..97bd748505e 100644
--- a/french/consultants/orbit.wml
+++ b/french/consultants/orbit.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="ORBIT Technologies, Inc."
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>ORBIT Technologies, Inc.</h1>
-<hr>
-<pre>
+<p>
ORBIT Technologies fournit des services et des produits pour des systèmes
embarqués, distribués et sur plates-formes croisées.
-</pre>
+</p>
diff --git a/french/consultants/osourcery.wml b/french/consultants/osourcery.wml
index 89002c05a1e..cc8efa8c2f8 100644
--- a/french/consultants/osourcery.wml
+++ b/french/consultants/osourcery.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>OpenSourcery, LLC</h1>
-
-<hr />
+#use wml::debian::consultant name="OpenSourcery, LLC"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Développement logiciel, serveurs GNU/Linux et BSD et conception, installation
diff --git a/french/consultants/ossafrica.wml b/french/consultants/ossafrica.wml
index ea053e50323..f376f110af1 100644
--- a/french/consultants/ossafrica.wml
+++ b/french/consultants/ossafrica.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>OSS Africa</h1>
-
-<hr />
+#use wml::debian::consultant name="OSS Africa"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Spécialisé dans l'installation et la gestion de serveurs.
diff --git a/french/consultants/ouattara.wml b/french/consultants/ouattara.wml
index 90145db3122..1eb7d944850 100644
--- a/french/consultants/ouattara.wml
+++ b/french/consultants/ouattara.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Sefie Janvier OUATTARA</h1>
+#use wml::debian::consultant name="Sefie Janvier OUATTARA"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Expert en serveurs de bases de données et d'applications.
diff --git a/french/consultants/oxalide.wml b/french/consultants/oxalide.wml
index 66909e084d3..95c399632e4 100644
--- a/french/consultants/oxalide.wml
+++ b/french/consultants/oxalide.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Oxalide</h1>
+#use wml::debian::consultant name="Oxalide"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Oxalide est une entreprise de conseil et un fournisseur de solutions français.
diff --git a/french/consultants/pahne.wml b/french/consultants/pahne.wml
index 3a221de2018..e84c8f2b6ef 100644
--- a/french/consultants/pahne.wml
+++ b/french/consultants/pahne.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Services informatiques Andy Pahne</h1>
+#use wml::debian::consultant name="Services informatiques Andy Pahne"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Expérience avec Linux et les applications à code source ouvert
diff --git a/french/consultants/parreiras_m.wml b/french/consultants/parreiras_m.wml
index dd9bc94b11a..d90cf63ebde 100644
--- a/french/consultants/parreiras_m.wml
+++ b/french/consultants/parreiras_m.wml
@@ -1,10 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="M&aacute;rcio H. Parreiras"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>M&aacute;rcio H. Parreiras</h1>
-
-<hr />
-
-<pre>
+<p>
Serveurs, stations de travail, réseaux, etc.
-</pre>
+</p>
diff --git a/french/consultants/penguintechs.wml b/french/consultants/penguintechs.wml
index 737f4167064..0ab3c387228 100644
--- a/french/consultants/penguintechs.wml
+++ b/french/consultants/penguintechs.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Penguin Techs</h1>
-
-<hr />
+#use wml::debian::consultant name="Penguin Techs"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Penguin Techs est spécialisée dans le déploiement de PBX Asterisk et dans
diff --git a/french/consultants/pete_b.wml b/french/consultants/pete_b.wml
index e0418292b17..25ab852a46c 100644
--- a/french/consultants/pete_b.wml
+++ b/french/consultants/pete_b.wml
@@ -1,27 +1,25 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>ELB Internet Services</h1>
+#use wml::debian::consultant name="ELB Internet Services"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>ELB est spécialisé dans la fourniture de solutions internet complètes pour
les entreprises et les gouvernements &mdash; du simple courriel aux solutions
-pour la Toile et à la haute connectivité pour les entreprises.
+pour la Toile et à la haute connectivité pour les entreprises.</p>
-<p>Les domaines d'expertise d'ELB comprennent&nbsp;:
+<p>Les domaines d'expertise d'ELB comprennent&nbsp;:</p>
<ul>
<li>l'installation, la mise à jour et l'aide à Debian GNU/Linux pour les DNS,
les serveurs de courriels, les pare-feu, les routeurs, les serveurs web,
- les solutions de bases de données, l'émission de télécopies...
+ les solutions de bases de données, l'émission de télécopies...</li>
<li>le développement et l'hébergement de site web &mdash; avec des solutions
pour la Toile basées totalement sur Debian. Veuillez nous contacter pour
- obtenir une liste de nos clients actuels&nbsp;;
+ obtenir une liste de nos clients actuels&nbsp;;</li>
<li>la fourniture à des petites et moyennes entreprises de réponses abordables
à leurs besoins de technologies et l'aide associée pour maximiser leur
- investissement&nbsp;;
+ investissement&nbsp;;</li>
<li>Veuillez indiquer que vous nous avez trouvés <i>via</i> Debian.org. Nous
reversons à Debian 5&nbsp;% de nos honoraires pour les travaux venant
- d'ici.
+ d'ici.</li>
</ul>
diff --git a/french/consultants/peter_d.wml b/french/consultants/peter_d.wml
index 36e0129a829..3f0de5719a4 100644
--- a/french/consultants/peter_d.wml
+++ b/french/consultants/peter_d.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Kangaroot Linux Solutions</h1>
+#use wml::debian::consultant name="Kangaroot Linux Solutions"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>Conseillers belges sur Linux centrés sur l'aide et l'installation pour
Debian. Serveurs de courriels, de fichiers et pour la Toile, pare-feu,
serveurs de travail en groupe, réseaux privés virtuels, commerce
-électronique...
+électronique...</p>
<p>Nous surveillons vos machines depuis notre centre d'opérations réseau
(<i>NOC, Network Operations Center</i>) et corrigeons les problèmes avant
qu'ils ne soient soulevés. Gestion à distance, aide, vérification et formation
-sur site pour Debian, d'autres Linux, Samba, Sendmail, proftpd, Apache...
+sur site pour Debian, d'autres Linux, Samba, Sendmail, proftpd, Apache...</p>
diff --git a/french/consultants/peter_naulls.wml b/french/consultants/peter_naulls.wml
index 26abadc34f5..68a4fffa8e4 100644
--- a/french/consultants/peter_naulls.wml
+++ b/french/consultants/peter_naulls.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Peter Naulls"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Peter Naulls</h1>
-<hr>
-<pre>
+<p>
Je suis spécialisé sur l'architecture ARM de Linux, y compris sur le
développement du noyau, mais j'ai aussi une expertise sur beaucoup
d'autres domaines de Linux, en particulier le déploiement de systèmes
Debian. J'ai aussi contribué pendant un certain temps à aider le projet
Debian.
-</pre>
+</p>
diff --git a/french/consultants/picone.wml b/french/consultants/picone.wml
index 6ca29c7cdb1..ed0c55ab660 100644
--- a/french/consultants/picone.wml
+++ b/french/consultants/picone.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Ants S.p.a."
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
-<h1>Ants S.p.a.</h1>
-<hr>
<p>
UNIX (Debian, Linux), réseaux locaux et étendus, technologies d'Internet (WWW,
FTP, DNS, courriel, etc.), équilibrage de charge d'ensembles de serveurs, haute
diff --git a/french/consultants/pits.wml b/french/consultants/pits.wml
index 920cc511f7b..e1edf2d2ecb 100644
--- a/french/consultants/pits.wml
+++ b/french/consultants/pits.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>PiTS - Peruzzi Thomas D.I.(FH)</h1>
-
-<hr />
+#use wml::debian::consultant name="PiTS - Peruzzi Thomas D.I.(FH)"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
OTRS, ITIL, OpenGroupware
diff --git a/french/consultants/porcacchia.wml b/french/consultants/porcacchia.wml
index 1b2835c088c..6e3008ce67a 100644
--- a/french/consultants/porcacchia.wml
+++ b/french/consultants/porcacchia.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Alessio Porcacchia</h1>
-
-<hr />
+#use wml::debian::consultant name="Alessio Porcacchia"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Administrateur systèmes Linux et Unix expérimenté
diff --git a/french/consultants/praksys.wml b/french/consultants/praksys.wml
index e2c4b24bce7..b756f787756 100644
--- a/french/consultants/praksys.wml
+++ b/french/consultants/praksys.wml
@@ -1,14 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="PraKsys"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>PraKsys</h1>
-
-<hr />
-
-<pre>
+<p>
Migration de systèmes informatiques complets vers Debian.
La distribution PraKsys est disponible sur gna.prg/pkaksys à condition que vous
disposiez d'un système Woody et de quelques compétences.
PraKsys (Guillaume Pernot) était présent lors de la conférence Debian de Porto
Allegre.
-</pre>
+</p>
diff --git a/french/consultants/produktivit.wml b/french/consultants/produktivit.wml
index 1b4a7a4d550..2e112ca735d 100644
--- a/french/consultants/produktivit.wml
+++ b/french/consultants/produktivit.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="produktivIT"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>produktivIT</h1>
-<hr>
-<pre>
+<p>
Attention particulière sur la réduction des coûts pour les technologies de
l'information, retour sur investissement, migration vers les technologies open
source. Expertise approfondie sur les serveurs de groupe dans un environnement
@@ -11,4 +9,4 @@ de réseau hétérogène et sur les systèmes de gestion de contenu. produktivIT
parraine les projets Debian et OpenGroupware par des dons de matériel, le
projet KDE du sous-projet Debian pour l'entreprise par de la main d'oeuvre et
l'intégration d'OpenOffice.org dans KDE par une aide financière.
-</pre>
+</p>
diff --git a/french/consultants/prolibre.wml b/french/consultants/prolibre.wml
index 0938cf68507..294b36fde2a 100644
--- a/french/consultants/prolibre.wml
+++ b/french/consultants/prolibre.wml
@@ -1,11 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="ProLibre"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>ProLibre</h1>
-
-<hr />
-
-<pre>
+<p>
Installation de serveurs Linux sous Debian, migration vers Linux,
développement, aide, maintenance et formation depuis&nbsp;2000.
-</pre>
+</p>
diff --git a/french/consultants/prosa.wml b/french/consultants/prosa.wml
index 2ac67e7a0da..69c16536c4f 100644
--- a/french/consultants/prosa.wml
+++ b/french/consultants/prosa.wml
@@ -1,16 +1,16 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="PROSA Progettazione Sviluppo Aperto"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>PROSA Progettazione Sviluppo Aperto</h1>
-<hr>
-<pre>
+<p>
Nous vendons des systèmes avec Debian GNU/Linux préinstallé. Nous proposons
de l'aide payante pour Debian GNU/Linux.
-
+</p>
+<p>
Nous sommes les auteurs de PROSA/Debian, une version italienne de
Debian qui est vendue sur nos systèmes.
-
+</p>
+<p>
PROSA n'utilise, ne produit et ne vend que des solutions basées sur le logiciel
libre.
-</pre>
+</p>
diff --git a/french/consultants/python_byte.wml b/french/consultants/python_byte.wml
index 31a2d6553ad..5ff1624ae43 100644
--- a/french/consultants/python_byte.wml
+++ b/french/consultants/python_byte.wml
@@ -1,15 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Python Byte Solutions"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Python Byte Solutions</h1>
-
-<hr />
-
-<pre>
+<p>
Nous sommes une entreprise de conseil en technologies de l'information
-fournissant tous les services dont : le développement logiciel, l'installation
+fournissant tous les services dont&nbsp;: le développement logiciel, l'installation
et l'aide pour les logiciels, l'administration système et l'hébergement. Nos
spécialités comprennent les technologies à source ouvert comme GNU/Linux, Zope
et Python. Si vous faites référence au site de Debian, nous reverserons à
-Debian 5 % du montant de la facture liée à votre projet.
-</pre>
+Debian 5&nbsp;% du montant de la facture liée à votre projet.
+</p>
diff --git a/french/consultants/qualsoftservices.wml b/french/consultants/qualsoftservices.wml
index 936c24884a4..cc06d6159a5 100644
--- a/french/consultants/qualsoftservices.wml
+++ b/french/consultants/qualsoftservices.wml
@@ -1,14 +1,13 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>QualSoft Services</h1>
-
-<hr />
+#use wml::debian::consultant name="QualSoft Services"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
QualSoft Services est une entreprise de développement externe de logiciels
offrant ses services pour ses clients dans le monde entier et produisant ses
-propre produits logiciels. Elle est spécialisée dans le développement de
+propre produits logiciels.
+</p>
+<p>
+Elle est spécialisée dans le développement de
logiciels personnalisés, les applications basées sur la Toile, les solutions de
commerce électronique, les applications basées sur les assistants personnels et
les applications client-serveur, mais également les applications de
diff --git a/french/consultants/qulix.wml b/french/consultants/qulix.wml
index ba61af1676d..aeabbf8bae9 100644
--- a/french/consultants/qulix.wml
+++ b/french/consultants/qulix.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Qulix Systems</h1>
+#use wml::debian::consultant name="Qulix Systems"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Qulix est une entreprise de développement logiciel externe dont le siège est à
diff --git a/french/consultants/r3deng.wml b/french/consultants/r3deng.wml
index 00da6d0af3c..4da1102ec29 100644
--- a/french/consultants/r3deng.wml
+++ b/french/consultants/r3deng.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>R3dEngineering</h1>
-
-<hr />
+#use wml::debian::consultant name="R3dEngineering"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Fourniture de logiciels pour J2EE (Tomcat, JSP, MySQL, Oracle, services Web) et
diff --git a/french/consultants/r_w_r.wml b/french/consultants/r_w_r.wml
index fd1e9fa3aec..3e7319ab52b 100644
--- a/french/consultants/r_w_r.wml
+++ b/french/consultants/r_w_r.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Daily Data, Inc."
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Daily Data, Inc.</h1>
-<hr>
-<pre>
+<p>
Nous vendons tout pour tout le monde, du particulier aux grandes entreprises,
<!-- We are a one-stop shop serving everyone ... -->
nous fournissons également de l'aide allant du paramétrage de systèmes
@@ -16,4 +14,4 @@ hétérogènes (nous pouvons même injecter un serveur Novell si vous le souhaitez
vraiment et payez en conséquence). Si nous ne pouvons pas faire quelque chose,
nous connaissons quelqu'un qui pourra et vous mettrons en contact avec (sans
commission).
-</pre>
+</p>
diff --git a/french/consultants/rafez_n.wml b/french/consultants/rafez_n.wml
index 83a157836be..453796c6ae9 100644
--- a/french/consultants/rafez_n.wml
+++ b/french/consultants/rafez_n.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Gazelle Informatics Ltd</h1>
+#use wml::debian::consultant name="Gazelle Informatics Ltd"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>Spécialistes de Lotus Domino sur Debian.</p>
diff --git a/french/consultants/researchut.wml b/french/consultants/researchut.wml
index 056f4ad7cb9..943ee72f424 100644
--- a/french/consultants/researchut.wml
+++ b/french/consultants/researchut.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>RESEARCHUT</h1>
-
-<hr />
+#use wml::debian::consultant name="RESEARCHUT"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
RESEARCHUT fournit tout autour du globe des solutions personnalisées de réseau
diff --git a/french/consultants/robert_millan.wml b/french/consultants/robert_millan.wml
index 138d6256d58..b4243ef64ca 100644
--- a/french/consultants/robert_millan.wml
+++ b/french/consultants/robert_millan.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Robert Millan"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Robert Millan</h1>
-<hr>
-<pre>
+<p>
Maintenance et administration de serveurs et de stations de travail Debian.
Ethernet, TCP/IP, routage, pare-feu, httpd, courriel, samba, etc.
-</pre>
+</p>
diff --git a/french/consultants/sam_solutions.wml b/french/consultants/sam_solutions.wml
index 20cfca2a7e2..851372238dd 100644
--- a/french/consultants/sam_solutions.wml
+++ b/french/consultants/sam_solutions.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>SaM-Solutions</h1>
-
-<hr />
+#use wml::debian::consultant name="SaM-Solutions"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Situé aux États-Unis, en Europe de l'Ouest et de l'Est, SaM-Solutions fournit
diff --git a/french/consultants/samantha_s.wml b/french/consultants/samantha_s.wml
index 0d540b7077f..e5a3b1c6d18 100644
--- a/french/consultants/samantha_s.wml
+++ b/french/consultants/samantha_s.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-
-<h1>Femtech</h1>
-
-<hr />
+#use wml::debian::consultant name="Femtech"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
<ul>
<li>Solutions pour fournisseurs d'accès internet</li>
diff --git a/french/consultants/samurai.wml b/french/consultants/samurai.wml
index 30603d739ff..8d0161d60bb 100644
--- a/french/consultants/samurai.wml
+++ b/french/consultants/samurai.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Samurai - Projetos Especiais</h1>
-
-<hr />
+#use wml::debian::consultant name="Samurai - Projetos Especiais"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Debian Linux, Plone, Zope, Samurai Linux.
diff --git a/french/consultants/scheeder.wml b/french/consultants/scheeder.wml
index 41628bb52a5..56ed9b61399 100644
--- a/french/consultants/scheeder.wml
+++ b/french/consultants/scheeder.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Scheeder &amp; Partner GmbH</h1>
-
-<hr />
+#use wml::debian::consultant name="Scheeder &amp; Partner GmbH"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Nous supportons des serveurs Debian dans l'industrie et la santé
diff --git a/french/consultants/seattlelinux.wml b/french/consultants/seattlelinux.wml
index 4e0102df31f..06f031468a7 100644
--- a/french/consultants/seattlelinux.wml
+++ b/french/consultants/seattlelinux.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Seattle Linux, Inc.</h1>
-
-<hr />
+#use wml::debian::consultant name="Seattle Linux, Inc."
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Services Linux et de logiciels à code source ouvert pour les petites
diff --git a/french/consultants/sergio_a.wml b/french/consultants/sergio_a.wml
index 71f18270fb2..50705ac149e 100644
--- a/french/consultants/sergio_a.wml
+++ b/french/consultants/sergio_a.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Sergio Arias"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Sergio Arias</h1>
-<hr>
-<pre>
+<p>
développements divers
-</pre>
+</p>
diff --git a/french/consultants/serverflow.wml b/french/consultants/serverflow.wml
index f544df4a187..cd04060f5ad 100644
--- a/french/consultants/serverflow.wml
+++ b/french/consultants/serverflow.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Serverflow consulting, d.o.o.</h1>
-
-<hr />
+#use wml::debian::consultant name="Serverflow consulting, d.o.o."
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Possibilité de télétravail où que soit l'emploi.
diff --git a/french/consultants/servitux.wml b/french/consultants/servitux.wml
index 16c7c40779d..a55ce89aa81 100644
--- a/french/consultants/servitux.wml
+++ b/french/consultants/servitux.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>ServiTux Servicios Inform&aacute;ticos S.L</h1>
-
-<hr />
+#use wml::debian::consultant name="ServiTux Servicios Inform&aacute;ticos S.L"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
À ServiTux nous développons et implantons toutes nos solutions avec Debian
diff --git a/french/consultants/shannon_d.wml b/french/consultants/shannon_d.wml
index 38357e2a6b6..fc9415bba51 100644
--- a/french/consultants/shannon_d.wml
+++ b/french/consultants/shannon_d.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>DeaTech Research Inc.</h1>
+#use wml::debian::consultant name="DeaTech Research Inc."
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>Spécialistes de temps réel, de pilotes de périphériques et de systèmes
embarqués. Expérience étendus en administration de systèmes, en développement
diff --git a/french/consultants/simone_giustetti.wml b/french/consultants/simone_giustetti.wml
index fd1fe5b3c3f..c942892fe23 100644
--- a/french/consultants/simone_giustetti.wml
+++ b/french/consultants/simone_giustetti.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-
-<h1>Studio Simone Giustetti</h1>
-
-<hr />
+#use wml::debian::consultant name="Studio Simone Giustetti"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
<p>
L'étude fournit des conseils centrés sur les systèmes informatiques et la
diff --git a/french/consultants/sine_nomine.wml b/french/consultants/sine_nomine.wml
index d372452b5d1..393400aeb39 100644
--- a/french/consultants/sine_nomine.wml
+++ b/french/consultants/sine_nomine.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Sine Nomine Associates"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Sine Nomine Associates</h1>
-<hr>
-<pre>
+<p>
Sine Nomine Associates est une entreprise de recherche et de développement
centrée sur l'application de technologies en expansion à des solutions
professionnelles.
-</pre>
+</p>
diff --git a/french/consultants/sniffer.wml b/french/consultants/sniffer.wml
index 687e0c22186..3fff882183a 100644
--- a/french/consultants/sniffer.wml
+++ b/french/consultants/sniffer.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Sniffer Networks Ltda.</h1>
+#use wml::debian::consultant name="Sniffer Networks Ltda."
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Spécialisé dans les serveurs d'applications pour la Toile et la récupération
diff --git a/french/consultants/softitaly.wml b/french/consultants/softitaly.wml
index 6dec6cfab10..76a2558dde7 100644
--- a/french/consultants/softitaly.wml
+++ b/french/consultants/softitaly.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Softitaly S.n.c.</h1>
-
-<hr />
+#use wml::debian::consultant name="Softitaly S.n.c."
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Disponible dans le nord de l'Italie.
diff --git a/french/consultants/soleyman.wml b/french/consultants/soleyman.wml
index 871641fc71e..0f3a40a1c9a 100644
--- a/french/consultants/soleyman.wml
+++ b/french/consultants/soleyman.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Le groupe Soleyman</h1>
-
-<hr />
+#use wml::debian::consultant name="Le groupe Soleyman"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Fourniture de services gérés et de conseils techniques commerciaux aux clients
diff --git a/french/consultants/solutionsfirst.wml b/french/consultants/solutionsfirst.wml
index 3f53ffdfae3..afc6a89f539 100644
--- a/french/consultants/solutionsfirst.wml
+++ b/french/consultants/solutionsfirst.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Solutions First</h1>
-
-<hr />
+#use wml::debian::consultant name="Solutions First"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Solutions First est une entreprise de conseil en technologies de l'information
diff --git a/french/consultants/sosa.wml b/french/consultants/sosa.wml
index 9e126460895..8dd04da28d2 100644
--- a/french/consultants/sosa.wml
+++ b/french/consultants/sosa.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Corporaci&oacute;n Sosa &amp; Sosa C.A."
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>Corporaci&oacute;n Sosa &amp; Sosa C.A.</h1>
-<hr>
-<pre>
+<p>
Systèmes d'exploitation, réseaux et sécurité.
-</pre>
+</p>
diff --git a/french/consultants/steve_l.wml b/french/consultants/steve_l.wml
index 580ad5036d0..413c1bcdbbd 100644
--- a/french/consultants/steve_l.wml
+++ b/french/consultants/steve_l.wml
@@ -1,14 +1,12 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="David Goodenough &amp; Associates Limited (DGA)"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>David Goodenough &amp; Associates Limited (DGA)</h1>
-<hr>
-<pre>
-Informations complémentaires : DGA est spécialisé en connectivité, et a été
-décrit comme un « un fabricant de colle technique » <!-- ? -->(« Technical Glue
-manufacturers »). Nous avons de l'expérience avec les systèmes d'entreprise, et
+<p>
+Informations complémentaires&nbsp;: DGA est spécialisé en connectivité, et a été
+décrit comme un «&nbsp;un fabricant de colle technique&nbsp;» <!-- ? -->(«&nbsp;Technical Glue
+manufacturers&nbsp;»). Nous avons de l'expérience avec les systèmes d'entreprise, et
nous avons beaucoup travaillé avec les serveurs Lotus Domino, Websphere et
Tomcat Web, ainsi qu'en programmation Java. Nous travaillons également sur des
systèmes de courriels d'entreprise, à la construction de passerelles entre des
systèmes propriétaires et SMTP, et nous faisons des migrations.
-</pre>
+</p>
diff --git a/french/consultants/storitback.wml b/french/consultants/storitback.wml
index e0e85efc7b4..09643598851 100644
--- a/french/consultants/storitback.wml
+++ b/french/consultants/storitback.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Stor IT Back, GbR</h1>
-
-<hr />
+#use wml::debian::consultant name="Stor IT Back, GbR"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Support pour le stockage et la sauvegarde, Debian et les sous-réseaux de
diff --git a/french/consultants/stuart_t.wml b/french/consultants/stuart_t.wml
index 49852a756bb..6c96b13f729 100644
--- a/french/consultants/stuart_t.wml
+++ b/french/consultants/stuart_t.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Linux Labs</h1>
+#use wml::debian::consultant name="Linux Labs"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>Spécialiste de LinuxBIOS et des grappes.</p>
diff --git a/french/consultants/syscovery.wml b/french/consultants/syscovery.wml
index afd2b4e2a8c..8ab260322e0 100644
--- a/french/consultants/syscovery.wml
+++ b/french/consultants/syscovery.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Services réseaux syscovery GmbH</h1>
-
-<hr />
+#use wml::debian::consultant name="Services réseaux syscovery GmbH"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
syscovery peut travailler pour vous sur des projets d'envergure régionale ou
diff --git a/french/consultants/tagfl.wml b/french/consultants/tagfl.wml
index 47ec6a66ad7..433b8e7c7e7 100644
--- a/french/consultants/tagfl.wml
+++ b/french/consultants/tagfl.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Technology Associates Group</h1>
+#use wml::debian::consultant name="Technology Associates Group"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Technology Associates Group (TAG) est une entreprise de conseil et de service
diff --git a/french/consultants/tecexperts.wml b/french/consultants/tecexperts.wml
index f75781ac6e3..981d72f61c3 100644
--- a/french/consultants/tecexperts.wml
+++ b/french/consultants/tecexperts.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>TecExpers</h1>
+#use wml::debian::consultant name="TecExpers"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Nous avons de l'expertise dans les domaines suivants&nbsp;:
diff --git a/french/consultants/ted_j.wml b/french/consultants/ted_j.wml
index 9b4f10aee7a..987224f5bc4 100644
--- a/french/consultants/ted_j.wml
+++ b/french/consultants/ted_j.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>JordanTeam IT Training</h1>
+#use wml::debian::consultant name="JordanTeam IT Training"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>Spécialisé en formation sur Unix, Linux et Solaris. Conseils en sécurité des
données, récupérations après désastre et partage d'application sur Unix et
diff --git a/french/consultants/tegtmeier.wml b/french/consultants/tegtmeier.wml
index 50861df986f..5cf41d3b55d 100644
--- a/french/consultants/tegtmeier.wml
+++ b/french/consultants/tegtmeier.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-
-<h1>Tegtmeier Internet Solutions e.K.</h1>
-
-<hr />
+#use wml::debian::consultant name="Tegtmeier Internet Solutions e.K."
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
<p>
Planification, réalisation, développement et maintenance de projets internet
diff --git a/french/consultants/terran_universal_systems.wml b/french/consultants/terran_universal_systems.wml
index 02acd3dbd3e..64db163962f 100644
--- a/french/consultants/terran_universal_systems.wml
+++ b/french/consultants/terran_universal_systems.wml
@@ -1,10 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.7" maintainer="Nicolas Bertolissio"
-
-<h1>Terran Univeral Systems</h1>
-
-<hr />
-
+#use wml::debian::consultant name="Terran Univeral Systems"
+#use wml::debian::translation-check translation="1.8" maintainer="Nicolas Bertolissio"
<h2>Terran Universal Systems -&greater; la stabilité D'ABORD</h2>
diff --git a/french/consultants/thoughtprocess.wml b/french/consultants/thoughtprocess.wml
index a80cfd8a96c..fbff525183d 100644
--- a/french/consultants/thoughtprocess.wml
+++ b/french/consultants/thoughtprocess.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>ThoughtProcess.net, Inc.</h1>
+#use wml::debian::consultant name="ThoughtProcess.net, Inc."
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Nous fournissons des migration de Windows et Novell vers Linux. Nous
diff --git a/french/consultants/tim_o.wml b/french/consultants/tim_o.wml
index 06b0ec93add..a882238a702 100644
--- a/french/consultants/tim_o.wml
+++ b/french/consultants/tim_o.wml
@@ -1,17 +1,17 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="OASys Engineering"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>OASys Engineering</h1>
-<hr>
-<pre>
-Informations complémentaires : OASys est spécialisé dans la fourniture de tout
+<p>
+Informations complémentaires&nbsp;: OASys est spécialisé dans la fourniture de tout
besoin informatique aux petites et moyennes entreprises. Nous recommandons
l'association de Debian GNU/Linux et de Samba plutôt qu'un serveur Windows NT
car Debian est stable, robuste et n'a pas de problèmes de licences. De plus,
nous révisons la plupart des variantes d'Unices ainsi que Windows 95, 98, et
-NT.
+NT.
+</p>
+<p>
OASys propose également de la formation et des cours d'administration de base
sur demande particulière.
-</pre>
+</p>
diff --git a/french/consultants/togaware.wml b/french/consultants/togaware.wml
index 02a88b3bb42..fdca8b1d12e 100644
--- a/french/consultants/togaware.wml
+++ b/french/consultants/togaware.wml
@@ -1,15 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Togaware"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>Togaware</h1>
-
-<hr />
-
-<pre>
+<p>
Togaware a plus de dix années d'expérience dans l'installation de systèmes
Debian GNU/Linux à la fois pour l'industrie et les collectivités, ainsi que
pour les particuliers. Notre guide de survie bureautique Debian GNU/Linux
contient de nombreuses références et est continuellement mis à jour. Nous
proposons aussi le paquet Debian wajig qui simplifie la gestion du système et
des paquets pour Debian.
-</pre>
+</p>
diff --git a/french/consultants/toni_m.wml b/french/consultants/toni_m.wml
index 082a01ad6f9..71a8b2becaa 100644
--- a/french/consultants/toni_m.wml
+++ b/french/consultants/toni_m.wml
@@ -1,18 +1,18 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Oeko.neT"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Oeko.neT</h1>
-<hr>
-<pre>
+<p>
Toni détient un diplôme universitaire en informatique et a maintenant une
dizaine d'années d'expérience en conseil dans le domaine des réseaux. Les
clients tels que des sociétés anonymes aiment les projets fonctionnels, qui
sont menés dans les temps et en tenant les budgets.
-
+</p>
+<p>
J'essaye de spécifier, de concevoir et de mettre en oeuvre des solutions
d'échelle robustes et sécurisées qui puissent soutenir une charge future si le
client le permet, peut-être à cause de mon passé de FAI.
-
+</p>
+<p>
Disponibles également pour travailler à l'étranger, en fonction du cahier des
charges, nous proposons un hébergement sur Debian, géré ou pas.
-</pre>
+</p>
diff --git a/french/consultants/transparen.wml b/french/consultants/transparen.wml
index b2d6a071bf5..657bf912eb8 100644
--- a/french/consultants/transparen.wml
+++ b/french/consultants/transparen.wml
@@ -1,59 +1,69 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Transparen Corporation"
+#use wml::debian::translation-check translation="1.4" maintainer="Nicolas Bertolissio"
-<h1>Transparen Corporation</h1>
-
-<hr />
-
-<pre>
+<p>
Transparen Corporation est sise au Canada et dispose de bureaux situés dans la
province de la Colombie Britannique, au Canada. Transparen Corporation fournit
ses services aux entreprises du Canada, des États-Unis, du Royaume-Uni et de
nombreux autres endroits dans le monde. Transparen Corporation accepte les
payements par carte de crédit et peut livrer des logiciels personnalisés
partout où internet est disponible.
-
+</p>
+<p>
Transparen Corporation utilise un réseau mondial de professionnels de
l'assistance, dont des programmeurs au Canada, aux États-Unis, en Russie et en
Ukraine. Les conseillers de Transparen sont situés au Canada et aux États-Unis.
-
+</p>
+<p>
Transparen a plusieurs domaines de prédilection, dont :
-- l'aide technique pour Linux et Windows ;
-- la personnalisation de Linux ;
-- l'écriture de documentation technique ;
-- les projets de logiciels personnalisés.
-
+</p>
+<ul>
+<li>l'aide technique pour Linux et Windows&nbsp;;</li>
+<li>la personnalisation de Linux&nbsp;;</li>
+<li>l'écriture de documentation technique&nbsp;;</li>
+<li>les projets de logiciels personnalisés.</li>
+</ul>
+<p>
Les clients d'Inde et du Pakistan utilisent les services de documentation
technique alors que ceux du Canada et des États-Unis utilisent les possibilités
de personnalisation de Linux ou d'autres projets de logiciels personnalisés.
-
+</p>
+<p>
La taille moyenne des projets de Transparen est de 12 000 $ américains, avec
des gros projets de 100 000 $ et certains petits de 2 000 $.
-
+</p>
+<p>
Transparen fournit un support commercial de Debian pour les clients qui ont
besoin de serveurs web ou de messagerie pour leurs applications
professionnelles. Le service est proposé sur site ou par d'autres moyens
distants, en fonction de ce qui est le plus approprié.
-
+</p>
+<p>
Transparen Corporation aide les clients dans leur utilisation de Debian pour
remplacer des contrôleurs de domaine Microsoft Windows lorsque c'est approprié.
-
+</p>
+<p>
Transparen Corporation fournit des services de personnalisation de Linux pour
les clients qui souhaitent produire des kiosques basés sur Debian pour leurs
succursales.
-
+</p>
+<p>
Transparen Corporation emploie un ordinateur utilisant Debian dans son
processus personnalisé de récupération des données de disques dur.
-
+</p>
+<p>
Transparen Corporation aide Debian et utilise Debian pour des fonctions serveur
et bureautique, et aide les clients qui utilisent Debian.
-
+</p>
+<p>
Transparen peut assister les clients sur les outils de script et d'aide à la
décision qui utilisent le système Debian comme technologie de support.
-
+</p>
+<p>
Transparen peut montrer comment utiliser Debian pour rendre un grand nombre
d'entreprise plus efficaces et plus rentables.
-
+</p>
+<p>
Transparen utilise des ordinateurs avec le système d'exploitation Debian dans
sa recherche de processus d'optimisation commerciale et d'aide à la décision.
-</pre>
+</p>
diff --git a/french/consultants/triona.wml b/french/consultants/triona.wml
index 99d5fd03d30..30ab65dd17c 100644
--- a/french/consultants/triona.wml
+++ b/french/consultants/triona.wml
@@ -1,11 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Triona - Information und Technologie GmbH"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Triona - Information und Technologie GmbH</h1>
-
-<hr />
-
-<pre>
+<p>
Installation et administration de systèmes Unix, logiciels personnels, conseils
en technologies de l'information
-</pre>
+</p>
diff --git a/french/consultants/trisinus.wml b/french/consultants/trisinus.wml
index 3f4202a9c6c..5e03a6f451d 100644
--- a/french/consultants/trisinus.wml
+++ b/french/consultants/trisinus.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Trisinus GmbH &amp; Co KG</h1>
-
-<hr />
+#use wml::debian::consultant name="Trisinus GmbH &amp; Co KG"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Nous proposons de l'aide commerciale pour Linux depuis&nbsp;1995. Bien que nous
diff --git a/french/consultants/trusted.wml b/french/consultants/trusted.wml
index 49f9316f42b..b1cac1eb843 100644
--- a/french/consultants/trusted.wml
+++ b/french/consultants/trusted.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-
-<h1>Trusted Solutions s.r.o.</h1>
+#use wml::debian::consultant name="Trusted Solutions s.r.o."
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
<p>
Trusted Solutions est une entreprise jeune et qui progresse orientée vers la
diff --git a/french/consultants/trustsec.wml b/french/consultants/trustsec.wml
index 6cfa60a81cd..24e4486bc3a 100644
--- a/french/consultants/trustsec.wml
+++ b/french/consultants/trustsec.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>trustsec IT solutions GmbH</h1>
+#use wml::debian::consultant name="trustsec IT solutions GmbH"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
trustsec est un partenaire de développement Debian et paye deux développeurs
diff --git a/french/consultants/turinglabs.wml b/french/consultants/turinglabs.wml
index d69842154a4..a8e7a792e82 100644
--- a/french/consultants/turinglabs.wml
+++ b/french/consultants/turinglabs.wml
@@ -1,19 +1,17 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Turing Labs, LLC"
+#use wml::debian::translation-check translation="1.3" maintainer="Nicolas Bertolissio"
-<h1>Turing Labs, LLC</h1>
-
-<hr />
-
-<pre>
+<p>
Intégration de sécurité réseau GNU/Linux, pare-feu redondants, système de
détection d'intrusion, routeurs pour réseaux étendus, évaluation de sécurité et
aide sur site pour les États du Connecticut et du Massachusetts aux États-Unis.
Programmation d'applications de bases de données et pour la Toile.
-
+</p>
+<p>
Debian est notre plate-forme serveur préférée.
-
+</p>
+<p>
Nous fournissons également de l'aide par internet ou au téléphone et de l'aide
gratuite lors des forums et des rencontres du groupe d'utilisateurs Linux de
Hartford.
-</pre>
+</p>
diff --git a/french/consultants/turo_technology.wml b/french/consultants/turo_technology.wml
index a38e559d122..4d20356db58 100644
--- a/french/consultants/turo_technology.wml
+++ b/french/consultants/turo_technology.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Turo Technology LLP"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Turo Technology LLP</h1>
-<hr>
-<pre>
+<p>
Développeur Debian. Préférence pour les logiciels libres. Préférence pour les
courriels signés avec GPG. Administration système essentiellement, résolution
de problèmes et développement et déploiement d'applications basées sur la
Toile. Espérantiste.
-</pre>
+</p>
diff --git a/french/consultants/udslinux.wml b/french/consultants/udslinux.wml
index 6b3d4b3ee74..101d7094bdb 100644
--- a/french/consultants/udslinux.wml
+++ b/french/consultants/udslinux.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>UDS Linux</h1>
-
-<hr />
+#use wml::debian::consultant name="UDS Linux"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Spécialiste du travail coopératif, de la sécurité, d'OpenOffice et de Samba.
diff --git a/french/consultants/ullrich-it-consult.wml b/french/consultants/ullrich-it-consult.wml
index 7956547d8ef..5893031f8cd 100644
--- a/french/consultants/ullrich-it-consult.wml
+++ b/french/consultants/ullrich-it-consult.wml
@@ -1,13 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Ullrich-IT-Consult"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Ullrich-IT-Consult</h1>
-
-<hr />
-
-<pre>
+<p>
Pour de plus amples informations, veuillez consulter ma page d'accueil,
m'envoyer un courriel ou me téléphoner directement. Toutes les solutions seront
-créées à partir de logiciels libres (selon la GPL et les règles « Debian »)
+créées à partir de logiciels libres (selon la GPL et les règles «&nbsp;Debian&nbsp;»)
exclusivement.
-</pre>
+</p>
diff --git a/french/consultants/ultreia.wml b/french/consultants/ultreia.wml
index 506177f0637..6f76a5bef1c 100644
--- a/french/consultants/ultreia.wml
+++ b/french/consultants/ultreia.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.6" maintainer="Nicolas Bertolissio"
-
-<h1>Ultreia Comunicaciones S.L.</h1>
-
-<hr />
+#use wml::debian::consultant name="Ultreia Comunicaciones S.L."
+#use wml::debian::translation-check translation="1.7" maintainer="Nicolas Bertolissio"
<p>
Ultreia Comunicaciones est un conseiller en conception se consacrant au
diff --git a/french/consultants/unimedgv.wml b/french/consultants/unimedgv.wml
index 17f8ba3f33d..c48f3849b8d 100644
--- a/french/consultants/unimedgv.wml
+++ b/french/consultants/unimedgv.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Unimed Governador Valadares</h1>
+#use wml::debian::consultant name="Unimed Governador Valadares"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Installation et configuration de serveurs et d'ordinateurs de bureau.
diff --git a/french/consultants/uslinux.wml b/french/consultants/uslinux.wml
index 9fe48903fb5..c871fd5528e 100644
--- a/french/consultants/uslinux.wml
+++ b/french/consultants/uslinux.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>U.S. Linux Networks</h1>
+#use wml::debian::consultant name="U.S. Linux Networks"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Accords d'assistance sur le long terme possibles.
diff --git a/french/consultants/viridiansun.wml b/french/consultants/viridiansun.wml
index 0e3a9ab40b5..f07a3231c97 100644
--- a/french/consultants/viridiansun.wml
+++ b/french/consultants/viridiansun.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Viridian Sun</h1>
+#use wml::debian::consultant name="Viridian Sun"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Nous disposons de notre propre équipe d'aide dédiée et de nos propres
diff --git a/french/consultants/vivek_k.wml b/french/consultants/vivek_k.wml
index 6db46fd506f..ebe64e34183 100644
--- a/french/consultants/vivek_k.wml
+++ b/french/consultants/vivek_k.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Vivek Kumar</h1>
+#use wml::debian::consultant name="Vivek Kumar"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>Spécialiste en développement de pilotes de périphériques et de code
d'amorçage.</p>
diff --git a/french/consultants/webspacestation.wml b/french/consultants/webspacestation.wml
index 470131d9378..6e66e2a351a 100644
--- a/french/consultants/webspacestation.wml
+++ b/french/consultants/webspacestation.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Web Space Station</h1>
-
-<hr />
+#use wml::debian::consultant name="Web Space Station"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Entreprise de développement de logiciels personnalisés et de développement pour
diff --git a/french/consultants/welters.wml b/french/consultants/welters.wml
index a9951ff083f..74d2c94db35 100644
--- a/french/consultants/welters.wml
+++ b/french/consultants/welters.wml
@@ -1,12 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
+#use wml::debian::consultant name="Welters Datentechnik"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
-<h1>Welters Datentechnik</h1>
-
-<hr>
-
-<pre>
+<p>
Debian GNU/Linux comme remplaçant de Micro$oft.
Installation et exploitation d'Exim, Sendmail, Samba, DHCP, Bind, MySQL
Hébergement et support de réseaux petits et moyens
-</pre>
+</p>
diff --git a/french/consultants/woods.wml b/french/consultants/woods.wml
index 85f449558be..ebe2457f0dc 100644
--- a/french/consultants/woods.wml
+++ b/french/consultants/woods.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>Woods Networking Consultants</h1>
-
-<hr />
+#use wml::debian::consultant name="Woods Networking Consultants"
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Nous travaillons aux États-Unis, au Canada et en Europe. Nous sommes cependant
diff --git a/french/consultants/xsto.info.wml b/french/consultants/xsto.info.wml
index 567741e8045..1fcaeb7a0e7 100644
--- a/french/consultants/xsto.info.wml
+++ b/french/consultants/xsto.info.wml
@@ -1,9 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" maintainer="Nicolas Bertolissio"
-
-<h1>xsto.info S. Coop. Mad.</h1>
-
-<hr />
+#use wml::debian::consultant name="xsto.info S. Coop. Mad."
+#use wml::debian::translation-check translation="1.2" maintainer="Nicolas Bertolissio"
<p>
Entreprise spécialisée dans les logiciels libres, l'accessibilité, le réseau et
diff --git a/german/consultants/757_technologies.wml b/german/consultants/757_technologies.wml
index d6174c7165c..43c6ad5e765 100644
--- a/german/consultants/757_technologies.wml
+++ b/german/consultants/757_technologies.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="757 Technologies"
+#use wml::debian::translation-check translation="1.3"
# Translator: Tobias Toedter <t.toedter@gmx.net>, 2004-06-09
# $Id$
-<h1>757 Technologies</h1>
-<hr />
<p>
Wir bieten die Installation und Integration von Debian GNU/Linux an
sowie GNU/Linux Co-Location und Wartung. Wir bedienen das Gebiet
diff --git a/german/consultants/abv.wml b/german/consultants/abv.wml
index c5c79230d8a..ef35348bbaa 100644
--- a/german/consultants/abv.wml
+++ b/german/consultants/abv.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="ABV - Integrator System&oacute;w i Sieci Komputerowych"
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-10
# $Id$
-<h1>ABV - Integrator System&oacute;w i Sieci Komputerowych</h1>
-<hr />
<ul>
<li>Servicegrad-Verträge <url http://www.abv.pl/sla.html></li>
<li>Outsourcing</li>
diff --git a/german/consultants/ace_technology_group.wml b/german/consultants/ace_technology_group.wml
index 4ee0ddd89a4..4c84e401333 100644
--- a/german/consultants/ace_technology_group.wml
+++ b/german/consultants/ace_technology_group.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="ACE Technology Group"
+#use wml::debian::translation-check translation="1.2"
# Translator: Tobias Toedter <t.toedter@gmx.net>, 2004-06-09
# $Id$
-<h1>ACE Technology Group</h1>
-<hr>
-<pre>
+<p>
Management von Infrastruktur, Migration von Windows nach Linux,
allgemeine Linux-Beratung.
-</pre>
+</p>
diff --git a/german/consultants/aerasec.wml b/german/consultants/aerasec.wml
index 37b3adc2c8e..4ad20002b42 100644
--- a/german/consultants/aerasec.wml
+++ b/german/consultants/aerasec.wml
@@ -1,12 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="AERAsec GmbH"
+#use wml::debian::translation-check translation="1.3"
# Translator: Tobias Toedter <t.toedter@gmx.net>, 2004-06-09
# $Id$
-<h1>AERAsec GmbH</h1>
-<hr>
-<pre>
+<p>
Sicherheit, komplexe Netzwerkszenarien, Serverstrategien.
-
+</p>
+<p>
Außerdem: München/Deutschland.
-</pre>
+</p>
diff --git a/german/consultants/agentbob.wml b/german/consultants/agentbob.wml
index 18280ba8475..35e4b95042e 100644
--- a/german/consultants/agentbob.wml
+++ b/german/consultants/agentbob.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Dipl.-Ing.(BA) Jochen Seifarth"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-07
# $Id$
-<h1>Dipl.-Ing.(BA) Jochen Seifarth</h1>
-<hr />
<p>
Spezialisiere neben Debian auf Oracle/PeopleSoft-, Java-, XML-Entwicklung,
-Integration und -Optimierung
diff --git a/german/consultants/aleph1.wml b/german/consultants/aleph1.wml
index 13da6a4fdee..5258344d013 100644
--- a/german/consultants/aleph1.wml
+++ b/german/consultants/aleph1.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Aleph One Ltd"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-13
# $Id$
-<h1>Aleph One Ltd</h1>
-
<p>
Wir haben uns auf eingebettete/kleine Systeme und die ARM-Architektur
spezialisiert, aber der Großteil dieser Expertise kann auf eingebettete
diff --git a/german/consultants/alex_r.wml b/german/consultants/alex_r.wml
index ae488c1a8d6..6cd21f6d202 100644
--- a/german/consultants/alex_r.wml
+++ b/german/consultants/alex_r.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Breakthrough LTD"
+#use wml::debian::translation-check translation="1.2"
# Translator: Noel Köthe, noel@debian.org, 2001-12-18
# $Id$
-<h1>Breakthrough LTD</h1>
-<hr />
<p>
Wir erstellen Internet/Intranet Server, die alle Firmenanforderungen
liefern:
diff --git a/german/consultants/amazon.wml b/german/consultants/amazon.wml
index 2c104a59e48..35bc3b367f7 100644
--- a/german/consultants/amazon.wml
+++ b/german/consultants/amazon.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Pedro Ivo Lima"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann <kreutzm@itp.uni-hannover.de>, 2005-06-11
# $Id$
-<h1>Pedro Ivo Lima</h1>
-<hr />
<p>
LCP - Linux Certified Professional - SAIR -
<a href="http://www.linuxcertification.org">www.linuxcertification.org</a>
diff --git a/german/consultants/anderson.wml b/german/consultants/anderson.wml
index 537a060ec74..a8804a9b59a 100644
--- a/german/consultants/anderson.wml
+++ b/german/consultants/anderson.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Anderson Carlos Daniel Sanches"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-11
# $Id$
-<h1>Anderson Carlos Daniel Sanches</h1>
-
<p>
Entwicklung unter der GPL, Server-Konfiguration und -Administration, Training.
</p>
diff --git a/german/consultants/andreu_i.wml b/german/consultants/andreu_i.wml
index c21aceafe5c..b69f68e9404 100644
--- a/german/consultants/andreu_i.wml
+++ b/german/consultants/andreu_i.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Internet Web Serveis"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-16
# $Id$
-<h1>Internet Web Serveis</h1>
-<hr />
-<pre>
+<p>
IWS bietet alle Arten von Linux- und Debian-bezogenen Diensten seit 1995:
Beratung, Entwicklung, Implementation, Unterstützung, Training und so weiter.
-</pre>
+</p>
diff --git a/german/consultants/anmsoft.wml b/german/consultants/anmsoft.wml
index a0388479602..0088ee1b995 100644
--- a/german/consultants/anmsoft.wml
+++ b/german/consultants/anmsoft.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="ANMsoft Technologies"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>ANMsoft Technologies</h1>
-<hr />
-<pre>
+<p>
ANMsoft Technologies fokussiert sich auf ausgelagerte Entwicklung und hat
starke Erfahrung im Bereich der Banken-, Kredit-/Debit-/Smartkarten- und
Finanzdienstleistungsindustrie erlangt. MVC-basierte J2EE-Architektur wird
für die Entwicklung verwendet.
-</pre>
+</p>
diff --git a/german/consultants/antonio_cosenza.wml b/german/consultants/antonio_cosenza.wml
index 16bf8bbb8b2..ffb8cae1f94 100644
--- a/german/consultants/antonio_cosenza.wml
+++ b/german/consultants/antonio_cosenza.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Antonio Cosenza"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Antonio Cosenza</h1>
-<hr />
-<pre>
+<p>
Open Source und GIS/Web-gis-Anwendungen basierend auf Debian GNU/Linux
-</pre>
+</p>
diff --git a/german/consultants/ants-art.wml b/german/consultants/ants-art.wml
index 4beba8505f8..808e73a6cb5 100644
--- a/german/consultants/ants-art.wml
+++ b/german/consultants/ants-art.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="ants-art"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-06
# $Id$
-<h1>ants-art</h1>
-<hr />
<p>
ants-art... die Kunst, es wie Ameisen zu machen.
</p>
diff --git a/german/consultants/applepie-solutions.wml b/german/consultants/applepie-solutions.wml
index 3555366ed4c..999d3c54616 100644
--- a/german/consultants/applepie-solutions.wml
+++ b/german/consultants/applepie-solutions.wml
@@ -1,14 +1,12 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Applepie Solutions"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Applepie Solutions</h1>
-<hr />
-<pre>
+<p>
Wir verwenden und entwickeln unter Linux seit mehr als 10 Jahren und haben
viel Erfahrung in einer Reihe von Distributionen darunter Debian, Red Hat
und SuSE sowohl auf dem PC als auch auf Plattformen wie Alpha und Itanium.
Verfügbar für Beratertätigkeit in ganz Irland. Wir bieten auch eine Reihe
von Linux-Training-Kursen an.
-</pre>
+</p>
diff --git a/german/consultants/apsis.wml b/german/consultants/apsis.wml
index 6a21eecf92b..3b887ee9937 100644
--- a/german/consultants/apsis.wml
+++ b/german/consultants/apsis.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Apsis S.r.l."
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Apsis S.r.l.</h1>
-<hr />
-<pre>
+<p>
Wir entwickeln Software und bieten Support für die Debian
GNU/Linux-Plattform.
-</pre>
+</p>
diff --git a/german/consultants/avalonix.wml b/german/consultants/avalonix.wml
index 70b25d4a0bd..3efbce796a7 100644
--- a/german/consultants/avalonix.wml
+++ b/german/consultants/avalonix.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="AVALONIX Linux Systems Support"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>AVALONIX Linux Systems Support</h1>
-<hr />
-<pre>
+<p>
spezialisiert auf Training; E-Publizieren; Dokument-Entwicklung
-</pre>
+</p>
diff --git a/german/consultants/baton_rouge.wml b/german/consultants/baton_rouge.wml
index 096d24b9065..e962c3c8cc0 100644
--- a/german/consultants/baton_rouge.wml
+++ b/german/consultants/baton_rouge.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Baton Rouge Free Computing"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Baton Rouge Free Computing</h1>
-<hr />
-<pre>
+<p>
Desktop Linux.
-</pre>
+</p>
diff --git a/german/consultants/beeznest.wml b/german/consultants/beeznest.wml
index ebe3136faba..c2c5590df59 100644
--- a/german/consultants/beeznest.wml
+++ b/german/consultants/beeznest.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="BeezNest"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>BeezNest</h1>
-<hr />
-<pre>
+<p>
Kann zwischen den Niederlanden und Spanien überall in Europa arbeiten,
darunter auch in Deutschland, und mehr falls notwendig.
-</pre>
+</p>
diff --git a/german/consultants/beil.wml b/german/consultants/beil.wml
index 006195fd7cf..d6ba2d559b2 100644
--- a/german/consultants/beil.wml
+++ b/german/consultants/beil.wml
@@ -1,12 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Beil Problem Solutions"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-17
# $Id$
-<h1>Beil Problem Solutions</h1>
-<hr />
-<pre>
+<p>
Ein Notar in Thawtes Web-of-Trust: bedeutet S/MIME E-Mail-Zertifikate
-kostenlos für persönliche Verwendung....http://www.thawte.com/wot/
-oder http://www.lugg.de/zertifikate.php
-</pre>
+kostenlos für persönliche Verwendung....
+<a href="http://www.thawte.com/wot/">http://www.thawte.com/wot/</a> oder
+<a href="http://www.lugg.de/zertifikate.php">http://www.lugg.de/zertifikate.php<a>
+</p>
diff --git a/german/consultants/ben_b.wml b/german/consultants/ben_b.wml
index cac51a742b6..b8d16c9e83f 100644
--- a/german/consultants/ben_b.wml
+++ b/german/consultants/ben_b.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Ben Bell"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Ben Bell</h1>
-
<p>Ich spezialisiere mich im Design und der Implementation von Infrastruktur
-- Netzen, Servern und Software. Ich habe eine weite Spanne von Erfahrung
da ich in Positionen von Netz- und Systemarchitektur für einen internationalen
diff --git a/german/consultants/bentosolutions.wml b/german/consultants/bentosolutions.wml
index f86899f45fe..58868b9144b 100644
--- a/german/consultants/bentosolutions.wml
+++ b/german/consultants/bentosolutions.wml
@@ -1,15 +1,13 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Bento Solutions"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Bento Solutions</h1>
-<hr />
-<pre>
+<p>
Bento Solutions: Komplette integrierte Informationsverwaltungslösungen
für kleine Betriebe und Regierungen unter Verwendung von Open Source
Software. Bento ist japanisch und bedeutet eingepacktes Mittagessen.
Ein komplettes Mittagessen in einer Packung. Eine Bento-Lösung ist
ein komplettes Informationsverwaltungssystem für öffentliche und
private Einheiten, alles in einer Packung.
-</pre>
+</p>
diff --git a/german/consultants/bitpusher.wml b/german/consultants/bitpusher.wml
index ca08eb66942..43add0dde8a 100644
--- a/german/consultants/bitpusher.wml
+++ b/german/consultants/bitpusher.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="BitPusher, LLC"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-27
# $Id$
-<h1>BitPusher, LLC</h1>
-<hr />
<p>
BitPusher, LLC sellt einen Satz von hochkalibriegen
Linux-Beratungs-Dienstleistungen bereit, um bei der Implementation und laufenden
diff --git a/german/consultants/bitspot.wml b/german/consultants/bitspot.wml
index d090f9766e7..1de5af9b8a7 100644
--- a/german/consultants/bitspot.wml
+++ b/german/consultants/bitspot.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Bitspot AG"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-17
# $Id$
-<h1>Bitspot AG</h1>
-<hr />
<p>
Lange Erfahrung in IT-Sicherheit,
Netzen, Software-Entwicklung
diff --git a/german/consultants/brainalliance.wml b/german/consultants/brainalliance.wml
index a26a8d0a20d..ac474f58275 100644
--- a/german/consultants/brainalliance.wml
+++ b/german/consultants/brainalliance.wml
@@ -1,14 +1,12 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Brain Alliance Solutions Oy / Ltd"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-19
# $Id$
-<h1>Brain Alliance Solutions Oy / Ltd</h1>
-<hr />
-<pre>
+<p>
Brain Alliance Solutions Oy / Ltd befindet sich in Espoo, Finnland. Wir bieten
professionelle Debian GNU/Linux-Installationen, Support, Consulting, Server-
und Workstation-Lösungen. Für weitere Informationen besuchen Sie unseren
Webauftritt unter
-http://www.brainalliance.com
-</pre>
+<a href="http://www.brainalliance.com">http://www.brainalliance.com</a>
+</p>
diff --git a/german/consultants/bryan_b.wml b/german/consultants/bryan_b.wml
index 131d3026764..3689031e8b3 100644
--- a/german/consultants/bryan_b.wml
+++ b/german/consultants/bryan_b.wml
@@ -1,15 +1,13 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Netsolus Consulting"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-19
# $Id$
-<h1>Netsolus Consulting</h1>
-<hr />
-<pre>
+<p>
Netsolus Consulting bietet Linux- und Windows-Integration ohne Vorzug eines
speziellen Anbieters oder eines speziellen Produkts. Unsere Anbieter- und
Produktneutralität garantieren die richtige Lösung für Ihre Geschäft. Voller
entfernter und vor-Ort-Support für Linux und die meisten Open Source-Produkte
erhältlich.
-</pre>
+</p>
diff --git a/german/consultants/buici.wml b/german/consultants/buici.wml
index 2511538da42..359e7e0e8af 100644
--- a/german/consultants/buici.wml
+++ b/german/consultants/buici.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="The Buici Company"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-19
# $Id$
-<h1>The Buici Company</h1>
-<hr />
-<pre>
+<p>
Referenzen verfügbar
-</pre>
+</p>
diff --git a/german/consultants/buttersideup.wml b/german/consultants/buttersideup.wml
index 95796da23e3..f3eb21cb401 100644
--- a/german/consultants/buttersideup.wml
+++ b/german/consultants/buttersideup.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="WDAP Limited"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-06
# $Id$
-<h1>WDAP Limited</h1>
-<hr />
<p>
Ich bin bereit, im ganzen Vereinigten Königreich und Übersee zu arbeiten. Für
längere Beschäftigungen (&gt;1 Woche) bevorzuge ich es, in Fahrtreichweite von
diff --git a/german/consultants/cargol.wml b/german/consultants/cargol.wml
index 1486c7d47cd..cbb9ee3b3c4 100644
--- a/german/consultants/cargol.wml
+++ b/german/consultants/cargol.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Cargol.net Solucions Lliures"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-06
# $Id$
-<h1>Cargol.net Solucions Lliures</h1>
-<hr />
<p>
Wir sind eine junge Firma von erfahrend und sachkundigen Computer-Fachmännern.
Wir bieten eine große Bandbreite an Diensten, die auf Freie Software fokusiert
diff --git a/german/consultants/catalyst.wml b/german/consultants/catalyst.wml
index 3627fade1f3..0dc948c0e76 100644
--- a/german/consultants/catalyst.wml
+++ b/german/consultants/catalyst.wml
@@ -1,31 +1,31 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.4"
+#use wml::debian::consultant name="Catalyst IT Ltd"
+#use wml::debian::translation-check translation="1.5"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-02
# $Id$
-<h1>Catalyst IT Ltd</h1>
-<hr />
-<pre>
+<p>
Angebotene Dienste:
-* Unterstützung via Telefon, E-Mail, entfernten Zugriff oder Vor-Ort
- (hauptsächlich Wellington und Auckland).
-* Debian GNU/Linux-Beratung &amp; -Unterstützung - Installations/Upgrade-Unterstützung
- NFS/Samba/DNS/DHCP/LDAP/E-Mail/Spam-Filter, angepasst gebautes Debian.
-* Entwicklungs-Unterstützung - wir verfügen über mehr als 30 Programmierer,
+</p>
+<ul>
+<li>Unterstützung via Telefon, E-Mail, entfernten Zugriff oder Vor-Ort
+ (hauptsächlich Wellington und Auckland).</li>
+<li>Debian GNU/Linux-Beratung &amp; -Unterstützung - Installations/Upgrade-Unterstützung
+ NFS/Samba/DNS/DHCP/LDAP/E-Mail/Spam-Filter, angepasst gebautes Debian.</li>
+<li>Entwicklungs-Unterstützung - wir verfügen über mehr als 30 Programmierer,
die in einer großen Bandbreite von Sprachen und Werkzeugen erfahren sind,
- darunter C, C++, Java, Perl, PHP, PostgreSQL, MySQL und viele mehr ...
-* Web-Seiten Hosting - wir haben unsere eigenen Internet-Server und einen
+ darunter C, C++, Java, Perl, PHP, PostgreSQL, MySQL und viele mehr ...</li>
+<li>Web-Seiten Hosting - wir haben unsere eigenen Internet-Server und einen
100 MB Draht ans Internet mit UPS- und Generatorabsicherung und redundanten
- Standorten, falls benötigt.
-* Internet-Zugang und Firewalls - gebaut aus Debian GNU/Linux.
-* Entfernte System-Administration - falls Sie nicht die Zeit haben, um ein
+ Standorten, falls benötigt.</li>
+<li>Internet-Zugang und Firewalls - gebaut aus Debian GNU/Linux.</li>
+<li>Entfernte System-Administration - falls Sie nicht die Zeit haben, um ein
Netz von Dutzenden von GNU/Linux-Maschinen in Ihrem Intranet oder Extranet
zu warten, oder falls Sie vielleicht gerade Unix lernen (oder Unix gar nicht
lernen wollen), aber JETZT eine GNU/Linux-Maschine in Ihrem Büro haben
wollen. Catalyst kann aus der Ferne Ihre Maschine konfigurieren und Uprades
- via Internet durchführen (über verschlüsselte Verbindungen).
-* Andere IT-Beratungs-Dienstleistungen - Catalyst hat ein Team mit Erfahrung
+ via Internet durchführen (über verschlüsselte Verbindungen).</li>
+<li>Andere IT-Beratungs-Dienstleistungen - Catalyst hat ein Team mit Erfahrung
von strategischer Modellierung bis zu Assembler-Programmierung, das Sie
mit qualitativen Dienstleistungen zu konkurrenzfähigen Preisen unterstützen
- kann.
-</pre>
+ kann.</li>
+</ul>
diff --git a/german/consultants/charles_s.wml b/german/consultants/charles_s.wml
index 4968f492e7c..89a153b992f 100644
--- a/german/consultants/charles_s.wml
+++ b/german/consultants/charles_s.wml
@@ -1,22 +1,26 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Activate Multi User System Support"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-19
# $Id$
-<h1>Activate Multi User System Support</h1>
-<hr />
-<pre>
+<p>
Spezialisiert in Unix-Netz-Konstruktion und missionskritischen Support
+</p>
+<p>
Wir unterstützen
-Debian
-Caldera
-Red Hat
-SCO
-Cisco
-Bay networks
-Microsoft
+</p>
+<ul>
+<li>Debian</li>
+<li>Caldera</li>
+<li>Red Hat</li>
+<li>SCO</li>
+<li>Cisco</li>
+<li>Bay networks</li>
+<li>Microsoft</li>
+</ul>
+<p>
Preise für Wartungs-Verträge und Telephon-Beratung auf Anfrage
-</pre>
+</p>
diff --git a/german/consultants/cits.wml b/german/consultants/cits.wml
index 89260b41492..b2e6484693f 100644
--- a/german/consultants/cits.wml
+++ b/german/consultants/cits.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Commercial IT Services"
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Commercial IT Services</h1>
-<hr />
<p>
Commercial IT Services bietet Unterstützung für verschiedene Open
Source-Produkte und sind Linux-Integrations-Spezialisten. Wir
diff --git a/german/consultants/clockwork.wml b/german/consultants/clockwork.wml
index c769febb7e1..75af02b4f69 100644
--- a/german/consultants/clockwork.wml
+++ b/german/consultants/clockwork.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Clockwork Software Systems"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-15
# $Id$
-<h1>Clockwork Software Systems</h1>
-<hr />
<p>
Clockwork Software Systems sind GNU/Linux-Geschäftsspezialisten. Wir
spezialisieren uns auf Debian-basierte betreute Desktop-Lösungen, mit
diff --git a/german/consultants/clue_inc.wml b/german/consultants/clue_inc.wml
index 58134d784a8..e0644fbb6c2 100644
--- a/german/consultants/clue_inc.wml
+++ b/german/consultants/clue_inc.wml
@@ -1,14 +1,12 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="clue inc"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-19
# $Id$
-<h1>clue inc</h1>
-<hr />
-<pre>
+<p>
clue inc bietet maßgeschneiderte Entwicklung mit Open Source und
frei-erhältlichen Technologien. Wir spezialisieren uns in Entwicklung und
Einsatz von Debian, sind aber auch in anderen Umgebungen gut versiert. Wir
stehen auch für Systemadministration, Wartung und Sicherheitsberatung zur
Verfügung.
-</pre>
+</p>
diff --git a/german/consultants/coderscorp.wml b/german/consultants/coderscorp.wml
index 51b2279a5bd..d5322bbfec4 100644
--- a/german/consultants/coderscorp.wml
+++ b/german/consultants/coderscorp.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="CodersCorp"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-19
# $Id$
-<h1>CodersCorp</h1>
-<hr />
-<pre>
+<p>
Wir beraten mit Linux und sind auf Debian spezialisiert, derzeit haben wir
ein Portofolio von mehreren ISPs und Firmen.
-</pre>
+</p>
diff --git a/german/consultants/coherent_light.wml b/german/consultants/coherent_light.wml
index aa931fd776f..af16e774c02 100644
--- a/german/consultants/coherent_light.wml
+++ b/german/consultants/coherent_light.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Coherent Light"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Coherent Light</h1>
-<hr />
-<pre>
+<p>
Spezialist im Web-Hosting, E-Mail-Verwaltung und Internet-Vernetzung.
-</pre>
+</p>
diff --git a/german/consultants/con_z.wml b/german/consultants/con_z.wml
index ec25cdcaeac..4d666fce858 100644
--- a/german/consultants/con_z.wml
+++ b/german/consultants/con_z.wml
@@ -1,53 +1,67 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.5"
+#use wml::debian::consultant name="Cybersource Pty Ltd"
+#use wml::debian::translation-check translation="1.6"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-29
# $Id$
-<h1>Cybersource Pty Ltd</h1>
-<hr />
-<pre>
+<p>
Wir sind Australiens führende Linux- und Freie/Open Source-Lösungen-Firma,
mit mehr als 14 Jahren im Geschäft und 25 Mitarbeitern. Wer unterstützen seit
langem die Linux-Gemeinschaft, helfen dabei, Open Source Victoria und Open
Source Industry Australia zu etablieren.
-
+</p>
+<p>
Wir können die folgenden Dienste für GNU/Linux anbieten:
-
+</p>
+<ul>
+ <li>
Unsere Kern-Expertise-Gebiete sind:
- * Linux Systemadministration, Unterstützung und Optimierung
- * Australiens führende Linux-Lösungen-Firma
- * Linux bis MS-Windows-Plattformintegration
- * Linux System- und Anwendungs-(LAMP-)Entwicklung
- * Geräteentwicklung unter Verwendung von Linux/FOSS-Komponenten
-
+ <ul>
+ <li>Linux Systemadministration, Unterstützung und Optimierung</li>
+ <li>Australiens führende Linux-Lösungen-Firma</li>
+ <li>Linux bis MS-Windows-Plattformintegration</li>
+ <li>Linux System- und Anwendungs-(LAMP-)Entwicklung</li>
+ <li>Geräteentwicklung unter Verwendung von Linux/FOSS-Komponenten</li>
+ </ul>
+ </li>
+ <li>
Unsere Dienste:
- * Proaktive Systemadministration-Dienste.
- * 24stündige entfernte System- und Netzüberwachung
- * Kurzfristiger Ersatz für eigene Systemadministratoren
- * SAMBA- und Linux-Server-Ersatz von NT-Servern
- * Sichere Web-Server-Installationen
- * Pro-Vorfall Linux-Unterstützung (Help Desk)
- * Netzplanung, Topologie- und System-Sicherheits-Design
- * Internet Expertise und Firewalls
-
+ <ul>
+ <li>Proaktive Systemadministration-Dienste.</li>
+ <li>24stündige entfernte System- und Netzüberwachung</li>
+ <li>Kurzfristiger Ersatz für eigene Systemadministratoren</li>
+ <li>SAMBA- und Linux-Server-Ersatz von NT-Servern</li>
+ <li>Sichere Web-Server-Installationen</li>
+ <li>Pro-Vorfall Linux-Unterstützung (Help Desk)</li>
+ <li>Netzplanung, Topologie- und System-Sicherheits-Design</li>
+ <li>Internet Expertise und Firewalls</li>
+ </ul>
+ </li>
+ <li>
Unsere Produkte (aufgebaut auf Linux/FOSS):
- * Cybersource/DATASAFE: Erstellt tägliche Schnappschüsse Ihres Servers
- * Cybersource Small Business Linux Server: Der preiswerteste kleine
+ <ul>
+ <li>Cybersource/DATASAFE: Erstellt tägliche Schnappschüsse Ihres Servers</li>
+ <li>Cybersource Small Business Linux Server: Der preiswerteste kleine
Geschäftsserver auf dem Markt und 75% weniger teuer als die
- Microsoft-Alternative
- * Cybersource Trim Client: Alle Vorteile des »Thin Clients« ohne eines der
- Nachteile
- * The Safe Internet Computer: Der sicherste Weg das Internet zu benutzen
- * Warm Spare Server Replicator: Dupliziert Ihre wichtigen Server.
- * LiveLAMP: LAMP LiveCD-Projekt.
-
+ Microsoft-Alternative</li>
+ <li>Cybersource Trim Client: Alle Vorteile des »Thin Clients« ohne eines der
+ Nachteile</li>
+ <li>The Safe Internet Computer: Der sicherste Weg das Internet zu benutzen</li>
+ <li>Warm Spare Server Replicator: Dupliziert Ihre wichtigen Server.</li>
+ <li>LiveLAMP: LAMP LiveCD-Projekt.</li>
+ </ul>
+ </li>
+</ul>
+<p>
Wir können auch auf Linux-basiert entwickeln:
- * C/C++
- * Perl
- * Java
- * Python
- * PHP Web-Datenbank-Integration
- * MySQL
- * PostgreSQL
- * VB &amp; VBA-Migration zu Linux
-</pre>
+</p>
+<ul>
+ <li>C/C++</li>
+ <li>Perl</li>
+ <li>Java</li>
+ <li>Python</li>
+ <li>PHP Web-Datenbank-Integration</li>
+ <li>MySQL</li>
+ <li>PostgreSQL</li>
+ <li>VB &amp; VBA-Migration zu Linux</li>
+</ul>
+</p>
diff --git a/german/consultants/cory_p.wml b/german/consultants/cory_p.wml
index f58c591e974..b113a56ed4e 100644
--- a/german/consultants/cory_p.wml
+++ b/german/consultants/cory_p.wml
@@ -1,14 +1,12 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Uversa Consulting"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-19
# $Id$
-<h1>Uversa Consulting</h1>
-<hr />
-<pre>
+<p>
Wir bieten Beratungsdienstleistungen für Unternehmen mit einem Fokus auf
Linux und Open Source-Software. Wir bieten auch Sicherheitsberatung, allgemeinen
Linux- und Debian-Support, maßgeschneiderte Entwicklung und Netz-Beratung mit
Preisen, die für kleine und mittlere Unternehmen erschwinglich sind.
-</pre>
+</p>
diff --git a/german/consultants/credativ.wml b/german/consultants/credativ.wml
index 42e7bfb4347..43427f0562e 100644
--- a/german/consultants/credativ.wml
+++ b/german/consultants/credativ.wml
@@ -1,17 +1,19 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="credativ GmbH"
+#use wml::debian::translation-check translation="1.2"
<h1>credativ GmbH</h1>
<hr/>
-<pre>
+<p>
Die credativ GmbH beschäftigt acht Debian-Entwickler, die auch in ihrem Job an
Debian arbeiten. Sie stellen regelmäßig CDs und andere Sachen für den
LinuxTag bereit und helfen allgemein Debian in Deutschland.
+</p>
+<p>
Die credativ GmbH ist ein herstellerunabhängiges Beratungs- und
Dienstleistungsunternehmen, das sich auf die Bereiche Qualitätssicherung in
IT-Projekten, Systemverwaltung, Open-Source-Services spezialisiert hat.
Zusammen mit unseren Kunden implementieren wir kundenspezifische Open-Source
Lösungen, die hohe Kostenreduzierungen ermöglichen, migrieren Systeme und
bieten spezialisierte Beratung. Weitere Informationen finden Sie auf
-http://www.credativ.de/.
-</pre>
+<a href="http://www.credativ.de/">http://www.credativ.de/</a>.
+</p>
diff --git a/german/consultants/csinetworks.wml b/german/consultants/csinetworks.wml
index 2f8af5e2b46..f6a75271264 100644
--- a/german/consultants/csinetworks.wml
+++ b/german/consultants/csinetworks.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="CSI Networks"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>CSI Networks</h1>
-
<p>
Netz, Sicherheit, VPN, VoIP, Speicher, Terminal-Dienste, Hochverfügbarkeit
und Hoch-Skalierbarkeit-Beratung. Server-Migration und Installation und
diff --git a/german/consultants/custom_engineering.wml b/german/consultants/custom_engineering.wml
index 2e7c8f3b2ca..4f00a1ffee4 100644
--- a/german/consultants/custom_engineering.wml
+++ b/german/consultants/custom_engineering.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Custom Engineering"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-20
# $Id$
-<h1>Custom Engineering</h1>
-<hr />
-<pre>
+<p>
Ich helfe Ihnen im Gebiet in und um Albuquerque.
-</pre>
+</p>
diff --git a/german/consultants/datalay.wml b/german/consultants/datalay.wml
index f2186b19d20..6ceadb2c686 100644
--- a/german/consultants/datalay.wml
+++ b/german/consultants/datalay.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Datay Soluciones Inform&aacute;ticas"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-30
# $Id$
-<h1>Datay Soluciones Inform&aacute;ticas</h1>
-<hr>
-<pre>
+<p>
Wenn Debian in unserer Arbeit verwendet wird, spenden wir einen Prozentteil
unseres Einkommens an das Debian-Projekt.
-</pre>
+</p>
diff --git a/german/consultants/datalink_internet.wml b/german/consultants/datalink_internet.wml
index 01dc5de24c4..ab98d2aa0b9 100644
--- a/german/consultants/datalink_internet.wml
+++ b/german/consultants/datalink_internet.wml
@@ -1,15 +1,20 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Datalink Internet"
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-13
# $Id$
-<h1>Datalink Internet</h1>
-<hr />
-<pre>
-Datalink Internet bietet drei Arten von Diensten: 1) Beratungsdienste für
-UNIX und DEBIAN im Speziellen 2) Systementwicklung auf UNIX speziell der
-auf TCP und DEBIAN als Plattform basierenden Netze. 3) Internet-Dienste:
-Web-Hosting, Unternehmens-E-Mail und Zugriff aufs Internet. Datalink
+<p>
+Datalink Internet bietet drei Arten von Diensten:
+</p>
+<ol>
+<li>Beratungsdienste für UNIX und DEBIAN im Speziellen</li>
+<li>Systementwicklung auf UNIX speziell der auf TCP und DEBIAN als
+ Plattform basierenden Netze.</li>
+<li>Internet-Dienste: Web-Hosting, Unternehmens-E-Mail und Zugriff aufs
+ Internet.</li>
+</ol>
+<p>
+Datalink
verkauft auch mehrere Server-Marken mit Debian und typischen Diensten wie
MAIL, WEB, PROXY, DATENBANK, GROUPWARE-DIENSTEN, ETC vorinstalliert.
-</pre>
+</p>
diff --git a/german/consultants/davonet.wml b/german/consultants/davonet.wml
index e8fef7a2622..e789f0c7919 100644
--- a/german/consultants/davonet.wml
+++ b/german/consultants/davonet.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="DAVOnet GmbH"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-04
# $Id$
-<h1>DAVOnet GmbH</h1>
-<hr />
<p>
DAVOnet konzentriert sich auf Beratung und Software-Entwicklung mit Linux- und
OpenSource-Systemen. Unser Fokus liegt auf Lösungen für AAA innerhalb
diff --git a/german/consultants/deeproot.wml b/german/consultants/deeproot.wml
index ae19b89f1f1..635758e8968 100644
--- a/german/consultants/deeproot.wml
+++ b/german/consultants/deeproot.wml
@@ -1,19 +1,18 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="DeepRoot Linux Pvt. Ltd."
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-30
# $Id$
-<h1>DeepRoot Linux Pvt. Ltd.</h1>
-<hr />
-<pre>
+<p>
DeepRoot-Linux ist eine der größten GNU/Linux-Produktfirmen in Indien.
Mit dem Hauptsitz in Bangalore entwickeln wir innovative Produkte und
Lösungen um »GNU/Linux für Sie zum Arbeiten zu bekommen - schneller, besser,
heute, auf jedem Weg.«
-
+</p>
+<p>
Unter unseren Produkten befinden sich Kleinbüro-Server, Nachrichten-Server,
Datei-Server, Firewall- und VPN-Geräte und Bandbreiten-Verwaltung und
Verbindungs-Verwaltungs-Lösungen. Wir bieten auch kommerzielle Unterstützung
für Freie Software und die Debian GNU/Linux-Distribution. Die Unterstützung
ist via Telefon, E-Mail, entfernten Login und vor-Ort verfügbar.
-</pre>
+</p>
diff --git a/german/consultants/delemar.wml b/german/consultants/delemar.wml
index 37fc546d544..9e4a44beb4f 100644
--- a/german/consultants/delemar.wml
+++ b/german/consultants/delemar.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Olivier Delemar"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-22
# $Id$
-<h1>Olivier Delemar</h1>
-<hr />
<p>
Ich suche eine Partnerschaft in der Gegend von Grenoble. Bitte nehmen Sie
Kontakt mit mir auf.
diff --git a/german/consultants/delicate.ch.wml b/german/consultants/delicate.ch.wml
index 0e8daf10e3d..95fce8d0a6d 100644
--- a/german/consultants/delicate.ch.wml
+++ b/german/consultants/delicate.ch.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="delicate.ch"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-17
# $Id$
-<h1>delicate.ch</h1>
-<hr />
-<pre>
+<p>
Consulting, Ausbildung, Support
-</pre>
+</p>
diff --git a/german/consultants/disoft.wml b/german/consultants/disoft.wml
index a7fb12a98b4..fb833b92f29 100644
--- a/german/consultants/disoft.wml
+++ b/german/consultants/disoft.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="MonoLab Consulting S.L."
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-28
# $Id$
-<h1>MonoLab Consulting S.L.</h1>
-
<p>
Unsere Firma hat seit mehr als sechs Jahren eine bewiesene und anerkannte
Erfahrung in der Linux-Welt.
diff --git a/german/consultants/douglas_h.wml b/german/consultants/douglas_h.wml
index 8436f907255..004a2c2b03e 100644
--- a/german/consultants/douglas_h.wml
+++ b/german/consultants/douglas_h.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="B. Douglas Hilton"
+#use wml::debian::translation-check translation="1.3"
# Translator: Noèl Köthe, noel@koethe.net, 2001-11-08
# $Id$
-<h1>B. Douglas Hilton</h1>
-
<ul>
<li>8 Jahre Erfahrung mit Debian auf vielen Systemen.</li>
<li>2 Jahre Erfahrung mit Gentoo auf X86-Maschinen.</li>
diff --git a/german/consultants/eauzone.wml b/german/consultants/eauzone.wml
index 8a0904579e1..808939dcd9e 100644
--- a/german/consultants/eauzone.wml
+++ b/german/consultants/eauzone.wml
@@ -1,14 +1,12 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="EauZone"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>EauZone</h1>
-<hr />
-<pre>
+<p>
Belgische Linux-Consultants mit Fokus auf Debian GNU/Linux-Unterstützung und
-Installation. Spezialisiert in einer Reihe von Diensten (Mail, Web,
Dateiverteilung, Groupware, Firewalls, VPN, E-Commerce, Anwendungsentwicklung,
Überwachung, ...). Wir bieten entfernte Verwaltung, Vor-Ort-Unterstützung,
Audits und Trainings...
-</pre>
+</p>
diff --git a/german/consultants/emergya.wml b/german/consultants/emergya.wml
index b431e2695f7..5be16f045e1 100644
--- a/german/consultants/emergya.wml
+++ b/german/consultants/emergya.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Emergya Consultor&iacute;a"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-22
# $Id$
-<h1>Emergya Consultor&iacute;a</h1>
-<hr />
<p>
Wir haben uns auf vorkonfektionierte Lösungen, basierend auf Debian GNU/Linux,
spezialisiert. Wir haben verschiedene auf Debian basierende Distributionen
diff --git a/german/consultants/enterux.wml b/german/consultants/enterux.wml
index 7c23421f8e3..43caa212d13 100644
--- a/german/consultants/enterux.wml
+++ b/german/consultants/enterux.wml
@@ -1,5 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.5"
+#use wml::debian::consultant name="Enterux Solutions"
+#use wml::debian::translation-check translation="1.6"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-30
# $Id$
@@ -7,55 +7,76 @@
# version of the pages. Please check, if a german one has been added
# since then and update the links if possible. Thanks
-<h1>Enterux Solutions</h1>
-<hr />
-<pre>
+<p>
Wir bieten ein volles Spektrum an Diensten, die auf unserem Web-Auftritt
aufgeführt sind, an, von denen ich einen Teil hier beschreiben kann:
+</p>
+<ul>
+<li>
<a href="http://www.enterux.com/en/services/application-services/">\
Anwendungs-Dienstleistungen</a>
-
+</li>
+<li>
<a href="http://www.enterux.com/en/services/product-engineering-services/">\
Produktentwicklungs-Dienstleistungen</a>
-
+</li>
+<li>
<a href="http://www.enterux.com/en/services/web-services/">Web-Dienstleistungen</a>
-
+</li>
+<li>
<a href="http://www.enterux.com/en/services/infrastructure-services/">\
Infrastruktur-Dienstleistungen</a>
-
+</li>
+<li>
<a href="http://www.enterux.com/services/technology-consulting/">\
Technik-Beratung</a>
+</li>
+</ul>
+<p>
Und die Lösungen, die wir anbieten können, sind:
+</p>
+<li>
<a href="http://www.enterux.com/en/solutions/enterprise-email-solutions/">\
Unternehmens-E-Mail-Lösungen</a>
-
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/enterprise-instant-messaging-solutions/">\
Unternehmens-Instant-Messaging-Lösungen</a>
-
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/enterprise-security-firewall-solutions/">\
Unternehmens-Sicherheit-/Firewall-Lösungen</a>
-
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/network-optimization-solutions/">\
Netz-Optimierungs-Lösungen</a>
-
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/load-balancing-high-volume-solutions/">\
Last-Verteilung-/Hoch-Volumens-Lösungen</a>
-
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/high-availability-solutions/">\
Hoch-Verfügbarkeitslösungen</a>
-
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/embedded-gnu-linux-solutions/">\
Eingebettete GNU/Linux-Lösungen</a>
-
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/server-migration-solutions/">\
Server-Migrations-Lösungen</a>
-
+</li>
+<li>
<a href="http://www.enterux.com/en/solutions/thin-client-solutions/">\
Thin Client-Lösungen</a>
+</li>
+</ul>
+<p>
Wir haben auch dieses Produkt mit Namen Resty:
Was ist Resty?
Resty ist ein Web-Anwendungsgerüst, das unter den Bedingungen der General
@@ -63,4 +84,4 @@ Public License von Enterux vertrieben wird. Bitte holen Sie sich die
Dokumentation um mehr über Resty zu erfahren.
Weitere hierzu gehörende Informationen erhältlich von: <a
href="http://www.resty.org/">Resty Homepage</a>
-</PRE>
+</p>
diff --git a/german/consultants/et_computer.wml b/german/consultants/et_computer.wml
index 84f6412d588..07cb5ee917a 100644
--- a/german/consultants/et_computer.wml
+++ b/german/consultants/et_computer.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="ET Computer"
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-20
# $Id$
-<h1>ET Computer</h1>
-<hr />
-<pre>
+<p>
Nur professionelle Arbeit. Habe F-Klasse Steuerbescheid (»F-skattebevis«).
-</pre>
+</p>
diff --git a/german/consultants/eugene_g.wml b/german/consultants/eugene_g.wml
index e8868ec9a28..69b6025aac2 100644
--- a/german/consultants/eugene_g.wml
+++ b/german/consultants/eugene_g.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="DataArt"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-30
# $Id$
-<h1>DataArt</h1>
-<hr />
-<pre>
+<p>
Ausgelagerte Software-Entwicklung und Outsourcing-Firma erfahren in Microsoft
.NET (ASP.Net)
-</pre>
+</p>
diff --git a/german/consultants/extralogix.wml b/german/consultants/extralogix.wml
index 4c03b0c435f..43d7177d3ba 100644
--- a/german/consultants/extralogix.wml
+++ b/german/consultants/extralogix.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Extralogix Solutions"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-30
# $Id$
-<h1>Extralogix Solutions</h1>
-<hr />
-<pre>
+<p>
Wir bieten auch kostenlosen Rat/Beratung für gemeinnützige Open-Source-Projekte
und Produkte. Für andere Projekte bieten wir eine unverbindliche Kosten- und
Zeitabschätzung.
-</pre>
+</p>
diff --git a/german/consultants/fai-cluster.wml b/german/consultants/fai-cluster.wml
index 156e0b70d4e..97700830cf0 100644
--- a/german/consultants/fai-cluster.wml
+++ b/german/consultants/fai-cluster.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="fai-cluster.de"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-16
# $Id$
-<h1>fai-cluster.de</h1>
-<hr>
-<pre>
+<p>
Wir bieten nur Unterstützung und Dienstleistungen rund um FAI,
der vollautomatischen Installation für Debian, an. Wir sind
Experten in der Installation von Beowulf-Clustern.
-</pre>
+</p>
diff --git a/german/consultants/federico_sevilla.wml b/german/consultants/federico_sevilla.wml
index 03dcbef3d1a..829dd231b04 100644
--- a/german/consultants/federico_sevilla.wml
+++ b/german/consultants/federico_sevilla.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Federico Sevilla III"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-02
# $Id$
-<h1>Federico Sevilla III</h1>
-
<p>
Mein Lebenslauf ist online erhältlich unter <a
href="http://jijo.free.net.ph/files/cv.pdf">\
diff --git a/german/consultants/fensterkitt.wml b/german/consultants/fensterkitt.wml
index abfc82ccdbe..6e3c1910b7a 100644
--- a/german/consultants/fensterkitt.wml
+++ b/german/consultants/fensterkitt.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Fensterkitt Computer Support"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-17
# $Id$
-<h1>Fensterkitt Computer Support</h1>
-<hr />
-<pre>
+<p>
Sprachen: Deutsch, Französisch und ein bisschen Italienisch und Englisch
-</pre>
+</p>
diff --git a/german/consultants/fff_managed.wml b/german/consultants/fff_managed.wml
index 0b8146d5cef..4900e53ca82 100644
--- a/german/consultants/fff_managed.wml
+++ b/german/consultants/fff_managed.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="FFF Managed Technology"
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-19
# $Id$
-<h1>FFF Managed Technology</h1>
-<hr />
-<pre>
+<p>
Als Anbieter von dienstleistungsbasierten Computer-Lösungen sind wir starke
Befürworter von Open Source-Software im geschäftlichen Umfelden.
-</pre>
+</p>
diff --git a/german/consultants/filippo_giunchedi.wml b/german/consultants/filippo_giunchedi.wml
index ab531b875f7..6cc376c9a25 100644
--- a/german/consultants/filippo_giunchedi.wml
+++ b/german/consultants/filippo_giunchedi.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Filippo Giunchedi"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-27
# $Id$
-<H1>Filippo Giunchedi</H1>
-<HR>
-<PRE>
+<p>
GNU/PG-Schlüssel: 6B79D401
-</PRE>
+</p>
diff --git a/german/consultants/firman.wml b/german/consultants/firman.wml
index 68aa86f3441..44439f4b781 100644
--- a/german/consultants/firman.wml
+++ b/german/consultants/firman.wml
@@ -1,18 +1,23 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Firman Consulting, LLC"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-25
# $Id$
-<h1>Firman Consulting, LLC</h1>
-<hr />
-<pre>
+<p>
Ich spezialisiere mich in der Installation neuer Debian GNU/Linux-Workstations
und -Server für kleine Betriebe.
Ich bin CompTIA Linux+ und LPI Linux zertifiziert.
Wenden Sie sich an mich bezüglich Empfehlungsschreiben und Referenzen.
+</p>
+<p>
Einige Details meiner Debian-basierten Angebote sind hier im PDF-Format:
-http://www.firman.us/LinuxSmallBusinessServer.pdf
-http://www.firman.us/LinuxSmallBusinessDesktop.pdf
-http://www.firman.us/Linux-MS.pdf
-</pre>
+</p>
+<ul>
+<li><a href="http://www.firman.us/LinuxSmallBusinessServer.pdf">\
+http://www.firman.us/LinuxSmallBusinessServer.pdf</a></li>
+<li><a href="http://www.firman.us/LinuxSmallBusinessDesktop.pdf">\
+http://www.firman.us/LinuxSmallBusinessDesktop.pdf</a></li>
+<li><a href="http://www.firman.us/Linux-MS.pdf">\
+http://www.firman.us/Linux-MS.pdf</a></li>
+</ul>
diff --git a/german/consultants/forlinux.wml b/german/consultants/forlinux.wml
index 92b358e76a0..ef1674855a7 100644
--- a/german/consultants/forlinux.wml
+++ b/german/consultants/forlinux.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="ForLinux"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-24
# $Id$
-<h1>ForLinux</h1>
-<hr />
-<pre>
+<p>
ForLinux stellt eine ganze Reihe von Diensten bereit, einschließlich
Support-Lösungen (darunter Komplettverwaltungsdienste, maßgeschneiderte
Support-Dienste und Notfallsupport), Lösungen für Wiederherstellungen nach
@@ -13,4 +11,4 @@ Unglücken und maßgeschneiderte Projekte. ForLinux kann eine effektive und
kosteneffiziente Lösung bereitstellen, wie auch immer Ihre Anforderungen sind.
ForLinux wird nicht die Bedürfnisse seiner Kunden ändern um Lösungen anzupassen,
sondern wird die Lösung so bereitstellen, dass sie den Anforderungen genügt.
-</pre>
+</p>
diff --git a/german/consultants/fortuitous.wml b/german/consultants/fortuitous.wml
index 4b8c1f8d9cf..b0ad756f146 100644
--- a/german/consultants/fortuitous.wml
+++ b/german/consultants/fortuitous.wml
@@ -1,15 +1,13 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Fortuitous Technologies"
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Fortuitous Technologies</h1>
-<hr />
-<pre>
+<p>
Fortuitous bietet Linux-Consulting-, Training-, Vernetzungs- und
Sicherheitsdienstleistungen für Texas, Louisiana, New Mexico und
kontinental-USA an. Wir unterstützen alle Linux-Distributionen, darunter
Debian, RHEL, Fedora, Mandriva und SuSE. Wir bieten Support für FreeBSD,
OpenBSD und Mac OSX. Wie bieten monatliche und vierteljährliche
Support-Verträge.
-</pre>
+</p>
diff --git a/german/consultants/fotopic.wml b/german/consultants/fotopic.wml
index 8de00bb683d..49e8be99ee4 100644
--- a/german/consultants/fotopic.wml
+++ b/german/consultants/fotopic.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Fotopic Limited"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-09
# $Id$
-<h1>Fotopic Limited</h1>
-<hr />
<p>
Debian-Entwickler, System-Administration, angepasste Software, Hardware und
Systeme.
diff --git a/german/consultants/freesoft.wml b/german/consultants/freesoft.wml
index 89872c18559..f8766155256 100644
--- a/german/consultants/freesoft.wml
+++ b/german/consultants/freesoft.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="freesoft technologies ltd"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-08
# $Id$
-<h1>freesoft technologies ltd</h1>
-<hr />
<p>
Willens Dienste in den ganzen arabischen Ländern bereitzustellen.
</p>
diff --git a/german/consultants/gbcomputers.wml b/german/consultants/gbcomputers.wml
index c00f4cc7125..45edf196b3a 100644
--- a/german/consultants/gbcomputers.wml
+++ b/german/consultants/gbcomputers.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="GB Computers"
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-27
# $Id$
-<h1>GB Computers</h1>
-<hr />
<p>
Bitte schauen Sie auf unsere Webseite für weitere Details und
Kontaktinformationen.
diff --git a/german/consultants/genilto_dallo.wml b/german/consultants/genilto_dallo.wml
index 518ba4d4fad..b567c0d407a 100644
--- a/german/consultants/genilto_dallo.wml
+++ b/german/consultants/genilto_dallo.wml
@@ -1,14 +1,12 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Genilto Dallo"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-28
# $Id$
-<h1>Genilto Dallo</h1>
-<hr />
-<pre>
+<p>
Verbindungs-Systeme und Projekt-Entwicklung, Sicherheit und Open
Source-Systeme.
Installation, Konfiguration und Wartung von Debian Linux-Servern.
Beratung für Internet-Provider, Verbindungsfähigkeit, drahtlosen Netzen und
Servern.
-</pre>
+</p>
diff --git a/german/consultants/gnulinux.wml b/german/consultants/gnulinux.wml
index 1ddd716cbf4..57fa759074d 100644
--- a/german/consultants/gnulinux.wml
+++ b/german/consultants/gnulinux.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Stichting Software Libre"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Stichting Software Libre</h1>
-<hr />
-<pre>
+<p>
Eine Null-Profit-Firma, spezialisiert auf das Debian GNU/Linux-Betriebssystem.
-</pre>
+</p>
diff --git a/german/consultants/guillermo_rico.wml b/german/consultants/guillermo_rico.wml
index d6b40767720..63a25817181 100644
--- a/german/consultants/guillermo_rico.wml
+++ b/german/consultants/guillermo_rico.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Guillermo Rico"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-13
-<h1>Guillermo Rico</h1>
-<hr>
-<pre>
+<p>
LPIC2-Zertifikation.
-</pre>
+</p>
diff --git a/german/consultants/gurunetwork.wml b/german/consultants/gurunetwork.wml
index 1f727101211..73d5733be6b 100644
--- a/german/consultants/gurunetwork.wml
+++ b/german/consultants/gurunetwork.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="GuruNetwork"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-12
# $Id$
-<h1>GuruNetwork</h1>
-<hr />
-<pre>
+<p>
Unternehmens-Linux-Systeme, Hochsichere Firewalls, Audits, Linux/*NIX-Beratung.
Verkaufe/Unterstütze Cisco-Produkte (CCNA-Zertifiziert) mit
Netz-Fehlersuche und Planung von LAN/WAN-Lösungen.
-</pre>
+</p>
diff --git a/german/consultants/harmuth.wml b/german/consultants/harmuth.wml
index d772b8e3a29..b5cafdac985 100644
--- a/german/consultants/harmuth.wml
+++ b/german/consultants/harmuth.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="IT-Gesamtlösungen"
+#use wml::debian::translation-check translation="1.2"
# Translator: Tobias Toedter, t.toedter@gmx.net, 2005-06-19
-<h1>IT-Gesamtlösungen</h1>
-
<p>
Sicherheitsberatung, Netzwerkdesign, ... sowie Implementation sind
ebenfalls verfügbar.
diff --git a/german/consultants/heureka.wml b/german/consultants/heureka.wml
index d10430fe3a3..36d57c63f60 100644
--- a/german/consultants/heureka.wml
+++ b/german/consultants/heureka.wml
@@ -1,8 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Heureka GmbH"
+#use wml::debian::translation-check translation="1.3"
# Translator: Noèl Köthe, noel@koethe.net, 2001-08-18
# $Id
-<H1>Heureka GmbH</H1>
-<HR>
+<p>
Erstberatung gratis.
+</p>
diff --git a/german/consultants/hornfordassociates.wml b/german/consultants/hornfordassociates.wml
index 7579aa8009d..16d943955d9 100644
--- a/german/consultants/hornfordassociates.wml
+++ b/german/consultants/hornfordassociates.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Hornford Associates"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-25
# $Id$
-<h1>Hornford Associates</h1>
-
<p>
Wir bieten professionelle Dienste beim Ausrichten der Informationstechnik an
die Geschäftsziele. Unternehmens-Architekturen, IT-Strategie,
diff --git a/german/consultants/houdek.wml b/german/consultants/houdek.wml
index e2ab1a7aa8c..fda0370ce82 100644
--- a/german/consultants/houdek.wml
+++ b/german/consultants/houdek.wml
@@ -1,11 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="HOUDEK-it"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-22
# $Id$
-<h1>HOUDEK-it</h1>
-<hr />
+<p>
Qualifikationen:
+</p>
<ul>
<li>Debian (Installation, Administration, Verwendung)</li>
<li>Vernetzen (LAN, WLAN, VPN)</li>
diff --git a/german/consultants/hp_germany.wml b/german/consultants/hp_germany.wml
index babd63a2020..2415ae92cca 100644
--- a/german/consultants/hp_germany.wml
+++ b/german/consultants/hp_germany.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Hewlett-Packard"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-13
# $Id$
-<h1>Hewlett-Packard</h1>
-
<p>
HP Services Consulting&amp;Integration Germany Open Source project
group ist auf Spezifikation, Entwicklung und Implementation von
diff --git a/german/consultants/hytechpro.wml b/german/consultants/hytechpro.wml
index 4a78baf5126..a4decd7cb6a 100644
--- a/german/consultants/hytechpro.wml
+++ b/german/consultants/hytechpro.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Hytech Professionals"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-26
# $Id$
-<h1>Hytech Professionals</h1>
-<hr />
<p>
Hytech Professionals ist eine US-basierte Firma mit Büros in den USA,
Deutschland und einem Software-Entwicklungszentrum in Indien.
diff --git a/german/consultants/ideal.wml b/german/consultants/ideal.wml
index f6586521929..6bcefa53ce2 100644
--- a/german/consultants/ideal.wml
+++ b/german/consultants/ideal.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="I.D.E.A.L. Technology Corporation"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-02
# $Id$
-<h1>I.D.E.A.L. Technology Corporation</h1>
-<hr />
-<pre>
+<p>
Erfolgreich Debian GNU/Linux in den Datenzentren von Unternehmenskunden wie
General Electric und der US Army eingesetzt.
-</pre>
+</p>
diff --git a/german/consultants/imagin.wml b/german/consultants/imagin.wml
index 60fbfed1c47..b7ad18873aa 100644
--- a/german/consultants/imagin.wml
+++ b/german/consultants/imagin.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Imagin"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-22
# $Id$
-<h1>Imagin</h1>
-<hr />
<p>
Akzeptiere auch Projekte außerhalb Polens.
</p>
diff --git a/german/consultants/incipit.wml b/german/consultants/incipit.wml
index cfe8240449a..e087da9fcb5 100644
--- a/german/consultants/incipit.wml
+++ b/german/consultants/incipit.wml
@@ -1,24 +1,26 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Incipit - Informatica Reti Sicurezza"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-23
# $Id$
-<h1>Incipit - Informatica Reti Sicurezza</h1>
-<hr />
-<pre>
-Incipit: Der Kunde im Zentrum
+<h3>Incipit: Der Kunde im Zentrum</h3>
+<p>
Unser Ansatz ist direkt: wir versuchen, die wahren Bedürfnisse des Kunden
zu verstehen und eine effiziente Lösung zu bieten, schnell und bei
niedrigen Kosten.
+</p>
-Incipit: Kompletter Service
+<h3>Incipit: Kompletter Service</h3>
+<p>
Wir können Computer-Service und Netz-Lösungen komplett anbieten:
wir planen die Lösung, verkaufen das Produkt, implementieren das Projekt,
konfigurieren alle Maschinen, sorgen für das Training und unterstützen
punktuell oder unter einem kontinuierlichen Vertrag.
+</p>
-Incipit: Der einzige Berater
+<h3>Incipit: Der einzige Berater</h3>
+<p>
Wir glauben, dass ein einzelner technischer Berater ein Vorteil für den
Kunden ist. Nur ein Name und eine Telephonnummer für alle Computerbedürfnisse,
Netz- und Sicherheitslösungen.
-</pre>
+</p>
diff --git a/german/consultants/indus_net_technologies.wml b/german/consultants/indus_net_technologies.wml
index 095fa07a31a..f3e5ebb5acf 100644
--- a/german/consultants/indus_net_technologies.wml
+++ b/german/consultants/indus_net_technologies.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Indus Net Technologies"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-26
# $Id$
-<h1>Indus Net Technologies</h1>
-<hr />
-<pre>
+<p>
Indus Net Technologies ist eine ISO 9001:2000 Software-Service-Firma, die
Beratung und Support auf Open-Source-Plattformen anbietet.
-</pre>
+</p>
diff --git a/german/consultants/inittab.wml b/german/consultants/inittab.wml
index 2a6f50897b3..96caad3b25f 100644
--- a/german/consultants/inittab.wml
+++ b/german/consultants/inittab.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Alberto Gonzalez Iniesta"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-02
# $Id$
-<h1>Alberto Gonzalez Iniesta</h1>
-<hr />
<p>
Debian-Entwickler, der Training für Freie Software (GNU/Linux, Apache, MySQL,
Samba, Sicherheit) und Beratung anbietet. GNU/Linux-Administration,
diff --git a/german/consultants/inl.wml b/german/consultants/inl.wml
index 59347e19018..c196efb6c73 100644
--- a/german/consultants/inl.wml
+++ b/german/consultants/inl.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="INL"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-08
# $Id$
-<h1>INL</h1>
-<hr />
<p>
INL bietet Open Source-Lösungen für Firmen und Organisationen an, die
zuverlässige und sichere Dienste und Produkte suchen. Wir bieten ein hohen
diff --git a/german/consultants/integrics.wml b/german/consultants/integrics.wml
index 50f15009fca..518c10b5576 100644
--- a/german/consultants/integrics.wml
+++ b/german/consultants/integrics.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Clavib"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-04
# $Id$
-<h1>Clavib</h1>
-<hr />
<p>
Spezialist in VoIP, Datenbanken und Perl.
</p>
diff --git a/german/consultants/internet_solutions.wml b/german/consultants/internet_solutions.wml
index 4a980f7b038..fd924e92c28 100644
--- a/german/consultants/internet_solutions.wml
+++ b/german/consultants/internet_solutions.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="internet solutions! gmbh"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-17
# $Id$
-<h1>internet solutions! gmbh</h1>
-<hr />
-<pre>
+<p>
internet solution! gmbh ist ein Internet-Dienstanbieter seit 1997. Wir bauen
seit 1998 auf Linux-basierte Lösungen, seit 2002 inklusive Debian basierter.
-</pre>
+</p>
diff --git a/german/consultants/ipodion.wml b/german/consultants/ipodion.wml
index 982f0be441a..75f56d75167 100644
--- a/german/consultants/ipodion.wml
+++ b/german/consultants/ipodion.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="iPodion GmbH"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-24
# $Id$
-<h1>iPodion GmbH</h1>
-<hr />
<p>
Allgemeine Debian/Linux-Unterstützung, vorkonfigurierte Server und
Workstation-Rechner, Entwicklung von angepassten Distributionen für die
diff --git a/german/consultants/it_service_drillich.wml b/german/consultants/it_service_drillich.wml
index 71dfade0529..06e7a030496 100644
--- a/german/consultants/it_service_drillich.wml
+++ b/german/consultants/it_service_drillich.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="IT-Service Drillich"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-17
# $Id$
-<h1>IT-Service Drillich</h1>
-<hr />
-<pre>
+<p>
Konfiguration und Administration von Unix-Systemen, individuelle Software,
IT-Consulting
-</pre>
+</p>
diff --git a/german/consultants/itsecuritymn.wml b/german/consultants/itsecuritymn.wml
index a5cd17364c2..8693a2419e2 100644
--- a/german/consultants/itsecuritymn.wml
+++ b/german/consultants/itsecuritymn.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="IT Security Services"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-29
# $Id$
-<h1>IT Security Services</h1>
-<hr />
<p>
IT Security Services befindet sich in Minneapolis, Minnesota, und bedient die
Twin Cities. Wir bieten eine komplette Linie an IT-Dienstleistungen mit
diff --git a/german/consultants/ivan_k.wml b/german/consultants/ivan_k.wml
index 3c5814c9519..b4e91c260fc 100644
--- a/german/consultants/ivan_k.wml
+++ b/german/consultants/ivan_k.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Freeside Internet Services, LLC"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-12
# $Id$
-<h1>Freeside Internet Services, LLC</h1>
-<hr />
-<pre>
+<p>
Spezialisiere auf Perl, Datenbanken und ISP-Betrieb.
-</pre>
+</p>
diff --git a/german/consultants/jarno_saarinen.wml b/german/consultants/jarno_saarinen.wml
index 771cab05b52..150aade1c41 100644
--- a/german/consultants/jarno_saarinen.wml
+++ b/german/consultants/jarno_saarinen.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="JS Tietotuki"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-20
# $Id$
-<h1>JS Tietotuki</h1>
-<hr />
-<pre>
+<p>
Arbeite derzeit hauptsächlich im Gebiet Süd-Karelien.
-</pre>
+</p>
diff --git a/german/consultants/jaume_t.wml b/german/consultants/jaume_t.wml
index 25a04b8ec6d..a521318584e 100644
--- a/german/consultants/jaume_t.wml
+++ b/german/consultants/jaume_t.wml
@@ -1,15 +1,13 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Jaume Teixi"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-24
# $Id$
-<h1>Jaume Teixi</h1>
-<hr />
-<pre>
+<p>
Cross-Plattform-Kommunikation und LAN zu weiten Netzumgebungen. Dedizierte
Debian-Server: (entfernter Zugriff, Firewall, Proxy, Web, E-Mail, DNS,
Datenbanken). E-Mail-Unterstützung erhältlich. Mehr als sechs Jahre nachweisbare
Debian-Erfahrung. Ein Teil dieser Profite wird an die
Debian-Entwicklergemeinschaft gespendet.
-</pre>
+</p>
diff --git a/german/consultants/javier_v.wml b/german/consultants/javier_v.wml
index 15d26325921..5efd391caf2 100644
--- a/german/consultants/javier_v.wml
+++ b/german/consultants/javier_v.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Yaco"
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-20
# $Id$
-<h1>Yaco</h1>
-<hr />
-<pre>
+<p>
Debian GNU/Linux-Experten (2 Debian-Entwickler in unserem Team).
Lösungs-Entwicklung und Informations-System-Migration auf Lösungen,
die auf freien und offenen Standards und Software basieren.
Entwicklung von eingebetteten Systemen mit GNU/Linux.
-</pre>
+</p>
diff --git a/german/consultants/jean_p.wml b/german/consultants/jean_p.wml
index 20bf4e1eeed..bbbfebf0132 100644
--- a/german/consultants/jean_p.wml
+++ b/german/consultants/jean_p.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Linuz.it"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-04
# $Id$
-<h1>Linuz.it</h1>
-<hr />
-<pre>
+<p>
Unternehmens-Linux-Systeme, hochsichere Firewalls, Linux-basierte
Antivirensysteme, hochverfügbare/-zuverlässige Linux-Server, spezialisiert
auf Linux/*BSD/Sun*/*NIX-Beratung.
-</pre>
+</p>
diff --git a/german/consultants/jeremy_r.wml b/german/consultants/jeremy_r.wml
index e6f8a33a7db..39b7b5779ab 100644
--- a/german/consultants/jeremy_r.wml
+++ b/german/consultants/jeremy_r.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Puget Sound Technology"
+#use wml::debian::translation-check translation="1.4"
# $Id$
# Translator: Noèl Köthe, noel@koethe.net, 2001-07-30
-<h1>Puget Sound Technology</h1>
-
<p>BSD &lt;-&gt; Linux Migrationen; vor Ort, angepasstes Training.
Wir machen zum Beispiel Apache, Postfix, Linux-Sicherheit und Grundlagen-Training
der Unix-Shell.</p>
diff --git a/german/consultants/jfranken.wml b/german/consultants/jfranken.wml
index 41cfc9d4eea..43d2a933dce 100644
--- a/german/consultants/jfranken.wml
+++ b/german/consultants/jfranken.wml
@@ -1,15 +1,15 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="FRANKEN IT-CONCEPTS"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-24
# $Id$
-<h1>FRANKEN IT-CONCEPTS</h1>
-<hr />
<p>
Seit 1992 ist die Firma von Johannes Franken für die außergewöhnliche
Realisation von komplexen IT-Projekten bekannt.
</p>
+<p>
Unsere Fokus-Gebiete sind:
+</p>
<ul>
<li>IT-Service und Beratung, Spezialisierung auf TCP/IP</li>
<li>Software-Entwicklung (Web-, Unternehmens- und Desktopanwendungen) in
@@ -17,12 +17,16 @@ praktisch allen derzeit bekannten Sprachen und Techniken, für alle Umgebungen
und Betriebssysteme.</li>
<li>IT-Seminare</li>
</ul>
+<p>
Aktuelle Projekte:
+</p>
<ul>
<li>Schreiben des »Debian Server Handbook«
(ISBN: 3-8266-1587-5, wird in Q1/2006 veröffentlicht)</li>
</ul>
+<p>
Johannes Veröffentlichungen und Zertifizierungen:
+</p>
<ul>
<li>eine Aufstellung seiner Veröffentlichungen, Vorträge, Bücher und
Open Source-Projekte kann unter
@@ -36,4 +40,8 @@ http://www.jfranken.de/homepages/johannes.de.html gefunden werden</li>
<li>CompTIA i-Net+</li>
<li>SAIR GNU/Linux Certified Administrator (LCA)</li>
</ul>
-Für Details lesen Sie bitte http://www.jfranken.de/unternehmen.de.html
+<p>
+Für Details lesen Sie bitte
+<a href="http://www.jfranken.de/unternehmen.en.html">\
+http://www.jfranken.de/unternehmen.en.html</a>
+</p>
diff --git a/german/consultants/jh_networks.wml b/german/consultants/jh_networks.wml
index 1d6878a2089..f4095510d10 100644
--- a/german/consultants/jh_networks.wml
+++ b/german/consultants/jh_networks.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="JH-Networks / Telebistro"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-16
# $Id$
-<h1>JH-Networks / Telebistro</h1>
-<hr>
-<pre>
+<p>
Telefonier-Geschäfte und Internet-Cafes, Firewalls, Schutz von Minderjährigen,
alle GNU/Linux-Systeme
-</pre>
+</p>
diff --git a/german/consultants/jibsystems.wml b/german/consultants/jibsystems.wml
index 571546eca0a..e5ab1029a66 100644
--- a/german/consultants/jibsystems.wml
+++ b/german/consultants/jibsystems.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Jib Systems Oy"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-20
# $Id$
-<h1>Jib Systems Oy</h1>
-<hr />
-<pre>
+<p>
Wir arbeiten hauptsächlich im Großraum von Helsinki aber wir sind ständig auf
der Suche um woandershin zu expandieren. Einer unserer großen Kunden ist seit
2003 das <a href="http://www.fmi.fi/">Finnische Meteorologische Institut</a>.
-</pre>
+</p>
diff --git a/german/consultants/jim_w.wml b/german/consultants/jim_w.wml
index bfc12ba42b9..357db3537b2 100644
--- a/german/consultants/jim_w.wml
+++ b/german/consultants/jim_w.wml
@@ -1,14 +1,12 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="LAN Comp Systems"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-02
# $Id$
-<h1>LAN Comp Systems</h1>
-<hr />
-<pre>
+<p>
LAN Comp Systems bietet Netzdesign, Installation und
Projektverwaltungs-Unterstützung für Client/Server OLTP-Systeme an, die unter
UNIX oder properitären Plattformen betrieben werden. Wir spezifizieren Linux
(speziell Debian) für die meisten Netz-Server.
-</pre>
+</p>
diff --git a/german/consultants/joan_l.wml b/german/consultants/joan_l.wml
index fdc74e7254f..9f3ad04799a 100644
--- a/german/consultants/joan_l.wml
+++ b/german/consultants/joan_l.wml
@@ -1,15 +1,13 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Digibel"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Digibel</h1>
-<hr />
-<pre>
+<p>
Digibel Open Source Support (Belgien) verwendet seine Kompetenz in
Open Source-Software um Lösungen, Beratung, Entwicklung, entfernte
Administration, Training und Unterstützung mit einem starken Fokus auf
Sicherheit zu liefern. Alle unsere Berater verwenden Linux seit 1995 und
haben extensive Open Source-Erfahrung.
-</pre>
+</p>
diff --git a/german/consultants/joe_m.wml b/german/consultants/joe_m.wml
index 2667705b89c..30681da61cd 100644
--- a/german/consultants/joe_m.wml
+++ b/german/consultants/joe_m.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Tangent Computer Research"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-02
# $Id$
-<h1>Tangent Computer Research</h1>
-<hr />
-<pre>
+<p>
20 Jahre Unix/Linux-Erfahrung
-</pre>
+</p>
diff --git a/german/consultants/joerg_w.wml b/german/consultants/joerg_w.wml
index a3bad6597f3..50bafddc9c2 100644
--- a/german/consultants/joerg_w.wml
+++ b/german/consultants/joerg_w.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Scan Plus GmbH"
+#use wml::debian::translation-check translation="1.3"
# Translator: Noèl Köthe, noel@koethe.net, 2001-07-30
-<h1>Scan Plus GmbH</h1>
-
<p>Eigene Debian GNU/Linux basierte Firewall-Distribution.</p>
diff --git a/german/consultants/joeyh.wml b/german/consultants/joeyh.wml
index 3323965d716..573c4926305 100644
--- a/german/consultants/joeyh.wml
+++ b/german/consultants/joeyh.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Joey Hess"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-22
# $Id$
-<h1>Joey Hess</h1>
-<hr />
<p>
Seit zehn Jahren Mitwirkender von Debian. Entwicklungsteam-Leiter für das
neue Debian-Installationsprogramm. Spezialisiert auf Debian-Installationen in
diff --git a/german/consultants/jurgen_l.wml b/german/consultants/jurgen_l.wml
index 50c998f7de7..592f3e5e3dd 100644
--- a/german/consultants/jurgen_l.wml
+++ b/german/consultants/jurgen_l.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Intranet Engineering"
+#use wml::debian::translation-check translation="1.4"
-<h1>Intranet Engineering</h1>
-<hr/>
-<pre>
+<p>
Ich bin öffentlich bestellter und vereidigter Sachverständiger für
Systeme und Anwendungen der Informationsverarbeitung.
-</pre>
+</p>
diff --git a/german/consultants/kaarlo_m.wml b/german/consultants/kaarlo_m.wml
index b75b25f7841..1bcf81ea2cb 100644
--- a/german/consultants/kaarlo_m.wml
+++ b/german/consultants/kaarlo_m.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Arvanet"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-20
# $Id$
-<h1>Arvanet</h1>
-<hr />
-<pre>
+<p>
Ergänzende Informationen: Unser Bereich ist hauptsächlich das
Hauptstadtgebiet (Helsinki, Vantaa, Espoo, Kauniainen, Tuusula,
Järvempää).
Es hat eine Beispielausnahme gegeben: Oulu &amp; Jyväslylä.
-</pre>
+</p>
diff --git a/german/consultants/karsten_m_self.wml b/german/consultants/karsten_m_self.wml
index 2236d3af1df..c7306ae13b4 100644
--- a/german/consultants/karsten_m_self.wml
+++ b/german/consultants/karsten_m_self.wml
@@ -1,11 +1,12 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Karsten M. Self"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-02
# $Id$
-<h1>Karsten M. Self</h1>
-<hr />
-<pre>
+<p>
Systemadministration, Netz, Sicherheit, Desktop, SAS
-Weitere Informationen: http://kmself.home.netcom.com/
-</pre>
+</p>
+<p>
+Weitere Informationen:
+<a href="http://kmself.home.netcom.com/">http://kmself.home.netcom.com/</a>
+</p>
diff --git a/german/consultants/kevin_l.wml b/german/consultants/kevin_l.wml
index fb9b672b74a..246ece0502a 100644
--- a/german/consultants/kevin_l.wml
+++ b/german/consultants/kevin_l.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Obsidian Consulting Group"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-25
# $Id$
-<h1>Obsidian Consulting Group</h1>
-<hr />
-<pre>
+<p>
Hosting und Abrechnungssysteme sind auch erhältlich.
-</pre>
+</p>
diff --git a/german/consultants/kevin_t.wml b/german/consultants/kevin_t.wml
index 0ff06ad2105..363025c83d6 100644
--- a/german/consultants/kevin_t.wml
+++ b/german/consultants/kevin_t.wml
@@ -1,19 +1,18 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Superior Software Services"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-24
# $Id$
-<h1>Superior Software Services</h1>
-<hr />
-<pre>
+<p>
Ich habe 10 Jahre Unix-Erfahrung (sieben mit Debian GNU/Linux) und spezialisiere
mich auf Betriebssystemadministration, Netz-Sicherheit, Wiederherstellung nach
Unglücken und Aufgaben-Automation. Ich habe auch mehr als fünf Jahre Erfahrung
in Web-Anwendungsentwicklung und Unterstützungsdienstleistungen mit PHP/Perl,
Javascript/CSS (DHTML), PostgreSQL/MySQL, Apache oder anderen Open Source
Anwendungen wie benötigt.
-
+</p>
+<p>
Bitte erwähnen Sie, dass Sie mich auf debian.org gefunden haben und ich werde
10% Ihrer Gebühr zurück an das Debian-Projekt spenden.
-</pre>
+</p>
diff --git a/german/consultants/knaepper.wml b/german/consultants/knaepper.wml
index 16e15498d14..d1fcb57865d 100644
--- a/german/consultants/knaepper.wml
+++ b/german/consultants/knaepper.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="IT Knäpper"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-17
# $Id$
-<h1>IT Knäpper</h1>
-<hr />
-<pre>
+<p>
Wir sind Experten in der Implementation von Domino und IBM Webservices.
Dies beinhaltet Samba, HylaFax und Netzwerkdienste. Verbessern Sie Ihr
Geschäft durch die Verwendung von Debian-Linux.
-</pre>
+</p>
diff --git a/german/consultants/koenigsmann.wml b/german/consultants/koenigsmann.wml
index 90c22106006..211aab96c5b 100644
--- a/german/consultants/koenigsmann.wml
+++ b/german/consultants/koenigsmann.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Koenigsmann-Ingenieure"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-17
# $Id$
-<h1>Koenigsmann-Ingenieure</h1>
-<hr />
-<pre>
+<p>
Wir sind die Autoren eines auf Debian/Woody basierenden
Linux-Administrationskurses, den Sie von Anfang 2005 auf
www.fernschule-weber.de buchen können.
-</pre>
+</p>
diff --git a/german/consultants/kotarba.wml b/german/consultants/kotarba.wml
index e653b34c66a..e86e38ba2e6 100644
--- a/german/consultants/kotarba.wml
+++ b/german/consultants/kotarba.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Kotarba.NET"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Kotarba.NET</h1>
-<hr />
-<pre>
+<p>
Nur polnisch und englisch.
-</pre>
+</p>
diff --git a/german/consultants/kring.wml b/german/consultants/kring.wml
index 89cfff22df3..b0d78d30c10 100644
--- a/german/consultants/kring.wml
+++ b/german/consultants/kring.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Kring Technologies India pvt Ltd"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-29
# $Id$
-<h1>Kring Technologies India pvt Ltd</h1>
-<hr />
<p>
Kring Technologies ist eine ausgelagerte Entwicklungsfirma in Gurgoan, die sich
auf angepaßte Softwareentwicklungsdienste &amp; -lösungen spezialisiert hat und
diff --git a/german/consultants/lawrence_c.wml b/german/consultants/lawrence_c.wml
index 2aef8349c5c..d0763a12685 100644
--- a/german/consultants/lawrence_c.wml
+++ b/german/consultants/lawrence_c.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.5"
+#use wml::debian::consultant name="Major Chai M J"
+#use wml::debian::translation-check translation="1.6"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-25
# $Id$
-<h1>Major Chai M J</h1>
-
<p>
Verfügbarkeit: Asien/Pazifik-Region (inkl. China und Japan)
</p>
diff --git a/german/consultants/lcs.wml b/german/consultants/lcs.wml
index befa50f19c4..6905d56ef09 100644
--- a/german/consultants/lcs.wml
+++ b/german/consultants/lcs.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Linux Computing Services (Eine Abteilung von Alreg Scientific)"
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-23
# $Id$
-<h1>Linux Computing Services (Eine Abteilung von Alreg Scientific)</h1>
-<hr />
<p>Wir spezialisieren uns auf vernetzte Server, Internet-Dienste,
Kommunikationssoftware, System-Entwicklung, System-Integration und
Datensicherheit.
diff --git a/german/consultants/leos.wml b/german/consultants/leos.wml
index 1b1fc311131..44cac8db131 100644
--- a/german/consultants/leos.wml
+++ b/german/consultants/leos.wml
@@ -1,14 +1,13 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Leonardo Buffa"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-29
# $Id$
-<h1>Leonardo Buffa</h1>
-<hr />
<p>
Ergänzende Informationen, falls vorhanden: Erfahrung in Netz-Sicherheit,
Sicherheitsbeurteilungen, Netz-Analysen und Infrastruktur-Begutachtung und
-Optimierung. Ersteller eine Slack-basierten Live-Distribution
-(www.malignuz.org), die in einigen italienieschen Universitäten tatsächlich
+(<a href="http://www.malignuz.org">www.malignuz.org</a>),
+die in einigen italienieschen Universitäten tatsächlich
zur Systemadministration eingesetzt wird.
</p>
diff --git a/german/consultants/liberobit.wml b/german/consultants/liberobit.wml
index c400e960784..d76c200b849 100644
--- a/german/consultants/liberobit.wml
+++ b/german/consultants/liberobit.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Studio Associato Liberobit"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-01
# $Id$
-<h1>Studio Associato Liberobit</h1>
-<hr />
-<pre>
+<p>
Wir bauten und unterstützen nur Debian-Server, Workstations und
LANs überwacht von Debian-Kisten
-</pre>
+</p>
diff --git a/german/consultants/libhertz.wml b/german/consultants/libhertz.wml
index 0e586f6119d..3cab8c4d5bd 100644
--- a/german/consultants/libhertz.wml
+++ b/german/consultants/libhertz.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Studio Associato Liberobit"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Studio Associato Liberobit</h1>
-<hr />
<p>
Arbeitet fast im gesamten Land (Lissabon, Aveiro, Porto, Portalegre, Beja, etc.).
</p>
diff --git a/german/consultants/libren.wml b/german/consultants/libren.wml
index 95abed9c685..4f41ae2d82b 100644
--- a/german/consultants/libren.wml
+++ b/german/consultants/libren.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Libren Informatika"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-01
# $Id$
-<h1>Libren Informatika</h1>
-
<p>
Volle Unterstützung für Debian GNU/Linux und UNIX-artige Systeme, bis zu
zwei Antworten pro E-Mail und Installationshilfe kostenfrei
diff --git a/german/consultants/linbit.wml b/german/consultants/linbit.wml
index 94abb6d2f4e..60a53d17d52 100644
--- a/german/consultants/linbit.wml
+++ b/german/consultants/linbit.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="LINBIT Information Technologies GmbH"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-16
# $Id$
-<h1>LINBIT Information Technologies GmbH</h1>
-
<p>Spezialisiert in HA-Clustering und Sicherheitslösungen.</p>
diff --git a/german/consultants/linbox.wml b/german/consultants/linbox.wml
index 4023f42201c..faaff1760ba 100644
--- a/german/consultants/linbox.wml
+++ b/german/consultants/linbox.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Free&amp;ALter Soft / Linbox"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Free&amp;ALter Soft / Linbox</h1>
-
<p>Wir haben mehrere DDs unter unseren Mitarbeitern.</p>
diff --git a/german/consultants/linux_ag.wml b/german/consultants/linux_ag.wml
index e00672ba752..efc12e081ca 100644
--- a/german/consultants/linux_ag.wml
+++ b/german/consultants/linux_ag.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
-
-<h1>Linux Information Systems AG</h1>
+#use wml::debian::consultant name="Linux Information Systems AG"
+#use wml::debian::translation-check translation="1.2"
<p>Die Linux Information Systems AG konzentriert sich in ihrer Arbeit
klar auf kleine und mittelständische Firmen sowie auf Behörden und hier
diff --git a/german/consultants/linux_box.wml b/german/consultants/linux_box.wml
index 5d5790c9fa3..3736fb36b70 100644
--- a/german/consultants/linux_box.wml
+++ b/german/consultants/linux_box.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="The Linux Box Corporation"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-01
# $Id$
-<h1>The Linux Box Corporation</h1>
-<hr />
-<pre>
+<p>
The Linux Box Corporation ist eine Beratungs-, Entwicklungs-, Integrations-,
Unterstützungs- und Trainings-Firma, die sich auf Wissenstransfer konzentriert,
spezialisiert in der Open Source- und Linux-Umgebung.
-</pre>
+</p>
diff --git a/german/consultants/linux_certified.wml b/german/consultants/linux_certified.wml
index f460165eed5..83fce9b853d 100644
--- a/german/consultants/linux_certified.wml
+++ b/german/consultants/linux_certified.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="LinuxCertified, Inc."
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-21
# $Id$
-<h1>LinuxCertified, Inc.</h1>
-<hr />
-<pre>
+<p>
Debian-Berater in verschiedenen Geographien.
-</pre>
+</p>
diff --git a/german/consultants/linux_consultancy.wml b/german/consultants/linux_consultancy.wml
index eb5bc74a200..9094e909ce6 100644
--- a/german/consultants/linux_consultancy.wml
+++ b/german/consultants/linux_consultancy.wml
@@ -1,15 +1,13 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="The Linux Consultancy"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-02
# $Id$
-<h1>The Linux Consultancy</h1>
-<hr />
-<pre>
+<p>
Ob Sie bloß jemanden haben wollen, der Ihnen ein Linux-System in Ordnung
bringt oder ob Sie nach jemanden Ausschau halten, der Ihnen einen Linux-Server
anbieten und warten kann &mdash; wir können helfen. Eines unserer Angebote
ist ein »Büro-Server«, der die gesamte E-Mailverwaltung (inkl. Spam- und
Viruserkennung), Dateiverwaltung, automatische Backups nach außerhalb, interne
Web-Seiten und mehr beherrscht.
-</pre>
+</p>
diff --git a/german/consultants/linux_mania.wml b/german/consultants/linux_mania.wml
index e28661b7ff9..f6437db8e5a 100644
--- a/german/consultants/linux_mania.wml
+++ b/german/consultants/linux_mania.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Linux Mania"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-10
# $Id$
-<h1>Linux Mania</h1>
-<hr />
<p>Linux-Unterstützung, -Installation und -Training.</p>
diff --git a/german/consultants/linuxcare.wml b/german/consultants/linuxcare.wml
index 60c020d8711..4ed21f08695 100644
--- a/german/consultants/linuxcare.wml
+++ b/german/consultants/linuxcare.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Linuxcare Systems"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-22
# $Id$
-<h1>Linuxcare Systems</h1>
-<hr />
<p>
Linux basierte Netz- und Computerlösungen für Firmen. Linux-Beratung und
-Unterstützung für Server und Geschäfts-Desktop-Systeme und Anwendungen.
diff --git a/german/consultants/linuxmagic.wml b/german/consultants/linuxmagic.wml
index 24e6456d3a6..09d67c81543 100644
--- a/german/consultants/linuxmagic.wml
+++ b/german/consultants/linuxmagic.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="LinuxMagic"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-01
# $Id$
-<h1>LinuxMagic</h1>
-<hr />
-<pre>
+<p>
Das erstklassige Linux-Support-Haus in Pacific Northwest; andere Debian-basierte
Produkte, »LinuxMagic Workplace«, »LinuxMagic Mail Server«
-</pre>
+</p>
diff --git a/german/consultants/linuxworks.wml b/german/consultants/linuxworks.wml
index 1173c9ffb87..d13177879b9 100644
--- a/german/consultants/linuxworks.wml
+++ b/german/consultants/linuxworks.wml
@@ -1,33 +1,35 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Linuxworks"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-26
# $Id$
-<h1>Linuxworks</h1>
-<hr />
-<pre>
+<p>
Unser Geschäft besteht darin, Computer- und Internet-Technik besser für Sie
arbeiten zu lassen. Dies bedeutet, Ihre Computerverwendung zu evaluieren, uns
anzuhören, was Sie wollen und dann mit Lösungen zu kommen, die Ihre
Bedürfnisse befriedigen. Sie können einfacher zu bedienen, schneller, mit
mehr Fähigkeiten, zuverlässiger und kostengünstiger sein.
-
+</p>
+<p>
Wir erstellen Debian-basierte Lösungen, hauptsächlich für kleine Organisationen.
Wir können andere Systeme ersetzen oder erweitern, sowohl auf dem Desktop als
auch im Back-Office/Server-Bereich. Wir können eine Einzelkomponente für eine
bestimmte Aufgabe erzeugen, bevorzugen aber einen Blick auf das ganze System,
da der Nutzen größer ist, wenn das ganze Bild in Betracht gezogen wird.
-
+</p>
+<p>
Unser Team beinhaltet Experten in Techniken wie Debian, Linux, Exim, Sendmail,
Squid, Apache, Thttpd, Samba, Netatalk, C/C++, Java, Python, Skripten, Web-Ware,
Mysql, Postgres, Gnome, Altlasten (Windows-)Anwendungslösungen und 802.11
drahtlos. Wir lernen ständig neues Zeug und wir nehmen jede Open Source-Technik
auf die Ihnen Nutzen bringt.
-
+</p>
+<p>
Sie können einen praktischen Ansatz zu Ihren Systemen wählen und uns detaillierte
Anweisungen erteilen, wie die Sachen aussehen sollen. Alternativ können Sie es
uns überlassen, mit einer Lösung die »einfach funktioniert«, zu kommen. Wir
freuen uns mit Ihnen zu arbeiten, was auch immer Sie wollen.
-
+</p>
+<p>
Wir freuen uns auf Ihren Anruf.
-</pre>
+</p>
diff --git a/german/consultants/logilab.wml b/german/consultants/logilab.wml
index a08c3b9797b..76f0304f262 100644
--- a/german/consultants/logilab.wml
+++ b/german/consultants/logilab.wml
@@ -1,14 +1,12 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="LOGILAB"
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-13
# $Id$
-<h1>LOGILAB</h1>
-<hr />
-<pre>
+<p>
Wir haben DD unter unseren Mitarbeitern und veröffentlichen alle unsere
Freie Software als Debian-Pakete, siehe www.logilab.org. Des Weiteren haben
wir einen Kurs über Debian-Administration und einen Kurs über das Paketieren
von Software für Debian. Andere Kurse werden auf unserer Webseite
veröffentlicht sobald sie geschrieben worden sind.
-</pre>
+</p>
diff --git a/german/consultants/mark_stanislav.wml b/german/consultants/mark_stanislav.wml
index adc647653b1..9089ddafc45 100644
--- a/german/consultants/mark_stanislav.wml
+++ b/german/consultants/mark_stanislav.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Mark Stanislav"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-02
# $Id$
-<h1>Mark Stanislav</h1>
-<hr />
-<pre>
+<p>
CompTIA Linux+-zertifiziert, Linux-Server-Administration
-</pre>
+</p>
diff --git a/german/consultants/markoer.wml b/german/consultants/markoer.wml
index 22b855162c1..0ae8f96805b 100644
--- a/german/consultants/markoer.wml
+++ b/german/consultants/markoer.wml
@@ -1,14 +1,12 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Marco Ermini"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-01
# $Id$
-<h1>Marco Ermini</h1>
-<hr />
-<pre>
+<p>
Ich bin ein erfahrener selbstständiger Berater, der mit vielen
GNU/Linux-Distributionen und vielen Arten von Linux arbeitet. Bitte schauen Sie
sich meinen Lebenslauf unter
<a href="http://www.markoer.org/cv/">http://www.markoer.org/cv/</a> an.
-</pre>
+</p>
diff --git a/german/consultants/maroonpoint.wml b/german/consultants/maroonpoint.wml
index fddeaba4f12..70a9e0264af 100644
--- a/german/consultants/maroonpoint.wml
+++ b/german/consultants/maroonpoint.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="MaroonPoint Polska Sp.J."
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-19
# $Id$
-<h1>MaroonPoint Polska Sp.J.</h1>
-<hr />
-<pre>
+<p>
Wir arbeiten mit Debian seit ungefähr 5 Jahren. Wir planen, Debian CDs in
Polen zu verteilen und einen Teil unserer Einnahmen an das Debian-Projekt
zu spenden.
-</pre>
+</p>
diff --git a/german/consultants/marques_j.wml b/german/consultants/marques_j.wml
index 9d78880efb6..78a84c75082 100644
--- a/german/consultants/marques_j.wml
+++ b/german/consultants/marques_j.wml
@@ -1,16 +1,14 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Marques Johansson"
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-26
# $Id$
-<h1>Marques Johansson</h1>
-<hr />
-<pre>
+<p>
Marques Johansson setzt Debian/GNU Linux seit dem Frühstadium ein, er hat
Debian-Systeme im E-Commerce, industriellen und Forschungseinrichtungen seit
1996 gewartet. Mit Sitz in Süd-Jersey bietet er Beratungs- und Support-Dienste
im Großraum Philadelphia an. Vertragsgebühren werden abhängig vom erwarteten
Lösungszeit- und -kostenaufwand bestimmt. Ein Anteil des Einkommens wird an
Software in the Public Interest gespendet.
-</pre>
+</p>
diff --git a/german/consultants/mathias_kettner.wml b/german/consultants/mathias_kettner.wml
index 42358a60ac4..f2a03bf49e8 100644
--- a/german/consultants/mathias_kettner.wml
+++ b/german/consultants/mathias_kettner.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Mathias Kettner"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-17
# $Id$
-<h1>Mathias Kettner</h1>
-<hr />
-<pre>
+<p>
automatische Installation und Software-Verteilung
im großen Umfang, Erfahrung in anderen hochrangigen Projekten
-</pre>
+</p>
diff --git a/german/consultants/michaeljohn_c.wml b/german/consultants/michaeljohn_c.wml
index 8bc5d49d30b..59e33cfef0c 100644
--- a/german/consultants/michaeljohn_c.wml
+++ b/german/consultants/michaeljohn_c.wml
@@ -1,14 +1,12 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Michaeljohn Clement"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-02
# $Id$
-<h1>Michaeljohn Clement</h1>
-<hr />
-<pre>
+<p>
Programmierung, geschäftlicher Einsatz von GNU/Linux und *BSD,
Web-Programmierung und -Design, Benutzerschnittstellen-Design und
-Implementation. C/C++/Java, Perl, SQL, PHP, etc. Ende-zu-Ende Lösungen,
basierend auf Open Source/Freier Software, für Ihr Geschäft.
-</pre>
+</p>
diff --git a/german/consultants/miju.wml b/german/consultants/miju.wml
index 99a82a4e55e..a4bcd94744d 100644
--- a/german/consultants/miju.wml
+++ b/german/consultants/miju.wml
@@ -1,14 +1,12 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Miju Systems"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-01
# $Id$
-<h1>Miju Systems</h1>
-<hr />
-<pre>
+<p>
Miju Systems arbeitet primär im Support-Bereich mit Kunden, vom kleinen
Geschäft bis zu Unternehmensbenutzern. Miju Systems unterstützt vernetzte
Server in ganz Australien, Europa, Kanada und den USA. Wir entwickeln
einen auf Debian KDE standarisierten Desktop und unterstützen auch
Open Source-Initiativen, um Linux-basierte Finanzanwendungen zu entwickeln.
-</pre>
+</p>
diff --git a/german/consultants/mind.wml b/german/consultants/mind.wml
index 50c4a98d9f5..fce130f243a 100644
--- a/german/consultants/mind.wml
+++ b/german/consultants/mind.wml
@@ -1,18 +1,17 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Mind nv"
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Mind nv</h1>
-<hr />
-<pre>
+<p>
Mind Linux Solutions (Leuven, Belgien) verwendet seine Kompetenz in Open
Source Software und System-Design um Lösungen, Consulting, Entwicklung,
Training und Unterstützung im Bereich der Entwicklung eingebetteter Systeme
zu liefern.
-
+</p>
+<p>
Wir verwenden Open Source-Software (bspw. Linux, RTLinux, RTAI, eCos, Wonka,
gcc, gdb, ...) um eine grundlegende Infrastruktur für neue eingebettete Systeme
(inklusive Systeme auf einem Chip) aufzusetzen und Kunden mit der Entwicklung
auf diesen Infrastrukturen zu helfen.
-</pre>
+</p>
diff --git a/german/consultants/minihub.wml b/german/consultants/minihub.wml
index c77bcf03185..4a4ec372779 100644
--- a/german/consultants/minihub.wml
+++ b/german/consultants/minihub.wml
@@ -1,15 +1,13 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Minihub Communications Incorporated"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-01
# $Id$
-<h1>Minihub Communications Incorporated</h1>
-<hr />
-<pre>
+<p>
Gemeinnützige Organisationen, die in Gemeinschafts-Interessen, Menschenrechten,
Umweltangelegenheiten und sozialer Gerechtigkeit involviert sind, benötigen
Kommunikationssysteme, die für ihren Bedarf angemessen sind. Debian Linux
stellt sichere, kostengünstige, erweiterbare Lösungen bereit, die gut unter
minimalen Hardware-Anforderungen laufen. Minihub bietet auch Firmenberatung und
arbeitet in ganz Süd-Ost-Asien.
-</pre>
+</p>
diff --git a/german/consultants/mivitec.wml b/german/consultants/mivitec.wml
index 17ddffc6b0c..6f60030bf90 100644
--- a/german/consultants/mivitec.wml
+++ b/german/consultants/mivitec.wml
@@ -1,16 +1,18 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="MIVITEC GmbH"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-16
# $Id$
-<h1>MIVITEC GmbH</h1>
-<hr />
-<pre>
+<p>
Wir bieten Linux-basierte Lösungen für Ihre Firma.
Andere Gebiete des Interesses:
-- wir bieten das Hosting Ihres Linux-basierten Servers in unseren Datenzentren
- in Frankfurt, München und Düsseldorf an
-- Web-Hosting (mit Zope, JBoss, Typo3, Tomcat usw.)
-- Programmierung.
+</p>
+<ul>
+<li>wir bieten das Hosting Ihres Linux-basierten Servers in unseren Datenzentren
+ in Frankfurt, München und Düsseldorf an</li>
+<li>Web-Hosting (mit Zope, JBoss, Typo3, Tomcat usw.)</li>
+<li>programmierung.</li>
+</ul>
+<p>
Sprechen Sie uns für weitere Informationen an.
-</pre>
+</p>
diff --git a/german/consultants/mladen_adamovic.wml b/german/consultants/mladen_adamovic.wml
index 111032d356b..52a0fbde9ef 100644
--- a/german/consultants/mladen_adamovic.wml
+++ b/german/consultants/mladen_adamovic.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Mladen Adamovic"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Mladen Adamovic</h1>
-<hr />
-<pre>
+<p>
Ich bin Lehr-Assistent in der Abteilung für Computer-Engineering
-</pre>
+</p>
diff --git a/german/consultants/murphy_soft.wml b/german/consultants/murphy_soft.wml
index 1a92a8fc39b..cca059af4e1 100644
--- a/german/consultants/murphy_soft.wml
+++ b/german/consultants/murphy_soft.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Murphy Software BV"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Murphy Software BV</h1>
-<hr />
<p>
Ein Teil der Debian-bezogenen Erlöse werden an das Debian-Projekt gespendet.
</p>
diff --git a/german/consultants/netdigix.wml b/german/consultants/netdigix.wml
index 816acfae65b..8e3f2d176f1 100644
--- a/german/consultants/netdigix.wml
+++ b/german/consultants/netdigix.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Netdigix Computer and Networking solutions"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-26
# $Id$
-<h1>Netdigix Computer and Networking solutions</h1>
-<hr />
-<pre>
+<p>
Projekte außerhalb der Stadt willkommen
-</pre>
+</p>
diff --git a/german/consultants/nikolai_l.wml b/german/consultants/nikolai_l.wml
index 9df8c7f3761..943adac1cc1 100644
--- a/german/consultants/nikolai_l.wml
+++ b/german/consultants/nikolai_l.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Nikolai Lusan"
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-02
# $Id$
-<h1>Nikolai Lusan</h1>
-<hr />
-<pre>
+<p>
Mit Fokus auf Infrastruktur stelle ich Gesamtlösungen für kleine bis
mittelgroße Unternehmen bereit. Netz-, Datenbank- und Desktop-Lösungen die
Ihren Bedürfnissen entsprechen. Lösungen, die die beste verfügbare Technik
verwenden, um Ihren Bedürfnissen zu dienen.
-</pre>
+</p>
diff --git a/german/consultants/norrix.wml b/german/consultants/norrix.wml
index d192d5f8750..318970479c6 100644
--- a/german/consultants/norrix.wml
+++ b/german/consultants/norrix.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Norrix Associates"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-24
# $Id$
-<h1>Norrix Associates</h1>
-<hr />
-<pre>
+<p>
Norrix Associates bietet entfernte und
vor-Ort Netzlösungen rund um den Globus an.
Alle Produkte basieren auf Debian.
-</pre>
+</p>
diff --git a/german/consultants/novochip.wml b/german/consultants/novochip.wml
index 9bb4c31d246..0077ff59901 100644
--- a/german/consultants/novochip.wml
+++ b/german/consultants/novochip.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Novochip Soluciones Informaticas"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-29
# $Id$
-<h1>Novochip Soluciones Informaticas</h1>
-<hr />
<p>
Allgemeine Beratung im Vernetzen von Intranets, Betriebssystemen, Relationalen
Datenbanken. Unser Flaggshiff: Integrierte LAN- &amp; WAN-Systeme mit Linux.
diff --git a/german/consultants/ns_computing.wml b/german/consultants/ns_computing.wml
index 018001066ab..53bbd81d737 100644
--- a/german/consultants/ns_computing.wml
+++ b/german/consultants/ns_computing.wml
@@ -1,15 +1,13 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="NS Computing"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-25
# $Id$
-<h1>NS Computing</h1>
-<hr />
-<pre>
+<p>
NS Computing bietet angepasste Intranet/Internet-Entwicklung, Netzsystem-Design,
Installation und Support. Wir benutzen GNU/Linux (speziell Debian) für
die meisten Netzwerk-Server. Wir bieten Debian-basierte Server für kleine
Betriebe mit angepassten Mehrbenutzer/Mehrfilialen-Intranet-Webanwendungen
(E-Mail, Fax, Dokumentverwaltungssystem und Kundenverwaltungssystem).
Monatliche/Jährliche Support-Verträge verfügbar.
-</pre>
+</p>
diff --git a/german/consultants/openbizz.wml b/german/consultants/openbizz.wml
index 7b2fb65e2c1..6ede9fe8771 100644
--- a/german/consultants/openbizz.wml
+++ b/german/consultants/openbizz.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="OpenBizz BV"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>OpenBizz BV</h1>
-<hr />
-<pre>
+<p>
Wir spezialisieren uns auf Büroumgebungen für kleine und mittelgroße
Firmen.
-</pre>
+</p>
diff --git a/german/consultants/openit.wml b/german/consultants/openit.wml
index 109b1a04aa0..272af9a1ae9 100644
--- a/german/consultants/openit.wml
+++ b/german/consultants/openit.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Open IT"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-10
# $Id$
-<h1>Open IT</h1>
-<hr />
<p>
Ich verwende Linux seit 1993 und erledige die System-Administration/-Integration
natürlich immer mit Debian.
diff --git a/german/consultants/opentechnologies.wml b/german/consultants/opentechnologies.wml
index a78b3722c12..cabc0551383 100644
--- a/german/consultants/opentechnologies.wml
+++ b/german/consultants/opentechnologies.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="OpenTechnologies"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-26
# $Id$
-<h1>OpenTechnologies</h1>
-<hr />
-<pre>
+<p>
Arbeite mit FreeBSD und OpenBSD. Arbeite auch mit Debian, Gentoo, SuSE,
Red Hat und Mandrake. Firewall-Konstruktion. Sicherheitsberater.
LAN/WAN, Internet/Intranet-Integration. RDBMSs. Internteauftritt.
-</pre>
+</p>
diff --git a/german/consultants/opentrend.wml b/german/consultants/opentrend.wml
index 42f94bb2446..617761ec357 100644
--- a/german/consultants/opentrend.wml
+++ b/german/consultants/opentrend.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="OpenTrend Solutions Ltd"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-01
# $Id$
-<h1>OpenTrend Solutions Ltd</h1>
-<hr />
-<pre>
+<p>
Wir spenden 2% unseres Bruttogewinns an die Unterstützung von Open Source
Software. Wir haben mit Organisationen in den Vereinigten Staaten und
Australien zusammengearbeitet um multi-nationale Kunden besser zu unterstützen.
-</pre>
+</p>
diff --git a/german/consultants/orbit.wml b/german/consultants/orbit.wml
index ba4cd147d01..5afd8968c8e 100644
--- a/german/consultants/orbit.wml
+++ b/german/consultants/orbit.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="ORBIT Technologies, Inc."
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-14
# $Id$
-<h1>ORBIT Technologies, Inc.</h1>
-<hr />
-<pre>
+<p>
ORBIT Technologies bietet gezielt für eingebettete, verteilte und
Cross-Plattform-Systeme Dienste und Produkte an.
-</pre>
+</p>
diff --git a/german/consultants/osourcery.wml b/german/consultants/osourcery.wml
index d858866d341..3d012476548 100644
--- a/german/consultants/osourcery.wml
+++ b/german/consultants/osourcery.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="OpenSourcery, LLC"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-13
# $Id$
-<h1>OpenSourcery, LLC</h1>
-<hr />
<p>Software-Entwicklung, GNU/Linux/BSD-Server und
Netzdesign/-Installation/-Sicherheit</p>
diff --git a/german/consultants/ossafrica.wml b/german/consultants/ossafrica.wml
index b1212685fcf..516d31a9e4b 100644
--- a/german/consultants/ossafrica.wml
+++ b/german/consultants/ossafrica.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="OSS Africa"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-22
# $Id$
-<h1>OSS Africa</h1>
-<hr />
<p>
Spezialisiert auf Server-Installation und -Verwaltung.
</p>
diff --git a/german/consultants/ouattara.wml b/german/consultants/ouattara.wml
index e14f9a41e41..5bce4b321c0 100644
--- a/german/consultants/ouattara.wml
+++ b/german/consultants/ouattara.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Sefie Janvier OUATTARA"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-27
# $Id$
-<h1>Sefie Janvier OUATTARA</h1>
-
<p>
Datenbanken- und Anwendungs-Server-Experte.
</p>
diff --git a/german/consultants/oxalide.wml b/german/consultants/oxalide.wml
index 2fc4b305bbf..01a4c74b6c3 100644
--- a/german/consultants/oxalide.wml
+++ b/german/consultants/oxalide.wml
@@ -1,9 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Oxalide"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-19
# $Id$
-<h1>Oxalide</h1>
<p>Oxalide ist eine französische Beratungsfirma und Lösungsanbieter. Unsere
Felder der Expertise beinhalten System-Einsatz von UNIX-Software wie
sichere E-Mail-Systeme (SMTP, POP, IMAP), fortgeschrittene
diff --git a/german/consultants/pahne.wml b/german/consultants/pahne.wml
index 0c29b61e244..a66a8e39ccb 100644
--- a/german/consultants/pahne.wml
+++ b/german/consultants/pahne.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="IT-Service Andy Pahne"
+#use wml::debian::translation-check translation="1.2"
# Translator: Tobias Toedter, t.toedter@gmx.net, 2005-06-19
-<h1>IT-Service Andy Pahne</h1>
-
<p>
Erfahrung mit Linux und Open Source seit 1996.
</p>
diff --git a/german/consultants/parreiras_m.wml b/german/consultants/parreiras_m.wml
index 954fffba437..07337cc170b 100644
--- a/german/consultants/parreiras_m.wml
+++ b/german/consultants/parreiras_m.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="M&aacute;rcio H. Parreiras"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-21
# $Id$
-<h1>M&aacute;rcio H. Parreiras</h1>
-<hr />
-<pre>
+<p>
Server, Workstations, Netze, etc.
-</pre>
+</p>
diff --git a/german/consultants/penguintechs.wml b/german/consultants/penguintechs.wml
index d02ae45c6c7..b8ab1c180a6 100644
--- a/german/consultants/penguintechs.wml
+++ b/german/consultants/penguintechs.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Penguin Techs"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-08
# $Id$
-<h1>Penguin Techs</h1>
-<hr />
<p>
Penguin Techs spezialisiert sich auf den Einsatz von Asterisk-PBX und der
Integration von Freier und Open Source-Software in existierende
diff --git a/german/consultants/pete_b.wml b/german/consultants/pete_b.wml
index 3a517ab7211..caf8984ed99 100644
--- a/german/consultants/pete_b.wml
+++ b/german/consultants/pete_b.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="ELB Internet Services"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-02
# $Id$
-<h1>ELB Internet Services</h1>
-
<p>ELB spezialisiert sich auf das Anbieten kompletter Ende-zu-Ende
Internet-Lösungen für Firmen und öffentliche Einrichtungen - von einfachen
E-Mail- zu Web-Lösungen bis hin zu unternehmensweiter Internet-Anbindung.</p>
diff --git a/german/consultants/peter_d.wml b/german/consultants/peter_d.wml
index 54e55669bd9..a5e36aaf6bb 100644
--- a/german/consultants/peter_d.wml
+++ b/german/consultants/peter_d.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Kangaroot Linux Solutions"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Kangaroot Linux Solutions</h1>
-
<p>Belgische Linux-Berater mit Fokus auf Debian-Support und Installation.
E-Mail, Web-Server, Firewalls, Groupware-Server, VPN, E-Commerce, ...
</p>
diff --git a/german/consultants/peter_naulls.wml b/german/consultants/peter_naulls.wml
index f0f55de357b..a8ac76a5d3a 100644
--- a/german/consultants/peter_naulls.wml
+++ b/german/consultants/peter_naulls.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Peter Naulls"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-02
# $Id$
-<h1>Peter Naulls</h1>
-<hr />
-<pre>
+<p>
Ich spezialisiere mich in ARM-Linux, inklusive Kernelentwicklung, aber habe
auch Expertise in vielen Gebieten von Linux, insbesondere dem Einsatz von
Debian-Systemen. Ich habe auch signifikat Zeit mit Hilfe für das
Debian-Projekt beigetragen.
-</pre>
+</p>
diff --git a/german/consultants/picone.wml b/german/consultants/picone.wml
index 571e3d57994..41493303d7e 100644
--- a/german/consultants/picone.wml
+++ b/german/consultants/picone.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Ants S.p.a."
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-20
# $Id$
-<h1>Ants S.p.a.</h1>
-<hr />
<p>
UNIX (Debian, Linux), LAN, WAN, Internettechnik (WWW, FTP,
DNS, E-Mail, etc..), Lastverteilung in Serverfarmen, Hochverfügbarkeit,
diff --git a/german/consultants/pits.wml b/german/consultants/pits.wml
index 61c2b2f6e84..f02b32a569a 100644
--- a/german/consultants/pits.wml
+++ b/german/consultants/pits.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="PiTS - Peruzzi Thomas D.I.(FH)"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-08
# $Id$
-<h1>PiTS - Peruzzi Thomas D.I.(FH)</h1>
-<hr />
<p>
OTRS, ITIL, OpenGroupware
</p>
diff --git a/german/consultants/porcacchia.wml b/german/consultants/porcacchia.wml
index 61f9e104dda..5dfa26cafc7 100644
--- a/german/consultants/porcacchia.wml
+++ b/german/consultants/porcacchia.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Alessio Porcacchia"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-06
# $Id$
-<h1>Alessio Porcacchia</h1>
-<hr />
<p>
Erfahrener Linux- und Unix-Systemadministrator, IT-Sicherheitsspezialist
(Härten und Audit)
diff --git a/german/consultants/praksys.wml b/german/consultants/praksys.wml
index 9f0f6fde982..b4c2d3c3efb 100644
--- a/german/consultants/praksys.wml
+++ b/german/consultants/praksys.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="PraKsys"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-19
# $Id$
-<h1>PraKsys</h1>
-<hr />
-<pre>
+<p>
Migration kompletter Informationssysteme zu Debian. Die Praksys-Distribution
ist unter gna.prg/pkaksys verfügbar, vorausgesetzt Sie besitzen ein
Woody-System und einige Kenntnisse.
PraKsys (Guillaume Pernot) war auf der Debconf in Porto Allegre anwesend.
-</pre>
+</p>
diff --git a/german/consultants/produktivit.wml b/german/consultants/produktivit.wml
index 5bc100743a2..3c4c3f325b0 100644
--- a/german/consultants/produktivit.wml
+++ b/german/consultants/produktivit.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="produktivIT"
+#use wml::debian::translation-check translation="1.2"
-<H1>produktivIT</H1>
-<HR>
-<PRE>
+<p>
Wir richten unseren Aufmerksamkeit auf Kostenoptimierung in der IT, machen
ROI-Analysen und Migrationsprojekte zu Open Source Technologien. Wir
verfügen über breite Expertise bei Abteilungsservern in heterogenen
@@ -11,4 +9,4 @@ Netzwerken und Content Management Systemen. produktivIT sponsert Debian
und das OpenGroupware Projekt mit Hardware-Spenden, KDE Debian Enterprise
mit Arbeitszeit und die Integration von OpenOffice.org in KDE mit
finanziellen Zuwendungen.
-</PRE>
+</p>
diff --git a/german/consultants/prolibre.wml b/german/consultants/prolibre.wml
index 3f623f67468..8af5271bda0 100644
--- a/german/consultants/prolibre.wml
+++ b/german/consultants/prolibre.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="ProLibre"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-17
# $Id$
-<h1>ProLibre</h1>
-<hr />
-<pre>
+<p>
Seit 2000 Linux-Server-Installationen von Debian, Migration auf Linux,
Entwicklung, Unterstützung, Wartung und Training.
-</pre>
+</p>
diff --git a/german/consultants/prosa.wml b/german/consultants/prosa.wml
index 629c42e824f..9125962ff8b 100644
--- a/german/consultants/prosa.wml
+++ b/german/consultants/prosa.wml
@@ -1,18 +1,18 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="PROSA Progettazione Sviluppo Aperto"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-25
# $Id$
-<h1>PROSA Progettazione Sviluppo Aperto</h1>
-<hr />
-<pre>
+<p>
Wir verkaufen vorinstallierte Debian-Linux-Systeme. Wir geben kommerziellen
Support für Debian-Linux.
-
+</p>
+<p>
Wir sind die Autoren von PROSA/Debian, einer italienischen Version von
Debian, die wir auf unseren Systemen verkaufen.
-
+</p>
+<p>
PROSA verwendet, erstellt und verkauft nur Lösungen, die auf freier Software
basieren.
-</pre>
+</p>
diff --git a/german/consultants/python_byte.wml b/german/consultants/python_byte.wml
index 5c983829e71..b6a11df2485 100644
--- a/german/consultants/python_byte.wml
+++ b/german/consultants/python_byte.wml
@@ -1,15 +1,13 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Python Byte Solutions"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-24
# $Id$
-<h1>Python Byte Solutions</h1>
-<hr />
-<pre>
+<p>
Wir sind eine IT-Beratungsfirma mit rundum-Service. Wir bieten u.A. folgende
Dienste an: Software-Entwicklung, Software-Installation/-Unterstützung,
Systemadministration und Hosting. Unsere Spezialitäten beinhalten Open
Source-Technologien wie GNU/LInux, Zope und Python. Falls Sie uns wissen lassen,
das Sie Debian.org geschickt hat, werden wir 5% unseres Umsatzes, den wir von
Ihnen erhalten, an Debian spenden!!
-</pre>
+</p>
diff --git a/german/consultants/qualsoftservices.wml b/german/consultants/qualsoftservices.wml
index 29256f98581..8c90dad51ec 100644
--- a/german/consultants/qualsoftservices.wml
+++ b/german/consultants/qualsoftservices.wml
@@ -1,14 +1,15 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="QualSoft Services"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-10
# $Id$
-<h1>QualSoft Services</h1>
-<hr />
<p>
QualSoft Services, eine ausgelagerte Software-Entwicklungsfirma, die
ausgelagerte Software-Entwicklungsdienstleistungen für ihre Kunden weltweit
-anbietet und eigene Software-Produkte produziert. Spezialisiert auf angepasste
+anbietet und eigene Software-Produkte produziert.
+</p>
+<p>
+Spezialisiert auf angepasste
Softwareentwicklung, Web-basierte Anwendungen, E-Commerce-Lösungen, PDA-basierte
Anwendungen, Client/Server-Anwendungen. Desktop-Anwendungen. Unser Fokus liegt
auf Software-Tests, Produktentwicklung, Software-Wartung, Produkt-Wartung,
diff --git a/german/consultants/qulix.wml b/german/consultants/qulix.wml
index 7b2cca9b4db..4ec2b0c7964 100644
--- a/german/consultants/qulix.wml
+++ b/german/consultants/qulix.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Qulix Systems"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-18
# $Id$
-<h1>Qulix Systems</h1>
-
<p>
Qulix ist eine ausgelagerte Entwicklungsfirma mit der Zentrale in Minsk,
Weißrussland.
diff --git a/german/consultants/r3deng.wml b/german/consultants/r3deng.wml
index 7ffea406325..e979b85c2d3 100644
--- a/german/consultants/r3deng.wml
+++ b/german/consultants/r3deng.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="R3dEngineering"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-08
# $Id$
-<h1>R3dEngineering</h1>
-<hr />
<p>
Bietet Software in J2EE (Tomcat, JSP, MySQL, Oracle, Web-Dienste) und PHP.
Unterstützt die Debian-Plattform: Web-Verwaltung, E-Mail, FTP, Datenbanken, etc.
diff --git a/german/consultants/r_w_r.wml b/german/consultants/r_w_r.wml
index 550f97bbe52..6018953b9c5 100644
--- a/german/consultants/r_w_r.wml
+++ b/german/consultants/r_w_r.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Daily Data, Inc."
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-25
# $Id$
-<h1>Daily Data, Inc.</h1>
-<hr />
-<pre>
+<p>
Wir sind ein Alles-Aus-Einer-Hand Laden der jeden bedient, von der Einzelperson
bis zu großen Firmen, und die Hilfe rangiert vom Aufsetzen heimbasierter Systeme
zum Hosten von Web-Auftritten und der Erstellung von kleinen Geschäftsnetzen und
@@ -16,4 +14,4 @@ Netze, die alle dieser enthalten (wir schmeißen sogar einen Novell-Server
dazu wenn Sie uns den Arm verrenken und viel Geld bezahlen). Falls wir es
nicht machen können, kennen wir jemanden, der es kann und leiten Sie an diesen
weiter (keine Überweisungsgebühr).
-</pre>
+</p>
diff --git a/german/consultants/rafez_n.wml b/german/consultants/rafez_n.wml
index 21d20774c4b..83a844dedb1 100644
--- a/german/consultants/rafez_n.wml
+++ b/german/consultants/rafez_n.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Gazelle Informatics Ltd"
+#use wml::debian::translation-check translation="1.2"
# $Id$
-<H1>Gazelle Informatics Ltd</H1>
-
<p>Spezialist von Lotus Domino auf Debian</p>
diff --git a/german/consultants/researchut.wml b/german/consultants/researchut.wml
index 4ee5ecbc0e4..5b92ab21294 100644
--- a/german/consultants/researchut.wml
+++ b/german/consultants/researchut.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="RESEARCHUT"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-25
# $Id$
-<h1>RESEARCHUT</h1>
-<hr />
<p>
RESEARCHUT bietet angepasste entfernte und eingeschränkt vor-Ort Netz-
und Wartungslösungen rund um die Welt.
diff --git a/german/consultants/robert_millan.wml b/german/consultants/robert_millan.wml
index 52fd5f9f699..93efaf6eb56 100644
--- a/german/consultants/robert_millan.wml
+++ b/german/consultants/robert_millan.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Robert Millan"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-02
# $Id$
-<h1>Robert Millan</h1>
-<hr />
-<pre>
+<p>
Wartung/Administration von Debian-Servern und -Workstations.
Ethernet, TCP/IP, Routing, Firewalls, HTTPD, E-Mail, Samba, etc.
-</pre>
+</p>
diff --git a/german/consultants/sam_solutions.wml b/german/consultants/sam_solutions.wml
index 4334c7f21e3..721d87e6923 100644
--- a/german/consultants/sam_solutions.wml
+++ b/german/consultants/sam_solutions.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="SaM Solutions"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-13
# $Id$
-<h1>SaM Solutions</h1>
-<hr />
<p>Basierend in den USA, West- und Osteuropa bietet SaM Solutions ausgelagerte
Software-Entwicklung &amp; BPO-Dienste an, die führenden US- und europäischen
Firmen erlauben, Ihre Software-Kosten zu optimieren und die Software-Qualität
diff --git a/german/consultants/samantha_s.wml b/german/consultants/samantha_s.wml
index b32c9ea5f48..5d2123411b7 100644
--- a/german/consultants/samantha_s.wml
+++ b/german/consultants/samantha_s.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Femtech"
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-28
# $Id$
-<h1>Femtech</h1>
-<hr />
<ul>
<li>ISP-Lösungen</li>
<li>Unternehmens-Lösungen</li>
diff --git a/german/consultants/samurai.wml b/german/consultants/samurai.wml
index 9bdf19f4927..11bf1eb23f3 100644
--- a/german/consultants/samurai.wml
+++ b/german/consultants/samurai.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Samurai - Projetos Especiais"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-10
# $Id$
-<h1>Samurai - Projetos Especiais</h1>
-<hr />
<p>Debian-Linux, Plone, Zope, Samurai-Linux.</p>
<p>Kunden und Partner: APTEL, CESAR, Sun Microsystems, Siemens, T-Systems.</p>
diff --git a/german/consultants/scheeder.wml b/german/consultants/scheeder.wml
index 4d647de095d..6eb4e72e204 100644
--- a/german/consultants/scheeder.wml
+++ b/german/consultants/scheeder.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Scheeder &amp; Partner GmbH"
+#use wml::debian::translation-check translation="1.2"
# $Id$
-<h1>Scheeder &amp; Partner GmbH</h1>
-<hr />
<p>
Wir arbeiten mit Debian-Servern in der Industrie und dem
Gesundheitswesen seit 1995. Wir unterstützen den kompletten
Debian-Anwendungsbereich, vor allem Samba, freeswan, PostgreSQL
und kennen uns mit OpenSource-Anwendungen sehr gut aus. Für
weitere Themen stehen wir Ihnen gerne zur Verfügung!
-</p> \ No newline at end of file
+</p>
diff --git a/german/consultants/seattlelinux.wml b/german/consultants/seattlelinux.wml
index a6c63745de6..35a4cf90b8f 100644
--- a/german/consultants/seattlelinux.wml
+++ b/german/consultants/seattlelinux.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Seattle Linux, Inc"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-29
# $Id$
-<h1>Seattle Linux, Inc</h1>
-<hr />
<p>
Linux- und Open Source-Dienstleistungen für kleine Firmen
</p>
diff --git a/german/consultants/sergio_a.wml b/german/consultants/sergio_a.wml
index 7ce0f034bd4..0adb28e84d3 100644
--- a/german/consultants/sergio_a.wml
+++ b/german/consultants/sergio_a.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Sergio Arias"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-24
# $Id$
-<h1>Sergio Arias</h1>
-<hr />
-<pre>
+<p>
vielzweck-Entwicklungen
-</pre>
+</p>
diff --git a/german/consultants/serverflow.wml b/german/consultants/serverflow.wml
index 48151c7bb61..c76bfe71254 100644
--- a/german/consultants/serverflow.wml
+++ b/german/consultants/serverflow.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Serverflow consulting, d.o.o."
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-08-08
# $Id$
-<h1>Serverflow consulting, d.o.o.</h1>
-<hr />
<p>
Kann für Jobs woanders pendeln.
</p>
diff --git a/german/consultants/servitux.wml b/german/consultants/servitux.wml
index 2251e694f71..3479aa06608 100644
--- a/german/consultants/servitux.wml
+++ b/german/consultants/servitux.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="ServiTux Servicios Inform&aacute;ticos S.L"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-01
# $Id$
-<h1>ServiTux Servicios Inform&aacute;ticos S.L</h1>
-<hr />
<p>
Wir in ServiTux entwickeln und implementieren alle Lösungen mit Debian
Linux. Wir bieten auch Debian-Unterstützung und -Training.
diff --git a/german/consultants/shannon_d.wml b/german/consultants/shannon_d.wml
index 08cf96bf0b8..6354712d9fe 100644
--- a/german/consultants/shannon_d.wml
+++ b/german/consultants/shannon_d.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="DeaTech Research Inc."
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-25
# $Id$
-<h1>DeaTech Research Inc.</h1>
-
<p>Echtzeit-, Gerätetreiber- und eingebettete Systeme-Spezialist. Umfangreiche
Erfahrung in Systemadministration, Web-Entwicklung und auch vielen anderen
Gebieten. Elf Jahre Linux-Erfahrung (hauptsächlich Debian), siebzehn Jahre
diff --git a/german/consultants/simone_giustetti.wml b/german/consultants/simone_giustetti.wml
index fbacc95e23e..a5fe781860c 100644
--- a/german/consultants/simone_giustetti.wml
+++ b/german/consultants/simone_giustetti.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Studio Simone Giustetti"
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-16
# $Id$
-<h1>Studio Simone Giustetti</h1>
-<hr />
<p>
Wir sind ein Ingenieursstudio mit Fokus auf IT-Beratung und Software- oder
Systemingenieursdienstleistungen für Firmen aller Größen. Wir haben viele Jahre
diff --git a/german/consultants/sine_nomine.wml b/german/consultants/sine_nomine.wml
index 0d431371a69..c525cd200cc 100644
--- a/german/consultants/sine_nomine.wml
+++ b/german/consultants/sine_nomine.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Sine Nomine Associates"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-01
# $Id$
-<h1>Sine Nomine Associates</h1>
-<hr />
-<pre>
+<p>
Sine Nomine Associates ist eine Forschungs- und Entwicklungsfirma, mit
dem Fokus, entwickelnde Techniken in praktische Geschäftslösungen zu
transformieren.
-</pre>
+</p>
diff --git a/german/consultants/sniffer.wml b/german/consultants/sniffer.wml
index 2b792251d3d..7bfee9bc1bb 100644
--- a/german/consultants/sniffer.wml
+++ b/german/consultants/sniffer.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Sniffer Networks Ltda."
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-25
# $Id$
-<h1>Sniffer Networks Ltda.</h1>
-
<p>
Spezialisiert in Webanwendungs-Server und Wiederherstellung nach Abstürzen
</p>
diff --git a/german/consultants/softitaly.wml b/german/consultants/softitaly.wml
index 32bfab9f7d0..1d213008c59 100644
--- a/german/consultants/softitaly.wml
+++ b/german/consultants/softitaly.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Softitaly S.n.c."
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-25
# $Id$
-<h1>Softitaly S.n.c.</h1>
-<hr />
<p>
Verfügbar in Nord-Italien
</p>
diff --git a/german/consultants/soleyman.wml b/german/consultants/soleyman.wml
index fe53e2ca9c0..9ba4f3f232d 100644
--- a/german/consultants/soleyman.wml
+++ b/german/consultants/soleyman.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="The Soleyman Group"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-26
# $Id$
-<h1>The Soleyman Group</h1>
-<hr />
<p>
Stellen verwaltete Dienste und geschäftliche technische Beratung an mögliche
Kunden zusätzlich zu System- und Netzadministration, Planung- und
diff --git a/german/consultants/solutionsfirst.wml b/german/consultants/solutionsfirst.wml
index 37d527db54e..967409b07cf 100644
--- a/german/consultants/solutionsfirst.wml
+++ b/german/consultants/solutionsfirst.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Solutions First"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-27
# $Id$
-<h1>Solutions First</h1>
-<hr />
<p>
Solutions First ist eine in Sydney basierte Informationstechnik-Beratung. Wir
stellen ein weites Spektrum an Diensten und Support für eine Vielzahl von
diff --git a/german/consultants/sosa.wml b/german/consultants/sosa.wml
index 7d9aaa96d2a..9498505fb1d 100644
--- a/german/consultants/sosa.wml
+++ b/german/consultants/sosa.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Corporaci&oacute;n Sosa &amp; Sosa C.A."
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-24
# $Id$
-<h1>Corporaci&oacute;n Sosa &amp; Sosa C.A.</h1>
-<hr />
-<pre>
+<p>
Betriebssysteme, Netze und Sicherheit.
-</pre>
+</p>
diff --git a/german/consultants/steve_l.wml b/german/consultants/steve_l.wml
index 7ad87dff892..1bfbaa2b4ca 100644
--- a/german/consultants/steve_l.wml
+++ b/german/consultants/steve_l.wml
@@ -1,15 +1,13 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="David Goodenough &amp; Associates Limited (DGA)"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-12
# $Id$
-<h1>David Goodenough &amp; Associates Limited (DGA)</h1>
-<hr />
-<pre>
+<p>
Ergänzende Information: DGA spezialisiert sich auf Verbindungsfähigkeit und
wurde als »Technischer Klebe-Hersteller« bezeichnet. Wir haben mit
Unternehmenssystemen Erfahrung und haben extensiv mit Lotus Domino, Websphere
und Tomcat-Web-Servern und Java-Programmierung gearbeitet. Wir arbeiten auch
mit Firmen-E-Mail-Systemen, bauen Brücken zwischen Alt- und SMTP-Systemen
und führen Migrationen durch.
-</pre>
+</p>
diff --git a/german/consultants/storitback.wml b/german/consultants/storitback.wml
index 2b52eb9747e..47538c3eea5 100644
--- a/german/consultants/storitback.wml
+++ b/german/consultants/storitback.wml
@@ -1,8 +1,6 @@
-#use wml::debian::translation-check translation="1.1"
-#use wml::debian::consultant
+#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Stor IT Back, GbR"
-<h1>Stor IT Back, GbR</h1>
-<hr />
<p>
Beratung für Storage- und Backup-Lösungen, Debian im SAN, Debian als
iSCSI-Target oder Initiator, Debian und Datensicherung, Cluster, NAS und
diff --git a/german/consultants/stuart_t.wml b/german/consultants/stuart_t.wml
index 2d430ff7fd9..196a8b16d74 100644
--- a/german/consultants/stuart_t.wml
+++ b/german/consultants/stuart_t.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Linux Labs"
+#use wml::debian::translation-check translation="1.2"
# Translator: Noèl Köthe, noel@koethe.net, 2001-07-30
-<h1>Linux Labs</h1>
-
-<p>LinuxBIOS- und Cluster-Spezialisten
+<p>LinuxBIOS- und Cluster-Spezialisten</p>
diff --git a/german/consultants/syscovery.wml b/german/consultants/syscovery.wml
index 0deafaf064c..c0a96e60852 100644
--- a/german/consultants/syscovery.wml
+++ b/german/consultants/syscovery.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="syscovery network services GmbH"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-07
# $Id$
-<h1>syscovery network services GmbH</h1>
-<hr />
<p>
syscovery kann für Sie in regionalen und landesweiten Projekten arbeiten.
</p>
diff --git a/german/consultants/tagfl.wml b/german/consultants/tagfl.wml
index f0fb78b97ca..3356455ea7b 100644
--- a/german/consultants/tagfl.wml
+++ b/german/consultants/tagfl.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Technology Associates Group"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-24
# $Id$
-<h1>Technology Associates Group</h1>
-
<p>
Technology Associates Group (TAG) ist eine Computernetz-Beratungs und
-Dienstleistungsfirma in Ocala, Florida.
diff --git a/german/consultants/tecexperts.wml b/german/consultants/tecexperts.wml
index 8ee3726691a..e9e36a14abe 100644
--- a/german/consultants/tecexperts.wml
+++ b/german/consultants/tecexperts.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="TecExpers"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-16
# $Id$
-<h1>TecExpers</h1>
-
<p>
Wir haben Expertiese in diesen Gebieten.
</p>
diff --git a/german/consultants/ted_j.wml b/german/consultants/ted_j.wml
index 44ad9b0e5c1..12e024e5df9 100644
--- a/german/consultants/ted_j.wml
+++ b/german/consultants/ted_j.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="JordanTeam IT Training"
+#use wml::debian::translation-check translation="1.3"
# $Id$
# Translator: Noel Koethe, noel@debian.org, 2001-12-21
-<h1>JordanTeam IT Training</h1>
-
<p>Spezialisiert auf Unix, Linux und Solaris
Schulungen. Beratung beinhaltet Datensicherheit,
Katastrophenwiederherstellung und Portierung von
diff --git a/german/consultants/tegtmeier.wml b/german/consultants/tegtmeier.wml
index b861b0579eb..02e84620ed0 100644
--- a/german/consultants/tegtmeier.wml
+++ b/german/consultants/tegtmeier.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Tegtmeier Internet Solutions e.K."
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-17
# $Id$
-<h1>Tegtmeier Internet Solutions e.K.</h1>
-<hr />
<p>
Planung, Realisation, Entwicklung und Wartung von Internet-Projekten die
auf Debian laufen. Fokus auf Internet-Sicherheit, Performance/Optimierung und
diff --git a/german/consultants/terran_universal_systems.wml b/german/consultants/terran_universal_systems.wml
index cbbfe0ab85a..f794563dcd2 100644
--- a/german/consultants/terran_universal_systems.wml
+++ b/german/consultants/terran_universal_systems.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.7"
+#use wml::debian::consultant name="Terran Univeral Systems"
+#use wml::debian::translation-check translation="1.8"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-26
# $Id$
-<h1>Terran Univeral Systems</h1>
-<hr />
<h2>Terran Universal Systems &mdash;&gt; Qualität &ndash; Sonst nichts</h2>
<h3>Migration</h3>
diff --git a/german/consultants/thoughtprocess.wml b/german/consultants/thoughtprocess.wml
index 66a2c9bac5f..259d016ab22 100644
--- a/german/consultants/thoughtprocess.wml
+++ b/german/consultants/thoughtprocess.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="ThoughtProcess.net, Inc."
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-26
# $Id$
-<h1>ThoughtProcess.net, Inc.</h1>
-
<p>
Wir bieten Windows- und Novell-Migration auf Linux. Wir entwickeln auch
angepasste integrierte Systeme für alle Anwendungen. Debian-Linux ist unsere
diff --git a/german/consultants/tim_o.wml b/german/consultants/tim_o.wml
index 94c5bf9b8ee..bc2d255a87c 100644
--- a/german/consultants/tim_o.wml
+++ b/german/consultants/tim_o.wml
@@ -1,19 +1,18 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="OASys Engineering"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-26
# $Id$
-<h1>OASys Engineering</h1>
-<hr />
-<pre>
+<p>
Ergänzende Information: OASys spezialisiert sich auf die Betreuung der Gemeinde
der kleinen und mittleren Firmen in all ihren Rechner-Bedürfnissen. Wir
empfehlen die Debian-Linux und Samba-Kombination anstatt Windows NT-Server
aufgrund Debians Stabilität, robusten Betrieb und der Abwesenheit von
Lizenzproblemen. Ergänzend bieten wir Dienstleistungen für die meisten
Unix-Varianten sowie Windows 95, 98 und NT an.
-
+</p>
+<p>
OASys bietet auf Anfrage/spezielles Arrangement hin auch Training und Kurse
zu grundlegender Administration.
-</pre>
+</p>
diff --git a/german/consultants/togaware.wml b/german/consultants/togaware.wml
index 883630255f7..c6a9fb0a6f1 100644
--- a/german/consultants/togaware.wml
+++ b/german/consultants/togaware.wml
@@ -1,15 +1,13 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Togaware"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-28
# $Id$
-<h1>Togaware</h1>
-<hr />
-<pre>
+<p>
Togaware hat mehr als 10 Jahre Erfahrung in der Installation von Debian
GNU/Linux-Systemen sowohl in der Industrie und der öffentlichen Verwaltung
als auch bei Heimbenutzern. Unser »Debian GNU/Linux Desktop Survial Guide«
(Debian GNU/Linux Desktop-Überlebensführer) wird viel referenziert und
kontinuierlich aktualisiert. Wir stellen auch das Debian-Paket wajig
bereit, das die System- und Paketverwaltung in Debian vereinfacht.
-</pre>
+</p>
diff --git a/german/consultants/toni_m.wml b/german/consultants/toni_m.wml
index f524c8b05d8..6e51c996e65 100644
--- a/german/consultants/toni_m.wml
+++ b/german/consultants/toni_m.wml
@@ -1,22 +1,22 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Oeko.neT"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-16
# $Id$
-<h1>Oeko.neT</h1>
-<hr>
-<pre>
+<p>
Toni trägt ein Universitätsabschluss in Informatik (Dipl.-Inf.)
und hat jetzt 10 Jahre Erfahrung als Berater im Netzwerk-Bereich.
Kunden so groß wie PLC genießen funktionierende, im Zeit- und
Kostenrahmen liegende Projekte.
-
+</p>
+<p>
Ich neige dazu, falls der Kunde dies erlaubt, in der Richtung von
robusten, skalierbaren und sicheren Lösung zu spezifizieren,
zu designen und zu implementieren, die die erwartete Last vertragen
können, was vielleicht an meinem ISP-Hintergrund liegen mag.
-
+</p>
+<p>
Auch für Aufgaben in anderen Ländern verfügbar, abhängig von
den Einzelheiten. Wir bieten das Unterbringen und Hosten von
Debian, sowohl verwaltet als auch unverwaltet.
-</pre>
+</p>
diff --git a/german/consultants/transparen.wml b/german/consultants/transparen.wml
index f7b74304e18..536e79443e3 100644
--- a/german/consultants/transparen.wml
+++ b/german/consultants/transparen.wml
@@ -1,59 +1,71 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Transparen Corporation"
+#use wml::debian::translation-check translation="1.4"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-01
# $Id$
-<h1>Transparen Corporation</h1>
-<hr />
-<pre>
+<p>
Transparen Corporation entstand innerhalb von Kanada in Burös, die räumlich
in British Columbia (BC), Kanada, liegen. Transparen Corporation bietet
Dienstleistungen für Unternehmen in Kanada, den Vereinigten Staaten (USA), dem
Vereinigten Königreich und vielen anderen Teilen der Welt an. Transparen
Corporation kann Kreditkartenzahlungen akzeptieren und kann angepasste Software
überall dorthin liefern, wo Internetzugriff existiert.
-
+</p>
+<p>
Transparen Corporation verwendet ein globales Netzwerk an Support-Fachleuten,
darunter Programmierer in Kanada, den Vereinigten Staaten, Russland und der
Ukraine. Die Berater von Transparen befinden sich in Kanada und den Vereinigten
Staaten.
-
+</p>
+<p>
Transparen hat mehrere grundsätzliche Service-Gebiete, diese beinhalten:
-- Technischer Support für Linux und Windows
-- Linux-Anpassung
-- Technisches Schreiben
-- Angepasste Software-Projekte
-
+</p>
+<ul>
+<li>Technischer Support für Linux und Windows</li>
+<li>Linux-Anpassung</li>
+<li>Technisches Schreiben</li>
+<li>Angepasste Software-Projekte</li>
+</ul>
+<p>
Kunden in Indien und Pakistan verwenden Transparens technische
Schreibdienste, während Kunden in Kanada und den Vereinigten Staaten die
Anpassungsfähigkeiten oder andere angepasste Software-Projekte verwenden.
-
+</p>
+<p>
Transparens durchschnittliche Projektgröße ist 12.000 US$, mit einigen
Projekten so groß wie 100.000 US$ und anderen so klein wie 2.000 US$.
-
+</p>
+<p>
Transparen bietet kommerzielle Debian-Unterstützung für Kunden, die Web- oder
E-Mail-Server für Unternehmensanwendungen erbitten, an. Service wird, wie
jeweils angemessen, vor Ort oder durch Fernzugangsmethoden geleistet.
-
+</p>
+<p>
Transparen Corporation unterstützt Kunden, wo passend, in ihrem Debianeinsatz
um Microsoft Windows Domain Kontroller zu ersetzen.
-
+</p>
+<p>
Transparen Corporation bietet Linux-Anpassungsdienste an Kunden, die
Debian-basierte Kioske für Verkaufsorte produzieren wollen.
-
+</p>
+<p>
Transparen Corporation setzt einen unter Debian laufenden Computer als Teil
des angepassten Festplattenrettungsprozesses ein.
-
+</p>
+<p>
Transparen Corporation unterstützt Debian und verwendet Debian für Desktop- und
Serverfunktionen und unterstützt kommerzielle Kunden, die Debian einsetzen.
-
+</p>
+<p>
Transparen kann Kunden durch Skripterstellung und
Entscheidungs-Unterstützungs-Werkzeuge, die Debian-Systeme als unterliegende
Technik einsetzen, helfen.
-
+</p>
+<p>
Transparen kann Einblicke geben, wie Debian verwendet werden kann, um eine
große Bandbreite an Unternehmen effizienter und profitabler zu machen.
-
+</p>
+<p>
Transparen verwendet Computer mit dem Debian-Betriebssystem in seiner Forschung
der Optimierung von Geschäfts- und Entscheidungsunterstützungsprozessen.
-</pre>
+</p>
diff --git a/german/consultants/triona.wml b/german/consultants/triona.wml
index 5ebe1023595..d5fcca416f5 100644
--- a/german/consultants/triona.wml
+++ b/german/consultants/triona.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Triona - Information und Technologie GmbH"
+#use wml::debian::translation-check translation="1.2"
# $Id$
-<h1>Triona - Information und Technologie GmbH</h1>
-<hr />
-<pre>
+<p>
Installation und Administration von Unix-Systemen, individuelle
Software, IT-Beratung
-</pre>
+</p>
diff --git a/german/consultants/trisinus.wml b/german/consultants/trisinus.wml
index 5b0542a14f0..f63e9c2475c 100644
--- a/german/consultants/trisinus.wml
+++ b/german/consultants/trisinus.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Trisinus GmbH &amp; Co KG"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-16
# $Id$
-<h1>Trisinus GmbH &amp; Co KG</h1>
-<hr>
<p>
Wir bieten seit 1995 kommerziellen Support für Linux an. Obwohl unser
Hauptfokus auf Debian- und SuSE-Distributionen liegt sind wir willens
diff --git a/german/consultants/trusted.wml b/german/consultants/trusted.wml
index da54f9c9aba..91a15050541 100644
--- a/german/consultants/trusted.wml
+++ b/german/consultants/trusted.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Trusted Solutions s.r.o."
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-01
# $Id$
-<h1>Trusted Solutions s.r.o.</h1>
-
<p>
Trusted Solutions ist eine junge und fortschrittliche Firma, die sich an
der Lieferung ausgeklügelten Lösungen orientiert. Unsere Lösungen basieren
diff --git a/german/consultants/trustsec.wml b/german/consultants/trustsec.wml
index 83f0a768726..fffd9215486 100644
--- a/german/consultants/trustsec.wml
+++ b/german/consultants/trustsec.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="trustsec IT solutions GmbH"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-21
# $Id$
-<h1>trustsec IT solutions GmbH</h1>
-
<p>trustsec ist ein Debian-Entwicklungsparter und bezahlt zwei
Debian-Entwickler, um an der S/390-Portierung von Debian zu arbeiten.
Sie hosten auch das Web-Portal für Debian auf zSeries (S/390) und
diff --git a/german/consultants/turinglabs.wml b/german/consultants/turinglabs.wml
index aafa581bbb2..ae15b6672ba 100644
--- a/german/consultants/turinglabs.wml
+++ b/german/consultants/turinglabs.wml
@@ -1,17 +1,18 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Turing Labs, LLC"
+#use wml::debian::translation-check translation="1.3"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-26
# $Id$
-<h1>Turing Labs, LLC</h1>
-<hr />
-<pre>
+<p>
GNU/Linux Netz-Sicherheitsintegration, redundante Firewalls, IDS, WAN-Router,
Sicherheits-Bewertung und vor-Ort-Support in Connecticut/Massachusetts, USA.
Web/Datenbank-Anwendungsprogrammierung.
-
+</p>
+<p>
Debian ist unsere bevorzugte Server-Plattform.
-
+</p>
+<p>
Wir bieten auch Internet/Telefon-Support und freien Support in den Greater
-Hartford GNU/Linux Users Group (http://ghglug.org)-Treffen und -Foren.
-</pre>
+Hartford GNU/Linux Users Group
+(<a href="http://ghglug.org">http://ghglug.org</a>)-Treffen und -Foren.
+</p>
diff --git a/german/consultants/turo_technology.wml b/german/consultants/turo_technology.wml
index d04f0c80b30..eee9ae0dcfd 100644
--- a/german/consultants/turo_technology.wml
+++ b/german/consultants/turo_technology.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Turo Technology LLP"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-01
# $Id$
-<h1>Turo Technology LLP</h1>
-<hr />
-<pre>
+<p>
Debian developer. Free software preferred. GPG email preferred.
Primarily system administration, troubleshooting and web-based
application development/deployment. Esperantisto.
-</pre>
+</p>
diff --git a/german/consultants/udslinux.wml b/german/consultants/udslinux.wml
index 68e6f6f9f30..d3fb2fd7b63 100644
--- a/german/consultants/udslinux.wml
+++ b/german/consultants/udslinux.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="UDS Linux"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-28
# $Id$
-<h1>UDS Linux</h1>
-<hr />
<p>
Spezialist für Groupware, Sicherheit, OpenOffice, Samba
</p>
diff --git a/german/consultants/ullrich-it-consult.wml b/german/consultants/ullrich-it-consult.wml
index e6d4b716893..a847106b16c 100644
--- a/german/consultants/ullrich-it-consult.wml
+++ b/german/consultants/ullrich-it-consult.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Ullrich-IT-Consult"
+#use wml::debian::translation-check translation="1.2"
-<H1>Ullrich-IT-Consult</H1>
-<HR>
-<PRE>
+<p>
Für alle weiteren Infos: Bitte meiner Homepage
entnehmen, mich anmailen oder einfach direkt anrufen.
Alle Lösungen werden ausschließlich mit freier Software (vornehmlich Debian)
im Sinne der GPL und den Debian-Richtlinien verwirklicht.
-</PRE>
+</p>
diff --git a/german/consultants/ultreia.wml b/german/consultants/ultreia.wml
index a9c757523a3..a6887b51734 100644
--- a/german/consultants/ultreia.wml
+++ b/german/consultants/ultreia.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.6"
+#use wml::debian::consultant name="Ultreia Comunicaciones S.L."
+#use wml::debian::translation-check translation="1.7"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-10
# $Id$
-<h1>Ultreia Comunicaciones S.L.</h1>
-<hr />
<p>
Ultreia Comunicaciones ist eine Ingenieurs-Beratung, die der Entwicklung von
Linux- und anderer Unix-basierter Projekte gewidmet ist. Wir arbeiten seit 1995
diff --git a/german/consultants/unimedgv.wml b/german/consultants/unimedgv.wml
index 40e9fe09e1a..bfee7ca45b6 100644
--- a/german/consultants/unimedgv.wml
+++ b/german/consultants/unimedgv.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Unimed Governador Valadares"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-19
# $Id$
-<h1>Unimed Governador Valadares</h1>
-
<p>
Installation und Konfiguration von Servern und Desktops
</p>
diff --git a/german/consultants/uslinux.wml b/german/consultants/uslinux.wml
index c3d84329c98..f4ebeea7271 100644
--- a/german/consultants/uslinux.wml
+++ b/german/consultants/uslinux.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="U.S. Linux Networks"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-04
# $Id$
-<h1>U.S. Linux Networks</h1>
-
<p>
Langfristige Support-Vereinbarungen erhältlich.
</p>
diff --git a/german/consultants/viridiansun.wml b/german/consultants/viridiansun.wml
index b2e647f50fe..fda51d56fe3 100644
--- a/german/consultants/viridiansun.wml
+++ b/german/consultants/viridiansun.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Viridian Sun"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-02
# $Id$
-<h1>Viridian Sun</h1>
-
<p>Wir haben unser eigenes dediziertes Unterstützungsteam und
Außendiensttechniker, und bieten angepasste Support- und Wartungsverträge an
und unterhalten selbst und für unsere Kunden viele Debian-Kisten.
diff --git a/german/consultants/vivek_k.wml b/german/consultants/vivek_k.wml
index 42445b5c89a..7f8153fc810 100644
--- a/german/consultants/vivek_k.wml
+++ b/german/consultants/vivek_k.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Vivek Kumar"
+#use wml::debian::translation-check translation="1.2"
# Translator: Noèl Köthe, noel@koethe.net, 2001-11-08
# $Id$
-<h1>Vivek Kumar</h1>
-
<p>Spezialisiert auf Gerätetreiberentwicklung und
Boot-Code.</p>
diff --git a/german/consultants/webspacestation.wml b/german/consultants/webspacestation.wml
index 7e14566f846..1a20f14d9f2 100644
--- a/german/consultants/webspacestation.wml
+++ b/german/consultants/webspacestation.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Web Space Station"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-27
# $Id$
-<h1>Web Space Station</h1>
-<hr />
<p>
Firma, die ausgelagerte Entwicklung angepaßter Software und Web Entwicklung
durchführt. Alle Gebiete der angepaßten Software-Entwicklung, Web-Entwicklung,
diff --git a/german/consultants/welters.wml b/german/consultants/welters.wml
index 6a69e241e7c..aa968507067 100644
--- a/german/consultants/welters.wml
+++ b/german/consultants/welters.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Welters Datentechnik"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-06-17
# $Id$
-<h1>Welters Datentechnik</h1>
-<hr />
-<pre>
+<p>
Debian-Linux als M$-Ersatz
Exim-, Sendmail-, Samba-, DHCP-, Bind-, MySQL-Installation und -Betrieb,
kleinere bis mittlere Netze, Hosting und Support
-</pre>
+</p>
diff --git a/german/consultants/woods.wml b/german/consultants/woods.wml
index 8029fdd26e2..e85e66837e3 100644
--- a/german/consultants/woods.wml
+++ b/german/consultants/woods.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Woods Networking Consultants"
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-19
# $Id$
-<h1>Woods Networking Consultants</h1>
-<hr />
<p>
Wir können in den USA, Kanada und Europa arbeiten. Wir sind allerdings
US-basiert. Ein EU-Büro wird in der näheren Zukunft eröffnet.
diff --git a/german/consultants/xsto.info.wml b/german/consultants/xsto.info.wml
index 585845a33cc..120246707f0 100644
--- a/german/consultants/xsto.info.wml
+++ b/german/consultants/xsto.info.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="xsto.info S. Coop. Mad."
+#use wml::debian::translation-check translation="1.2"
# Translator: Helge Kreutzmann, kreutzm@itp.uni-hannover.de, 2005-07-19
# $Id$
-<h1>xsto.info S. Coop. Mad.</h1>
-<hr />
<p>
Firma, die auf Freie Software, Zugänglichkeit, Netz- und Inhaltsverwaltung
spezialisiert ist.
diff --git a/italian/consultants/apsis.wml b/italian/consultants/apsis.wml
index 36758d94d4e..6c3f5f6a265 100644
--- a/italian/consultants/apsis.wml
+++ b/italian/consultants/apsis.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Apsis S.r.l."
+#use wml::debian::translation-check translation="1.2"
-<h1>Apsis S.r.l.</h1>
-<hr/>
-<pre>
+<p>
Sviluppiamo software e forniamo assistenza su piattaforma debian
GNU/Linux
-</pre>
+</p>
diff --git a/italian/consultants/credativ.wml b/italian/consultants/credativ.wml
index 9da34698c6b..fdf8f0e7a0c 100644
--- a/italian/consultants/credativ.wml
+++ b/italian/consultants/credativ.wml
@@ -1,17 +1,17 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="credativ GmbH"
+#use wml::debian::translation-check translation="1.2"
-<h1>credativ GmbH</h1>
-<hr/>
-<pre>
+<p>
credativ GmbH ha otto sviluppatori Debian nel suo staff, che svolgono lavori
per Debian come parte del loro impiego. Spesso sponsorizza CD ed altro
materiale per LinuxTag ed aiuta Debian in Germania.
+</p>
+<p>
credativ fornisce consulenze indipendenti e servizi aziendali specialmente di
quality assurance nei progetti IT, di systems management e di servizi Open
Source. Insieme ai clienti implementiamo soluzioni open source personalizzate
(preferably completely Free Software) con un alta potenzialità nella
riduzione dei costi, nella migrazione di sistemi ed offriamo un supporto
specializzato per le reti. Per ulteriori informazioni si visiti
-http://www.credativ.de/.
-</pre>
+<a href="http://www.credativ.de/">http://www.credativ.de/</a>.
+</p>
diff --git a/italian/consultants/incipit.wml b/italian/consultants/incipit.wml
index 55a93391579..9bf9a40b93d 100644
--- a/italian/consultants/incipit.wml
+++ b/italian/consultants/incipit.wml
@@ -1,22 +1,22 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Incipit - Informatica Reti Sicurezza"
+#use wml::debian::translation-check translation="1.2"
-<h1>Incipit - Informatica Reti Sicurezza</h1>
-<hr/>
-<pre>
-Incipit: il cliente al centro
+<h3>Incipit: il cliente al centro</h3>
+<p>
Il nostro approccio è chiaro: cerchiamo di interpretare le necessità
reali del cliente e di fornire soluzioni efficaci, veloci e a costi
ragionevoli.
-
-Incipit: servizio a 360 gradi
+</p>
+<h3>Incipit: servizio a 360 gradi</h3>
+<p>
Siamo in grado di erogare servizi di informatica e reti a 360 gradi:
progettiamo la soluzione, vendiamo i prodotti, implementiamo il
progetto, configuriamo gli apparati, realizziamo la formazione e curiamo
l'assistenza nel tempo, anche con contratti continuativi.
-
-Incipit: un unico referente
+</p>
+<h3>Incipit: un unico referente</h3>
+<p>
Pensiamo che un unico referente tecnologico sia un vantaggio per il
cliente. Un solo nome e un solo numero telefonico per tutte le necessità
di informatica, di reti e di sicurezza.
-</pre>
+</p>
diff --git a/italian/consultants/r3deng.wml b/italian/consultants/r3deng.wml
index c45bc87c4f1..cfe45871146 100644
--- a/italian/consultants/r3deng.wml
+++ b/italian/consultants/r3deng.wml
@@ -1,10 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="R3dEngineering"
+#use wml::debian::translation-check translation="1.2"
-<h1>R3dEngineering</h1>
-<hr />
<p>
Sviluppiamo software in J2EE (Tomcat, JSP, Mysql, Oracle, Web service), e Php.
-Forniamo assistenza su piattaforma debian per la gestione web, posta elettronica, ftp, database, etc.
+Forniamo assistenza su piattaforma debian per la gestione web, posta
+elettronica, ftp, database, etc.
</p>
diff --git a/italian/consultants/simone_giustetti.wml b/italian/consultants/simone_giustetti.wml
index a78500edde1..e0d2c7bdd83 100644
--- a/italian/consultants/simone_giustetti.wml
+++ b/italian/consultants/simone_giustetti.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Studio Simone Giustetti"
+#use wml::debian::translation-check translation="1.4"
-<h1>Studio Simone Giustetti</h1>
-<hr />
<p>
Lo studio fornisce consulenza incentrata sui sistemi
informatici e l'ingegnerizzazione di software e servizi per aziende di ogni
diff --git a/japanese/consultants/credativ.wml b/japanese/consultants/credativ.wml
index 83ff2ba072e..50cfb540553 100644
--- a/japanese/consultants/credativ.wml
+++ b/japanese/consultants/credativ.wml
@@ -1,12 +1,12 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="credativ GmbH"
#use wml::debian::translation-check translation="1.1"
<h1>credativ GmbH</h1>
<hr/>
-<pre>
+<p>
credativ GmbH $B$O(B 8 $BL>$N(B Debian $B3+H/<T$r8[MQ$7!"H`$i$N;E;v$N0lIt$H$7$F(B Debian $B$G$N:n6H$K$"(B
$B$?$C$F$$$^$9!#(B $B$^$?H`$i$OKh2s(B CD $B$r8e1g$7!"(BLinuxTag $B$J$I%I%$%D$K$*$$$F9-$/(B Debian $B$r;Y1g$7$F$$$^$9!#(B
credativ $B$O!"(BIT $B%W%m%8%'%/%H$K$*$1$kIJ<A4IM}!&%7%9%F%`4IM}!&(B $B%*!<%W%s%=!<%9%5!<%S%9$KFC2=$7$?!"%Y%s%@!<FHN)$N%3%s%5%k%F%#%s%0(B $B%5!<%S%94k6H$G(B
$B$9!#8\5R$H$H$b$K!"%3%9%H$N:o8:$d%7%9%F%`$N0\9T$J$I(B $B9b$$@x:_G=NO$r$b$D%+%9%?%`%a%$%I$N(B ($B$G$-$l$P40A4$K%U%j!<%=%U%H%&%'(B $B%"$K$h$k(B) $B%*!<%W%s%=!<%9%=%j%e(B
$B!<%7%g%s$r<B8=$7!"40A4$J%M%C%H%o!<(B $B%/$KBP$9$k@lLgE*$J%5%]!<%H$rDs6!$7$^$9!#>\$7$/$O(B http://www.credativ.de/ $B$rK,$l$F$/$@$5$$!#(B
-</pre>
+</p>
diff --git a/polish/consultants/757_technologies.wml b/polish/consultants/757_technologies.wml
index cc9846aaa9b..2627a396c9b 100644
--- a/polish/consultants/757_technologies.wml
+++ b/polish/consultants/757_technologies.wml
@@ -1,13 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="757 Technologies"
+#use wml::debian::translation-check translation="1.3"
-<h1>757 Technologies</h1>
-<hr />
<p>
Oferujemy instalacjê i intergracjê Debiana GNU/Linux, jak równie¿
-kolokacjê i zarz±dzanie GNU/Linuksem.
-We offer installation and integration of Debian
-GNU/Linux, as well as GNU/Linux co-location and maintenance. Dzia³amy
+kolokacjê i zarz±dzanie GNU/Linuksem. Dzia³amy
w okolicach Hampton Roads w Virginii. Obs³ugujemy architektury i386,
PowerPC oraz Sparc.
</p>
diff --git a/polish/consultants/abv.wml b/polish/consultants/abv.wml
index 48e31610e5b..31f91a41adb 100644
--- a/polish/consultants/abv.wml
+++ b/polish/consultants/abv.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="ABV - Integrator System&oacute;w i Sieci Komputerowych"
+#use wml::debian::translation-check translation="1.4"
-<h1>ABV - Integrator System&oacute;w i Sieci Komputerowych</h1>
-<hr>
<ul>
<li>SLA - <url http://www.abv.pl/sla.html></li>
<li>Outsourcing</li>
diff --git a/polish/consultants/aerasec.wml b/polish/consultants/aerasec.wml
index 6719d4546d9..20f58047367 100644
--- a/polish/consultants/aerasec.wml
+++ b/polish/consultants/aerasec.wml
@@ -1,10 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="AERAsec GmbH"
+#use wml::debian::translation-check translation="1.3"
-<H1>AERAsec GmbH</H1>
-<HR>
-<PRE>
+<p>
Bezpieczeñstwo, rozbudowane projekty sieci, strategie serwerów.
-
+</p>
+<p>
Równie¿: Munich/Germany.
-</PRE>
+</p>
diff --git a/polish/consultants/alex_r.wml b/polish/consultants/alex_r.wml
index 6ad31057307..3b3c7470874 100644
--- a/polish/consultants/alex_r.wml
+++ b/polish/consultants/alex_r.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Breakthrough LTD"
+#use wml::debian::translation-check translation="1.2"
-<H1>Breakthrough LTD</H1>
-<HR>
-<PRE>
+<p>
Budowanie serwerów Internetowych i Intranetowych zaspokajaj±cych wszystkie
potrzeby firmowej sieci lokalnej:
³±czenie z Internetem przez ISDN, zdalny dostêp, serwer plików dla Windows,
NFS, DNS, serwer HTTP, FTP, serwer pocztowy...
-</PRE>
+</p>
diff --git a/polish/consultants/andreu_i.wml b/polish/consultants/andreu_i.wml
index 5976b72043b..802d3a07093 100644
--- a/polish/consultants/andreu_i.wml
+++ b/polish/consultants/andreu_i.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Internet Web Serveis"
+#use wml::debian::translation-check translation="1.2"
-<H1>Internet Web Serveis</H1>
-<HR>
-<PRE>
+<p>
IWS od 1995 roku oferuje wszystkie typy us³ug zwi±zane z Linuksem i Debianem:
konsulting, rozwój oprogramowania, wdro¿enia, support, szkolenia, itd.
-</PRE>
+</p>
diff --git a/polish/consultants/avalonix.wml b/polish/consultants/avalonix.wml
index 5427ebc0063..610f13bf368 100644
--- a/polish/consultants/avalonix.wml
+++ b/polish/consultants/avalonix.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="AVALONIX Linux Systems Support"
+#use wml::debian::translation-check translation="1.2"
-<H1>AVALONIX Linux Systems Support</H1>
-<HR>
-<PRE>
+<p>
Specjalizacja w szkoleniach, publikacjach sieciowych, projektowaniu dokumentów
-</PRE>
+</p>
diff --git a/polish/consultants/beeznest.wml b/polish/consultants/beeznest.wml
index 5a372eef88d..89a69ce12e8 100644
--- a/polish/consultants/beeznest.wml
+++ b/polish/consultants/beeznest.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="BeezNest"
+#use wml::debian::translation-check translation="1.2"
-<H1>BeezNest</H1>
-<HR>
-<PRE>
+<p>
Praca w dowolnym miejscu Europy pomiêdzy Holandi± a Hiszpani±, w³±czaj±c
w to Niemcy i inne je¶li trzeba.
-</PRE>
+</p>
diff --git a/polish/consultants/ben_b.wml b/polish/consultants/ben_b.wml
index b9edd45319f..7494d8e86f8 100644
--- a/polish/consultants/ben_b.wml
+++ b/polish/consultants/ben_b.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
-
-<h1>Ben Bell</h1>
+#use wml::debian::consultant name="Ben Bell"
+#use wml::debian::translation-check translation="1.2"
<p>Specjalizujê siê w projektowaniu i wdra¿aniu infrastruktury sieciowej,
serwerów i oprogramowania. Posiadam szerokie do¶wiadczenie, zaczynaj±c
diff --git a/polish/consultants/bryan_b.wml b/polish/consultants/bryan_b.wml
index dbdb6177753..a25b12b4475 100644
--- a/polish/consultants/bryan_b.wml
+++ b/polish/consultants/bryan_b.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Netsolus Consulting"
+#use wml::debian::translation-check translation="1.2"
-<H1>Netsolus Consulting</H1>
-<HR>
-<PRE>
+<p>
Netsolus Consulting oferuje us³ugi integruj±ce Linuksa i Windowsa bez
wzglêdu na konkretnego dostawcê lub produkt. Nasza neutralno¶æ w stosunku
do dostawców i produktów gwarantuje odpowiedni dobór rozwi±zania dla Twojej
firmy. Oferujemy równie¿ pe³ne wsparcie dla Linuksa i wiêkszo¶ci produktów
Open Source zarówno zdalnie jak i u klienta.
-</PRE>
+</p>
diff --git a/polish/consultants/catalyst.wml b/polish/consultants/catalyst.wml
index 05a8713e02f..e578e6ce3d8 100644
--- a/polish/consultants/catalyst.wml
+++ b/polish/consultants/catalyst.wml
@@ -1,32 +1,32 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Catalyst IT Ltd"
#use wml::debian::translation-check translation="1.3"
-<H1>Catalyst IT Ltd</H1>
-<HR>
-<PRE>
+<p>
Dostarczane us³ugi:
-* Wsparcie przez telefon, e-mail lub u klienta (Wellington and Auckland).
-* Konsultacje i wsparcie dla Debian GNU/Linux - wsparcie dla
+</p>
+<ul>
+<li>Wsparcie przez telefon, e-mail lub u klienta (Wellington and
+ Auckland).</li>
+<li>Konsultacje i wsparcie dla Debian GNU/Linux - wsparcie dla
instalacji/aktualizacji, ustawiania NFS/Samba/DNS/DHCP, konfiguracja
- sendmaila, rozwi±zywanie problemów z PPP.
-* Wsparcie rozwojowe - posiadamy do¶wiadczonych programistów, znaj±cych
+ sendmaila, rozwi±zywanie problemów z PPP.</li>
+<li>Wsparcie rozwojowe - posiadamy do¶wiadczonych programistów, znaj±cych
wiele jêzyków programowania i narzêdzi, m.in. C, C++, Java, Perl, bash,
- Visual Basic i wiele innych...
-* Utrzymywanie stron WWW - posiadamy w³asne serwery internetowe oraz
- pod³±czenie o przepustowo¶ci 10MB.
-* Bramki i zapory ogniowe - zbudowane na Debian GNU/Linux.
+ Visual Basic i wiele innych...</li>
+<li>Utrzymywanie stron WWW - posiadamy w³asne serwery internetowe oraz
+ pod³±czenie o przepustowo¶ci 10MB.</li>
+<li>Bramki i zapory ogniowe - zbudowane na Debian GNU/Linux.
U¿ywamy IP maskarady i wdzoñ-na-¿±danie, wiêc mo¿esz pod³±czyæ swoje
biuro do internetu u¿ywaj±c jednego standardowego konta wdzwanianego od
- swojego dostawcy internetu.
-* Zdalna administracja systemami - je¶li nie masz czasu na zarz±dzanie
+ swojego dostawcy internetu.</li>
+<li>Zdalna administracja systemami - je¶li nie masz czasu na zarz±dzanie
tuzinami maszyn z GNU/Linuksem w swojej sieci lub dopiero uczysz siê
obs³ugi Uniksa (albo nie chcesz siê go uczyæ), ale chcesz mieæ stacjê
z GNU/Linuksem w swoim biurze ju¿ teraz! Catalyst mo¿e zdalnie skonfigurowaæ
i zaktualizowaæ Twoje komputery poprzez internet (u¿ywaj±c szyfrowanych
- po³±czeñ) lub poprzez linie wdzwaniane.
-* Inne us³ugi konsultacyjne IT - Catalyst dysponuje specjalistami
+ po³±czeñ) lub poprzez linie wdzwaniane.</li>
+<li>Inne us³ugi konsultacyjne IT - Catalyst dysponuje specjalistami
z do¶wiadczeniem od modelowania strategicznego do programowania
w assemblerze, a przez to zapewnia wysokiej jako¶ci us³ugi przy
- konkurencyjnych cenach.
-</PRE>
-
+ konkurencyjnych cenach.</li>
+</ul>
diff --git a/polish/consultants/filippo_giunchedi.wml b/polish/consultants/filippo_giunchedi.wml
index c994c6b548b..a4534a24dc4 100644
--- a/polish/consultants/filippo_giunchedi.wml
+++ b/polish/consultants/filippo_giunchedi.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Filippo Giunchedi"
+#use wml::debian::translation-check translation="1.2"
-<H1>Filippo Giunchedi</H1>
-<HR>
-<PRE>
+<p>
Klucz GNU/PG: 6B79D401
-</PRE>
+</p>
diff --git a/polish/consultants/heureka.wml b/polish/consultants/heureka.wml
index 6e620a90aeb..472f32ddfd2 100644
--- a/polish/consultants/heureka.wml
+++ b/polish/consultants/heureka.wml
@@ -1,6 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Heureka GmbH"
+#use wml::debian::translation-check translation="1.3"
-<H1>Heureka GmbH</H1>
-<HR>
+<p>
Pierwszy kontakt darmowy.
+</p>
diff --git a/polish/consultants/kotarba.wml b/polish/consultants/kotarba.wml
index 1a793853333..03c5f9d5caa 100644
--- a/polish/consultants/kotarba.wml
+++ b/polish/consultants/kotarba.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Kotarba.NET"
+#use wml::debian::translation-check translation="1.2"
-<H1>Kotarba.NET</H1>
-<HR>
-<PRE>
+<p>
Tylko po polsku i angielsku.
-</PRE>
+</p>
diff --git a/polish/consultants/lawrence_c.wml b/polish/consultants/lawrence_c.wml
index 57e4162fab9..25a3c647aaf 100644
--- a/polish/consultants/lawrence_c.wml
+++ b/polish/consultants/lawrence_c.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Chai Mee Joon"
#use wml::debian::translation-check translation="1.4"
-<h1>Chai Mee Joon</h1>
-
<p>
Dostêpno¶æ: rejon Azji ( w³±czaj±c Chiny i Japonie )
</p>
diff --git a/polish/consultants/rafez_n.wml b/polish/consultants/rafez_n.wml
index 21d2b10e3ef..71dd4ea0493 100644
--- a/polish/consultants/rafez_n.wml
+++ b/polish/consultants/rafez_n.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
-
-<H1>Gazelle Informatics Ltd</H1>
+#use wml::debian::consultant name="Gazelle Informatics Ltd"
+#use wml::debian::translation-check translation="1.2"
<p>Specjalizujemy siê w Lotus Domino na systemie Debian</p>
diff --git a/polish/consultants/sosa.wml b/polish/consultants/sosa.wml
index 8a63f6b2539..d6403b03309 100644
--- a/polish/consultants/sosa.wml
+++ b/polish/consultants/sosa.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Korporacja Sosa &amp; Sosa C.A."
+#use wml::debian::translation-check translation="1.3"
-<H1>Korporacja Sosa &amp; Sosa C.A.</H1>
-<HR>
-<PRE>
+<p>
OS, sieci i bezpieczeñstwo.
-</PRE>
+</p>
diff --git a/polish/consultants/stuart_t.wml b/polish/consultants/stuart_t.wml
index 9f038079a82..0e565ccd128 100644
--- a/polish/consultants/stuart_t.wml
+++ b/polish/consultants/stuart_t.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Linux Labs"
+#use wml::debian::translation-check translation="1.2"
-<h1>Linux Labs</h1>
-
-<p>Specjali¶ci z dziedziny LinuxBIOS and Klastrów
+<p>Specjali¶ci z dziedziny LinuxBIOS and Klastrów</p>
diff --git a/polish/consultants/turo_technology.wml b/polish/consultants/turo_technology.wml
index 0abb751b117..c1a5f905e49 100644
--- a/polish/consultants/turo_technology.wml
+++ b/polish/consultants/turo_technology.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Turo Technology LLP"
+#use wml::debian::translation-check translation="1.2"
-<H1>Turo Technology LLP</H1>
-<HR>
-<PRE>
+<p>
Deweloper Debiana. Preferowane Wolne Oprogramowanie. Preferowane
listy elektroniczne szyfrowane przez GPG.
G³ównie administracja systemem, rozwi±zywanie problemów
i rozwijanie/wdra¿anie aplikacji opartych na WWW.
application development/deployment. Esperantysta.
-</PRE>
+</p>
diff --git a/polish/consultants/vivek_k.wml b/polish/consultants/vivek_k.wml
index d649c6b4493..58d7498360d 100644
--- a/polish/consultants/vivek_k.wml
+++ b/polish/consultants/vivek_k.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
-
-<h1>Vivek Kumar</h1>
+#use wml::debian::consultant name="Vivek Kumar"
+#use wml::debian::translation-check translation="1.2"
<p>Specjalizuje siê w rozwijaniu sterowników urz±dzeñ i kodu
startowego</p>
diff --git a/portuguese/consultants/757_technologies.wml b/portuguese/consultants/757_technologies.wml
index 0fdce4a8a96..a6bf6604f7f 100644
--- a/portuguese/consultants/757_technologies.wml
+++ b/portuguese/consultants/757_technologies.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" translation_maintainer="Marcio Roberto Teixeira"
+#use wml::debian::consultant name="757 Technologies"
+#use wml::debian::translation-check translation="1.3" translation_maintainer="Marcio Roberto Teixeira"
-<h1>757 Technologies</h1>
-<hr />
<p>
Nós oferecemos instalação e integração de Debian GNU/Linux, assim como
manutenção e co-locação de GNU/Linux. Prestamos serviço na
diff --git a/portuguese/consultants/ace_technology_group.wml b/portuguese/consultants/ace_technology_group.wml
index 979e325067b..4e007726f6c 100644
--- a/portuguese/consultants/ace_technology_group.wml
+++ b/portuguese/consultants/ace_technology_group.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1" translation_maintainer="Marcio Roberto Teixeira"
+#use wml::debian::consultant name="ACE Technology Group"
+#use wml::debian::translation-check translation="1.2" translation_maintainer="Marcio Roberto Teixeira"
-<H1>ACE Technology Group</H1>
-<HR>
-<PRE>
+<p>
Gerenciamento de infra-estrutura, migração de Windows para Linux,
consultoria geral sobre Linux.
-</PRE>
+</p>
diff --git a/portuguese/consultants/credativ.wml b/portuguese/consultants/credativ.wml
index 0e32ecbde15..5c7e5acc0f4 100644
--- a/portuguese/consultants/credativ.wml
+++ b/portuguese/consultants/credativ.wml
@@ -1,18 +1,18 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="credativ GmbH"
+#use wml::debian::translation-check translation="1.2"
-<h1>credativ GmbH</h1>
-<hr/>
-<pre>
+<p>
credative GmbH têm oito desenvolvedores Debian no seu pessoal, que fazem
trabalhos para o Debian como parte de seu serviço. Eles também patrocinam
regularmente CDs e outros materiais para a LinuxTag e geralmente ajuda o
Debian na Alemanha.
+</p>
+<p>
credativ é uma companhia de consultoria e serviços independente especializada
em controle de qualidade em projetos de TI, gerencimanto de sistemas e
serviços de código aberto. Junto com nossos clientes nós implementamos
soluções personalizadas de software livre (preferencialmente com software
completamente livre) com potencial em redução de custos, migração de sistemas
e oferece suporte especializado para redes completas. Para mais informações
-visite http://www.credativ.de/.
-</pre>
+visite <a href="http://www.credativ.de/">http://www.credativ.de/</a>.
+</p>
diff --git a/portuguese/consultants/genilto_dallo.wml b/portuguese/consultants/genilto_dallo.wml
index c95ef95645b..45d6e51cfe7 100644
--- a/portuguese/consultants/genilto_dallo.wml
+++ b/portuguese/consultants/genilto_dallo.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Genilto Dallo"
+#use wml::debian::translation-check translation="1.2"
-<h1>Genilto Dallo</h1>
-<hr/>
-<pre>
+<p>
Desenvolvimento de projetos e sistemas de conectividade, segurança e
sistemas open source.
Instalação, configuração e manutenção de Servidores Linux Debian.
Consultoria para Provedores de Internet, conectividade, redes wireless, e
servidores.
-</pre>
+</p>
diff --git a/portuguese/consultants/guillermo_rico.wml b/portuguese/consultants/guillermo_rico.wml
index d10b7f57030..f0919325891 100644
--- a/portuguese/consultants/guillermo_rico.wml
+++ b/portuguese/consultants/guillermo_rico.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Guillermo Rico"
+#use wml::debian::translation-check translation="1.3"
-<H1>Guillermo Rico</H1>
-<HR>
-<PRE>
+<p>
Certifica&ccedil;&atilde;o LPIC2
-</PRE>
+</p>
diff --git a/portuguese/consultants/samurai.wml b/portuguese/consultants/samurai.wml
index 3939cb4e6be..2cc1c5eee1f 100644
--- a/portuguese/consultants/samurai.wml
+++ b/portuguese/consultants/samurai.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Samurai - Projetos Especiais"
+#use wml::debian::translation-check translation="1.2"
-<h1>Samurai - Projetos Especiais</h1>
-<hr />
<p>Debian Linux, Plone, Zope, Samurai Linux</p>
<p>Clientes e Parceiros: APTEL, CESAR, Sun Microsystems, Siemens,
T-Systems</p>
diff --git a/portuguese/consultants/unimedgv.wml b/portuguese/consultants/unimedgv.wml
index 6d1eb8a04e0..23104ff76e5 100644
--- a/portuguese/consultants/unimedgv.wml
+++ b/portuguese/consultants/unimedgv.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
-
-<h1>Unimed Governador Valadares</h1>
+#use wml::debian::consultant name="Unimed Governador Valadares"
+#use wml::debian::translation-check translation="1.2"
<p>
Instalação e configuração de servidores e desktops
diff --git a/romanian/consultants/credativ.wml b/romanian/consultants/credativ.wml
index 620d4c298d0..4ca18b3fa8e 100644
--- a/romanian/consultants/credativ.wml
+++ b/romanian/consultants/credativ.wml
@@ -1,16 +1,16 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="credativ GmbH"
+#use wml::debian::translation-check translation="1.2"
-<h1>credativ GmbH</h1>
-<hr/>
-<pre>
+<p>
credativ GmbH are opt programatori Debian in echipa sa, care programeazã
pentru Debian în timpul slujbei. Deasemenea, credativ plãteºte CD-uri ºi
ajutã LinuxTag ºi în general ajutã Debian în Germania.
+</p>
+<p>
credativ este o companie care oferã servicii de consultanþã pentru:
asigurarea calitãþii pentru proiecte IT, Systems management, servicii "Open
Source". credativ implementeazã soluþii "open-source" specifice clienþilor
sãi, soluþii care permit reducerea costurilor, migrarea de sisteme ºi oferã
suport pentru reþele complexe de calculatoare. Soluþiile de tip "free
software" bazate pe Debian GNU/Linux, KDE ºi PostgreSQL sînt preferate.
-</pre>
+</p>
diff --git a/spanish/consultants/757_technologies.wml b/spanish/consultants/757_technologies.wml
index d4b8d67853a..316734a5e53 100644
--- a/spanish/consultants/757_technologies.wml
+++ b/spanish/consultants/757_technologies.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="757 Technologies"
+#use wml::debian::translation-check translation="1.3"
-<h1>757 Technologies</h1>
-<hr />
<p>
Ofrecemos instalación e integración de Debian
GNU/Linux, así como mantenimiento y hospedaje en "co-location" de
diff --git a/spanish/consultants/aerasec.wml b/spanish/consultants/aerasec.wml
index 574a2c85cd8..6a8995e581f 100644
--- a/spanish/consultants/aerasec.wml
+++ b/spanish/consultants/aerasec.wml
@@ -1,10 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="AERAsec GmbH"
+#use wml::debian::translation-check translation="1.3"
-<H1>AERAsec GmbH</H1>
-<HR>
-<PRE>
+<p>
Seguridad, situaciones complejas de redes, estrategias de servidor.
-
+</p>
+<p>
También: Munich/Germany.
-</PRE>
+</p>
diff --git a/spanish/consultants/alex_r.wml b/spanish/consultants/alex_r.wml
index 16073461bbc..e97fb55791d 100644
--- a/spanish/consultants/alex_r.wml
+++ b/spanish/consultants/alex_r.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Breakthrough LTD"
+#use wml::debian::translation-check translation="1.2"
-<H1>Breakthrough LTD</H1>
-<HR>
-<PRE>
+<p>
Montamos servirodes para Internet/Intranet para cubrir todas las
necesidades que la LAN de su compañía necesita:
Conectividad a Internet por RDSI, Acceso remoto, Servidor de ficheros
de Windows, NFS, DNS, Servidor web, Servidor FTP, Servidor de correo
electrónico, ...
-</PRE>
+</p>
diff --git a/spanish/consultants/andreu_i.wml b/spanish/consultants/andreu_i.wml
index e0ce0791cfd..13a88d3015f 100644
--- a/spanish/consultants/andreu_i.wml
+++ b/spanish/consultants/andreu_i.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Internet Web Serveis"
+#use wml::debian::translation-check translation="1.2"
-<H1>Internet Web Serveis</H1>
-<HR>
-<PRE>
+<p>
IWS ofrece desde 1995 todo tipo de servicios relacionados con Linux y
Debian: Consultoría, Desarrollo, implementación, soporte, formación, etc.
-</PRE>
+</p>
diff --git a/spanish/consultants/antonio_cosenza.wml b/spanish/consultants/antonio_cosenza.wml
index af22234c13d..09e02da68dd 100644
--- a/spanish/consultants/antonio_cosenza.wml
+++ b/spanish/consultants/antonio_cosenza.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Antonio Cosenza"
+#use wml::debian::translation-check translation="1.3"
-<H1>Antonio Cosenza</H1>
-<HR>
-<PRE>
+<p>
Aplicaciones «Open Source», GIS y web basadas en Debian GNU/Linux.
-</PRE>
+</p>
diff --git a/spanish/consultants/applepie-solutions.wml b/spanish/consultants/applepie-solutions.wml
index 10ceccf5b0a..29fb01e6ad8 100644
--- a/spanish/consultants/applepie-solutions.wml
+++ b/spanish/consultants/applepie-solutions.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Applepie Solutions"
+#use wml::debian::translation-check translation="1.2"
-<H1>Applepie Solutions</H1>
-<HR>
-<PRE>
+<p>
Hemos estado utilizando y desarrollando en Linux durante más de 10 años
y tenemos gran experiencia en un amplio número de distribuciones, incluyendo
Debian, Red Hat y SuSE, tanto en PC como en plataformas como Alpha o Itanium.
Disponibles para consultoría en cualquier lugar de Irlanda. Asimismo, ofecemos
cursos de formación en Linux.
-</PRE>
+</p>
diff --git a/spanish/consultants/avalonix.wml b/spanish/consultants/avalonix.wml
index 04fb45148d5..32bd2ad6f63 100644
--- a/spanish/consultants/avalonix.wml
+++ b/spanish/consultants/avalonix.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="AVALONIX Linux Systems Support"
+#use wml::debian::translation-check translation="1.2"
-<H1>AVALONIX Linux Systems Support</H1>
-<HR>
-<PRE>
+<p>
especializados en formación; e-publishing; ingeniería de documentos
-</PRE>
+</p>
diff --git a/spanish/consultants/beeznest.wml b/spanish/consultants/beeznest.wml
index 44432db176c..c9aa537e32f 100644
--- a/spanish/consultants/beeznest.wml
+++ b/spanish/consultants/beeznest.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="BeezNest"
+#use wml::debian::translation-check translation="1.2"
-<H1>BeezNest</H1>
-<HR>
-<PRE>
+<p>
Podemos trabajar en cualquier parte de Europa entre Holanda y España,
incluida Alemania, y más si fuera necesario.
-</PRE>
+</p>
diff --git a/spanish/consultants/ben_b.wml b/spanish/consultants/ben_b.wml
index 7c1110dd60f..f60105ba501 100644
--- a/spanish/consultants/ben_b.wml
+++ b/spanish/consultants/ben_b.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
-
-<h1>Ben Bell</h1>
+#use wml::debian::consultant name="Ben Bell"
+#use wml::debian::translation-check translation="1.2"
<p>Me especializo en el diseño e implantación de infraestructura: red,
servidor y software. Poseo un amplio rango de experiencia, habiendo
diff --git a/spanish/consultants/bryan_b.wml b/spanish/consultants/bryan_b.wml
index a803fccc0c8..8b817239553 100644
--- a/spanish/consultants/bryan_b.wml
+++ b/spanish/consultants/bryan_b.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Netsolus Consulting"
+#use wml::debian::translation-check translation="1.2"
-<H1>Netsolus Consulting</H1>
-<HR>
-<PRE>
+<p>
Netsolus Consulting ofrece Integración de Linux y Windows sin prejucios
ante fabricantes o productos particulares. Nuestra solución neutral ante
fabricante y producto garantiza la solución adecuada para su negocio.
Disponemos de soporte completamente remoto e in-situ para Linux y la
mayoría del Open Source.
-</PRE>
+</p>
diff --git a/spanish/consultants/catalyst.wml b/spanish/consultants/catalyst.wml
index e4969f16118..9a0167dbf83 100644
--- a/spanish/consultants/catalyst.wml
+++ b/spanish/consultants/catalyst.wml
@@ -1,36 +1,36 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.4" maintainer="David Moreno Garza"
+#use wml::debian::consultant name="Catalyst IT Ltd"
+#use wml::debian::translation-check translation="1.5" maintainer="David Moreno Garza"
-<h1>Catalyst IT Ltd</h1>
-<hr>
-<pre>
+<p>
Servicios que se ofrecen:
-* Soporte por teléfono, correo electrónico, acceso remoto o
+</p>
+<ul>
+<li>Soporte por teléfono, correo electrónico, acceso remoto o
presencial (Wellington
- y Auckland).
-* Consultoría y soporte de Debian GNU/Linux - soporte de
+ y Auckland).</li>
+<li>Consultoría y soporte de Debian GNU/Linux - soporte de
instalación/actualización, configuración de
NFS/Samba/DNS/DHCP/LDAP/EMail/filtrado de spam, construcción de
- sistemas Debian a la medida.
-* Soporte de desarrollo - tenemos más de 30 programadores disponibles con
+ sistemas Debian a la medida.</li>
+<li>Soporte de desarrollo - tenemos más de 30 programadores disponibles con
experiencia en una amplia gama de lenguajes y herramientas, entre
las que se incluyen C, C++, Java, Perl, PHP, PostgreSQL, MySQL y
- muchas más...
-* Albergue de sitios web - tenemos nuestros propios servidores de
+ muchas más...</li>
+<li>Albergue de sitios web - tenemos nuestros propios servidores de
Internet, y una línea de 100 MB a Internet con UPS y generador de
- respaldos y sitios redundantes, si así se desea.
-* Pasarelas y cortafuegos de Internet - hechos en Debian GNU/Linux.
-* Administración de sistemas remota - si no tiene tiempo para mantener
+ respaldos y sitios redundantes, si así se desea.</li>
+<li>Pasarelas y cortafuegos de Internet - hechos en Debian GNU/Linux.</li>
+<li>Administración de sistemas remota - si no tiene tiempo para mantener
una red de docenas de máquinas GNU/Linux en su Intranet o
Extranet, o quizás está empezando a aprender Unix (o no quiere
aprender Unix), pero quiere una máquina GNU/Linux para su oficina
¡AHORA!, Catalyst puede configurar y actualizar remotamente su
máquina a través de Internet (usando conexiones cifradas), o
mediante conexiones telefónicas.
- Internet (using encrypted connections).
-* Otros servicios de consultoría de TI - Catalyst tiene un equipo con
+ Internet (using encrypted connections).</li>
+<li>Otros servicios de consultoría de TI - Catalyst tiene un equipo con
experiencia desde Modelado Estratégico hasta Programación en
Ensamblador, que puede ofrecerle servicios de calidad a unos
- precios competitivos.
-</pre>
+ precios competitivos.</li>
+</ul>
diff --git a/spanish/consultants/charles_s.wml b/spanish/consultants/charles_s.wml
index d233871dfd4..26d342253df 100644
--- a/spanish/consultants/charles_s.wml
+++ b/spanish/consultants/charles_s.wml
@@ -1,22 +1,26 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Soporte de Sistemas Multiusuario Activo"
+#use wml::debian::translation-check translation="1.3"
-<H1>Soporte de Sistemas Multiusuario Activo</H1>
-<HR>
-<PRE>
+<p>
Nos especializamos en Ingeniería de Red en Unix y soporte crítico de
Misiones.
+</p>
+<p>
Damos soporte a:
-Debian
-Caldera
-Red Hat
-SCO
-Cisco
-Bay Networks
-Microsoft
+</p>
+<ul>
+<li>Debian</li>
+<li>Caldera</li>
+<li>Red Hat</li>
+<li>SCO</li>
+<li>Cisco</li>
+<li>Bay Networks</li>
+<li>Microsoft</li>
+</ul>
+<p>
Póngase en contacto con nosotros para informarse de los precios de
Contratos de Mantenimiento y consulta telefónica.
-</PRE>
+</p>
diff --git a/spanish/consultants/coderscorp.wml b/spanish/consultants/coderscorp.wml
index 52c30a9c75d..d67da4493a9 100644
--- a/spanish/consultants/coderscorp.wml
+++ b/spanish/consultants/coderscorp.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="CodersCorp"
+#use wml::debian::translation-check translation="1.3"
-<h1>CodersCorp</h1>
-<hr/>
-<pre>
+<p>
Hacemos consultoria en Linux y nos especializamos en Debian, actualmente
tenemos a nuestro cargos varios ISP's y companias.
-</pre>
+</p>
diff --git a/spanish/consultants/con_z.wml b/spanish/consultants/con_z.wml
index 2ac56c3aac7..bc1ae40b32a 100644
--- a/spanish/consultants/con_z.wml
+++ b/spanish/consultants/con_z.wml
@@ -1,54 +1,69 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.5" maintainer="David Moreno Garza"
+#use wml::debian::consultant name="Cybersource Pty Ltd"
+#use wml::debian::translation-check translation="1.6" maintainer="David Moreno Garza"
-<h1>Cybersource Pty Ltd</h1>
-<hr />
-<pre>
+<p>
Somos una compañía que principalmente brinda servicios a Linux y la comunidad
del código Libre/Abierto, con más de 14 años en los negocios y 25 personas de
planta. Hemos estado apoyando a la comunidad Linux (Usuarios de Linux de
Victoria) durante mucho tiempo, ayudando a establecer Open Source Victoria y
Open Source Industry Australia
+</p>
+<p>
Podemos proveer los siguientes servicios para GNU/Linux
-
+</p>
+<ul>
+ <li>
Nuestras áreas principales de experiencia son:
- * Administración, soporte y optimización de sistemas Linux
- * Centro de Soporte de Linux australiano
- * Integración de plataformas Linux a MS-Windows
- * Desarrollo de sistemas y aplicaciones (LAMP) en Linux
- * Desarrollo usando componentes Linux/FLOSS
-
+ <ul>
+ <li>Administración, soporte y optimización de sistemas Linux</li>
+ <li>Centro de Soporte de Linux australiano</li>
+ <li>Integración de plataformas Linux a MS-Windows</li>
+ <li>Desarrollo de sistemas y aplicaciones (LAMP) en Linux</li>
+ <li>Desarrollo usando componentes Linux/FLOSS</li>
+ </ul>
+ </li>
+ <li>
Nuestro Servicio:
- * Servicios pro-activos de Administración de sistemas
- * 24 horas de soporte remoto de sistemas y monitoreo de red
- * Administradores de sistema que reemplazan a la plantilla durante
-un corto periodo de tiempo.
- * Reemplazo de servidores NT con servidores Linux y SAMBA.
- * Instalación de Servidores Web Seguros.
- * Soporte de una mesa de ayuda de Linux ante algún incidente.
- * Planeación de redes, topología y diseño de sistemas seguros.
- * Experiencia en Internet y cortafuegos.
-
+ <ul>
+ <li>Servicios pro-activos de Administración de sistemas</li>
+ <li>24 horas de soporte remoto de sistemas y monitoreo de red</li>
+ <li>Administradores de sistema que reemplazan a la plantilla durante
+un corto periodo de tiempo.</li>
+ <li>Reemplazo de servidores NT con servidores Linux y SAMBA.</li>
+ <li>Instalación de Servidores Web Seguros.</li>
+ <li>Soporte de una mesa de ayuda de Linux ante algún incidente.</li>
+ <li>Planeación de redes, topología y diseño de sistemas seguros.</li>
+ <li>Experiencia en Internet y cortafuegos.</li>
+ </ul>
+ </li>
+ <li>
Nuestros productos (hechos en Linux/FOSS):
- * Cybersource/DATASAFE: Toma imágenes de su servidor, diariamente.
- * Cybersource Small Business Linux Server: El mejor servidor para
+ <ul>
+ <li>Cybersource/DATASAFE: Toma imágenes de su servidor, diariamente.</li>
+ <li>Cybersource Small Business Linux Server: El mejor servidor para
negocios sobre precio en el mercado y 75% más económico que su
- alternativa Microsoft.
- * Cybersource Trim Client: Todas las ventajas de Thin Client con
- ninguna de sus desventajas.
- * The Safe Internet Computer: La manera más segura de usar Internet.
- * Warm Spare Server Replicator: Duplique sus servidores importantes.
- * LiveLAMP: Proyecto LiveCD con LAMP.
+ alternativa Microsoft.</li>
+ <li>Cybersource Trim Client: Todas las ventajas de Thin Client con
+ ninguna de sus desventajas.</li>
+ <li>The Safe Internet Computer: La manera más segura de usar Internet.</li>
+ <li>Warm Spare Server Replicator: Duplique sus servidores importantes.</li>
+ <li>LiveLAMP: Proyecto LiveCD con LAMP.</li>
+ </ul>
+ </li>
+</ul>
+<p>
También podemos hacer desarrollo basados en Linux
- * C/C++
- * Perl
- * Java
- * Python
- * Integración de bases de datos en PHP para la WEB
- * MySQL
- * PostgreSQL
- * Migración de VB y VBA a Linux
-</pre>
+</p>
+<ul>
+ <li>C/C++</li>
+ <li>Perl</li>
+ <li>Java</li>
+ <li>Python</li>
+ <li>Integración de bases de datos en PHP para la WEB</li>
+ <li>MySQL</li>
+ <li>PostgreSQL</li>
+ <li>Migración de VB y VBA a Linux</li>
+</ul>
diff --git a/spanish/consultants/cory_p.wml b/spanish/consultants/cory_p.wml
index 1bb194c4362..24ec0331cd1 100644
--- a/spanish/consultants/cory_p.wml
+++ b/spanish/consultants/cory_p.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Uversa Consulting"
+#use wml::debian::translation-check translation="1.2"
-<H1>Uversa Consulting</H1>
-<HR>
-<PRE>
+<p>
Proporcionamos servicios de consultoría a empresas concentrándonos en
Linux y software abierto. También proporcionamos consultoría de seguridad,
soporte general de Linux y Debian, desarrollo a medida y consultoría en
redes con precios asequibles para pequeña y mediana empresa.
-</PRE>
+</p>
diff --git a/spanish/consultants/douglas_h.wml b/spanish/consultants/douglas_h.wml
index 2719f3613ff..60f3bd5ec89 100644
--- a/spanish/consultants/douglas_h.wml
+++ b/spanish/consultants/douglas_h.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2" maintainer="David Moreno Garza"
-
-<h1>B. Douglas Hilton</h1>
+#use wml::debian::consultant name="B. Douglas Hilton"
+#use wml::debian::translation-check translation="1.3" maintainer="David Moreno Garza"
<ul>
<li>Experiencia de 8 años con Debian en muchos sistemas.</li>
diff --git a/spanish/consultants/heureka.wml b/spanish/consultants/heureka.wml
index 99163555782..c894fed86c2 100644
--- a/spanish/consultants/heureka.wml
+++ b/spanish/consultants/heureka.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Heureka GmbH"
# $Id
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::translation-check translation="1.3"
-<H1>Heureka GmbH</H1>
-<HR>
-El primer contacto es gratuito.
+<p>El primer contacto es gratuito.</p>
diff --git a/spanish/consultants/inittab.wml b/spanish/consultants/inittab.wml
index 58abab30fb0..554cac32ac6 100644
--- a/spanish/consultants/inittab.wml
+++ b/spanish/consultants/inittab.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Alberto Gonzalez Iniesta"
+#use wml::debian::translation-check translation="1.2"
-<h1>Alberto Gonzalez Iniesta</h1>
-<hr />
<p>
Wearrollador Debian que presta servicios de consultoría y
formación en Software Libre (GNU/Linux, Apache, Mysql, Samba,
diff --git a/spanish/consultants/ivan_k.wml b/spanish/consultants/ivan_k.wml
index 5af5672d382..1e9b351fc97 100644
--- a/spanish/consultants/ivan_k.wml
+++ b/spanish/consultants/ivan_k.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Freeside Internet Services, LLC"
+#use wml::debian::translation-check translation="1.2"
-<H1>Freeside Internet Services, LLC</H1>
-<HR>
-<PRE>
+<p>
Especializados en Perl, bases de datos y operación en ISP.
-</PRE>
+</p>
diff --git a/spanish/consultants/jaume_t.wml b/spanish/consultants/jaume_t.wml
index e056a31586f..050bc3e7e4c 100644
--- a/spanish/consultants/jaume_t.wml
+++ b/spanish/consultants/jaume_t.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Jaume Teixi"
+#use wml::debian::translation-check translation="1.3"
-<H1>Jaume Teixi</H1>
-<HR>
-<PRE>
+<p>
Comunicaciones en sistemas multiplataforma y entornos de red local a
extendida. Servidores Debian dedicados (acceso remoto, cortafuegos, proxy,
web, correo, DNS, bases de datos). Soporte por correo disponible. Más de
6 años de experiencia demostrable en Debian Linux. Un porcentaje de la
retribución se dona a la comunidad de desarrolladores de Debian.
-</PRE>
+</p>
diff --git a/spanish/consultants/javier_v.wml b/spanish/consultants/javier_v.wml
index adba9ab8300..639c3a8c108 100644
--- a/spanish/consultants/javier_v.wml
+++ b/spanish/consultants/javier_v.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Yaco"
+#use wml::debian::translation-check translation="1.4"
-<H1>Yaco</H1>
-<HR>
-<PRE>
+<p>
Expertos en Debian GNU/Linux (2 Desarrolladores Debian en
plantilla). Desarrollo de soluciones y migraci&oacute;n de sistemas de
informaci&oacute;n a soluciones basadas en software y est&aacute;ndares abiertos y
libres. Desarrollo de sistemas empotrados con GNU/Linux.
-</PRE>
+</p>
diff --git a/spanish/consultants/jeremy_r.wml b/spanish/consultants/jeremy_r.wml
index 6a8f9456e1a..f699a5d70e3 100644
--- a/spanish/consultants/jeremy_r.wml
+++ b/spanish/consultants/jeremy_r.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3" maintainer="David Moreno Garza"
-
-<h1>Puget Sound Technology</h1>
+#use wml::debian::consultant name="Puget Sound Technology"
+#use wml::debian::translation-check translation="1.4" maintainer="David Moreno Garza"
<p>Migraciones BSD &lt;-&gt; Linux; formación en el sitio, a medida.
Trabajamos con Apache, Postfix, seguridad en Linux y entrenamiento
-básico de shell de Unix.
+básico de shell de Unix.</p>
diff --git a/spanish/consultants/joerg_w.wml b/spanish/consultants/joerg_w.wml
index ee249012f1b..a7966f80647 100644
--- a/spanish/consultants/joerg_w.wml
+++ b/spanish/consultants/joerg_w.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
-
-<h1>Scan Plus GmbH</h1>
+#use wml::debian::consultant name="Scan Plus GmbH"
+#use wml::debian::translation-check translation="1.3"
<p>Distribución propia con cortafuegos basada en Debian GNU/Linux.</p>
diff --git a/spanish/consultants/linux_mania.wml b/spanish/consultants/linux_mania.wml
index 08237caa99d..52ee014154f 100644
--- a/spanish/consultants/linux_mania.wml
+++ b/spanish/consultants/linux_mania.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Linux Mania"
+#use wml::debian::translation-check translation="1.3"
-<h1>Linux Mania</h1>
-<hr />
<p>Soporte, instalacion, capacitacion en Linux..</p>
diff --git a/spanish/consultants/murphy_soft.wml b/spanish/consultants/murphy_soft.wml
index e0c36e93aa1..493eba66cb8 100644
--- a/spanish/consultants/murphy_soft.wml
+++ b/spanish/consultants/murphy_soft.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Murphy Software BV"
+#use wml::debian::translation-check translation="1.2"
-<H1>Murphy Software BV</H1>
-<hr>
<p>
Una parte de las ganancias relacionadas con Debian serán donadas al proyecto Debian.
</p>
diff --git a/spanish/consultants/rafez_n.wml b/spanish/consultants/rafez_n.wml
index b2b5c255758..4dcf5842a2f 100644
--- a/spanish/consultants/rafez_n.wml
+++ b/spanish/consultants/rafez_n.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Gazelle Informatics Ltd"
# $Id$
-#use wml::debian::translation-check translation="1.1"
-
-<H1>Gazelle Informatics Ltd</H1>
+#use wml::debian::translation-check translation="1.2"
<p>Especialistas en Lotus Domino sobre Debian</p>
diff --git a/spanish/consultants/robert_millan.wml b/spanish/consultants/robert_millan.wml
index 0480339148c..85230500c15 100644
--- a/spanish/consultants/robert_millan.wml
+++ b/spanish/consultants/robert_millan.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Robert Millan"
+#use wml::debian::translation-check translation="1.2"
-<H1>Robert Millan</H1>
-<HR>
-<PRE>
+<p>
Mantenimiento y administración de servidores y estaciones de trabajo Debian.
Ethernet, TCP/IP, routing, cortafuegos, httpd, correo, Samba, etc.
-</PRE>
+</p>
diff --git a/spanish/consultants/stuart_t.wml b/spanish/consultants/stuart_t.wml
index d60ce33cc48..1ff2b14f015 100644
--- a/spanish/consultants/stuart_t.wml
+++ b/spanish/consultants/stuart_t.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Linux Labs"
+#use wml::debian::translation-check translation="1.2"
-<h1>Linux Labs</h1>
-
-<p>Especialistas en LinuxBIOS y Cluster
+<p>Especialistas en LinuxBIOS y Cluster</p>
diff --git a/spanish/consultants/ultreia.wml b/spanish/consultants/ultreia.wml
index c0edf4226fb..247ddc15854 100644
--- a/spanish/consultants/ultreia.wml
+++ b/spanish/consultants/ultreia.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.6" maintainer="David Moreno Garza"
+#use wml::debian::consultant name="Ultreia Comunicaciones S.L."
+#use wml::debian::translation-check translation="1.7" maintainer="David Moreno Garza"
-<h1>Ultreia Comunicaciones S.L.</h1>
-<hr />
<p>
Ultreia Comunicaciones es una empresa de ingeniería dedicada
al desarrollo de proyectos basados en Linux y en otros unices.
diff --git a/spanish/consultants/vivek_k.wml b/spanish/consultants/vivek_k.wml
index ad0e4017c64..b0e80d83b20 100644
--- a/spanish/consultants/vivek_k.wml
+++ b/spanish/consultants/vivek_k.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
+#use wml::debian::consultant name="Vivek Kumar"
# $Id$
-#use wml::debian::translation-check translation="1.1"
-
-<h1>Vivek Kumar</h1>
+#use wml::debian::translation-check translation="1.2"
<p>Especializado en el desarrollo de controladores de dispositivos y
código de arranque</p>
diff --git a/spanish/consultants/xsto.info.wml b/spanish/consultants/xsto.info.wml
index f098deb59b9..b778c72620f 100644
--- a/spanish/consultants/xsto.info.wml
+++ b/spanish/consultants/xsto.info.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="xsto.info S. Coop. Mad."
+#use wml::debian::translation-check translation="1.2"
-<h1>xsto.info S. Coop. Mad.</h1>
-<hr />
<p>
Cooperativa especializada en software libre, accesibilidad, redes y
gestión del contenido.
diff --git a/swedish/consultants/aerasec.wml b/swedish/consultants/aerasec.wml
index 5afb6f632eb..3bb5034a03a 100644
--- a/swedish/consultants/aerasec.wml
+++ b/swedish/consultants/aerasec.wml
@@ -1,10 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="AERAsec GmbH"
+#use wml::debian::translation-check translation="1.3"
-<H1>AERAsec GmbH</H1>
-<HR>
-<PRE>
+<p>
Säkerhet, komplexa nätverksscenarier, serverstrategier.
-
+</p>
+<p>
Även: München/Tyskland.
-</PRE>
+</p>
diff --git a/swedish/consultants/alex_r.wml b/swedish/consultants/alex_r.wml
index 23a79dabdb6..5c98f4c5c22 100644
--- a/swedish/consultants/alex_r.wml
+++ b/swedish/consultants/alex_r.wml
@@ -1,11 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Breakthrough LTD"
+#use wml::debian::translation-check translation="1.2"
-<H1>Breakthrough LTD</H1>
-<HR>
-<PRE>
+<p>
Bygga Internet-/intranättjänster som täcker företagtes alla LAN-behov:
ISDN-Internetkonnektivitet, fjärråtkomst, Windowsfilserver, NFS, DNS,
webbserver, ftp-server, e-postserver, ....
-</PRE>
+</p>
diff --git a/swedish/consultants/andreu_i.wml b/swedish/consultants/andreu_i.wml
index 208d6d90e2e..bd4fd886bc4 100644
--- a/swedish/consultants/andreu_i.wml
+++ b/swedish/consultants/andreu_i.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Internet Web Serveis"
+#use wml::debian::translation-check translation="1.2"
-<H1>Internet Web Serveis</H1>
-<HR>
-<PRE>
+<p>
IWS tillhandahåller alla sorters Linux- och Debianrelaterade tjänster
sedan 1995: Konsulttjänster, utveckling, implementering, support,
utbildning, med mera.
-</PRE>
+</p>
diff --git a/swedish/consultants/avalonix.wml b/swedish/consultants/avalonix.wml
index ab0cf584073..fefd4694cc0 100644
--- a/swedish/consultants/avalonix.wml
+++ b/swedish/consultants/avalonix.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="AVALONIX Linux Systems Support"
+#use wml::debian::translation-check translation="1.2"
-<H1>AVALONIX Linux Systems Support</H1>
-<HR>
-<PRE>
+<p>
specialiserat på utbildning; e-publicering; dokumenttillverkning
-</PRE>
+</p>
diff --git a/swedish/consultants/ben_b.wml b/swedish/consultants/ben_b.wml
index f669b7d9969..ecd5d69ee3b 100644
--- a/swedish/consultants/ben_b.wml
+++ b/swedish/consultants/ben_b.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
-
-<h1>Ben Bell</h1>
+#use wml::debian::consultant name="Ben Bell"
+#use wml::debian::translation-check translation="1.2"
<p>
Jag specialiserar mig på formgivning och implementation av infrastruktur
diff --git a/swedish/consultants/charles_s.wml b/swedish/consultants/charles_s.wml
index a5459504782..3bf5aca4869 100644
--- a/swedish/consultants/charles_s.wml
+++ b/swedish/consultants/charles_s.wml
@@ -1,20 +1,23 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Activate Multi User System Support"
+#use wml::debian::translation-check translation="1.3"
-<H1>Activate Multi User System Support</H1>
-<HR>
-<PRE>
+<p>
Specialiserar sig på Unixnätverk och företagskritiskt stöd
+</p>
+<p>
Vi stöder
-Debian
-Caldera
-Red Hat
-SCO
-Cisco
-Bay networks
-Microsoft
-
+</p>
+<ul>
+<li>Debian</li>
+<li>Caldera</li>
+<li>Red Hat</li>
+<li>SCO</li>
+<li>Cisco</li>
+<li>Bay networks</li>
+<li>Microsoft</li>
+</ul>
+<p>
Underhållskontrakt och telefonkonsulteringspriser vid förfrågan
-</PRE>
+</p>
diff --git a/swedish/consultants/credativ.wml b/swedish/consultants/credativ.wml
index 5ed355f2654..4b10a632fb6 100644
--- a/swedish/consultants/credativ.wml
+++ b/swedish/consultants/credativ.wml
@@ -1,17 +1,18 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="credativ GmbH"
+#use wml::debian::translation-check translation="1.2"
-<h1>credativ GmbH</h1>
-<hr/>
-<pre>
+<p>
credativ GmbH har åtta Debianutvecklare anställda, som utför Debianrelaterade
uppgifter som en del av sitt jobb. De sponsrar också med jämna mellanrum
cd-skivor och annat för LinuxTag och hjälper Debian i Tyskland i allmänhet.
+</p>
+<p>
credativ är en återförsäljaroberoende konsult- och tjänstefirma som
specialiserar sig på kvalitetskontroll i IT-projekt, systemhantering och
tjänster inom öppen källkod. Tillsammans med våra kunder implementerar vi
skräddarsydda lösningar i öppen källkod (helst helt i fri programvara), som
har stor potential att reducera kostnader, migrerar vi system och
tillhandahåller vi specialiserad support för kompletta nätverk. För mer
-information, besök http://www.credativ.de/.
-</pre>
+information, besök
+<a href="http://www.credativ.de/">http://www.credativ.de/</a>.
+</p>
diff --git a/swedish/consultants/datalink_internet.wml b/swedish/consultants/datalink_internet.wml
index 8575e2cb3ac..9e82790cbb3 100644
--- a/swedish/consultants/datalink_internet.wml
+++ b/swedish/consultants/datalink_internet.wml
@@ -1,13 +1,18 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Datalink Internet"
+#use wml::debian::translation-check translation="1.4"
-<H1>Datalink Internet</H1>
-<HR>
-<PRE>
-Datalink Internet tillhandahåller tre sorters tjänster: 1) Konsulttjänster
-inom UNIX specifikt DEBIAN 2) Systemutveckling på UNIX specifikt inom
-nätverk baseradee på TCP och DEBIAN som plattform. 3) Internettjänster:
-Webbhotell, företags-e-post och anslutning till Internet. Datalink säljer
+<p>
+Datalink Internet tillhandahåller tre sorters tjänster:
+</p>
+<ol>
+<li>Konsulttjänster inom UNIX specifikt DEBIAN</li>
+<li>Systemutveckling på UNIX specifikt inom nätverk baseradee på TCP
+ och DEBIAN som plattform.</li>
+<li>Internettjänster: Webbhotell, företags-e-post och anslutning till
+ Internet.</li>
+</ol>
+<p>
+Datalink säljer
även flera märkesservrar förkonfigurerade mede Debian och typiska tjänster
såsom E-POST, WEBB, MELLANSERVER, DATABAS, GRUPPROGRAM, OSV
-</PRE>
+</p>
diff --git a/swedish/consultants/deeproot.wml b/swedish/consultants/deeproot.wml
index 1a554ff16a6..b42660042d7 100644
--- a/swedish/consultants/deeproot.wml
+++ b/swedish/consultants/deeproot.wml
@@ -1,17 +1,16 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="DeepRoot Linux Pvt. Ltd."
+#use wml::debian::translation-check translation="1.4"
-<H1>DeepRoot Linux Pvt. Ltd.</H1>
-<HR>
-<PRE>
+<p>
DeepRoot Linux är ett av de största GNU/Linux-produktföretagen i Indien.
Med huvudkontor i Bangalore utvecklar vi spjutspetsprodukter och lösningar
för att "få GNU/Linux att fungera för dig - snabbare, bättre, idag, på alla
vis".
-
+</p>
+<p>
Bland våra produkter finns kontorsservrar, meddelandeservrar, filservrar,
brandväggar, VPN-produkter, bandbreddshantering och länkhanteringslösningar.
Vi tillhandahåller även kommersiell support för fri programvara och Debian
GNU/Linux-distributionen. Vi ger support över telefon, e-post,
fjärrinloggning och på plats.
-</PRE>
+</p>
diff --git a/swedish/consultants/et_computer.wml b/swedish/consultants/et_computer.wml
index 1e94f104177..b5fa113c2b4 100644
--- a/swedish/consultants/et_computer.wml
+++ b/swedish/consultants/et_computer.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="ET Computer"
+#use wml::debian::translation-check translation="1.4"
-<H1>ET Computer</H1>
-<HR>
-<PRE>
+<p>
Endast professionella arbeten. Har F-skattebevis.
-</PRE>
+</p>
diff --git a/swedish/consultants/eugene_g.wml b/swedish/consultants/eugene_g.wml
index b36a80d324e..8ddaa63bac1 100644
--- a/swedish/consultants/eugene_g.wml
+++ b/swedish/consultants/eugene_g.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="DataArt"
+#use wml::debian::translation-check translation="1.2"
-<H1>DataArt</H1>
-<HR>
-<PRE>
+<p>
Offshoreprogramvaruutveckling och entrepenadfirma med kunskaper i Microsoft
.NET (ASP.Net)
-</PRE>
+</p>
diff --git a/swedish/consultants/heureka.wml b/swedish/consultants/heureka.wml
index 35ec6bc9b4a..d10c37f44a7 100644
--- a/swedish/consultants/heureka.wml
+++ b/swedish/consultants/heureka.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Heureka GmbH"
+#use wml::debian::translation-check translation="1.3"
-<H1>Heureka GmbH</H1>
-<HR>
-Första kontakten gratis.
+<p>Första kontakten gratis.</p>
diff --git a/swedish/consultants/indus_net_technologies.wml b/swedish/consultants/indus_net_technologies.wml
index ac950dfc065..80ad43df51e 100644
--- a/swedish/consultants/indus_net_technologies.wml
+++ b/swedish/consultants/indus_net_technologies.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Indus Net Technologies"
+#use wml::debian::translation-check translation="1.2"
-<H1>Indus Net Technologies</H1>
-<HR>
-<PRE>
+<p>
Indus Net Technologies är ett ISO 9001:2000-programvarutjänsteföretag som
tillhandahåller konsulttjänster och support på öppen källkod-plattformar.
-</PRE>
+</p>
diff --git a/swedish/consultants/ivan_k.wml b/swedish/consultants/ivan_k.wml
index 11ca8733d88..d4e40ca2e71 100644
--- a/swedish/consultants/ivan_k.wml
+++ b/swedish/consultants/ivan_k.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Freeside Internet Services, LLC"
+#use wml::debian::translation-check translation="1.2"
-<H1>Freeside Internet Services, LLC</H1>
-<HR>
-<PRE>
+<p>
Specialiserar sig på Perl, databaser och funktioner för Internetleverantörer.
-</PRE>
+</p>
diff --git a/swedish/consultants/jaume_t.wml b/swedish/consultants/jaume_t.wml
index 95e9eb41821..cb5d641ed64 100644
--- a/swedish/consultants/jaume_t.wml
+++ b/swedish/consultants/jaume_t.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Jaume Teixi"
+#use wml::debian::translation-check translation="1.3"
-<H1>Jaume Teixi</H1>
-<HR>
-<PRE>
+<p>
Korsplattformskommunikation och LAN till WAN-miljöer. Dedicerade Debianservrar:
(fjärråtkomst, brandvägg, proxy, webb, e-post, dns, databas). E-postsupport
tillgänglig. Mer än sex års bevisbar erfarenhet av Debian Linux. En del av
inkomsterna kommer doneras till Debians utvecklarmiljö.
-</PRE>
+</p>
diff --git a/swedish/consultants/jean_p.wml b/swedish/consultants/jean_p.wml
index 342f6f8b595..d1397478ce7 100644
--- a/swedish/consultants/jean_p.wml
+++ b/swedish/consultants/jean_p.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Linuz.it"
+#use wml::debian::translation-check translation="1.2"
-<h1>Linuz.it</h1>
-<hr>
-<pre>
+<p>
Linuxsystem för företag, brandväggar med hög säkerhet, Linuxbaserade
antivirussystem, högtillgängliga/pålitliga Linuxservrar, specialiserat
Linux/*BSD/Sun*/*NIX-konsultarbete.
-</pre>
+</p>
diff --git a/swedish/consultants/jim_w.wml b/swedish/consultants/jim_w.wml
index 0042705cb7d..0f36a169413 100644
--- a/swedish/consultants/jim_w.wml
+++ b/swedish/consultants/jim_w.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="LAN Comp Systems"
+#use wml::debian::translation-check translation="1.3"
-<H1>LAN Comp Systems</H1>
-<HR>
-<PRE>
+<p>
LAN Comp Systems tillhandahåller formgivning, installation och
projekthanteringssupport inom nätverkssystem för OLTP-klientserversystem som
använder Unix eller stängda operativsystemsplattformar. Vi specificerar Linux
(specifikt Debian) för de flesta nätverksservrar.
-</PRE>
+</p>
diff --git a/swedish/consultants/joan_l.wml b/swedish/consultants/joan_l.wml
index f6b90dc58f4..d87bd01b14c 100644
--- a/swedish/consultants/joan_l.wml
+++ b/swedish/consultants/joan_l.wml
@@ -1,14 +1,12 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Digibel"
+#use wml::debian::translation-check translation="1.2"
-<h1>Digibel</h1>
-<hr>
-<pre>
+<p>
Digibel Open Source support (Belgien) använder sin kompetens inom
programvara med öppen källkod för att tillhandahålla lösningar,
konsulttjänster, utveckling, fjärradministration, utbildning och
användarstöd med starkt fokus på säkerhet. Alla våra konsulter har
använt Linux sedan 1995 och har omfattande erfarenhet med öppen
källkod.
-</pre>
+</p>
diff --git a/swedish/consultants/joe_m.wml b/swedish/consultants/joe_m.wml
index 90a744edc98..a6abf6ebaa7 100644
--- a/swedish/consultants/joe_m.wml
+++ b/swedish/consultants/joe_m.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Tangent Computer Research"
+#use wml::debian::translation-check translation="1.2"
-<H1>Tangent Computer Research</H1>
-<HR>
-<PRE>
+<p>
20 års erfarenhet av unix/linux
-</PRE>
+</p>
diff --git a/swedish/consultants/joerg_w.wml b/swedish/consultants/joerg_w.wml
index 21aac05c634..b73b0976993 100644
--- a/swedish/consultants/joerg_w.wml
+++ b/swedish/consultants/joerg_w.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Scan Plus GmbH"
+#use wml::debian::translation-check translation="1.3"
-<h1>Scan Plus GmbH</h1>
-
-<p>Egen Debian/GNU Linux-baserad brandväggsdistribution
+<p>Egen Debian/GNU Linux-baserad brandväggsdistribution</p>
diff --git a/swedish/consultants/kaarlo_m.wml b/swedish/consultants/kaarlo_m.wml
index c3b64887c9f..f903e5236e2 100644
--- a/swedish/consultants/kaarlo_m.wml
+++ b/swedish/consultants/kaarlo_m.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Arvanet"
+#use wml::debian::translation-check translation="1.3"
-<H1>Arvanet</H1>
-<HR>
-<PRE>
+<p>
Ytterligare information: Vårt distrikt är huvudsakligen storstadsregionen
(Helsingfors, Vanda, Esbo, Grankulla, Tusby, Träskända). Undantag har
förekommet, till exempel: Uleåborg &amp; Jyväskylä.
-</PRE>
+</p>
diff --git a/swedish/consultants/kevin_l.wml b/swedish/consultants/kevin_l.wml
index 3d835ad35d1..f8e0c7a3e3b 100644
--- a/swedish/consultants/kevin_l.wml
+++ b/swedish/consultants/kevin_l.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Obsidian Consulting Group"
+#use wml::debian::translation-check translation="1.2"
-<H1>Obsidian Consulting Group</H1>
-<HR>
-<PRE>
+<p>
Värd- och fakturatjänster också tillgängliga.
-</PRE>
+</p>
diff --git a/swedish/consultants/kevin_t.wml b/swedish/consultants/kevin_t.wml
index b6fc4f51b26..a57387d2aac 100644
--- a/swedish/consultants/kevin_t.wml
+++ b/swedish/consultants/kevin_t.wml
@@ -1,9 +1,9 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Superior Software Services"
+#use wml::debian::translation-check translation="1.2"
<h1>Superior Software Services</h1>
<hr>
-<pre>
+<p>
Jag har 10 års erfarenhet med Unix (7 med Debian GNU/Linux) med
specialområdena operativsystemsadministration, nätverkssäkerhet,
katastrofåterhämtning och automatisering. Jag har även mer än fem års
@@ -13,5 +13,5 @@ med öppen källkod om så krävs.
Om du nämner att du hittade mig via debian.org kommer jag donera 10% av din
avgift tillbaka till Debianprojektet.
-</pre>
+</p>
diff --git a/swedish/consultants/lawrence_c.wml b/swedish/consultants/lawrence_c.wml
index dc5339a5e96..26d8146a734 100644
--- a/swedish/consultants/lawrence_c.wml
+++ b/swedish/consultants/lawrence_c.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.5"
-
-<h1>Major Chai M J</h1>
+#use wml::debian::consultant name="Major Chai M J"
+#use wml::debian::translation-check translation="1.6"
<p>
Tillgänglighet: Asien och Stilla havs-regionen (bland annat Kina och Japan)
diff --git a/swedish/consultants/linux_box.wml b/swedish/consultants/linux_box.wml
index 6f0629070c0..f54b1ee3dde 100644
--- a/swedish/consultants/linux_box.wml
+++ b/swedish/consultants/linux_box.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="The Linux Box Corporation"
+#use wml::debian::translation-check translation="1.2"
-<H1>The Linux Box Corporation</H1>
-<HR>
-<PRE>
+<p>
Linux Box Corporation är ett konsult-, utvecklings-, integrerings-, support-
och utbildningsföretag med fokus på överföring av kunskap, specialiserat på
öppen källkod och Linuxmiljön.
-</PRE>
+</p>
diff --git a/swedish/consultants/michaeljohn_c.wml b/swedish/consultants/michaeljohn_c.wml
index b150b45a520..513fae8ff53 100644
--- a/swedish/consultants/michaeljohn_c.wml
+++ b/swedish/consultants/michaeljohn_c.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Michaeljohn Clement"
+#use wml::debian::translation-check translation="1.2"
-<H1>Michaeljohn Clement</H1>
-<HR>
-<PRE>
+<p>
programmering, företagsdriftsättning av GNU/Linux och *BSD,
webbprogrammering och design, användargränssnittsdesign och -implementering.
C/C++/Java, Perl, SQL, PHP, osv. End-to-end-lösningar baserad på öppen
källkod/fri programvara för ditt företag.
-</PRE>
+</p>
diff --git a/swedish/consultants/mind.wml b/swedish/consultants/mind.wml
index 1e2014f946e..094d67c4cd4 100644
--- a/swedish/consultants/mind.wml
+++ b/swedish/consultants/mind.wml
@@ -1,16 +1,15 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Mind nv"
+#use wml::debian::translation-check translation="1.4"
-<H1>Mind nv</H1>
-<HR>
-<PRE>
+<p>
Mind Linux Solutions (Leuven, Belgien) använder sin kompetens inom programvara
med öppen källkod och systemformgivning för att leverera lösningar,
konsulttjänster, utveckling, utbildning och användarstöd inom utveckling av
inbyggda system.
-
+</p>
+<p>
Vi använder programvara med öppen källkod (t.ex. Linux, RTLinux, RTAI, eCos,
Wonka, gcc, gdb,...) för att skapa grundläggande infrastruktur för nya inbyggda
system (inklusive enkretssystem) och att hjälpa kunder med utveckling på dessa
infrastrukturer.
-</PRE>
+</p>
diff --git a/swedish/consultants/minihub.wml b/swedish/consultants/minihub.wml
index 0db72a35ee0..27d2891f57c 100644
--- a/swedish/consultants/minihub.wml
+++ b/swedish/consultants/minihub.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Minihub Communications Incorporated"
+#use wml::debian::translation-check translation="1.2"
-<H1>Minihub Communications Incorporated</H1>
-<HR>
-<PRE>
+<p>
Ickestatliga organisationer (NGO:er) involverade i samhällsintresse,
mänskliga rättigheter, miljö och social rättvisa behöver
kommunikationssystem som är lämpade för deras behov. Debian Linux ger säkra,
billiga, utökningsbara lösningar som fungerar bra på minimala
maskinvarukrav. Minihub tillhandahåller även konsulttjänster för företag och
arbetar över hela sydöstra Asien.
-</PRE>
+</p>
diff --git a/swedish/consultants/murphy_soft.wml b/swedish/consultants/murphy_soft.wml
index d635f59986c..bafa2272f73 100644
--- a/swedish/consultants/murphy_soft.wml
+++ b/swedish/consultants/murphy_soft.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Murphy Software BV"
+#use wml::debian::translation-check translation="1.2"
-<H1>Murphy Software BV</H1>
-<hr>
<p>
Delar av Debianrelaterade inkomster kommer att doneras till Debianprojektet.
</p>
diff --git a/swedish/consultants/nikolai_l.wml b/swedish/consultants/nikolai_l.wml
index 57eee713758..06da316408a 100644
--- a/swedish/consultants/nikolai_l.wml
+++ b/swedish/consultants/nikolai_l.wml
@@ -1,12 +1,10 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Nikolai Luzan"
+#use wml::debian::translation-check translation="1.4"
-<h1>Nikolai Luzan</h1>
-<hr>
-<pre>
+<p>
Med fokus på infrastruktur tillhandahåller jag kompletta lösningar till
mellanstora företag. Nätverks-, databas- och skrivbordslösningar som passar
era behov. Lösningar som använder den bästa tillgängliga tekniken för att
uppfylla era behov.
-</pre>
+</p>
diff --git a/swedish/consultants/ns_computing.wml b/swedish/consultants/ns_computing.wml
index a814d02eef9..feaff982e5c 100644
--- a/swedish/consultants/ns_computing.wml
+++ b/swedish/consultants/ns_computing.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="NS Computing"
+#use wml::debian::translation-check translation="1.3"
-<h1>NS Computing</h1>
-<hr>
-<pre>
+<p>
NS Computing tillhandahåller skräddarsydd utveckling av Internet/intranät,
formgivning av nätverkssystem, installation och support. Vi använder
GNU/Linux (specifikt Debian) för de flesta nätverksservrarna. Vi
@@ -11,4 +9,4 @@ tillhandahåller Debianbaserade servrar för mindre företag med ett
skräddarsytt fleranvändar-/flerkontors-Internetwebbtillämpning (e-post, fax,
dokumenthantering och kundhantering). Månatliga/årliga supportkontrakt
tillgängliga.
-</pre>
+</p>
diff --git a/swedish/consultants/opentechnologies.wml b/swedish/consultants/opentechnologies.wml
index 534f25ce2bb..0162ffd9268 100644
--- a/swedish/consultants/opentechnologies.wml
+++ b/swedish/consultants/opentechnologies.wml
@@ -1,10 +1,8 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="OpenTechnologies"
+#use wml::debian::translation-check translation="1.2"
-<H1>OpenTechnologies</H1>
-<HR>
-<PRE>
+<p>
Arberar med FreeBSD och OpenBSD. Arbetar även med Debian, Gentoo, SuSE, Red
Hat och Mandrake. Brandväggskonstruktion. Säkerhetskonsult. LAN/WAN,
Internet/intranet-migrering. RDBMS:er. Internetnärvaro.
-</PRE>
+</p>
diff --git a/swedish/consultants/pete_b.wml b/swedish/consultants/pete_b.wml
index a99c4b9135b..9daf4f5a29a 100644
--- a/swedish/consultants/pete_b.wml
+++ b/swedish/consultants/pete_b.wml
@@ -1,27 +1,27 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
-
-<h1>ELB Internet Services</h1>
+#use wml::debian::consultant name="ELB Internet Services"
+#use wml::debian::translation-check translation="1.2"
<p>
ELB specialiserar sig på att tillhandahålla kompletta Internetlösningar för
företag och myndigheter &ndash; allt från enkla e-post- och webblösningar till
Internetkonnektivitet för hela företag.
+</p>
<p>
Bland ELBs erfarenhetsområden finns:
+</p>
<ul>
<li>Installation, uppgradering och stöd för Debian Linux för DNS,
e-postservrar, brandväggar, routrar, webbservrar, databaslösningar,
- faxvidaresändning...
+ faxvidaresändning...</li>
<li>Webbplatsutveckling och -hotell &ndash; kompletta Debianbaserade
- webblösningar. Kontakta oss för en förteckning över nuvarande kunder.
+ webblösningar. Kontakta oss för en förteckning över nuvarande kunder.</li>
<li>Ge små och mellanstora företag svar på deras tekniska behov och pågående
- stöd för att maximera deras investeringar.
+ stöd för att maximera deras investeringar.</li>
<li>Berätta att du fann oss via Debian.org. Vi kommer att betala Debian vårt
- vanliga 5%-remitteringsarvode för alla jobb som kommer härifrån.
+ vanliga 5%-remitteringsarvode för alla jobb som kommer härifrån.</li>
</ul>
diff --git a/swedish/consultants/peter_d.wml b/swedish/consultants/peter_d.wml
index e27707f3b79..9dc302432f8 100644
--- a/swedish/consultants/peter_d.wml
+++ b/swedish/consultants/peter_d.wml
@@ -1,13 +1,13 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Kangaroot Linux Solutions"
+#use wml::debian::translation-check translation="1.2"
<h1>Kangaroot Linux Solutions</h1>
<p>
Belgiska Linuxkonsulter som fokuserar på Debianstöd och installationer.
E-post-, fil-, webbservrar, brandväggar, gruppprogramservrar, VPN, e-commerce,
-...
+...</p>
<p>Vi övervakar dina maskiner från vårt NOC och rättar problem innan de uppstår.
Fjärrövervakning, support på plats, granskning och utbildning inom Debian, andra
-Linuxvarianter, Samba, Sendmail, proftpd, Apache, ...
+Linuxvarianter, Samba, Sendmail, proftpd, Apache, ...</p>
diff --git a/swedish/consultants/prosa.wml b/swedish/consultants/prosa.wml
index e7a28fbe159..4e3480aab27 100644
--- a/swedish/consultants/prosa.wml
+++ b/swedish/consultants/prosa.wml
@@ -1,16 +1,16 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="PROSA Progettazione Sviluppo Aperto"
+#use wml::debian::translation-check translation="1.3"
-<h1>PROSA Progettazione Sviluppo Aperto</h1>
-<hr>
-<pre>
+<p>
Vi säljer förinstallerade Debian Linux-system. Vi ger kommersiellt stöd på
Debian Linux.
-
+</p>
+<p>
Vi är författare till PROSA/Debian, en italiensk version av Debian, vilken vi
säljer på våra system.
-
+</p>
+<p>
PROSA använder, producerar och säljer endast lösningar baserade på fri
programvara.
-</pre>
+</p>
diff --git a/swedish/consultants/r_w_r.wml b/swedish/consultants/r_w_r.wml
index ad148c5f298..7ba4e01d32f 100644
--- a/swedish/consultants/r_w_r.wml
+++ b/swedish/consultants/r_w_r.wml
@@ -1,9 +1,7 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Daily Data, Inc."
+#use wml::debian::translation-check translation="1.2"
-<H1>Daily Data, Inc.</H1>
-<HR>
-<PRE>
+<p>
Vi är en allomfattande firma som hjälper allt från individer till stora
företag med allt från att få igång hembaserade system till webbhotell och
skapa småföretagsnätverk och skriva skräddarsydda program. Vi började med
@@ -12,4 +10,4 @@ kan täcka alla versioner av Linux, Windows, Mac och specialiserar oss på
att integrera nätverk med alla i (vi kan även kasta in en Novellserver om ni
utövar påtryckning och betalar massor av pengar). Om vi inte klarar jobbet
vet vi vem som gör det och skickar er till dem (utan extra kostnad).
-</PRE>
+</p>
diff --git a/swedish/consultants/rafez_n.wml b/swedish/consultants/rafez_n.wml
index 8dfbc6fc513..5f5d468b605 100644
--- a/swedish/consultants/rafez_n.wml
+++ b/swedish/consultants/rafez_n.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
-
-<H1>Gazelle Informatics Ltd</H1>
+#use wml::debian::consultant name="Gazelle Informatics Ltd"
+#use wml::debian::translation-check translation="1.2"
<p>Specialister inom Lotus Domino på Debian</p>
diff --git a/swedish/consultants/samantha_s.wml b/swedish/consultants/samantha_s.wml
index 444ec857cc4..2d18ecb44c5 100644
--- a/swedish/consultants/samantha_s.wml
+++ b/swedish/consultants/samantha_s.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.3"
+#use wml::debian::consultant name="Femtech"
+#use wml::debian::translation-check translation="1.4"
-<h1>Femtech</h1>
-<hr>
<ul>
<li>Lösningar för Internetleverantörer</li>
<li>Företagslösningar</li>
diff --git a/swedish/consultants/sergio_a.wml b/swedish/consultants/sergio_a.wml
index 37be0b0bd9e..866fb9d42f9 100644
--- a/swedish/consultants/sergio_a.wml
+++ b/swedish/consultants/sergio_a.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Sergio Arias"
+#use wml::debian::translation-check translation="1.2"
-<H1>Sergio Arias</H1>
-<HR>
-<PRE>
+<p>
utvecklar för flera ändamål
-</PRE>
+</p>
diff --git a/swedish/consultants/shannon_d.wml b/swedish/consultants/shannon_d.wml
index 0a9fcad4f94..54fe56a5f85 100644
--- a/swedish/consultants/shannon_d.wml
+++ b/swedish/consultants/shannon_d.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
-
-<h1>DeaTech Research Inc.</h1>
+#use wml::debian::consultant name="DeaTech Research Inc."
+#use wml::debian::translation-check translation="1.3"
<p>
Specialister på realtidssystem, drivrutiner och inbyggda system.
@@ -11,7 +9,9 @@ Elva års Linuxerfarenhet (huvudsakligen Debian), sjutton års Unixerfarenhet.
BS i Computer Science, 22 års yrkeserfarenhet, 17 med eget företag.
För mer detaljerad information besök webbplatsen på
<a href="http://www.deatech.com/">www.deatech.com</a>
+</p>
<p>
Referera till Debians webbplats och fem procent av intäkterna från avgifter för
arbetstid från ditt projekt kommer att doneras till Debian.
+</p>
diff --git a/swedish/consultants/sosa.wml b/swedish/consultants/sosa.wml
index 0d4ca8e22a7..a723d285b35 100644
--- a/swedish/consultants/sosa.wml
+++ b/swedish/consultants/sosa.wml
@@ -1,8 +1,6 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="Corporación Sosa &amp; Sosa C.A."
+#use wml::debian::translation-check translation="1.3"
-<H1>Corporación Sosa &amp; Sosa C.A.</H1>
-<HR>
-<PRE>
+<p>
OS, nätverk och säkerhet.
-</PRE>
+</p>
diff --git a/swedish/consultants/steve_l.wml b/swedish/consultants/steve_l.wml
index 04455788702..8ce9411f7a9 100644
--- a/swedish/consultants/steve_l.wml
+++ b/swedish/consultants/steve_l.wml
@@ -1,13 +1,11 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="David Goodenough &amp; Associates Limited (DGA)"
+#use wml::debian::translation-check translation="1.2"
-<H1>David Goodenough &amp; Associates Limited (DGA)</H1>
-<HR>
-<PRE>
+<p>
Ytterligare information: DGA specialiserar sig på konnektivitet och har
beskrivits som "tillverkare av tekniskt klister". Vi har erfarenheter av
företagssystem och har i stor utsträckning jobbat med Lotus Domino, Websphere
och Tomcatwebbservrar och Javaprogrammering. Vi arbetar även med
företags-e-postsystem, bygga broar mellan existerande och SMTP-system och
migreringar.
-</PRE>
+</p>
diff --git a/swedish/consultants/stuart_t.wml b/swedish/consultants/stuart_t.wml
index 713d715267f..26e56bc29a9 100644
--- a/swedish/consultants/stuart_t.wml
+++ b/swedish/consultants/stuart_t.wml
@@ -1,6 +1,4 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Linux Labs"
+#use wml::debian::translation-check translation="1.2"
-<h1>Linux Labs</h1>
-
-<p>LinuxBIOS- och klusterspecialister
+<p>LinuxBIOS- och klusterspecialister</p>
diff --git a/swedish/consultants/ted_j.wml b/swedish/consultants/ted_j.wml
index 9623e966f78..a711e914931 100644
--- a/swedish/consultants/ted_j.wml
+++ b/swedish/consultants/ted_j.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
-
-<h1>JordanTeam IT Training</h1>
+#use wml::debian::consultant name="JordanTeam IT Training"
+#use wml::debian::translation-check translation="1.3"
<p>
Specialiserar på utbildning inom Unix, Linux och Solaris.
diff --git a/swedish/consultants/tim_o.wml b/swedish/consultants/tim_o.wml
index 50ae6b678a3..1fd2e549aff 100644
--- a/swedish/consultants/tim_o.wml
+++ b/swedish/consultants/tim_o.wml
@@ -1,16 +1,16 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::consultant name="OASys Engineering"
+#use wml::debian::translation-check translation="1.3"
-<H1>OASys Engineering</H1>
-<HR>
-<PRE>
+<p>
Ytterligare information: OASys specialiserar sig på att tillhandahålla alla
datorbehov för små och mellanstora företag. Vi rekommenderar kombinationen av
Debian Linux och Samba framför Windows NT-server på grund av Debians stabilitet,
robusta utförande och frånvaro från licenshuvudvärk. Dessutom betjänar vi de
flesta Unixvarianter såväl som Windows 95, 98 och NT.
+</p>
+<p>
OASys tillhandahåller även utbildning och grundläggande administreringskurser
enligt önskemål/speciella arrangemang.
-</PRE>
+</p>
diff --git a/swedish/consultants/toni_m.wml b/swedish/consultants/toni_m.wml
index 9da419eb0c2..fe8bad71837 100644
--- a/swedish/consultants/toni_m.wml
+++ b/swedish/consultants/toni_m.wml
@@ -1,18 +1,20 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
+#use wml::debian::consultant name="Oeko.neT"
+#use wml::debian::translation-check translation="1.2"
-<H1>Oeko.neT</H1>
-<HR>
-<PRE>
+<p>
Toni har universitetsexamen i datavetenskap (Dipl.-Inf.) och har nu ett
tiotal års erfarenhet som konsult inom nätverkstjänster. Kunder stora som
PLC:er uppskattar även de projekt som är funktionella, i tid och enligt
budget.
+</p>
+<p>
Jag burkar specificera, formge och implementera mot en robust, skalbar och
säker lösning som kan hantera den förväntade lasten om kunden godtar det,
kanske på grund av min bakgrund som ISP.
+</p>
+<p>
Tillgänglig för uppgifter i andra länder, beroende på detaljerna. Vi
tillhandahåller värdtjänster för Debian, både hanterade och ohanterade.
-</PRE>
+</p>
diff --git a/swedish/consultants/vivek_k.wml b/swedish/consultants/vivek_k.wml
index 40dcc2dbf38..1d1d212b68c 100644
--- a/swedish/consultants/vivek_k.wml
+++ b/swedish/consultants/vivek_k.wml
@@ -1,7 +1,5 @@
-#use wml::debian::consultant
-#use wml::debian::translation-check translation="1.1"
-
-<h1>Vivek Kumar</h1>
+#use wml::debian::consultant name="Vivek Kumar"
+#use wml::debian::translation-check translation="1.2"
<p>
Specialiserar sig på att utveckla drivrutiner och startkod.

© 2014-2024 Faster IT GmbH | imprint | privacy policy