diff options
| author | David Prévot <taffit> | 2011-12-31 22:39:18 +0000 |
|---|---|---|
| committer | David Prévot <taffit> | 2011-12-31 22:39:18 +0000 |
| commit | 816a6188d128ae1cd473d4ce2b80a6d44e089aef (patch) | |
| tree | a5bfbdf153609154e032308b8559386882e0bc70 | |
| parent | 39394c98984567a135b931b294f4ee9df3cb995e (diff) | |
Handle and translate countries with isoquery (and add a count of vendors)
CVS version numbers
bulgarian/distrib/pre-installed.wml: 1.21 -> 1.22
catalan/distrib/pre-installed.wml: 1.9 -> 1.10
chinese/distrib/pre-installed.wml: 1.11 -> 1.12
croatian/distrib/pre-installed.wml: 1.16 -> 1.17
czech/distrib/pre-installed.wml: 1.8 -> 1.9
danish/distrib/pre-installed.wml: 1.30 -> 1.31
dutch/distrib/pre-installed.wml: 1.26 -> 1.27
english/distrib/Makefile: 1.45 -> 1.46
english/distrib/count: INITIAL -> 1.1
english/distrib/pre-installed.wml: 1.38 -> 1.39
finnish/distrib/pre-installed.wml: 1.28 -> 1.29
french/distrib/pre-installed.wml: 1.29 -> 1.30
german/distrib/pre-installed.wml: 1.33 -> 1.34
greek/distrib/pre-installed.wml: 1.17 -> 1.18
hungarian/distrib/pre-installed.wml: 1.8 -> 1.9
italian/distrib/pre-installed.wml: 1.32 -> 1.33
japanese/distrib/pre-installed.wml: 1.26 -> 1.27
norwegian/distrib/pre-installed.wml: 1.16 -> 1.17
polish/distrib/pre-installed.wml: 1.25 -> 1.26
portuguese/distrib/pre-installed.wml: 1.19 -> 1.20
romanian/distrib/pre-installed.wml: 1.21 -> 1.22
russian/distrib/pre-installed.wml: 1.17 -> 1.18
slovak/distrib/pre-installed.wml: 1.12 -> 1.13
spanish/distrib/pre-installed.wml: 1.15 -> 1.16
swedish/distrib/pre-installed.wml: 1.26 -> 1.27
ukrainian/distrib/pre-installed.wml: 1.9 -> 1.10
26 files changed, 195 insertions, 529 deletions
diff --git a/bulgarian/distrib/pre-installed.wml b/bulgarian/distrib/pre-installed.wml index 3305f0bd5c6..9196ac91058 100644 --- a/bulgarian/distrib/pre-installed.wml +++ b/bulgarian/distrib/pre-installed.wml @@ -1,32 +1,11 @@ #use wml::debian::template title="Доставчици на компютри с Дебиан" GEN_TIME="yes" -#use wml::debian::translation-check translation="1.38" +#use wml::debian::translation-check translation="1.39" #use wml::debian::countries +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" -<a href="#au"><AUc></a> -<a href="#ar"><ARc></a> -<a href="#at"><ATc></a> -<a href="#be"><BEc></a> -<a href="br"><BRc></a> -<a href="#de"><DEc></a> -#<a href="#gr"><GRc></a>   -<a href="#dk"><DKc></a> -<a href="#in"><INc></a> -<a href="#es"><ESc></a> -<a href="#it"><ITc></a> -<a href="#ca"><CAc></a> -<a href="#mx"><MXc></a> -<a href="#uk"><UKc></a> -<a href="#pl"><PLc></a> -#<a href="#ro"><ROc></a> -<a href="#sk"><SKc></a> -<a href="#us"><USc></a> -<a href="#hu"><HUc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -<a href="#nl"><NLc></a> -<a href="#ch"><CHc></a> -<a href="#za"><ZAc></a> - +<p> +<country-list vendors <list_country>> +</p> <p>Фирмите, описани по-долу предлагат компютри с Дебиан. Освен, че спестява времето за инсталиране на операционната система, този diff --git a/catalan/distrib/pre-installed.wml b/catalan/distrib/pre-installed.wml index a73c4b2febf..af1e28cc997 100644 --- a/catalan/distrib/pre-installed.wml +++ b/catalan/distrib/pre-installed.wml @@ -1,22 +1,11 @@ #use wml::debian::template title="Venedors d'ordinadors que preinstal·len Debian" GEN_TIME="yes" #use wml::debian::countries -#use wml::debian::translation-check translation="1.20" maintainer="Guillem Jover" - -<a href="#au"><AUc></a> -<a href="#at"><ATc></a> -<a href="#be"><BEc></a> -#<a href="br"><BRc></a> -<a href="#ca"><CAc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -<a href="#de"><DEc></a> -#<a href="#gr"><GRc></a>   -<a href="#hu"><HUc></a> -<a href="#it"><ITc></a> -<a href="#mx"><MXc></a> -<a href="#es"><ESc></a> - -<a href="#us"><USc></a> +#use wml::debian::translation-check translation="1.39" maintainer="Guillem Jover" +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" + +<p> +<country-list vendors <list_country>> +</p> <p>Les companyies llistades en aquesta pàgina preinstal·laràn Debian al vostre sistema Debian. A banda d'estalviar-vos el temps d'instal·lar-vos diff --git a/chinese/distrib/pre-installed.wml b/chinese/distrib/pre-installed.wml index 41a14e9cd84..0cbde693c20 100644 --- a/chinese/distrib/pre-installed.wml +++ b/chinese/distrib/pre-installed.wml @@ -1,26 +1,16 @@ #use wml::debian::template title="預先安裝 Debian 的電腦販售商" GEN_TIME="yes" #use wml::debian::countries -#use wml::debian::translation-check translation="1.20" maintainer="Kanru Chen" +#use wml::debian::translation-check translation="1.39" maintainer="Kanru Chen" # $Id$ # Translator: Franklin <franklin@goodhorse.idv.tw>, 2002/11/24 # Checked by foka, 2002/11/25 -<a href="#au"><AUc></a> -<a href="#at"><ATc></a> -<a href="#be"><BEc></a> -#<a href="br"><BRc></a> -<a href="#ca"><CAc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -<a href="#de"><DEc></a> -#<a href="#gr"><GRc></a>   -<a href="#hu"><HUc></a> -<a href="#it"><ITc></a> -<a href="#mx"><MXc></a> -<a href="#es"><ESc></a> +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" -<a href="#us"><USc></a> +<p> +<country-list vendors <list_country>> +</p> #<p>The companies listed on this page will pre-install Debian on your #system. Besides saving you the time of installing the OS yourself, diff --git a/croatian/distrib/pre-installed.wml b/croatian/distrib/pre-installed.wml index 4f40db7d4ee..d708c4ec291 100644 --- a/croatian/distrib/pre-installed.wml +++ b/croatian/distrib/pre-installed.wml @@ -1,22 +1,11 @@ #use wml::debian::template title="Računalne tvrtke koje predinstaliraju Debian" GEN_TIME="yes" #use wml::debian::countries -#use wml::debian::translation-check translation="1.20" - -<a href="#au"><AUc></a> -<a href="#at"><ATc></a> -<a href="#be"><BEc></a> -#<a href="br"><BRc></a> -<a href="#ca"><CAc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -<a href="#de"><DEc></a> -#<a href="#gr"><GRc></a>   -<a href="#hu"><HUc></a> -<a href="#it"><ITc></a> -<a href="#mx"><MXc></a> -<a href="#es"><ESc></a> - -<a href="#us"><USc></a> +#use wml::debian::translation-check translation="1.39" +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" + +<p> +<country-list vendors <list_country>> +</p> <p>Dolje navedene tvrtke će predinstalirati Debian na vaš sustav. Osim što će vam uštediti vrijeme instaliranja OS-a, također nećete morati kupovati diff --git a/czech/distrib/pre-installed.wml b/czech/distrib/pre-installed.wml index 7ed2fe3ba52..5ec64f3684b 100644 --- a/czech/distrib/pre-installed.wml +++ b/czech/distrib/pre-installed.wml @@ -1,22 +1,11 @@ #use wml::debian::template title="Prodejci pota s pedinstalovanm Debianem" GEN_TIME="yes" #use wml::debian::countries -#use wml::debian::translation-check translation="1.20" maintainer="Michal Simunek" - -<a href="#au"><AUc></a> -<a href="#be"><BEc></a> -#<a href="br"><BRc></a> -<a href="#ca"><CAc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -<a href="#de"><DEc></a> -#<a href="#gr"><GRc></a> -<a href="#hu"><HUc></a> -<a href="#it"><ITc></a> -<a href="#mx"><MXc></a> -<a href="#at"><ATc></a> -<a href="#es"><ESc></a> - -<a href="#us"><USc></a> +#use wml::debian::translation-check translation="1.39" maintainer="Michal Simunek" +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" + +<p> +<country-list vendors <list_country>> +</p> <p>Firmy uveden na tto strnce dodvaj potae s pedinstalovanm Debianem. Krom toho, e uette as s instalovnm operanho systmu, uette tak penze diff --git a/danish/distrib/pre-installed.wml b/danish/distrib/pre-installed.wml index 6c74177d5bc..bc76eb55059 100644 --- a/danish/distrib/pre-installed.wml +++ b/danish/distrib/pre-installed.wml @@ -1,36 +1,11 @@ #use wml::debian::template title="Edb-forhandlere som præ-installerer Debian" GEN_TIME="yes" -#use wml::debian::translation-check translation="1.38" +#use wml::debian::translation-check translation="1.39" #use wml::debian::countries +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" -# Note: These links are sorted after their full Danish name, -# _not_ the abbreviation nor the English or local name - -<a href="#ar"><ARc></a> -<a href="#au"><AUc></a> -<a href="#be"><BEc></a> -<a href="#br"><BRc></a> -<a href="#ca"><CAc></a> -<a href="#cr"><CRc></a> -<a href="#dk"><DKc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -#<a href="#gr"><GRc></a> -<a href="#nl"><NLc></a> -<a href="#in"><INc></a> -<a href="#it"><ITc></a> -<a href="#mx"><MXc></a> -<a href="#pl"><PLc></a> -#<a href="#ro"><ROc></a> -<a href="#ch"><CHc></a> -<a href="#sk"><SKc></a> -<a href="#es"><ESc></a> -<a href="#uk"><UKc></a> -<a href="#za"><ZAc></a> -<a href="#cz"><CZc></a> -<a href="#de"><DEc></a> -<a href="#hu"><HUc></a> -<a href="#us"><USc></a> -<a href="#at"><ATc></a> +<p> +<country-list vendors <list_country>> +</p> <p>Firmaerne nedenfor kan præ-installere Debian på dit system. Foruden at du sparer tid ved ikke selv at skulle installere styresystemet, diff --git a/dutch/distrib/pre-installed.wml b/dutch/distrib/pre-installed.wml index 865afc55ec7..cdb2d819eb9 100644 --- a/dutch/distrib/pre-installed.wml +++ b/dutch/distrib/pre-installed.wml @@ -1,36 +1,15 @@ #use wml::debian::template title="Computerverkopers die Debian voorgeïnstalleerd leveren" GEN_TIME="yes" #use wml::debian::countries -#use wml::debian::translation-check translation="1.38" +#use wml::debian::translation-check translation="1.39" # Last Translation Update by: $Author$ # Last Translation Update at: $Date$ -<a href="#ar"><ARc></a> -<a href="#au"><AUc></a> -<a href="#be"><BEc></a> -<a href="#br"><BRc></a> -<a href="#ca"><CAc></a> -<a href="#cr"><CRc></a> -<a href="#dk"><DKc></a> -<a href="#de"><DEc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -#<a href="#gr"><GRc></a> -<a href="#hu"><HUc></a> -<a href="#in"><INc></a> -<a href="#it"><ITc></a> -<a href="#mx"><MXc></a> -<a href="#nl"><NLc></a> -<a href="#at"><ATc></a> -<a href="#pl"><PLc></a> -#<a href="#ro"><ROc></a> -<a href="#sk"><SKc></a> -<a href="#cz"><CZc></a> -<a href="#es"><ESc></a> -<a href="#uk"><UKc></a> -<a href="#us"><USc></a> -<a href="#za"><ZAc></a> -<a href="#ch"><CHc></a> +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" + +<p> +<country-list vendors <list_country>> +</p> <p>De bedrijven die op deze pagina staan vermeld, leveren Debian voorgeïnstalleerd op uw systeem. Behalve de tijd die het u oplevert diff --git a/english/distrib/Makefile b/english/distrib/Makefile index 1b5030c5a17..e8ee37489ea 100644 --- a/english/distrib/Makefile +++ b/english/distrib/Makefile @@ -17,7 +17,7 @@ packages.$(LANGUAGE).html: packages.wml $(TEMPLDIR)/release_info.wml \ $(ENGLISHDIR)/distrib/search_contents-form.inc pre-installed.$(LANGUAGE).html: pre-installed.wml $(TEMPLDIR)/countries.wml \ $(ENGLISHDIR)/distrib/pre-installed.data $(ENGLISHDIR)/CD/vendors/vendors.CD.def \ - $(ENGLISHDIR)/distrib/pre-installed.defs \ + $(ENGLISHDIR)/distrib/pre-installed.defs $(ENGLISHSRCDIR)/distrib/pre-installed.inc index.$(LANGUAGE).html: index.wml \ $(TEMPLDIR)/release_info.wml \ @@ -29,6 +29,9 @@ netinst.$(LANGUAGE).html: netinst.wml \ $(TEMPLDIR)/release_images.wml \ ifeq "$(LANGUAGE)" "en" +$(ENGLISHSRCDIR)/distrib/pre-installed.inc: pre-installed.data count + $(ENGLISHSRCDIR)/distrib/count + clean:: rm -f archive.mirrors archive-nonus.mirrors diff --git a/english/distrib/count b/english/distrib/count new file mode 100755 index 00000000000..03275389ea3 --- /dev/null +++ b/english/distrib/count @@ -0,0 +1,50 @@ +#!/usr/bin/perl +# +# Adapted from CD/vendors/count +# +# Written by: Behan Webster <behanw@pobox.com> +# Hacked By: David Prévot <david@tilapin.org> + +$filename = 'pre-installed.data'; +$comment = '^\s*country="(\w\w)".*$'; + +# Read in file +open( FILE, "<$filename" ) || die "$filename: $!\n"; + +my $buffer = ""; +my $outfile = "pre-installed.inc"; +my $count = 0; +my %country; +my $list =''; + +# Count vendors/countries +while ( <FILE> ) { + chomp; + if( /$comment/ ) { + $count++; + $country{$1}++; + } +} +@_ = keys %country; + +my $number = $#_ + 1; + +close( FILE ); + +# Print results + +foreach ( sort keys %country ) { + printf "%-4d %s\n", $country{$_}, $_; + $list .= "$_-$country{$_} "; +} + +# Report numbers and update file in buffer +print "Number of vendors: $count\n"; +print "Number of countries: $number\n"; +$buffer .= sprintf ("<define-tag total_vendor>%d</define-tag>\n", $count); +$buffer .= sprintf ("<define-tag total_country>%d</define-tag>\n", $number); +$buffer .= sprintf ("<define-tag list_country>%s</define-tag>\n", $list); + +open (FILE, ">$outfile") || die "$outfile: $!\n"; +print FILE $buffer; +close (FILE); diff --git a/english/distrib/pre-installed.wml b/english/distrib/pre-installed.wml index 2c201e971e3..3af8d82257c 100644 --- a/english/distrib/pre-installed.wml +++ b/english/distrib/pre-installed.wml @@ -1,32 +1,10 @@ #use wml::debian::template title="Computer vendors that pre-install Debian" GEN_TIME="yes" #use wml::debian::countries +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" -<a href="#ar"><ARc></a> -<a href="#au"><AUc></a> -<a href="#at"><ATc></a> -<a href="#be"><BEc></a> -<a href="#br"><BRc></a> -<a href="#ca"><CAc></a> -<a href="#cr"><CRc></a> -<a href="#cz"><CZc></a> -<a href="#dk"><DKc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -<a href="#de"><DEc></a> -#<a href="#gr"><GRc></a>   -<a href="#hu"><HUc></a> -<a href="#in"><INc></a> -<a href="#it"><ITc></a> -<a href="#mx"><MXc></a> -<a href="#nl"><NLc></a> -<a href="#pl"><PLc></a> -#<a href="#ro"><ROc></a> -<a href="#sk"><SKc></a> -<a href="#za"><ZAc></a> -<a href="#es"><ESc></a> -<a href="#ch"><CHc></a> -<a href="#uk"><UKc></a> -<a href="#us"><USc></a> +<p> +<country-list vendors <list_country>> +</p> <p>The companies listed on this page will pre-install Debian on your system. Besides saving you the time of installing the OS yourself, diff --git a/finnish/distrib/pre-installed.wml b/finnish/distrib/pre-installed.wml index b3711e3b5b3..bc6ba014b09 100644 --- a/finnish/distrib/pre-installed.wml +++ b/finnish/distrib/pre-installed.wml @@ -1,30 +1,11 @@ #use wml::debian::template title="Debianin esiasentavat tietokonevalmistajat" GEN_TIME="yes" #use wml::debian::countries -#use wml::debian::translation-check translation="1.38" - -<a href="#nl"><NLc></a> -<a href="#ar"><ARc></a> -<a href="#au"><AUc></a> -<a href="#be"><BEc></a> -<a href="#br"><BRc></a> -<a href="#es"><ESc></a> -<a href="#za"><ZAc></a> -<a href="#in"><INc></a> -<a href="#it"><ITc></a> -<a href="#at"><ATc></a> -<a href="#ca"><CAc></a> -#<a href="#gr"><GRc></a> -<a href="#cr"><CRc></a> -<a href="#mx"><MXc></a> -<a href="#pl"><PLc></a> -<a href="#sk"><SKc></a> -<a href="#fr"><FRc></a> -#<a href="#ro"><ROc></a> -<a href="#de"><DEc></a> -<a href="#fi"><FIc></a> -<a href="#dk"><DKc></a> -<a href="#hu"><HUc></a> -<a href="#us"><USc></a> +#use wml::debian::translation-check translation="1.39" +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" + +<p> +<country-list vendors <list_country>> +</p> <p>Tässä luetellut yritykset esiasentavat järjestelmääsi Debianin. Paitsi että säästät ajan, joka kuluu käyttöjärjestelmän asentamiseen diff --git a/french/distrib/pre-installed.wml b/french/distrib/pre-installed.wml index e52b0c152fc..8237dfa04d6 100644 --- a/french/distrib/pre-installed.wml +++ b/french/distrib/pre-installed.wml @@ -1,33 +1,11 @@ #use wml::debian::template title="Revendeurs d'ordinateurs qui préinstallent Debian" GEN_TIME="yes" #use wml::debian::countries -#use wml::debian::translation-check translation="1.38" maintainer="Christian Couder" - -<a href="#za"><ZAc></a> -<a href="#de"><DEc></a> -<a href="#ar"><ARc></a> -<a href="#au"><AUc></a> -<a href="#at"><ATc></a> -<a href="#be"><BEc></a> -<a href="#br"><BRc></a> -<a href="#ca"><CAc></a> -<a href="#ca"><CRc></a> -<a href="#dk"><DKc></a> -<a href="#es"><ESc></a> -<a href="#us"><USc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -#<a href="#gr"><GRc></a>   -<a href="#hu"><HUc></a> -<a href="#in"><INc></a> -<a href="#it"><ITc></a> -<a href="#mx"><MXc></a> -<a href="#nl"><NLc></a> -<a href="#pl"><PLc></a> -#<a href="#ro"><ROc></a> -<a href="#sk"><SKc></a> -<a href="#uk"><UKc></a> -<a href="#ch"><CHc></a> -<a href="#cz"><CZc></a> +#use wml::debian::translation-check translation="1.39" maintainer="Christian Couder" +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" + +<p> +<country-list vendors <list_country>> +</p> <p> Les entreprises indiquées sur cette page préinstalleront Debian sur diff --git a/german/distrib/pre-installed.wml b/german/distrib/pre-installed.wml index b3535cd985e..083bbcbb5e1 100644 --- a/german/distrib/pre-installed.wml +++ b/german/distrib/pre-installed.wml @@ -1,41 +1,15 @@ #use wml::debian::template title="Computer-Händler, die vorinstallierte Debian-Systeme anbieten" GEN_TIME="yes" #use wml::debian::countries -#use wml::debian::translation-check translation="1.38" +#use wml::debian::translation-check translation="1.39" # Translator: Martin Schulze <joey@debian.org> # Updated: Holger Wansing <linux@wansing-online.de>, 2011 # $Id$ -# Translators: -# This list should be sorted with your own language -# country names (similar to ../CD/vendors/index.wml). -# HW +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" -<a href="#ar"><ARc></a> -<a href="#au"><AUc></a> -<a href="#be"><BEc></a> -<a href="#br"><BRc></a> -<a href="#cr"><CRc></a> -<a href="#dk"><DKc></a> -<a href="#de"><DEc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -#<a href="#gr"><GRc></a> -<a href="#in"><INc></a> -<a href="#it"><ITc></a> -<a href="#ca"><CAc></a> -<a href="#mx"><MXc></a> -<a href="#nl"><NLc></a> -<a href="#at"><ATc></a> -<a href="#pl"><PLc></a> -#<a href="#ro"><ROc></a> -<a href="#ch"><CHc></a> -<a href="#sk"><SKc></a> -<a href="#es"><ESc></a> -<a href="#za"><ZAc></a> -<a href="#cz"><CZc></a> -<a href="#hu"><HUc></a> -<a href="#uk"><UKc></a> -<a href="#us"><USc></a> +<p> +<country-list vendors <list_country>> +</p> <p>Die Firmen, die unten aufgezählt sind, installieren Debian auf Ihrem neuen Computer. Abgesehen von der bei der Installation eingesparten diff --git a/greek/distrib/pre-installed.wml b/greek/distrib/pre-installed.wml index 321f4972a86..ff5e878ad90 100644 --- a/greek/distrib/pre-installed.wml +++ b/greek/distrib/pre-installed.wml @@ -1,22 +1,14 @@ #use wml::debian::template title="Εταιρίες που προ-εγκαταστούν το Debian" GEN_TIME="yes" #use wml::debian::countries #use wml::debian::translation-check translation="1.17" maintainer="George Papamichelakis" +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" -<a href="#au"><AUc></a> -<a href="#at"><ATc></a> -<a href="#be"><BEc></a> -#<a href="br"><BRc></a> -<a href="#ca"><CAc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -<a href="#de"><DEc></a> -#<a href="#gr"><GRc></a>   -<a href="#hu"><HUc></a> -<a href="#it"><ITc></a> -<a href="#mx"><MXc></a> -<a href="#es"><ESc></a> - -<a href="#us"><USc></a> +# Translator, please see the following NOTE line 31 +# (and the translation check can then be bumped to 1.39). + +<p> +<country-list vendors <list_country>> +</p> <p>Οι εταιρίες που εμφανίζονται σε αυτή τη σελίδα, μπορούν να παραδώσουν συστήματα με το Debian προ-εγκαταστημένο. Με αυτόν τον τρόπο οχι μόνο @@ -32,10 +24,12 @@ <h2>Πληροφορίες για πωλητές υλικού</h2> + <p> Αν θέλετε να συμπεριληφθείτε σε αυτόν τον κατάλογο, στείλτε μας ενα μήνυμα στο -<a href="mailto:webmaster@debian.org">webmaster@debian.org</a> +# NOTE: please add the translation of <strong>in English</strong> here (keep the strong). +<a href="mailto:preinstallvendors@debian.org">preinstallvendors@debian.org</a> με τα παρακάτω στοιχεία: <ul> diff --git a/hungarian/distrib/pre-installed.wml b/hungarian/distrib/pre-installed.wml index 14b61f13291..6ad77be437a 100644 --- a/hungarian/distrib/pre-installed.wml +++ b/hungarian/distrib/pre-installed.wml @@ -1,23 +1,11 @@ #use wml::debian::template title="Előre telepített Debian-t kínáló kereskedők" GEN_TIME="yes"
#use wml::debian::countries
-#use wml::debian::translation-check translation="1.20" maintainer="Szabolcs Siebenhofer"
-
-
-<a href="#au"><AUc></a>
-<a href="#at"><ATc></a>
-<a href="#be"><BEc></a>
-#<a href="br"><BRc></a>
-<a href="#ca"><CAc></a>
-<a href="#fi"><FIc></a>
-<a href="#fr"><FRc></a>
-<a href="#de"><DEc></a>
-#<a href="#gr"><GRc></a>  
-<a href="#hu"><HUc></a>
-<a href="#it"><ITc></a>
-<a href="#mx"><MXc></a>
-<a href="#es"><ESc></a>
-
-<a href="#us"><USc></a>
+#use wml::debian::translation-check translation="1.39" maintainer="Szabolcs Siebenhofer"
+#include "$(ENGLISHDIR)/distrib/pre-installed.inc"
+
+<p>
+<country-list vendors <list_country>>
+</p>
<p>A lenti listában szereplő cégek előre telepítik a Debian-t a
számítógépeden. Emelett az oprációs rendszer telepítésének idejét is
diff --git a/italian/distrib/pre-installed.wml b/italian/distrib/pre-installed.wml index a12716b5b9e..6e9a7e1b046 100644 --- a/italian/distrib/pre-installed.wml +++ b/italian/distrib/pre-installed.wml @@ -1,32 +1,11 @@ #use wml::debian::template title="Venditori di computer con Debian preinstallato" GEN_TIME="yes" #use wml::debian::countries -#use wml::debian::translation-check translation="1.33" maintainer="Giuseppe Sacco" +#use wml::debian::translation-check translation="1.39" maintainer="Giuseppe Sacco" +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" -<a href="#ar"><ARc></a> -<a href="#au"><AUc></a> -<a href="#at"><ATc></a> -<a href="#be"><BEc></a> -<a href="#br"><BRc></a> -<a href="#ca"><CAc></a> -<a href="#cr"><CRc></a> -<a href="#cz"><CZc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -<a href="#de"><DEc></a> -#<a href="#gr"><GRc></a>   -<a href="#hu"><HUc></a> -<a href="#in"><INc></a> -<a href="#it"><ITc></a> -<a href="#mx"><MXc></a> -<a href="#nl"><NLc></a> -<a href="#pl"><PLc></a> -#<a href="#ro"><ROc></a> -<a href="#sk"><SKc></a> -<a href="#za"><ZAc></a> -<a href="#es"><ESc></a> -<a href="#ch"><CHc></a> -<a href="#uk"><UKc></a> -<a href="#us"><USc></a> +<p> +<country-list vendors <list_country>> +</p> <p>Le seguenti società vendono macchine con Debian preinstallato. Oltre a farti risparmiare il tempo di installare Debian avrai anche il risparmio diff --git a/japanese/distrib/pre-installed.wml b/japanese/distrib/pre-installed.wml index d2bf88c1d8b..6b88bedc0ca 100644 --- a/japanese/distrib/pre-installed.wml +++ b/japanese/distrib/pre-installed.wml @@ -1,33 +1,11 @@ #use wml::debian::template title="Debian をプリインストールしているコンピュータベンダ" GEN_TIME="yes" #use wml::debian::countries -#use wml::debian::translation-check translation="1.33" - -<a href="#us"><USc></a> -<a href="#ar"><ARc></a> -<a href="#uk"><UKc></a> -<a href="#it"><ITc></a> -<a href="#in"><INc></a> -<a href="#at"><ATc></a> -<a href="#au"><AUc></a> -<a href="#nl"><NLc></a> -<a href="#ca"><CAc></a> -#<a href="#gr"><GRc></a> -<a href="#cr"><CRc></a> -<a href="#ch"><CHc></a> -<a href="#es"><ESc></a> -<a href="#sk"><SKc></a> -<a href="#cz"><CZc></a> -<a href="#dk"><DKc></a> -<a href="#de"><DEc></a> -<a href="#hu"><HUc></a> -<a href="#fi"><FIc></a> -<a href="#br"><BRc></a> -<a href="#fr"><FRc></a> -<a href="#be"><BEc></a> -<a href="#pl"><PLc></a> -<a href="#za"><ZAc></a> -<a href="#mx"><MXc></a> -#<a href="#ro"><ROc></a> +#use wml::debian::translation-check translation="1.39" +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" + +<p> +<country-list vendors <list_country>> +</p> <p>このページで紹介されている企業は、自社の製品に Debian をプリインストールしています。 diff --git a/norwegian/distrib/pre-installed.wml b/norwegian/distrib/pre-installed.wml index 9ec7d992f90..0fe91c12f40 100644 --- a/norwegian/distrib/pre-installed.wml +++ b/norwegian/distrib/pre-installed.wml @@ -1,37 +1,13 @@ #use wml::debian::template title="Forhandlere som forhåndsinstallerer Debian" GEN_TIME="yes" #use wml::debian::countries -#use wml::debian::translation-check translation="1.38" maintainer="Hans F. Nordhaug" +#use wml::debian::translation-check translation="1.39" maintainer="Hans F. Nordhaug" # Oversatt til norsk av Hans F. Nordhaug <hansfn@gmail.com> -# Note: These links are sorted after their full Norwegian name, -# _not_ the abbreviation nor the English or local name +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" -<a href="#ar"><ARc></a> -<a href="#au"><AUc></a> -<a href="#be"><BEc></a> -<a href="br"><BRc></a> -<a href="#ca"><CAc></a> -<a href="#cr"><CRc></a> -<a href="#dk"><DKc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -#<a href="#gr"><GRc></a> -<a href="#in"><INc></a> -<a href="#it"><ITc></a> -<a href="#mx"><MXc></a> -<a href="#nl"><NLc></a> -<a href="#pl"><PLc></a> -#<a href="#ro"><ROc></a> -<a href="#sk"><SKc></a> -<a href="#es"><ESc></a> -<a href="#uk"><UKc></a> -<a href="#ch"><CHc></a> -<a href="#za"><ZAc></a> -<a href="#cz"><CZc></a> -<a href="#de"><DEc></a> -<a href="#hu"><HUc></a> -<a href="#us"><USc></a> -<a href="#at"><ATc></a> +<p> +<country-list vendors <list_country>> +</p> <p> Firmaene nedenfor kan forhåndsinstallere Debian på ditt system. diff --git a/polish/distrib/pre-installed.wml b/polish/distrib/pre-installed.wml index 5ba478cfe76..7088c441ae3 100644 --- a/polish/distrib/pre-installed.wml +++ b/polish/distrib/pre-installed.wml @@ -1,33 +1,12 @@ #use wml::debian::template title="Sprzedawcy komputerów z zainstalowanym Debianem" GEN_TIME="yes" #use wml::debian::countries -#use wml::debian::translation-check translation="1.38" - -<a href="#ar"><ARc></a> -<a href="#au"><AUc></a> -<a href="#at"><ATc></a> -<a href="#be"><BEc></a> -<a href="#br"><BRc></a> -<a href="#cr"><CRc></a> -<a href="#cz"><CZc></a> -<a href="#dk"><DKc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -#<a href="#gr"><GRc></a>   -# Hiszpania -<a href="#es"><ESc></a> -<a href="#in"><INc></a> -# Kanada -<a href="#ca"><CAc></a> -<a href="#mx"><MXc></a> -# Niemcy -<a href="#de"><DEc></a> -# Stany Zjednoczone -<a href="#us"><USc></a> -# Węgry -<a href="#hu"><HUc></a> -# Włochy -<a href="#it"><ITc></a> +#use wml::debian::translation-check translation="1.39" +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" + +<p> +<country-list vendors <list_country>> +</p> <p>Firmy wymienione na tej stronie pre-instalują Debiana na sprzedawanych przez siebie komputerach. Możesz dzięki temu zaoszczędzić czas i pieniądze, ponieważ diff --git a/portuguese/distrib/pre-installed.wml b/portuguese/distrib/pre-installed.wml index 1c85ad0fc85..aec59a285bd 100644 --- a/portuguese/distrib/pre-installed.wml +++ b/portuguese/distrib/pre-installed.wml @@ -1,21 +1,11 @@ #use wml::debian::template title="Vendedores de Computador que pré-instalam o Debian" GEN_TIME="yes" #use wml::debian::countries -#use wml::debian::translation-check translation="1.20" translation_maintainer="Felipe Augusto van de Wiel (faw)" - -<a href="#de"><DEc></a> -<a href="#au"><AUc></a> -<a href="#at"><ATc></a> -<a href="#be"><BEc></a> -#<a href="br"><BRc></a> -<a href="#ca"><CAc></a> -<a href="#es"><ESc></a> -<a href="#us"><USc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -#<a href="#gr"><GRc></a>   -<a href="#hu"><HUc></a> -<a href="#it"><ITc></a> -<a href="#mx"><MXc></a> +#use wml::debian::translation-check translation="1.39" translation_maintainer="Felipe Augusto van de Wiel (faw)" +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" + +<p> +<country-list vendors <list_country>> +</p> <p>As empresas listadas nesta página pré-instalarão o Debian no seu diff --git a/romanian/distrib/pre-installed.wml b/romanian/distrib/pre-installed.wml index 35f1f050df5..af865d36dd2 100644 --- a/romanian/distrib/pre-installed.wml +++ b/romanian/distrib/pre-installed.wml @@ -1,21 +1,10 @@ -#use wml::debian::translation-check translation="1.20" +#use wml::debian::translation-check translation="1.39" #use wml::debian::template title="Distribuitori de computere cu Debian preinstalat" GEN_TIME="yes" +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" -<a href="#au"><AUc></a> -<a href="#at"><ATc></a> -<a href="#be"><BEc></a> -#<a href="br"><BRc></a> -<a href="#ca"><CAc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -<a href="#de"><DEc></a> -#<a href="#gr"><GRc></a>   -<a href="#hu"><HUc></a> -<a href="#it"><ITc></a> -<a href="#mx"><MXc></a> -<a href="#es"><ESc></a> - -<a href="#us"><USc></a> +<p> +<country-list vendors <list_country>> +</p> <p>Companiile listate în această pagină vor preinstala Debian pe sistemul dumneavostră. Pe lângă faptul că veți economisi timpul necesar diff --git a/russian/distrib/pre-installed.wml b/russian/distrib/pre-installed.wml index 5c22f63734b..569c43a562a 100644 --- a/russian/distrib/pre-installed.wml +++ b/russian/distrib/pre-installed.wml @@ -1,22 +1,11 @@ #use wml::debian::template title="Продавцы компьютеров, предустанавливающие Debian" GEN_TIME="yes" #use wml::debian::countries -#use wml::debian::translation-check translation="1.20" - -<a href="#au"><AUc></a> -<a href="#at"><ATc></a> -<a href="#be"><BEc></a> -#<a href="br"><BRc></a> -<a href="#ca"><CAc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -<a href="#de"><DEc></a> -#<a href="#gr"><GRc></a>   -<a href="#hu"><HUc></a> -<a href="#it"><ITc></a> -<a href="#mx"><MXc></a> -<a href="#es"><ESc></a> - -<a href="#us"><USc></a> +#use wml::debian::translation-check translation="1.39" +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" + +<p> +<country-list vendors <list_country>> +</p> <p>Компании, перечисленные на этой странице, предустановят Debian на вашу систему. Кроме того, что это сохранит вам время, потраченное на самостоятельную diff --git a/slovak/distrib/pre-installed.wml b/slovak/distrib/pre-installed.wml index 06ff7eb1313..b0636232c72 100644 --- a/slovak/distrib/pre-installed.wml +++ b/slovak/distrib/pre-installed.wml @@ -1,32 +1,11 @@ #use wml::debian::template title="Predajcovia počítačov s predinštalovaným Debianon" GEN_TIME="yes" #use wml::debian::countries -#use wml::debian::translation-check translation="1.38" maintainer="Slavko" -<a href="#ar"><ARc></a> -<a href="#au"><AUc></a> -<a href="#be"><BEc></a> -<a href="#br"><BRc></a> -<a href="#ca"><CAc></a> -<a href="#cr"><CRc></a> -<a href="#cz"><CZc></a> -<a href="#dk"><DKc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -<a href="#de"><DEc></a> -#<a href="#gr"><GRc></a> -<a href="#hu"><HUc></a> -<a href="#in"><INc></a> -<a href="#it"><ITc></a> -<a href="#mx"><MXc></a> -<a href="#nl"><NLc></a> -<a href="#pl"><PLc></a> -#<a href="#ro"><ROc></a> -<a href="#at"><ATc></a> -<a href="#sk"><SKc></a> -<a href="#za"><ZAc></a> -<a href="#es"><ESc></a> -<a href="#ch"><CHc></a> -<a href="#uk"><UKc></a> -<a href="#us"><USc></a> +#use wml::debian::translation-check translation="1.39" maintainer="Slavko" +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" + +<p> +<country-list vendors <list_country>> +</p> <p>Spoločnosti uvedené na tejto stránke dodávajú počítače s nainštalovaným Debianom. Okrem toho, že ušetríte čas s inštaláciou operačného systému, diff --git a/spanish/distrib/pre-installed.wml b/spanish/distrib/pre-installed.wml index 5608d630632..071d9aa534f 100644 --- a/spanish/distrib/pre-installed.wml +++ b/spanish/distrib/pre-installed.wml @@ -1,22 +1,14 @@ #use wml::debian::template title="Vendedores de ordenadores que preinstalan Debian" GEN_TIME="yes" #use wml::debian::translation-check translation="1.17" maintainer="David Moreno Garza" #use wml::debian::countries +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" -<a href="#au"><AUc></a> -<a href="#at"><ATc></a> -<a href="#be"><BEc></a> -#<a href="br"><BRc></a> -<a href="#ca"><CAc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -<a href="#de"><DEc></a> -#<a href="#gr"><GRc></a>   -<a href="#hu"><HUc></a> -<a href="#it"><ITc></a> -<a href="#mx"><MXc></a> -<a href="#es"><ESc></a> - -<a href="#us"><USc></a> +# Translator, please see the following NOTE line 29 +# (and the translation check can then be bumped to 1.39). + +<p> +<country-list vendors <list_country>> +</p> <p>Las compañías que se listan en ésta página le preinstalarán Debian en su sistema. Además de ahorrarle tiempo al instalarle el @@ -34,7 +26,8 @@ comprar.</p> <p> Si desea aparecer en el listado de esta página, envíe un correo a -<a href="mailto:webmaster@debian.org">webmaster@debian.org</a> +# NOTE: please add the translation of <strong>in English</strong> here (keep the strong). +<a href="mailto:preinstallvendors@debian.org">preinstallvendors@debian.org</a> proporcionando la siguiente información: <ul> diff --git a/swedish/distrib/pre-installed.wml b/swedish/distrib/pre-installed.wml index fad3f09e959..d246077bcaa 100644 --- a/swedish/distrib/pre-installed.wml +++ b/swedish/distrib/pre-installed.wml @@ -1,23 +1,11 @@ -#use wml::debian::translation-check translation="1.20" +#use wml::debian::translation-check translation="1.39" #use wml::debian::template title="Datorföretag som förinstallerar Debian" GEN_TIME="yes" #use wml::debian::countries +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" -<a href="#au"><AUc></a> - -<a href="#be"><BEc></a> -<a href="#dk"><DKc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> -<a href="#us"><USc></a> -#<a href="#gr"><GRc></a> -<a href="#it"><ITc></a> -<a href="#mx"><MXc></a> -<a href="#es"><ESc></a> -<a href="#ca"><CAc></a> - -<a href="#de"><DEc></a> -<a href="#hu"><HUc></a> -<a href="#at"><ATc></a> +<p> +<country-list vendors <list_country>> +</p> <p>Företagen som listas på denna sidan förinstallerar Debian på ditt datorsystem. diff --git a/ukrainian/distrib/pre-installed.wml b/ukrainian/distrib/pre-installed.wml index f9775bbec56..7f32361223d 100644 --- a/ukrainian/distrib/pre-installed.wml +++ b/ukrainian/distrib/pre-installed.wml @@ -1,21 +1,11 @@ #use wml::debian::template title="Постачальники комп'ютерів що передвстановлюють Debian" GEN_TIME="yes" #use wml::debian::countries -#use wml::debian::translation-check translation="1.20" maintainer="Borys Yanovych" - -<a href="#au"><AUc></a> -<a href="#at"><ATc></a> -<a href="#be"><BEc></a> -#<a href="br"><BRc></a> -#<a href="#gr"><GRc></a>   -<a href="#es"><ESc></a> -<a href="#it"><ITc></a> -<a href="#ca"><CAc></a> -<a href="#mx"><MXc></a> -<a href="#de"><DEc></a> -<a href="#us"><USc></a> -<a href="#hu"><HUc></a> -<a href="#fi"><FIc></a> -<a href="#fr"><FRc></a> +#use wml::debian::translation-check translation="1.39" maintainer="Borys Yanovych" +#include "$(ENGLISHDIR)/distrib/pre-installed.inc" + +<p> +<country-list vendors <list_country>> +</p> <p>Компанії, список яких наведено на цій сторінці, передвстановлюють Debian на |