Replace english/template/debian/ by po/template/debian/

Replace english/ports/ files containing slices by the ones under
po/ports/

CVS version numbers

.wmlrc: 1.3 -> 1.4 
english/po/Makefile: 1.3 -> 1.4 
english/po/README: 1.2 -> 1.3 
english/ports/menu.defs: 1.8 -> 1.9 
english/ports/alpha/menu.inc: 1.8 -> 1.9 
english/ports/arm/menu.inc: 1.12 -> 1.13 
english/ports/beowulf/menu.inc: 1.11 -> 1.12 
english/ports/hppa/menu.inc: 1.12 -> 1.13 
english/ports/hurd/menu.inc: 1.12 -> 1.13 
english/ports/ia64/menu.inc: 1.12 -> 1.13 
english/ports/m68k/menu.inc: 1.7 -> 1.8 
english/ports/mips/cpu.data: 1.10 -> 1.11 
english/ports/mips/menu.inc: 1.12 -> 1.13 
english/ports/netbsd/menu.inc: 1.5 -> 1.6 
english/ports/powerpc/menu.inc: 1.16 -> 1.17 
english/ports/s390/menu.inc: 1.11 -> 1.12 
english/ports/sparc/menu.inc: 1.14 -> 1.15 
english/ports/sparc64/menu.inc: 1.10 -> 1.11 
english/template/debian/cdimage.wml: 1.46 -> 1.47 
english/template/debian/common_tags.wml: 1.2 -> 1.3 
english/template/debian/common_translation.wml: 1.160 -> 1.161 
english/template/debian/consultant.wml: 1.51 -> 1.52 
english/template/debian/countries.wml: 1.167 -> 1.168 
english/template/debian/ddp.wml: 1.40 -> 1.41 
english/template/debian/events_common.wml: 1.30 -> 1.31 
english/template/debian/fixes_link.wml: 1.53 -> 1.54 
english/template/debian/footer.wml: 1.100 -> 1.101 
english/template/debian/languages.wml: 1.114 -> 1.115 
english/template/debian/links.tags.wml: 1.122 -> 1.123 
english/template/debian/mirrors.wml: 1.33 -> 1.34 
english/template/debian/news.wml: 1.52 -> 1.53 
english/template/debian/recent_list.wml: 1.100 -> 1.101 
english/template/debian/security_tags.wml: 1.39 -> 1.40 
english/template/debian/todoitem.wml: 1.13 -> 1.14 
english/template/debian/translation-check.wml: 1.71 -> 1.72 
english/template/debian/url.wml: 1.3 -> 1.4 
english/template/debian/votebar.wml: 1.94 -> 1.95 
english/template/debian/weeklynews/footer.wml: 1.71 -> 1.72

1 files changed, 51 insertions, 230 deletions

diff --git a/english/template/debian/cdimage.wml b/english/template/debian/cdimage.wml
index 01becd40745..8ad83b9aecd 100644
--- a/english/template/debian/cdimage.wml
+++ b/english/template/debian/cdimage.wml
@@ -4,236 +4,57 @@
 #use wml::debian::links.tags
 
 # note: only change the sep(arator) if it's not good for your charset
-<define-tag-sliced sep whitespace=delete>
-  [EN:&middot;:]
-  [JA:¡¦:]
-</define-tag-sliced>
-<define-tag-sliced dc_faq whitespace=delete>
-  [EN:faq:]
-  [DA:OSS:]
-  [DE:FAQ:]
-  [FI:VUKK:]
-  [FR:faq:]
-  [IT:FAQ:]
-  [JA:FAQ:]
-  [LT:DUK:]
-  [NO:OSS:]
-  [PL:FAQ:]
-  [RO:FAQ:]
-  [RU:FAQ:]
-  [SV:OSF:]
-</define-tag-sliced>
-<define-tag-sliced dc_jigdo whitespace=delete>
-  [EN:download with jigdo:]
-  [DA:hent med jigdo:]
-  [DE:mit jigdo herunterladen:]
-  [FI:hae jigdolla:]
-  [FR:télécharger avec jigdo:]
-  [HR:download jigdom:]
-  [IT:scarica tramite jigdo:]
-  [JA:jigdo ¤ò»È¤Ã¤¿¥À¥¦¥ó¥í¡¼¥É:]
-  [LT:parsisiøsti su jigdo:]
-  [NO:hent med jigdo:]
-  [PL:pobierz przy pomocy jigdo:]
-  [RU:úÁÇÒÕÚÉÔØ Ó ÐÏÍÏÝØÀ jigdo:]
-  [RO:descãrcare cu jigdo:]
-  [SV:hämta med jigdo:]
-</define-tag-sliced>
-<define-tag-sliced dc_httpftp whitespace=delete>
-  [EN:download via http/ftp:]
-  [DA:hent via http/ftp:]
-  [DE:über http/ftp herunterladen:]
-  [FI:hae http/ftp:llä:]
-  [FR:télécharger par http/ftp:]
-  [HR:download HTTP-om/FTP-om:]
-  [IT:scarica via http/ftp:]
-  [JA:http/ftp ·Ðͳ¤Î¥À¥¦¥ó¥í¡¼¥É:]
-  [LT:parsisiøsti http/ftp protokolais:]
-  [NO:hent via http/ftp:]
-  [PL:pobierz przez HTTP/FTP:]
-  [RO:descãrcare prin http/ftp:]
-  [RU:úÁÇÒÕÚÉÔØ ÐÏ HTTP/FTP:]
-  [SV:hämta via http/ftp:]
-</define-tag-sliced>
-<define-tag-sliced dc_buy whitespace=delete>
-  [EN:buy pre-made images:]
-  [DA:køb færdige cd-aftryk:]
-  [DE:vorgefertigte Images kaufen:]
-  [FI:osta valmiit romput:]
-  [FR:acheter des images prêtes:]
-  [HR:kupi napravljene snimke:]
-  [IT:compra immagini già fatte:]
-  [JA:½ÐÍè¹ç¤¤¤Î CD ¤òÇ㤦:]
-  [LT:nusipirkti paruoðtas cd kopijas:]
-  [NO:kjøp ferdige cd-avtrykk:]
-  [PL:kup gotowe obrazy:]
-  [RO:cumpãraþi imagini pre-alcãtuite:]
-  [RU:ëÕÐÉÔØ ÇÏÔÏ×ÙÅ ÄÉÓËÉ:]
-  [SV:köp färdigtryckta cd:]
-</define-tag-sliced>
-<define-tag-sliced dc_net whitespace=delete>
-  [EN:network install:]
-  [DA:netværksinstallering:]
-  [DE:Netzwerk-Installation:]
-  [FI:verkkoasennus:]
-  [FR:installer par le réseau:]
-  [HR:mre¾na instalacija:]
-  [IT:istallazione via rete:]
-  [JA:¥Í¥Ã¥È¥ï¡¼¥¯·Ðͳ¤Î¥¤¥ó¥¹¥È¡¼¥ë:]
-  [LT:ádiegti per tinklà:]
-  [NO:nettverksinstallasjon:]
-  [PL:instalacja przez sieæ:]
-  [RO:instalare de pe internet:]
-  [RU:õÓÔÁÎÏ×ËÁ ÐÏ ÓÅÔÉ:]
-  [SV:nätverksinstallation:]
-</define-tag-sliced>
-<define-tag-sliced dc_pik whitespace=delete>
-  [EN:download with pik:]
-  [DA:hent med p.i.k.:]
-  [DE:mit pik herunterladen:]
-  [FI:hae P.I.K.:llä:]
-  [FR:télécharger avec kpi:]
-  [HR:download pikom:]
-  [IT:scarica con pik:]
-  [JA:pik ¤ò»È¤Ã¤¿¥À¥¦¥ó¥í¡¼¥É:]
-  [LT:parsisiøsti su pik:]
-  [NO:hent med pik:]
-  [PL:pobierz przy pomocy PIK:]
-  [RO:descãrcare cu pik:]
-  [RU:úÁÇÒÕÚÉÔØ Ó ÐÏÍÏÛØÀ PIK:]
-  [SV:hämta med pik:]
-</define-tag-sliced>
-<define-tag-sliced dc_misc whitespace=delete>
-  [EN:misc:]
-  [DA:diverse:]
-  [DE:Verschiedenes:]
-  [FI:sekalaista:]
-  [FR:divers:]
-  [HR:razno:]
-  [IT:varie:]
-  [JA:¤½¤Î¾:]
-  [LT:kita:]
-  [NO:diverse:]
-  [PL:inne:]
-  [RO:divers:]
-  [RU:òÁÚÎÏÅ:]
-  [SV:diverse:]
-</define-tag-sliced>
-<define-tag-sliced debian-cd-team whitespace=delete>
-  [EN:Debian CD team:]
-  [DE:Debian-CD-Team:]
-  [FI:Debian-CD-ryhmä:]
-  [FR:Équipe Debian CD:]
-  [HR:Debian CD grupa:]
-  [IT:Team Debian CD:]
-  [JA:Debian CD ¥Á¡¼¥à:]
-  [LT:Debian CD komanda:]
-  [NO:Debians cd-gruppe:]
-  [PL:Grupa Debian CD:]
-  [RO:Echipa Debian CD:]
-  [RU:çÒÕÐÐÁ Debian CD:]
-  [SV:Debians cd-grupp:]
-</define-tag-sliced>
-<define-tag-sliced debian-on-cd-bottom whitespace=delete>
-  [EN:debian_on_cd:]
-  [DA:debian på cd:]
-  [DE:Debian auf CD:]
-  [FI:Debian CD:llä:]
-  [FR:Debian sur disque compact:]
-  [HR:debian_na_cdu:]
-  [JA:Debian ¤Î CD:]
-  [LT:debian kompakte:]
-  [PL:Debian na CD:]
-  [RO:Debian pe CD:]
-  [RU:Debian ÎÁ CD:]
-  [SV:debian på cd:]
-  [NO:Debian på CD:]
-</define-tag-sliced>
-<define-tag-sliced faq-bottom whitespace=delete>
-  [EN:faq:]
-  [DA:oss:]
-  [DE:FAQ:]
-  [FI:VUKK:]
-  [JA:FAQ:]
-  [LT:DUK:]
-  [PL:FAQ:]
-  [RO:FAQ:]
-  [RU:FAQ:]
-  [SV:osf:]
-  [NO:oss:]
-</define-tag-sliced>
-<define-tag-sliced jigdo-bottom whitespace=delete>
-  [EN:jigdo:]
-  [PL:jigdo:]
-  [RO:jigdo:]
-</define-tag-sliced>
-<define-tag-sliced http-ftp-bottom whitespace=delete>
-  [EN:http_ftp:]
-  [DA:http/ftp:]
-  [DE:HTTP/FTP:]
-  [FI:http/ftp:]
-  [FR:http/ftp:]
-  [JA:http/ftp:]
-  [LT:http/ftp:]
-  [PL:HTTP/FTP:]
-  [RO:http/ftp:]
-  [RU:http/ftp:]
-  [SV:http/ftp:]
-</define-tag-sliced>
-<define-tag-sliced buy-bottom whitespace=delete>
-  [EN:buy:]
-  [DA:køb:]
-  [DE:Kaufen:]
-  [FI:osta:]
-  [FR:acheter:]
-  [HR:kupi:]
-  [JA:¹ØÆþ:]
-  [LT:pirk:]
-  [PL:kupowanie:]
-  [RO:cumpãraþi:]
-  [RU:ëÕÐÉÔØ:]
-  [SV:köp:]
-  [NO:kjøp:]
-</define-tag-sliced>
-<define-tag-sliced net-install-bottom whitespace=delete>
-  [EN:net_install:]
-  [DA:netinstall:]
-  [DE:Netz-Installation:]
-  [FI:verkkoasennus:]
-  [FR:install-réseau:]
-  [HR:mre¾ni_instal:]
-  [JA:¥Í¥Ã¥È¥¤¥ó¥¹¥È¡¼¥ë:]
-  [LT:ádiegimas per tinklà:]
-  [PL:instalacja przez sieæ:]
-  [RO:instalare de pe internet:]
-  [RU:õÓÔÁÎÏ×ËÁ ÐÏ ÓÅÔÉ:]
-  [SV:nätinstall:]
-</define-tag-sliced>
-<define-tag-sliced pik-bottom whitespace=delete>
-  [EN:pik:]
-  [DA:p.i.k.:]
-  [DE:P.I.K.:]
-  [FI:P.I.K.:]
-  [FR:kpi:]
-  [LT:P.I.K:]
-  [PL:P.I.K.:]
-  [RU:P.I.K:]
-</define-tag-sliced>
-<define-tag-sliced misc-bottom whitespace=delete>
-  [EN:misc:]
-  [DA:div:]
-  [DE:Verschiedenes:]
-  [FI:sekalaista:]
-  [FR:divers:]
-  [HR:razno:]
-  [JA:¤½¤Î¾:]
-  [LT:kita:]
-  [PL:ró¿ne:]
-  [RO:divers:]
-  [RU:òÁÚÎÏÅ:]
-  [SV:div:]
-  [NO:div:]
-</define-tag-sliced>
+<define-tag sep whitespace=delete>
+  <gettext>&middot;</gettext>
+</define-tag>
+<define-tag dc_faq whitespace=delete>
+  <gettext><void id="dc_faq" />faq</gettext>
+</define-tag>
+<define-tag dc_jigdo whitespace=delete>
+  <gettext>download with jigdo</gettext>
+</define-tag>
+<define-tag dc_httpftp whitespace=delete>
+  <gettext>download via http/ftp</gettext>
+</define-tag>
+<define-tag dc_buy whitespace=delete>
+  <gettext>buy pre-made images</gettext>
+</define-tag>
+<define-tag dc_net whitespace=delete>
+  <gettext>network install</gettext>
+</define-tag>
+<define-tag dc_pik whitespace=delete>
+  <gettext>download with pik</gettext>
+</define-tag>
+<define-tag dc_misc whitespace=delete>
+  <gettext><void id="dc_misc" />misc</gettext>
+</define-tag>
+<define-tag debian-cd-team whitespace=delete>
+  <gettext>Debian CD team</gettext>
+</define-tag>
+<define-tag debian-on-cd-bottom whitespace=delete>
+  <gettext>debian_on_cd</gettext>
+</define-tag>
+<define-tag faq-bottom whitespace=delete>
+  <gettext><void id="faq-bottom" />faq</gettext>
+</define-tag>
+<define-tag jigdo-bottom whitespace=delete>
+  <gettext>jigdo</gettext>
+</define-tag>
+<define-tag http-ftp-bottom whitespace=delete>
+  <gettext>http_ftp</gettext>
+</define-tag>
+<define-tag buy-bottom whitespace=delete>
+  <gettext>buy</gettext>
+</define-tag>
+<define-tag net-install-bottom whitespace=delete>
+  <gettext>net_install</gettext>
+</define-tag>
+<define-tag pik-bottom whitespace=delete>
+  <gettext>pik</gettext>
+</define-tag>
+<define-tag misc-bottom whitespace=delete>
+  <gettext><void id="misc-bottom" />misc</gettext>
+</define-tag>
 
 # don't translate anything below this point