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
author: Denis Barbier <barbier> 2002-11-01 14:00:07 +0000
committer: Denis Barbier <barbier> 2002-11-01 14:00:07 +0000
commit: 0cf62aed65db193332806ceae07baa8c65fb202c (patch)
tree: 9f869341461e2e6f2e66818bb1c0975c0f9e39e2
parent: 7823f083cfff7a85707cb59e35c8fb5207ffb419 (diff)
38 files changed, 392 insertions, 4830 deletions
diff --git a/.wmlrc b/.wmlrc
index aa8af54269d..2a949fcc5f0 100644
--- a/.wmlrc
+++ b/.wmlrc
@@ -4,5 +4,4 @@
 -D ENGLISHDIR~english
 -D HTMLDIR~../debian.org
 -I english/template
--I po/template
 -D SEARCH=http://search.debian.org/
diff --git a/english/po/Makefile b/english/po/Makefile
index 0215ed53b47..5a49520d957 100644
--- a/english/po/Makefile
+++ b/english/po/Makefile
@@ -9,8 +9,7 @@ include $(WMLBASE)/Make.lang
 
 LOCALEROOT = $(WMLBASE)/../locale
 
-SHOULD_BE_REPLACED_BY_TEMPLDIR_WHEN_TESTING_IS_OVER = $(WMLBASE)/../po/template/debian
-TEMPLATE_FILES  = $(wildcard $(SHOULD_BE_REPLACED_BY_TEMPLDIR_WHEN_TESTING_IS_OVER)/*.wml) $(SHOULD_BE_REPLACED_BY_TEMPLDIR_WHEN_TESTING_IS_OVER)/countries.def
+TEMPLATE_FILES  = $(wildcard $(TEMPLDIR)/*.wml $(TEMPLDIR)/*/*.wml) $(TEMPLDIR)/countries.def
 TEMPLATE_POT    = $(ENGLISHDIR)/po/templates.pot
 
 SHOULD_BE_REPLACED_BY_ENGLISH_PORTS_WHEN_TESTING_IS_OVER = $(WMLBASE)/../po/ports
diff --git a/english/po/README b/english/po/README
index aafb51c9b16..e33bbbb6507 100644
--- a/english/po/README
+++ b/english/po/README
@@ -1,10 +1,5 @@
 
 Q. What to do with those <lang>/po directories?
-A. Currently nothing, except for testing.  But it would be nice if all
-   translators could check that they are able to generate files for
-   their language, and that there is no difference.
-
-Q. So how does it work?
 A. Read more informations about commands below in gettext documentation.
    When running 'make' in english/ directory, templates.pot is generated.
    This file contains all the translatable strings found in
@@ -23,27 +18,8 @@ A. Read more informations about commands below in gettext documentation.
    Last, 'make install' copy templates.mo files under
      webwml/locale/<xx>/LC_MESSAGES/templates.mo
 
-Q. It looks nice, how could I try?
-A. You need at least mp4h 1.3.0 (only available in sid), and you must
-   add a line
-     -I po/template
-   *after*
-     -I english/template
-   in your <lang>/.wmlrc file so that new templates are loaded instead
-   of old ones.
-   DO NOT COMMIT THESE MODIFIED .WMLRC FILES OR BUILD WILL BE BROKEN
-
-   Then compile pages as usual and check that output do not differ.
-   If you want to come back with usual templates, you only have to
-   switch the two lines above in <lang>/.wmlrc.
-
 Q. It doesn't work, what happens?
 A. No idea, but ask on <debian-www@lists.debian.org>.  Note that your
    language must have been enabled in /etc/locale.gen, otherwise
    locales do not seem to work :(
 
-Q. It works, could I commit changes in PO files instead of slicing?
-A. Please don't, <lang>/po/templates.<xx>.po files are currently
-   automatically generated from english/template/debian/*.wml, so your
-   changes will be lost.
-
diff --git a/english/ports/alpha/menu.inc b/english/ports/alpha/menu.inc
index c785955d61f..3564f72bebc 100644
--- a/english/ports/alpha/menu.inc
+++ b/english/ports/alpha/menu.inc
@@ -1,34 +1,9 @@
 #use wml::debian::submenu
 #include "$(ENGLISHDIR)/ports/menu.defs"
 
-# Please keep slices sorted alphabetically so it's easier to detect
-# languages in them (except english ones).
 
 <define-menu-item name="alpha">
-   [EN:Debian for Alpha:]
-   [AR:Debian for Alpha:]
-   [CA:Debian per a Alpha:]
-   [DA:Debian til Alpha:]
-   [DE:Debian f�r Alpha:]
-   [EL:Debian for Alpha:]
-   [EO:Debian for Alpha:]
-   [ES:Debian para Alpha:]
-   [FI:Debian for Alpha:]
-   [FR:Debian pour Alpha:]
-   [HR:Debian za Alphu:]
-   [HU:Debian for Alpha:]
-   [IT:Debian per Alpha:]
-   [JA:Debian for Alpha:]
-   [KO:Debian for Alpha:]
-   [NL:Debian for Alpha:]
-   [NO:Debian for Alpha:]
-   [PL:Debian for Alpha:]
-   [PT:Debian para Alpha:]
-   [RO:Debian for Alpha:]
-   [RU:Debian for Alpha:]
-   [SV:Debian f�r Alpha:]
-   [TR:Debian for Alpha:]
-   [ZH:Debian for Alpha:]
+  <gettext domain="ports">Debian for Alpha</gettext>
 </define-menu-item>
 
 <menu-item name="ports"         basename="../index">
diff --git a/english/ports/arm/menu.inc b/english/ports/arm/menu.inc
index 84ef11cfbb5..318ef5a401d 100644
--- a/english/ports/arm/menu.inc
+++ b/english/ports/arm/menu.inc
@@ -1,33 +1,9 @@
 #use wml::debian::submenu
 #include "$(ENGLISHDIR)/ports/menu.defs"
 
-# Please keep slices sorted alphabetically so it's easier to detect
-# languages in them (except english ones).
 
 <define-menu-item name="arm">
-   [EN:Debian for ARM:]
-   [AR:Debian for ARM:]
-   [DA:Debian til ARM:]
-   [DE:Debian f�r ARM:]
-   [EL:Debian for ARM:]
-   [EO:Debian for ARM:]
-   [ES:Debian para ARM:]
-   [FI:Debian for ARM:]
-   [FR:Debian pour ARM:]
-   [HR:Debian for ARM:]
-   [HU:Debian for ARM:]
-   [IT:Debian per ARM:]
-   [JA:Debian for ARM:]
-   [KO:Debian for ARM:]
-   [NL:Debian for ARM:]
-   [NO:Debian for ARM:]
-   [PL:Debian for ARM:]
-   [PT:Debian para ARM:]
-   [RO:Debian for ARM:]
-   [RU:Debian for ARM:]
-   [SV:Debian f�r ARM:]
-   [TR:Debian for ARM:]
-   [ZH:Debian for ARM:]
+  <gettext domain="ports">Debian for ARM</gettext>
 </define-menu-item>
 
 <menu-item name="ports"         basename="../index">
diff --git a/english/ports/beowulf/menu.inc b/english/ports/beowulf/menu.inc
index 09db645d670..091e710d322 100644
--- a/english/ports/beowulf/menu.inc
+++ b/english/ports/beowulf/menu.inc
@@ -1,34 +1,9 @@
 #use wml::debian::submenu
 #include "$(ENGLISHDIR)/ports/menu.defs"
 
-# Please keep slices sorted alphabetically so it's easier to detect
-# languages in them (except english ones).
 
 <define-menu-item name="beowulf">
-   [EN:Debian for Beowulf:]
-   [AR:Debian for Beowulf:]
-   [CA:Debian per a Beowulf:]
-   [DA:Debian til Beowulf:]
-   [DE:Debian f�r Beowulf:]
-   [EL:Debian for Beowulf:]
-   [EO:Debian for Beowulf:]
-   [ES:Debian para Beowulf:]
-   [FI:Debian for Beowulf:]
-   [FR:Debian pour Beowulf:]
-   [HR:Debian za Beowulf:]
-   [HU:Debian for Beowulf:]
-   [IT:Debian per Beowulf:]
-   [JA:Debian for Beowulf:]
-   [KO:Debian for Beowulf:]
-   [NL:Debian for Beowulf:]
-   [NO:Debian for Beowulf:]
-   [PL:Debian for Beowulf:]
-   [PT:Debian para Beowulf:]
-   [RO:Debian for Beowulf:]
-   [RU:Debian for Beowulf:]
-   [SV:Debian f�r Beowulf:]
-   [TR:Debian for Beowulf:]
-   [ZH:Debian for Beowulf:]
+  <gettext domain="ports">Debian for Beowulf</gettext>
 </define-menu-item>
 
 <menu-item name="ports"         basename="../index">
diff --git a/english/ports/hppa/menu.inc b/english/ports/hppa/menu.inc
index b29d2dab0ec..5b366240079 100644
--- a/english/ports/hppa/menu.inc
+++ b/english/ports/hppa/menu.inc
@@ -1,33 +1,9 @@
 #use wml::debian::submenu
 #include "$(ENGLISHDIR)/ports/menu.defs"
 
-# Please keep slices sorted alphabetically so it's easier to detect
-# languages in them (except english ones).
 
 <define-menu-item name="hppa">
-   [EN:Debian for PA-RISC:]
-   [AR:Debian for PA-RISC:]
-   [DA:Debian til PA-RISC:]
-   [DE:Debian f�r PA-RISC:]
-   [EL:Debian for PA-RISC:]
-   [EO:Debian for PA-RISC:]
-   [ES:Debian para PA-RISC:]
-   [FI:Debian for PA-RISC:]
-   [FR:Debian pour PA-RISC:]
-   [HR:Debian for PA-RISC:]
-   [HU:Debian for PA-RISC:]
-   [IT:Debian per PA-RISC:]
-   [JA:Debian for PA-RISC:]
-   [KO:Debian for PA-RISC:]
-   [NL:Debian for PA-RISC:]
-   [NO:Debian for PA-RISC:]
-   [PL:Debian for PA-RISC:]
-   [PT:Debian para PA-RISC:]
-   [RO:Debian for PA-RISC:]
-   [RU:Debian for PA-RISC:]
-   [SV:Debian f�r PA-RISC:]
-   [TR:Debian for PA-RISC:]
-   [ZH:Debian for PA-RISC:]
+  <gettext domain="ports">Debian for PA-RISC</gettext>
 </define-menu-item>
 
 <menu-item name="ports"         basename="../index">
diff --git a/english/ports/hurd/menu.inc b/english/ports/hurd/menu.inc
index 8ec3bacdcf4..d863c34ee9f 100644
--- a/english/ports/hurd/menu.inc
+++ b/english/ports/hurd/menu.inc
@@ -1,60 +1,14 @@
 #use wml::debian::submenu
 #include "$(ENGLISHDIR)/ports/menu.defs"
 
-# Please keep slices sorted alphabetically so it's easier to detect
-# languages in them (except english ones).
 
 #   Arch specific menu entries
 <define-menu-item name="hurd">
-   [EN:Debian GNU/Hurd:]
-   [AR:Debian GNU/Hurd:]
-   [DA:Debian GNU/Hurd:]
-   [DE:Debian GNU/Hurd:]
-   [EL:Debian GNU/Hurd:]
-   [EO:Debian GNU/Hurd:]
-   [ES:Debian GNU/Hurd:]
-   [FI:Debian GNU/Hurd:]
-   [FR:Debian GNU/Hurd:]
-   [HR:Debian GNU/Hurd:]
-   [HU:Debian GNU/Hurd:]
-   [IT:Debian GNU/Hurd:]
-   [JA:Debian GNU/Hurd:]
-   [KO:Debian GNU/Hurd:]
-   [NL:Debian GNU/Hurd:]
-   [NO:Debian GNU/Hurd:]
-   [PL:Debian GNU/Hurd:]
-   [PT:Debian GNU/Hurd:]
-   [RO:Debian GNU/Hurd:]
-   [RU:Debian GNU/Hurd:]
-   [SV:Debian GNU/Hurd:]
-   [TR:Debian GNU/Hurd:]
-   [ZH:Debian GNU/Hurd:]
+  <gettext domain="ports">Debian GNU/Hurd</gettext>
 </define-menu-item>
 
 <define-menu-item name="hurd-cd">
-   [EN:Hurd-CDs:]
-   [AR:Hurd-CDs:]
-   [DA:Hurd p� cd:]
-   [DE:Hurd-CDs:]
-   [EL:Hurd-CDs:]
-   [EO:Hurd-CDs:]
-   [ES:CDs de Hurd:]
-   [FI:Hurd-CDs:]
-   [FR:Hurd-CDs:]
-   [HR:Hurd CDi:]
-   [HU:Hurd-CDs:]
-   [IT:CD di Hurd:]
-   [JA:Hurd-CDs:]
-   [KO:Hurd-CDs:]
-   [NL:Hurd-CDs:]
-   [NO:Hurd p� cd:]
-   [PL:Hurd-CDs:]
-   [PT:Hurd-CDs:]
-   [RO:Hurd-CDs:]
-   [RU:Hurd-CDs:]
-   [SV:Hurd p� cd:]
-   [TR:Hurd-CDs:]
-   [ZH:Hurd-CDs:]
+  <gettext domain="ports">Hurd-CDs</gettext>
 </define-menu-item>
 
 <menu-item name="ports"         basename="../index">
diff --git a/english/ports/ia64/menu.inc b/english/ports/ia64/menu.inc
index 21ace4bc5ce..2cba32a408a 100644
--- a/english/ports/ia64/menu.inc
+++ b/english/ports/ia64/menu.inc
@@ -1,34 +1,9 @@
 #use wml::debian::submenu
 #include "$(ENGLISHDIR)/ports/menu.defs"
 
-# Please keep slices sorted alphabetically so it's easier to detect
-# languages in them (except english ones).
 
 <define-menu-item name="ia64">
-   [EN:Debian for IA-64:]
-   [AR:Debian for IA-64:]
-   [CA:Debian per a IA-64:]
-   [DA:Debian til IA-64:]
-   [DE:Debian f�r IA-64:]
-   [EL:Debian for IA-64:]
-   [EO:Debian for IA-64:]
-   [ES:Debian para IA-64:]
-   [FI:Debian for IA-64:]
-   [FR:Debian pour IA-64:]
-   [HR:Debian for IA-64:]
-   [HU:Debian for IA-64:]
-   [IT:Debian per IA-64:]
-   [JA:Debian for IA-64:]
-   [KO:Debian for IA-64:]
-   [NL:Debian for IA-64:]
-   [NO:Debian for IA-64:]
-   [PL:Debian for IA-64:]
-   [PT:Debian para IA-64:]
-   [RO:Debian for IA-64:]
-   [RU:Debian for IA-64:]
-   [SV:Debian f�r IA-64:]
-   [TR:Debian for IA-64:]
-   [ZH:Debian for IA-64:]
+  <gettext domain="ports">Debian for IA-64</gettext>
 </define-menu-item>
 
 <menu-item name="ports"         basename="../index">
diff --git a/english/ports/m68k/menu.inc b/english/ports/m68k/menu.inc
index 6af6a73bc4d..2581c53c166 100644
--- a/english/ports/m68k/menu.inc
+++ b/english/ports/m68k/menu.inc
@@ -1,34 +1,9 @@
 #use wml::debian::submenu
 #include "$(ENGLISHDIR)/ports/menu.defs"
 
-# Please keep slices sorted alphabetically so it's easier to detect
-# languages in them (except english ones).
 
 <define-menu-item name="m68k">
-   [EN:Debian for Motorola 680x0:]
-   [AR:Debian for Motorola 680x0:]
-   [CA:Debian per a Motorola 680x0:]
-   [DA:Debian for Motorola 680x0:]
-   [DE:Debian f�r Motorola 680x0:]
-   [EL:Debian for Motorola 680x0:]
-   [EO:Debian for Motorola 680x0:]
-   [ES:Debian para Motorola 680x0:]
-   [FI:Debian for Motorola 680x0:]
-   [FR:Debian pour Motorola 680x0:]
-   [HR:Debian for Motorola 680x0:]
-   [HU:Debian for Motorola 680x0:]
-   [IT:Debian per Motorola 680x0:]
-   [JA:Debian for Motorola 680x0:]
-   [KO:Debian for Motorola 680x0:]
-   [NL:Debian for Motorola 680x0:]
-   [NO:Debian for Motorola 680x0:]
-   [PL:Debian for Motorola 680x0:]
-   [PT:Debian para Motorola 680x0:]
-   [RO:Debian for Motorola 680x0:]
-   [RU:Debian for Motorola 680x0:]
-   [SV:Debian f�r Motorola 680x0:]
-   [TR:Debian for Motorola 680x0:]
-   [ZH:Debian for Motorola 680x0:]
+  <gettext domain="ports">Debian for Motorola 680x0</gettext>
 </define-menu-item>
 
 <menu-item name="ports"         basename="../index">
diff --git a/english/ports/menu.defs b/english/ports/menu.defs
index eccc230b316..c11699ac784 100644
--- a/english/ports/menu.defs
+++ b/english/ports/menu.defs
@@ -2,412 +2,65 @@
 # File included by webwml/english/ports/*/menu.inc
 #
 
-# Please keep slices sorted alphabetically so it's easier to detect
-# languages in them (except english ones).
 
 #   Arch independent items
 <define-menu-item name="contact">
-   [EN:Contact:]
-   [AR:Contact:]
-   [CA:Contacte:]
-   [DA:Kontakt:]
-   [DE:Kontakt:]
-   [EL:Contact:]
-   [EO:Contact:]
-   [ES:Contactos:]
-   [FI:Contact:]
-   [FR:Contact:]
-   [HR:Kontakt:]
-   [HU:Contact:]
-   [IT:Contatti:]
-   [JA:Contact:]
-   [KO:Contact:]
-   [NL:Contact:]
-   [NO:Kontakt:]
-   [PL:Contact:]
-   [PT:Contato:]
-   [RO:Contact:]
-   [RU:Contact:]
-   [SV:Kontakt:]
-   [TR:Contact:]
-   [ZH:Contact:]
+  <gettext domain="ports">Contact</gettext>
 </define-menu-item>
 
 <define-menu-item name="cpu">
-   [EN:CPUs:]
-   [AR:CPUs:]
-   [CA:CPU:]
-   [DA:Processorer:]
-   [DE:CPUs:]
-   [EL:CPUs:]
-   [EO:CPUs:]
-   [ES:CPUs:]
-   [FI:CPUs:]
-   [FR:CPUs:]
-   [HR:CPUi:]
-   [HU:CPUs:]
-   [IT:CPUs:]
-   [JA:CPUs:]
-   [KO:CPUs:]
-   [NL:CPUs:]
-   [NO:Prosessorer:]
-   [PL:CPUs:]
-   [PT:CPUs:]
-   [RO:CPUs:]
-   [RU:CPUs:]
-   [SV:Processorer:]
-   [TR:CPUs:]
-   [ZH:CPUs:]
+  <gettext domain="ports">CPUs</gettext>
 </define-menu-item>
 
 <define-menu-item name="credits">
-   [EN:Credits:]
-   [AR:Credits:]
-   [CA:Cr�dits:]
-   [DA:Tak:]
-   [DE:Danksagung:]
-   [EL:Credits:]
-   [EO:Credits:]
-   [ES:Cr�ditos:]
-   [FI:Credits:]
-   [FR:Remerciements:]
-   [HR:Zasluge:]
-   [HU:Credits:]
-   [IT:Credits:]
-   [JA:Credits:]
-   [KO:Credits:]
-   [NL:Credits:]
-   [NO:Takk:]
-   [PL:Credits:]
-   [PT:Cr�ditos:]
-   [RO:Credits:]
-   [RU:Credits:]
-   [SV:Tack:]
-   [TR:Credits:]
-   [ZH:Credits:]
+  <gettext domain="ports">Credits</gettext>
 </define-menu-item>
 
 <define-menu-item name="devel">
-   [EN:Development:]
-   [AR:Development:]
-   [CA:Desenvolupament:]
-   [DA:Udvikling:]
-   [DE:Entwicklung:]
-   [EL:Development:]
-   [EO:Development:]
-   [ES:Desarrollo:]
-   [FI:Development:]
-   [FR:D�veloppement:]
-   [HR:Razvoj:]
-   [HU:Development:]
-   [IT:Sviluppo:]
-   [JA:Development:]
-   [KO:Utvikling:]
-   [NL:Development:]
-   [NO:Utvikling:]
-   [PL:Development:]
-   [PT:Development:]
-   [RO:Development:]
-   [RU:Development:]
-   [SV:Utveckling:]
-   [TR:Development:]
-   [ZH:Development:]
+  <gettext domain="ports">Development</gettext>
 </define-menu-item>
 
 <define-menu-item name="doc">
-   [EN:Documentation:]
-   [AR:Documentation:]
-   [CA:Documentaci�:]
-   [DA:Dokumentation:]
-   [DE:Dokumentation:]
-   [EL:Documentation:]
-   [EO:Documentation:]
-   [ES:Documentaci�n:]
-   [FI:Documentation:]
-   [FR:Documentation:]
-   [HR:Dokumentacija:]
-   [HU:Documentation:]
-   [IT:Documentazione:]
-   [JA:Documentation:]
-   [KO:Documentation:]
-   [NL:Documentation:]
-   [NO:Dokumentasjon:]
-   [PL:Documentation:]
-   [PT:Documenta��o:]
-   [RO:Documentation:]
-   [RU:Documentation:]
-   [SV:Dokumentation:]
-   [TR:Documentation:]
-   [ZH:Documentation:]
+  <gettext domain="ports">Documentation</gettext>
 </define-menu-item>
 
 <define-menu-item name="install">
-   [EN:Installation:]
-   [AR:Installation:]
-   [CA:Instal�laci�:]
-   [DA:Installering:]
-   [DE:Installation:]
-   [EL:Installation:]
-   [EO:Installation:]
-   [ES:Instalaci�n:]
-   [FI:Installation:]
-   [FR:Installation:]
-   [HR:Instalacija:]
-   [HU:Installation:]
-   [IT:Installazione:]
-   [JA:Installation:]
-   [KO:Installation:]
-   [NL:Installation:]
-   [NO:Installasjon:]
-   [PL:Installation:]
-   [PT:Instala��o:]
-   [RO:Installation:]
-   [RU:Installation:]
-   [SV:Installation:]
-   [TR:Installation:]
-   [ZH:Installation:]
+  <gettext domain="ports">Installation</gettext>
 </define-menu-item>
 
 <define-menu-item name="links">
-   [EN:Links:]
-   [AR:Links:]
-   [CA:Enlla�os:]
-   [DA:Links:]
-   [DE:Links:]
-   [EL:Links:]
-   [EO:Links:]
-   [ES:Enlaces:]
-   [FI:Links:]
-   [FR:Liens:]
-   [HR:Veze:]
-   [HU:Links:]
-   [IT:Collegamenti:]
-   [JA:Links:]
-   [KO:Links:]
-   [NL:Links:]
-   [NO:Pekere:]
-   [PL:Links:]
-   [PT:Links:]
-   [RO:Links:]
-   [RU:Links:]
-   [SV:L�nkar:]
-   [TR:Links:]
-   [ZH:Links:]
+  <gettext domain="ports">Links</gettext>
 </define-menu-item>
 
 <define-menu-item name="news">
-   [EN:News:]
-   [AR:News:]
-   [CA:Not�cies:]
-   [DA:Nyheder:]
-   [DE:Neues:]
-   [EL:News:]
-   [EO:News:]
-   [ES:Noticias:]
-   [FI:News:]
-   [FR:Nouvelles:]
-   [HR:Novosti:]
-   [HU:News:]
-   [IT:Novit�:]
-   [JA:News:]
-   [KO:News:]
-   [NL:News:]
-   [NO:Nyheter:]
-   [PL:News:]
-   [PT:Novidades:]
-   [RO:News:]
-   [RU:News:]
-   [SV:Nyheter:]
-   [TR:News:]
-   [ZH:News:]
+  <gettext domain="ports">News</gettext>
 </define-menu-item>
 
 <define-menu-item name="porting">
-   [EN:Porting:]
-   [AR:Porting:]
-   [CA:Portar:]
-   [DA:Tilpasning:]
-   [DE:Portierung:]
-   [EL:Porting:]
-   [EO:Porting:]
-   [ES:Migraci�n:]
-   [FI:Porting:]
-   [FR:Porter:]
-   [HR:Portanje:]
-   [HU:Porting:]
-   [IT:Porting:]
-   [JA:Porting:]
-   [KO:Porting:]
-   [NL:Porting:]
-   [NO:Porting:]
-   [PL:Porting:]
-   [PT:Portando:]
-   [RO:Porting:]
-   [RU:Porting:]
-   [SV:Anpassa:]
-   [TR:Porting:]
-   [ZH:Porting:]
+  <gettext domain="ports">Porting</gettext>
 </define-menu-item>
 
 <define-menu-item name="ports">
-   [EN:Ports:]
-   [AR:Ports:]
-   [CA:Ports:]
-   [DA:Tilpasninger:]
-   [DE:Portierungen:]
-   [EL:Ports:]
-   [EO:Ports:]
-   [ES:Migraciones:]
-   [FI:Ports:]
-   [FR:Portages:]
-   [HR:Portovi:]
-   [HU:Ports:]
-   [IT:Port:]
-   [JA:Ports:]
-   [KO:Ports:]
-   [NL:Ports:]
-   [NO:Porteringer:]
-   [PL:Ports:]
-   [PT:Ports:]
-   [RO:Ports:]
-   [RU:Ports:]
-   [SV:Anpassningar:]
-   [TR:Ports:]
-   [ZH:Ports:]
+  <gettext domain="ports">Ports</gettext>
 </define-menu-item>
 
 <define-menu-item name="problems">
-   [EN:Problems:]
-   [AR:Problems:]
-   [CA:Problemes:]
-   [DA:Problemer:]
-   [DE:Probleme:]
-   [EL:Problems:]
-   [EO:Problems:]
-   [ES:Problemas:]
-   [FI:Problems:]
-   [FR:Probl�mes:]
-   [HR:Problemi:]
-   [HU:Problems:]
-   [IT:Problems:]
-   [JA:Problems:]
-   [KO:Problems:]
-   [NL:Problems:]
-   [NO:Problemer:]
-   [PL:Problems:]
-   [PT:Problemas:]
-   [RO:Problems:]
-   [RU:Problems:]
-   [SV:Problem:]
-   [TR:Problems:]
-   [ZH:Problems:]
+  <gettext domain="ports">Problems</gettext>
 </define-menu-item>
 
 <define-menu-item name="softwaremap">
-   [EN:Software Map:]
-   [AR:Software Map:]
-   [CA:Mapa del programari:]
-   [DA:Softwarekatalog:]
-   [DE:Software-Verzeichnis:]
-   [EL:Software Map:]
-   [EO:Software Map:]
-   [ES:Cat�logo de Software:]
-   [FI:Software Map:]
-   [FR:Software Map:]
-   [HR:Mapa softvera:]
-   [HU:Software Map:]
-   [IT:Software Map:]
-   [JA:Software Map:]
-   [KO:Software Map:]
-   [NL:Software Map:]
-   [NO:Programvarekatalog:]
-   [PL:Software Map:]
-   [PT:Mapa de Software:]
-   [RO:Software Map:]
-   [RU:Software Map:]
-   [SV:Programvarukatalog:]
-   [TR:Software Map:]
-   [ZH:Software Map:]
+  <gettext domain="ports">Software Map</gettext>
 </define-menu-item>
 
 <define-menu-item name="status">
-   [EN:Status:]
-   [AR:Status:]
-   [CA:Estat:]
-   [DA:Status:]
-   [DE:Status:]
-   [EL:Status:]
-   [EO:Status:]
-   [ES:Status:]
-   [FI:Status:]
-   [FR:�tat:]
-   [HR:Stanje:]
-   [HU:Status:]
-   [IT:Status:]
-   [JA:Status:]
-   [KO:Status:]
-   [NL:Status:]
-   [NO:Status:]
-   [PL:Status:]
-   [PT:Status:]
-   [RO:Status:]
-   [RU:Status:]
-   [SV:Status:]
-   [TR:Status:]
-   [ZH:Status:]
+  <gettext domain="ports">Status</gettext>
 </define-menu-item>
 
 <define-menu-item name="supply">
-   [EN:Supply:]
-   [AR:Supply:]
-   [CA:Suministrament:]
-   [DA:Tilg�ngelighed:]
-   [DE:Bezugsquellen:]
-   [EL:Supply:]
-   [EO:Supply:]
-   [ES:Suministro:]
-   [FI:Supply:]
-   [FR:Supply:]
-   [HR:Nabava:]
-   [HU:Supply:]
-   [IT:Fornitura:]
-   [JA:Supply:]
-   [KO:Supply:]
-   [NL:Supply:]
-   [NO:Supply:]
-   [PL:Supply:]
-   [PT:Supply:]
-   [RO:Supply:]
-   [RU:Supply:]
-   [SV:Tillg�nglighet:]
-   [TR:Supply:]
-   [ZH:Supply:]
+  <gettext domain="ports">Supply</gettext>
 </define-menu-item>
 
 <define-menu-item name="systems">
-   [EN:Systems:]
-   [AR:Systems:]
-   [CA:Sistemes:]
-   [DA:Systemer:]
-   [DE:Systeme:]
-   [EL:Systems:]
-   [EO:Systems:]
-   [ES:Sistemas:]
-   [FI:Systems:]
-   [FR:Syst�mes:]
-   [HR:Sustavi:]
-   [HU:Systems:]
-   [IT:Systems:]
-   [JA:Systems:]
-   [KO:Systems:]
-   [NL:Systems:]
-   [NO:Systemer:]
-   [PL:Systems:]
-   [PT:Sistemas:]
-   [RO:Systems:]
-   [RU:Systems:]
-   [SV:System:]
-   [TR:Systems:]
-   [ZH:Systems:]
+  <gettext domain="ports">Systems</gettext>
 </define-menu-item>
 
diff --git a/english/ports/mips/cpu.data b/english/ports/mips/cpu.data
index 1842023a01c..97bff39c6cb 100644
--- a/english/ports/mips/cpu.data
+++ b/english/ports/mips/cpu.data
@@ -1,44 +1,34 @@
-<define-tag-sliced name_vendor whitespace=delete>
-  [EN:Vendor/Name:]
-  [DA:Fabrikant/navn:]
-  [DE:Hersteller/Name:]
-  [ES:Nombre fabricante:]
-</define-tag-sliced>
-
-<define-tag-sliced name_date whitespace=delete>
-  [EN:Date announced:]
-  [DA:Annonceret den:]
-  [DE:Datum:]
-  [ES:Fecha de presentaci�n:]
-</define-tag-sliced>
-
-<define-tag-sliced name_speed whitespace=delete>
-  [EN:Clock:]
-  [ES:Reloj:]
-</define-tag-sliced>
-
-<define-tag-sliced name_icache whitespace=delete>
-  [EN:ICache:]
-</define-tag-sliced>
-
-<define-tag-sliced name_dcache whitespace=delete>
-  [EN:DCache:]
-</define-tag-sliced>
-
-<define-tag-sliced name_tlb whitespace=delete>
-  [EN:TLB:]
-</define-tag-sliced>
-
-<define-tag-sliced name_isa whitespace=delete>
-  [EN:ISA:]
-</define-tag-sliced>
-
-<define-tag-sliced name_specials whitespace=delete>
-  [EN:Specials:]
-  [DA:S�regenheder:]
-  [DE:Besonderheiten:]
-  [ES:Especiales:]
-</define-tag-sliced>
+<define-tag name_vendor whitespace=delete>
+  <gettext>Vendor/Name</gettext>
+</define-tag>
+
+<define-tag name_date whitespace=delete>
+  <gettext>Date announced</gettext>
+</define-tag>
+
+<define-tag name_speed whitespace=delete>
+  <gettext>Clock</gettext>
+</define-tag>
+
+<define-tag name_icache whitespace=delete>
+  <gettext>ICache</gettext>
+</define-tag>
+
+<define-tag name_dcache whitespace=delete>
+  <gettext>DCache</gettext>
+</define-tag>
+
+<define-tag name_tlb whitespace=delete>
+  <gettext>TLB</gettext>
+</define-tag>
+
+<define-tag name_isa whitespace=delete>
+  <gettext>ISA</gettext>
+</define-tag>
+
+<define-tag name_specials whitespace=delete>
+  <gettext>Specials</gettext>
+</define-tag>
 
 <define-tag cpu>
 	<preserve vendor name date speed icache dcache tlb isa specials>
@@ -75,12 +65,9 @@
 		<td><name_specials></td>
 	</tr>
 
-<define-tag-sliced r2000_specials whitespace=delete>
-  [EN:No FPU (R2010), external caches:]
-  [DA:Ingen FPU (R2010), ekstern cache:]
-  [DE:Keine FPU (R2010), externe Caches:]
-  [ES:Sin FPU (R2010), cach�s externas:]
-</define-tag-sliced>
+<define-tag r2000_specials whitespace=delete>
+  <gettext>No FPU (R2010), external caches</gettext>
+</define-tag>
 
 	<cpu	vendor="Mips"
 		name="R2000"
@@ -93,12 +80,9 @@
 		specials="<r2000_specials>"
 	>
 
-<define-tag-sliced r3000_specials whitespace=delete>
-  [EN:No FPU (R3010):]
-  [DA:Ingen FPU (R3010):]
-  [DE:Keine FPU (R3010):]
-  [ES:Sin FPU (R3010):]
-</define-tag-sliced>
+<define-tag r3000_specials whitespace=delete>
+  <gettext>No FPU (R3010)</gettext>
+</define-tag>
 
 	<cpu	vendor="Mips"
 		name="R3000"
@@ -111,12 +95,9 @@
 		specials="<r3000_specials>"
 	>
 
-<define-tag-sliced r4000_specials whitespace=delete>
-  [EN:Virtual indexed L1 cache, L2 cache controller:]
-  [DA:Virtuelt indekseret L1-cache, L2-cache-controller:]
-  [DE:Virtuell indizierter L1-Cache, L2-Cache-Controller:]
-  [ES:Cach� L1 indizada virtualmente, controladora de cach� L2:]
-</define-tag-sliced>
+<define-tag r4000_specials whitespace=delete>
+  <gettext>Virtual indexed L1 cache, L2 cache controller</gettext>
+</define-tag>
 
 	<cpu	vendor="Mips"
 		name="R4000"
@@ -129,12 +110,9 @@
 		specials="<r4000_specials>"
 	>
 
-<define-tag-sliced r4400_specials whitespace=delete>
-  [EN:Virtual indexed L1 cache, L2 cache controller:]
-  [DA:Virtuelt indekseret L1-cache, L2-cache-controller:]
-  [DE:Virtuell indizierter L1-Cache, L2-Cache-Controller:]
-  [ES:Cach� L1 indizada virtualmente, controladora de cach� L2:]
-</define-tag-sliced>
+<define-tag r4400_specials whitespace=delete>
+  <gettext>Virtual indexed L1 cache, L2 cache controller</gettext>
+</define-tag>
 
 	<cpu	vendor="Mips"
 		name="R4400"
@@ -147,12 +125,9 @@
 		specials="<r4400_specials>"
 	>
 
-<define-tag-sliced r6000_specials whitespace=delete>
-  [EN:External L1 cache:]
-  [DA:Ekstern L1-cache:]
-  [DE:Externer L1 Cache:]
-  [ES:Cach� L1 externa:]
-</define-tag-sliced>
+<define-tag r6000_specials whitespace=delete>
+  <gettext>External L1 cache</gettext>
+</define-tag>
 
 	<cpu	vendor="Mips"
 		name="R6000"
@@ -161,12 +136,9 @@
 		specials="<r6000_specials>"
 	>
 
-<define-tag-sliced r8000_specials whitespace=delete>
-  [EN:Multiple chip CPU:]
-  [DA:CPU med flere chips:]
-  [DE:Mehrfach-Chip-CPU:]
-  [ES:CPU de m�ltiples chips:]
-</define-tag-sliced>
+<define-tag r8000_specials whitespace=delete>
+  <gettext>Multiple chip CPU</gettext>
+</define-tag>
 
 	<cpu	vendor="Mips"
 		name="R8000"
@@ -187,12 +159,9 @@
 		isa="IV"
 	>
 
-<define-tag-sliced tmpr1940_specials whitespace=delete>
-  [EN:Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, I2C, Watchdog:]
-  [DA:Mips16 ISA-udvidelse, ingen FPU, 512k flash, 16k RAM, DMAC, UART, timer, I2C, watchdog:]
-  [DE:Mips16 ISA-Erweiterung, keine FPU, 512k Flash, 16k RAM, DMAC, UART, Timer, I2C, Watchdog:]
-  [ES:Extensi�n isa Mips16, Sin FPU, flash de 512k, 16k ram, DMAC, UART, Timer, I2C, Watchdog:]
-</define-tag-sliced>
+<define-tag tmpr1940_specials whitespace=delete>
+  <gettext>Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, I2C, Watchdog</gettext>
+</define-tag>
 
 	<cpu	vendor="Toshiba"
 		name="TMPR1940"
@@ -201,12 +170,9 @@
 		specials="<tmpr1940_specials>"
 	>
 
-<define-tag-sliced tmpr3903_specials whitespace=delete>
-  [EN:No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller:]
-  [DA:Ingen FPU, DRAMC, ROMC, DMAC, UART, timer, I2C, LCD-controller:]
-  [DE:Keine FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD-Controller:]
-  [ES:Sin FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, controladora LCD:]
-</define-tag-sliced>
+<define-tag tmpr3903_specials whitespace=delete>
+  <gettext>No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller</gettext>
+</define-tag>
 
 	<cpu	vendor="Toshiba"
 		name="TMPR 3903"
@@ -217,12 +183,9 @@
 		specials="<tmpr3903_specials>"
 	>
 
-<define-tag-sliced tmpr3904_specials whitespace=delete>
-  [EN:No FPU, DRAMC, ROMC, DMAC, UART, Timer:]
-  [DA:Ingen FPU, DRAMC, ROMC, DMAC, UART, timer:]
-  [DE:Keine FPU, DRAMC, ROMC, DMAC, UART, Timer:]
-  [ES:Sin FPU, DRAMC, ROMC, DMAC, UART, Timer:]
-</define-tag-sliced>
+<define-tag tmpr3904_specials whitespace=delete>
+  <gettext>No FPU, DRAMC, ROMC, DMAC, UART, Timer</gettext>
+</define-tag>
 
 	<cpu	vendor="Toshiba"
 		name="TMPR 3904"
@@ -233,12 +196,9 @@
 		specials="<tmpr3904_specials>"
 	>
 
-<define-tag-sliced tmpr3907_specials whitespace=delete>
-  [EN:No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer:]
-  [DA:Ingen FPU, DRAMC, ROMC, DMAC, PCIC, UART, timer:]
-  [DE:Keine FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer:]
-  [ES:Sin FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer:]
-</define-tag-sliced>
+<define-tag tmpr3907_specials whitespace=delete>
+  <gettext>No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer</gettext>
+</define-tag>
 
 	<cpu	vendor="Toshiba"
 		name="TMPR 3907"
@@ -249,12 +209,9 @@
 		specials="<tmpr3907_specials>"
 	>
 
-<define-tag-sliced tmpr3911_specials whitespace=delete>
-  [EN:No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA:]
-  [DA:Ingen FPU, SDRAMC, ROMC, timer, PCMCIA, LCD-controller, IrDA:]
-  [DE:Keine FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD-Controller, IrDA:]
-  [ES:Sin FPU, SDRAMC, ROMC, Timer, PCMCIA, controladora LCD, IrDA:]
-</define-tag-sliced>
+<define-tag tmpr3911_specials whitespace=delete>
+  <gettext>No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA</gettext>
+</define-tag>
 
 	<cpu	vendor="Toshiba"
 		name="TMPR 3911"
@@ -265,12 +222,9 @@
 		specials="<tmpr3911_specials>"
 	>
 
-<define-tag-sliced tmpr3912_specials whitespace=delete>
-  [EN:No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA:]
-  [DA:Ingen FPU, SDRAMC, ROMC, UART, timer, PCMCIA, LCD-controller, IrDA:]
-  [DE:Keine FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD-Controller, IrDA:]
-  [ES:Sin FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, controladora LCD, IrDA:]
-</define-tag-sliced>
+<define-tag tmpr3912_specials whitespace=delete>
+  <gettext>No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA</gettext>
+</define-tag>
 
 	<cpu	vendor="Toshiba"
 		name="TMPR 3912"
@@ -282,12 +236,9 @@
 		specials="<tmpr3912_specials>"
 	>
 
-<define-tag-sliced tmpr3922_specials whitespace=delete>
-  [EN:No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA:]
-  [DA:Ingen FPU, SDRAMC, ROMC, UART, timer, PCMCIA, IrDA:]
-  [DE:Keine FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA:]
-  [ES:Sin FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA:]
-</define-tag-sliced>
+<define-tag tmpr3922_specials whitespace=delete>
+  <gettext>No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA</gettext>
+</define-tag>
 
 	<cpu	vendor="Toshiba"
 		name="TMPR 3922"
@@ -299,12 +250,9 @@
 		specials="<tmpr3922_specials>"
 	>
 
-<define-tag-sliced tmpr3927_specials whitespace=delete>
-  [EN:No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer:]
-  [DA:Ingen FPU, SDRAMC, ROMC, DMAC, PCIC, UART, timer:]
-  [DE:Keine FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer:]
-  [ES:Sin FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer:]
-</define-tag-sliced>
+<define-tag tmpr3927_specials whitespace=delete>
+  <gettext>No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer</gettext>
+</define-tag>
 
 	<cpu	vendor="Toshiba"
 		name="TMPR 3927"
@@ -344,10 +292,9 @@
 		isa="IV"
 	>	
 
-<define-tag-sliced au1000_specials whitespace=delete>
-  [EN:2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O:]
-  [DA:2 10/100 ethernet, 4 UART, IrDA, AC'97, I2C, 38 digital I/O:]
-</define-tag-sliced>
+<define-tag au1000_specials whitespace=delete>
+  <gettext>2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O</gettext>
+</define-tag>
 
 	<cpu	vendor="Alchemy"
 		name="Au1000"
@@ -356,11 +303,9 @@
 		specials="<au1000_specials>"
 	>
 
-<define-tag-sliced rm5231_specials whitespace=delete>
-  [EN:FPU, 32-bit external bus:]
-  [DA:FPU, ekstern 32-bits bus:]
-  [DE:FPU, externer 32-Bit Bus:]
-</define-tag-sliced>
+<define-tag rm5231_specials whitespace=delete>
+  <gettext>FPU, 32-bit external bus</gettext>
+</define-tag>
 
 	<cpu	vendor="QED"
 		name="RM5231"
@@ -371,11 +316,9 @@
 		specials="<rm5231_specials>"
 	>
 
-<define-tag-sliced rm5231a_specials whitespace=delete>
-  [EN:FPU, 32-bit external bus:]
-  [DA:FPU, ekstern 32-bits bus:]
-  [DE:FPU, externer 32-Bit Bus:]
-</define-tag-sliced>
+<define-tag rm5231a_specials whitespace=delete>
+  <gettext>FPU, 32-bit external bus</gettext>
+</define-tag>
 
 	<cpu	vendor="QED"
 		name="RM5231A"
@@ -386,11 +329,9 @@
 		specials="<rm5231a_specials>"
 	>
 
-<define-tag-sliced rm5261_specials whitespace=delete>
-  [EN:FPU, 64-bit external bus:]
-  [DA:FPU, ekstern 64-bits bus:]
-  [DE:FPU, externer 64-Bit Bus:]
-</define-tag-sliced>
+<define-tag rm5261_specials whitespace=delete>
+  <gettext>FPU, 64-bit external bus</gettext>
+</define-tag>
 
 	<cpu	vendor="QED"
 		name="RM5261"
@@ -401,11 +342,9 @@
 		specials="<rm5261_specials>"
 	>
 
-<define-tag-sliced rm5261a_specials whitespace=delete>
-  [EN:FPU, 64-bit external bus:]
-  [DA:FPU, ekstern 64-bits bus:]
-  [DE:FPU, externer 64-Bit Bus:]
-</define-tag-sliced>
+<define-tag rm5261a_specials whitespace=delete>
+  <gettext>FPU, 64-bit external bus</gettext>
+</define-tag>
 
 	<cpu	vendor="QED"
 		name="RM5261A"
@@ -416,11 +355,9 @@
 		specials="<rm5261a_specials>"
 	>
 
-<define-tag-sliced rm5271_specials whitespace=delete>
-  [EN:FPU, 64-bit external bus, external L2 cache:]
-  [DA:FPU, ekstern 64-bits bus, ekstern L2-cache:]
-  [DE:FPU, externer 64-Bit Bus, externer L2-Cache:]
-</define-tag-sliced>
+<define-tag rm5271_specials whitespace=delete>
+  <gettext>FPU, 64-bit external bus, external L2 cache</gettext>
+</define-tag>
 
 	<cpu	vendor="QED"
 		name="RM5271"
@@ -431,12 +368,9 @@
 		specials="<rm5271_specials>"
 	>
 
-<define-tag-sliced rm7000_specials whitespace=delete>
-  [EN:256 L2 cache on die:]
-  [DA:256 L2-cache p� chip'en:]
-  [DE:256 L2-Cache auf dem Chip:]
-  [ES:256 L2 cach� en placa:]
-</define-tag-sliced>
+<define-tag rm7000_specials whitespace=delete>
+  <gettext>256 L2 cache on die</gettext>
+</define-tag>
 
 	<cpu	vendor="QED"
 		name="RM7000"
@@ -447,9 +381,9 @@
 		specials="<rm7000_specials>"
 	>
 
-<define-tag-sliced lx4180_specials whitespace=delete>
-  [EN:Mips 16:]
-</define-tag-sliced>
+<define-tag lx4180_specials whitespace=delete>
+  <gettext>Mips 16</gettext>
+</define-tag>
 
 	<cpu	vendor="Lexra"
 		name="LX4180"
@@ -460,11 +394,9 @@
 		specials="<lx4180_specials>"
 	>
 
-<define-tag-sliced vr4121_specials whitespace=delete>
-  [EN:Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel:]
-  [DA:Mips 16, RTC, tastatur, TouchPanel, audio, Compact-Flash, UART, parallel:]
-  [DE:Mips 16, RTC, Tastatur, TouchPanel, Audio, Compact-Flash, UART, Parallel:]
-</define-tag-sliced>
+<define-tag vr4121_specials whitespace=delete>
+  <gettext>Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel</gettext>
+</define-tag>
 
 	<cpu	vendor="NEC"
 		name="VR4121"
@@ -475,10 +407,9 @@
 		specials="<vr4121_specials>"
 	>
 
-<define-tag-sliced vr4122_specials whitespace=delete>
-  [EN:Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC:]
-  [DA:Mips 16, Compact Flash, UART, parallel, RTC, audio, PCIC:]
-</define-tag-sliced>
+<define-tag vr4122_specials whitespace=delete>
+  <gettext>Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC</gettext>
+</define-tag>
 
 	<cpu	vendor="NEC"
 		name="VR4122"
@@ -489,12 +420,9 @@
 		specials="<vr4122_specials>"
 	>
 
-<define-tag-sliced vr4181_specials whitespace=delete>
-  [EN:Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, USB, Touchpad, Audio:]
-  [DA:Mips 16, LCD-controller, Compact Flash, UART, parallel, RTC, tastatur, USB, touchpad, audio:]
-  [DE:Mips 16, LCD-Controller, Compact Flash, UART, Parallel, RTC, Tastatur, USB, Touchpad, Audio:]
-  [ES:Mips 16, controladora LCD, Compact Flash, UART, Parallel, RTC, Keyboard, USB, Touchpad, Audio:]
-</define-tag-sliced>
+<define-tag vr4181_specials whitespace=delete>
+  <gettext>Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, USB, Touchpad, Audio</gettext>
+</define-tag>
 
 	<cpu	vendor="NEC"
 		name="VR4181"
diff --git a/english/ports/mips/menu.inc b/english/ports/mips/menu.inc
index 7d70e381392..f63a30a1e28 100644
--- a/english/ports/mips/menu.inc
+++ b/english/ports/mips/menu.inc
@@ -1,33 +1,9 @@
 #use wml::debian::submenu
 #include "$(ENGLISHDIR)/ports/menu.defs"
 
-# Please keep slices sorted alphabetically so it's easier to detect
-# languages in them (except english ones).
 
 <define-menu-item name="mips">
-   [EN:Debian for MIPS:]
-   [AR:Debian for MIPS:]
-   [DA:Debian til MIPS:]
-   [DE:Debian f�r MIPS:]
-   [EL:Debian for MIPS:]
-   [EO:Debian for MIPS:]
-   [ES:Debian para MIPS:]
-   [FI:Debian for MIPS:]
-   [FR:Debian pour MIPS:]
-   [HR:Debian for MIPS:]
-   [HU:Debian for MIPS:]
-   [IT:Debian per MIPS:]
-   [JA:Debian for MIPS:]
-   [KO:Debian for MIPS:]
-   [NL:Debian for MIPS:]
-   [NO:Debian for MIPS:]
-   [PL:Debian for MIPS:]
-   [PT:Debian para MIPS:]
-   [RO:Debian for MIPS:]
-   [RU:Debian for MIPS:]
-   [SV:Debian f�r MIPS:]
-   [TR:Debian for MIPS:]
-   [ZH:Debian for MIPS:]
+  <gettext domain="ports">Debian for MIPS</gettext>
 </define-menu-item>
 
 <define-tag email>&lt;<A href="mailto:%0">%0</A>&gt;</define-tag>
diff --git a/english/ports/netbsd/menu.inc b/english/ports/netbsd/menu.inc
index 04717ffeb3f..c1e5934f24d 100644
--- a/english/ports/netbsd/menu.inc
+++ b/english/ports/netbsd/menu.inc
@@ -1,115 +1,21 @@
 #use wml::debian::submenu
 #include "$(ENGLISHDIR)/ports/menu.defs"
 
-# Please keep slices sorted alphabetically so it's easier to detect
-# languages in them (except english ones).
 
 <define-menu-item name="netbsd-i386">
-   [EN:Debian GNU/NetBSD for i386:]
-   [AR:Debian GNU/NetBSD for i386:]
-   [CA:Debian GNU/NetBSD per a i386:]
-   [DA:Debian GNU/NetBSD til i386:]
-   [DE:Debian GNU/NetBSD f�r i386:]
-   [EL:Debian GNU/NetBSD for i386:]
-   [EO:Debian GNU/NetBSD for i386:]
-   [ES:Debian GNU/NetBSD para i386:]
-   [FI:Debian GNU/NetBSD for i386:]
-   [FR:Debian GNU/NetBSD pour i386:]
-   [HR:Debian GNU/NetBSD for i386:]
-   [HU:Debian GNU/NetBSD for i386:]
-   [IT:Debian GNU/NetBSD per i386:]
-   [JA:Debian GNU/NetBSD for i386:]
-   [KO:Debian GNU/NetBSD for i386:]
-   [NL:Debian GNU/NetBSD for i386:]
-   [NO:Debian GNU/NetBSD for i386:]
-   [PL:Debian GNU/NetBSD for i386:]
-   [PT:Debian GNU/NetBSD para i386:]
-   [RO:Debian GNU/NetBSD for i386:]
-   [RU:Debian GNU/NetBSD for i386:]
-   [SV:Debian GNU/NetBSD f�r i386:]
-   [TR:Debian GNU/NetBSD for i386:]
-   [ZH:Debian GNU/NetBSD for i386:]
+  <gettext domain="ports">Debian GNU/NetBSD for i386</gettext>
 </define-menu-item>
 
 <define-menu-item name="netbsd-alpha">
-   [EN:Debian GNU/NetBSD for Alpha:]
-   [AR:Debian GNU/NetBSD for Alpha:]
-   [CA:Debian GNU/NetBSD per a Alpha:]
-   [DA:Debian GNU/NetBSD til Alpha:]
-   [DE:Debian GNU/NetBSD f�r Alpha:]
-   [EL:Debian GNU/NetBSD for Alpha:]
-   [EO:Debian GNU/NetBSD for Alpha:]
-   [ES:Debian GNU/NetBSD para Alpha:]
-   [FI:Debian GNU/NetBSD for Alpha:]
-   [FR:Debian GNU/NetBSD pour Alpha:]
-   [HR:Debian GNU/NetBSD for Alpha:]
-   [HU:Debian GNU/NetBSD for Alpha:]
-   [IT:Debian GNU/NetBSD per Alpha:]
-   [JA:Debian GNU/NetBSD for Alpha:]
-   [KO:Debian GNU/NetBSD for Alpha:]
-   [NL:Debian GNU/NetBSD for Alpha:]
-   [NO:Debian GNU/NetBSD for Alpha:]
-   [PL:Debian GNU/NetBSD for Alpha:]
-   [PT:Debian GNU/NetBSD para Alpha:]
-   [RO:Debian GNU/NetBSD for Alpha:]
-   [RU:Debian GNU/NetBSD for Alpha:]
-   [SV:Debian GNU/NetBSD f�r Alpha:]
-   [TR:Debian GNU/NetBSD for Alpha:]
-   [ZH:Debian GNU/NetBSD for Alpha:]
+  <gettext domain="ports">Debian GNU/NetBSD for Alpha</gettext>
 </define-menu-item>
 
 <define-menu-item name="why">
-   [EN:Why:]
-   [AR:Why:]
-   [CA:Per qu�:]
-   [DA:Hvorfor:]
-   [DE:Wieso:]
-   [EL:Why:]
-   [EO:Why:]
-   [ES:Why:]
-   [FI:Why:]
-   [FR:Pourquoi:]
-   [HR:Why:]
-   [HU:Why:]
-   [IT:Why:]
-   [JA:Why:]
-   [KO:Why:]
-   [NL:Why:]
-   [NO:Why:]
-   [PL:Why:]
-   [PT:Why:]
-   [RO:Why:]
-   [RU:Why:]
-   [SV:Why:]
-   [TR:Why:]
-   [ZH:Why:]
+  <gettext domain="ports">Why</gettext>
 </define-menu-item>
 
 <define-menu-item name="people">
-   [EN:People:]
-   [AR:People:]
-   [CA:Gent:]
-   [DA:Folk:]
-   [DE:Leute:]
-   [EL:People:]
-   [EO:People:]
-   [ES:People:]
-   [FI:People:]
-   [FR:People:]
-   [HR:People:]
-   [HU:People:]
-   [IT:People:]
-   [JA:People:]
-   [KO:People:]
-   [NL:People:]
-   [NO:People:]
-   [PL:People:]
-   [PT:People:]
-   [RO:People:]
-   [RU:People:]
-   [SV:People:]
-   [TR:People:]
-   [ZH:People:]
+  <gettext domain="ports">People</gettext>
 </define-menu-item>
 
 <menu-item name="ports"         basename="../index">
diff --git a/english/ports/powerpc/menu.inc b/english/ports/powerpc/menu.inc
index fa6fb1628c5..99a0c5019d1 100644
--- a/english/ports/powerpc/menu.inc
+++ b/english/ports/powerpc/menu.inc
@@ -1,34 +1,9 @@
 #use wml::debian::submenu
 #include "$(ENGLISHDIR)/ports/menu.defs"
 
-# Please keep slices sorted alphabetically so it's easier to detect
-# languages in them (except english ones).
 
 <define-menu-item name="powerpc">
-   [EN:Debian for PowerPC:]
-   [AR:Debian for PowerPC:]
-   [CA:Debian per a PowerPC:]
-   [DA:Debian til PowerPC:]
-   [DE:Debian f�r PowerPC:]
-   [EL:Debian for PowerPC:]
-   [EO:Debian for PowerPC:]
-   [ES:Debian para PowerPC:]
-   [FI:Debian for PowerPC:]
-   [FR:Debian pour PowerPC:]
-   [HR:Debian za PowerPC:]
-   [HU:Debian for PowerPC:]
-   [IT:Debian per PowerPC:]
-   [JA:Debian for PowerPC:]
-   [KO:Debian for PowerPC:]
-   [NL:Debian for PowerPC:]
-   [NO:Debian for PowerPC:]
-   [PL:Debian for PowerPC:]
-   [PT:Debian para PowerPC:]
-   [RO:Debian for PowerPC:]
-   [RU:Debian for PowerPC:]
-   [SV:Debian f�r PowerPC:]
-   [TR:Debian for PowerPC:]
-   [ZH:Debian for PowerPC:]
+  <gettext domain="ports">Debian for PowerPC</gettext>
 </define-menu-item>
 
 <menu-item name="ports"         basename="../index">
diff --git a/english/ports/s390/menu.inc b/english/ports/s390/menu.inc
index aac927227bd..14c602d157b 100644
--- a/english/ports/s390/menu.inc
+++ b/english/ports/s390/menu.inc
@@ -1,33 +1,9 @@
 #use wml::debian::submenu
 #include "$(ENGLISHDIR)/ports/menu.defs"
 
-# Please keep slices sorted alphabetically so it's easier to detect
-# languages in them (except english ones).
 
 <define-menu-item name="s390">
-   [EN:Debian for S/390:]
-   [AR:Debian for S/390:]
-   [DA:Debian til S/390:]
-   [DE:Debian f�r S/390:]
-   [EL:Debian for S/390:]
-   [EO:Debian for S/390:]
-   [ES:Debian para S/390:]
-   [FI:Debian for S/390:]
-   [FR:Debian pour S/390:]
-   [HR:Debian for S/390:]
-   [HU:Debian for S/390:]
-   [IT:Debian per S/390:]
-   [JA:Debian for S/390:]
-   [KO:Debian for S/390:]
-   [NL:Debian for S/390:]
-   [NO:Debian for S/390:]
-   [PL:Debian for S/390:]
-   [PT:Debian para S/390:]
-   [RO:Debian for S/390:]
-   [RU:Debian for S/390:]
-   [SV:Debian f�r S/390:]
-   [TR:Debian for S/390:]
-   [ZH:Debian for S/390:]
+  <gettext domain="ports">Debian for S/390</gettext>
 </define-menu-item>
 
 <menu-item name="ports"         basename="../index">
diff --git a/english/ports/sparc/menu.inc b/english/ports/sparc/menu.inc
index 32e298b3681..848a35b1ede 100644
--- a/english/ports/sparc/menu.inc
+++ b/english/ports/sparc/menu.inc
@@ -1,33 +1,9 @@
 #use wml::debian::submenu
 #include "$(ENGLISHDIR)/ports/menu.defs"
 
-# Please keep slices sorted alphabetically so it's easier to detect
-# languages in them (except english ones).
 
 <define-menu-item name="sparc">
-   [EN:Debian for Sparc:]
-   [AR:Debian for Sparc:]
-   [DA:Debian til Sparc:]
-   [DE:Debian f�r Sparc:]
-   [EL:Debian for Sparc:]
-   [EO:Debian for Sparc:]
-   [ES:Debian para Sparc:]
-   [FI:Debian for Sparc:]
-   [FR:Debian pour Sparc:]
-   [HR:Debian za Sparc:]
-   [HU:Debian for Sparc:]
-   [IT:Debian per Sparc:]
-   [JA:Debian for Sparc:]
-   [KO:Debian for Sparc:]
-   [NL:Debian for Sparc:]
-   [NO:Debian for Sparc:]
-   [PL:Debian for Sparc:]
-   [PT:Debian para Sparc:]
-   [RO:Debian for Sparc:]
-   [RU:Debian for Sparc:]
-   [SV:Debian f�r Sparc:]
-   [TR:Debian for Sparc:]
-   [ZH:Debian for Sparc:]
+  <gettext domain="ports">Debian for Sparc</gettext>
 </define-menu-item>
 
 <menu-item name="ports"         basename="../index">
diff --git a/english/ports/sparc64/menu.inc b/english/ports/sparc64/menu.inc
index 6cef7dabcba..109d1c4fa41 100644
--- a/english/ports/sparc64/menu.inc
+++ b/english/ports/sparc64/menu.inc
@@ -1,33 +1,9 @@
 #use wml::debian::submenu
 #include "$(ENGLISHDIR)/ports/menu.defs"
 
-# Please keep slices sorted alphabetically so it's easier to detect
-# languages in them (except english ones).
 
 <define-menu-item name="sparc64">
-   [EN:Debian for Sparc64:]
-   [AR:Debian for Sparc64:]
-   [DA:Debian til Sparc64:]
-   [DE:Debian f�r Sparc64:]
-   [EL:Debian for Sparc64:]
-   [EO:Debian for Sparc64:]
-   [ES:Debian para Sparc64:]
-   [FI:Debian for Sparc64:]
-   [FR:Debian pour Sparc64:]
-   [HR:Debian za Sparc64:]
-   [HU:Debian for Sparc64:]
-   [IT:Debian per Sparc64:]
-   [JA:Debian for Sparc64:]
-   [KO:Debian for Sparc64:]
-   [NL:Debian for Sparc64:]
-   [NO:Debian for Sparc64:]
-   [PL:Debian for Sparc64:]
-   [PT:Debian para Sparc64:]
-   [RO:Debian for Sparc64:]
-   [RU:Debian for Sparc64:]
-   [SV:Debian f�r Sparc64:]
-   [TR:Debian for Sparc64:]
-   [ZH:Debian for Sparc64:]
+  <gettext domain="ports">Debian for Sparc64</gettext>
 </define-menu-item>
 
 <menu-item name="ports"         basename="../index">
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
 
diff --git a/english/template/debian/common_tags.wml b/english/template/debian/common_tags.wml
index 3b739af8949..cc5aff3a388 100644
--- a/english/template/debian/common_tags.wml
+++ b/english/template/debian/common_tags.wml
@@ -8,9 +8,9 @@
 <define-tag email><a href="mailto:%0">%0</a></define-tag>
 <define-tag newsemail><email %0 /></define-tag>
 
-#   The <define-tag-sliced> tag can be used instead of <define-tag>
+#   The <define-tag> tag can be used instead of <define-tag>
 #   when defining piece of text to translate.  Example:
-#     <define-tag-sliced flags whitespace=delete>
+#     <define-tag flags whitespace=delete>
 #           [EN:Flags::]
 #           [DA:Flag::]
 #           [FI:Liput::]
@@ -18,7 +18,7 @@
 #           [HR:Oznake::]
 #           [IT:Opzioni::]
 #           [SV:Flaggor::]
-#     </define-tag-sliced>
+#     </define-tag>
 #   Then slices for all other languages are automatically copied from
 #   English.  It currently does only work when slices are on a single
 #   line.
diff --git a/english/template/debian/common_translation.wml b/english/template/debian/common_translation.wml
index 19185074cf0..49e68509484 100644
--- a/english/template/debian/common_translation.wml
+++ b/english/template/debian/common_translation.wml
@@ -1,759 +1,94 @@
-#use wml::debian::common_tags
+<when <symbol-info printf />>
+   #  mp4h >= 1.3.0
+   <use name="intl:gettext" />
+
+   <mp4h-l10n LC_MESSAGES="<or "$(CUR_LOCALE)" <downcase $(CUR_LANG) /> />" />
+   <textdomain domain="templates" />
+   <bindtextdomain domain="templates" path="$(ENGLISHDIR)/../locale" />
+   <bind_textdomain_codeset domain="templates" codeset="<or $(CHARSET_WML) $(CHARSET) />" />
+</when>
+<when <not <symbol-info printf /> />> 
+   #  mp4h < 1.3.0, intl:gettext is not available
+   #  <gettext> is defined in order not to break nm.d.o.
+   <define-tag gettext endtag=required>%body</define-tag>
+</when>
+
+#  Add <void id="foo"> to make msgids unique
+<define-tag void></define-tag>
 
-# Please keep slices sorted alphabetically with the exception of English.
 
 <define-tag yes whitespace=delete>
-	[EN:Yes:]
-	[AR:���:]
-	[CA:S�:]
-	[DA:Ja:]
-	[DE:Ja:]
-	[EL:���:]
-	[EO:Jes:]
-	[ES:S�:]
-	[FI:Kyll�:]
-	[FR:Oui:]
-	[HR:Da:]
-	[HU:Igen:]
-	[ID:Ya:]
-	[IT:S�:]
-	[JA:����:]
-	[KO:��:]
-	[LT:Taip:]
-	[NL:Ja:]
-	[NO:Ja:]
-	[PL:Tak:]
-	[PT:Sim:]
-	[RO:Da:]
-	[RU:��:]
-	[SV:Ja:]
-	[TR:Evet:]
-	[ZH:�O:]
+  <gettext>Yes</gettext>
 </define-tag>
 <define-tag no whitespace=delete>
-	[EN:No:]
-	[AR:��:]
-	[CA:No:]
-	[DA:Nej:]
-	[DE:Nein:]
-	[EL:���:]
-	[EO:Ne:]
-	[ES:No:]
-	[FI:Ei:]
-	[FR:Non:]
-	[HR:Ne:]
-	[HU:Nem.:]
-	[ID:Tidak:]
-	[IT:No:]
-	[JA:�ʤ�:]
-	[KO:�ƴϿ�:]
-	[LT:Ne:]
-	[NL:Nee:]
-	[NO:Nei:]
-	[PL:Nie:]
-	[PT:N�o:]
-	[RO:Nu:]
-	[RU:���:]
-	[SV:Nej:]
-	[TR:Hay�r:]
-	[ZH:�_:]
+  <gettext>No</gettext>
 </define-tag>
 <define-tag debianproject whitespace=delete>
-	[EN:Debian Project:]
-	[AR:����� �����:]
-	[CA:Projecte Debian:]
-	[DA:Debian-projektet:]
-	[DE:Debian-Projekt:]
-	[EL:������ ����� Debian:]
-	[EO:Projekto Debiano:]
-	[ES:Proyecto Debian:]
-	[FI:Debian-projekti:]
-	[FR:Projet Debian:]
-	[HR:Debian Projekt:]
-	[ID:Proyek Debian:]
-	[IT:Progetto Debian:]
-	[JA:Debian �ץ���������:]
-	[KO:Debian Project:]
-	[LT:Debian Projektas:]
-	[NL:Debian Project:]
-	[NO:Debianprosjektet:]
-	[PL:Projekt Debian:]
-	[PT:Projeto Debian:]
-	[RO:Proiectul Debian:]
-	[RU:������ Debian:]
-	[SV:Debianprojektet:]
-	[ZH:Debian �p��:]
+  <gettext>Debian Project</gettext>
 </define-tag>
 <define-tag blurb whitespace=delete>
-<:
-my $slices = q{
-[EN:Debian GNU/Linux is a free distribution of the GNU/Linux operating
-    system. It is maintained and updated through the work of many users
-    who volunteer their time and effort.:]
-[AR:����� ��� ����� ����� �� ����� ������� ��� �����. � �� ����
-    � ����� ��� ���� ��� ������ �� ���������� ������ �������� ������ �
-    �����.:]
-[CA:Debian GNU/Linux �s una distribuci� lliure del sistema operatiu GNU/Linux.
-    Es mant� i actualitza gr�cies a la feina de molts usuaris que contribueixen
-    amb el seu treball i esfor�.:]
-[DA:Debian GNU/Linux er en fri distribution af styresystemet
-    GNU/Linux. Den vedligeholdes og opdateres af frivillige brugere, der
-    donerer arbejde, tid og energi.:]
-[DE:Debian GNU/Linux ist eine freie Distribution des
-    GNU/Linux-Betriebssystems. Sie wird ausschlie�lich von vielen
-    Freiwilligen gewartet und aktuell gehalten.:]
-[EL:�� Debian GNU/Linux ����� ��� ������ ������� ��� ������������
-    ���������� GNU/Linux. �� ��������� ��� ����� ��� ��� �������� ���
-    ������������ �� ����� �� ������� ��� ���� ��� ����������� ����
-    ��������.:]
-[EO:Debian GNU/Linux estas libera distribuo de la majstra sistemo
-    GNU/Linux. �i estas �isdatigita de la laboro de multaj uzantoj kiuj
-    volonte donas siajn fortojn kaj tempon.:]
-[ES:Debian GNU/Linux es una distribuci�n libre del sistema operativo
-    GNU/Linux. Es mantenida y actualizada a trav�s de la red por muchos
-    usuarios que contribuyen con su tiempo y esfuerzo.:]
-[FI:Debian GNU/Linux on GNU/Linux-k�ytt�j�rjestelm�n vapaa
-    jakelu.  Sit� yll�pit�� ja uudistaa joukko vapaaehtoisia k�ytt�ji�.:]
-[FR:Debian GNU/Linux est une distribution libre du syst�me
-    d'exploitation GNU/Linux. Elle est d�velopp�e et mise � jour gr�ce au
-    travail de nombreux utilisateurs qui offrent leur temps et leurs
-    efforts.:]
-[HR:Debian GNU/Linux je besplatna distribucija operativnog sustava
-    GNU/Linux. Odr�ava se i osvje�ava radom mnogih korisnika koji mu
-    poklanjaju svoje vrijeme i napore.:]
-[HU:A Debian GNU/Linux a GNU/Linux oper�ci�s rendszer ingyenes
-    disztrib�ci�ja. Sz�mos �nk�ntes f�radozik szabad idej�ben fenntart�s�n
-    �s friss�t�s�n.:]
-[ID:Debian GNU/Linux adalah distribusi sistem operasi GNU/Linux yang free. 
-    Dimaintain dan diupdate oleh para pengguna yang mendedikasikan waktu dan 
-    usahanya secara sukarela.:]
-[IT:Debian GNU/Linux � una distribuzione libera del sistema operativo
-    GNU/Linux. � gestita e aggiornata dal lavoro di molti utenti che
-    volontariamente offrono il loro tempo e il loro sforzo.:]
-[JA:Debian GNU/Linux �� GNU/Linux ���ڥ졼�ƥ��󥰥����ƥ�Υե꡼��
-    �ǥ����ȥ�ӥ塼�����Ǥ������֤ȼ�֤��󶡤���¿���Υ桼���ˤ�ä�
-    �ݼ顦��������Ƥ��ޤ���:]
-[KO:Debian GNU/Linux is a free distribution of the GNU/Linux operating
-    system. It is maintained and updated through the work of many users
-    who volunteer their time and effort.:]
-[LT:Debian GNU/Linux yra nemokama GNU/Linux operacin�s sistemos distribucija.
-    J� pri�i�ri ir atnaujina daug vartotoj�, dovanojan�i� savo laisv� laik� ir pastangas.:]
-[NL:Debian GNU/Linux is een vrije distributie van het GNU/Linux
-    operating systeem. Onderhoud en bijwerken gebeurt door de vele
-    gebruikers die vrijwillig hun tijd en inspanningen aanbieden.:]
-[NO:Debian GNU/Linux er en fri distribusjon av operativsystemet
-    GNU/Linux. Den vedlikeholdes og oppdateres av frivillige brukere som
-    donerer tid og arbeid.:]
-[PL:Debian GNU/Linux jest darmow� dystrybucj� systemu operacyjnego
-    GNU/Linux. Opiekuje si� ni� wielu u�ytkownik�w, kt�rzy po�wi�caj� jej
-    sw�j czas i wysi�ek.:]
-[PT: Debian GNU/Linux � uma distribui��o livre do sistema operacional
-    GNU/Linux. Ela � mantida e atualizada atrav�s do trabalho de muitos
-    usu�rios que doam seu tempo e esfor�o voluntariamente.:]
-[RO:Debian GNU/Linux este o distribu�ie &#8222;free&#8220; a sistemului de
-    operare GNU/Linux. Este men�inut� �i actualizat� prin munca multor
-    utilizatori care �i sacrific� timp �i efort pentru aceasta.:]
-[RU:Debian GNU/Linux ��� �������� ���������������� �����������
-    ������������ ������� GNU/Linux. �� ������������� � ���������� �� ����
-    �����, ������� ������ �� ��� ���� ��������� �����.:]
-[SV:Debian GNU/Linux �r en fri distribution av operativsystemet
-    GNU/Linux. Det underh�lls och uppdateras av frivilliga anv�ndare,
-    vilka l�gger ner arbete, tid och energi.:]
-[TR:Debian GNU/Linux, GNU/Linux i�letim sisteminin, �cretsiz bir
-    da��t�m�d�r. Zaman�n� ve g�c�n� g�n�ll� olarak bu i�e veren bir �ok
-    kullan�c� taraf�ndan geli�tirilmektedir.:]
-[ZH:Debian GNU/Linux is a free distribution of the GNU/Linux operating
-    system. It is maintained and updated through the work of many users
-    who volunteer their time and effort.:]
-};
-$slices =~ s/([^:][^ \]])\n/$1 \n/g;
-$slices =~ s/\n\s*//g;
-print $slices;
-:>
+  <gettext>Debian GNU/Linux is a free distribution of the GNU/Linux operating system. It is maintained and updated through the work of many users who volunteer their time and effort.</gettext>
 </define-tag>
 <define-tag keywords whitespace=delete>
-	[EN:debian, GNU, linux, unix, open source, free, DFSG:]
-	[AR:�����, ���, �����, ����, ��� �����, ���, DFSG:]
-	[CA:debian, GNU, linux, unix, open source, lliure, DFSG:]
-	[DA:debian, GNU, linux, unix, open source, fri, DFSG:]
-	[DE:debian, GNU, linux, unix, open source, frei, DFSG:]
-	[EL:debian, GNU, linux, unix, open source, ������, DFSG:]
-	[EO:debian, GNU, linux, unix, open source, libera, DFSG:]
-	[ES:debian, GNU, linux, unix, open source, libre, DFSG:]
-	[FI:debian, GNU, linux, unix, open source, vapaa, DFSG:]
-	[FR:debian, GNU, linux, unix, open source, libre, DFSG:]
-	[HR:debian, GNU, linux, unix, open source, free, DFSG:]
-	[HU:debian, GNU, linux, unix, open source, ny�lt forr�sk�d, szabad, ingyenes, DFSG:]
-	[ID:debian, GNU, linux, unix, open source, free, DFSG:]
-	[IT:debian, GNU, linux, unix, open source, libero, DFSG:]
-	[JA:debian, GNU, linux, unix, �����ץ󥽡���, �ե꡼, DFSG:]
-	[KO:debian, GNU, linux, unix, open source, free, DFSG:]
-	[LT:debian, GNU, linux, unix, open source, atviras kodas, i�eities tekstai:]
-	[NL:debian, GNU, linux, unix, open source, vrij, DFSG:]
-	[NO:debian, GNU, linux, unix, open source, free, �pen kildekode, fri, DFSG:]
-	[PL:debian, GNU, linux, unix, wolnodost�pne �r�d�a, darmowy, DFSG:]
-	[PT:debian, GNU, linux, unix, open source, c�digo aberto, c�digo livre, livre, free, DFSG:]
-	[RO:debian, GNU, linux, unix, open source, liber, gratuit, gratis, DFSG:]
-	[RU:debian, ������, GNU, linux, ������, unix, ����� ,open source, free, DFSG:]
-	[SV:debian, GNU, linux, unix, open source, fritt, DFSG:]
-	[TR:debian, GNU, linux, unix, open source, free, DFSG:]
-	[ZH:debian, GNU, linux, unix, open source, �}�񷽽X, �}�񷽥N�X, �}���l�X, free, �ۥ�, DFSG[CN::][HK::][TW::][CNHK::][CNTW::][HKTW::]:]
+  <gettext>debian, GNU, linux, unix, open source, free, DFSG</gettext>
 </define-tag>
 <define-tag returnline whitespace=delete>
-	[EN:Back to the <a href="m4_HOME/">Debian Project homepage</a>.:]
-	[AR: ���� ��� <a href="m4_HOME/">���� ����� ��������</a>.:]
-	[CA:Tornar a la p�gina principal del <a href="m4_HOME/">Projecte Debian</a>:]
-	[DA:Tilbage til <a href="m4_HOME/">Debian-projektets hjemmeside</a>.:]
-	[DE:Zur&uuml;ck zur <a href="m4_HOME/">Homepage des Debian-Projekts</a>.:]
-	[EL:���� ���� <a href="m4_HOME/">�������� ������ ��� Debian</a>.:]
-	[EO:Reen al la <a href="m4_HOME/">Debiana Projekta hejmpa�o</a>.:]
-	[ES:Volver a la <a href="m4_HOME/">p�gina principal de Debian</a>.:]
-	[FI:Takaisin <a href="m4_HOME/">Debian-projektin kotisivulle</a>.:]
-	[FR:Retour � la <a href="m4_HOME/">page d'accueil de Debian</a>.:]
-	[HR:Natrag na <a href="m4_HOME/">po�etnu stranicu Debian Projekta</a>.:]
-	[HU:Vissza a <a href="m4_HOME/">Debian-projekt kezd�oldal�ra</a>.:]
-	[ID:Kembali ke <a href="m4_HOME/">Halaman Utama Proyek Debian</a>.:]
-	[IT:Ritorna alla pagina principale del <a href="m4_HOME/">Progetto Debian</a>.:]
-	[JA:<a href="m4_HOME/">Debian �ץ��������ȥۡ���ڡ���</a>����롣:]
-	[KO:<a href="m4_HOME/">Debian Ȩ ��������</a>:]
-	[LT:<a href="m4_HOME/">Debian Projekto tinklapis</a>.:]
-	[NL:Terug naar de <a href="m4_HOME/">Debian Project Homepagina</a>.:]
-	[NO:Tilbake til <a href="m4_HOME/">Debianprosjektets hjemmeside</a>.:]
-	[PL:Powr�t do <a href="m4_HOME/">strony g��wnej Debiana</a>.:]
-	[PT:Voltar para a <a href="m4_HOME/">p�gina principal do Debian</a>.:]
-	[RO:�napoi la <a href="m4_HOME/">pagina principal� Debian</a>.:]
-	[RU:����� �� �������� �������� ������� <a href="m4_HOME/">Debian</a>.:]
-	[SV:Tillbaka till <a href="m4_HOME/">Debianprojektets ing�ngssida</a>.:]
-	[TR:<a href="m4_HOME/">Debian ana sayfas�</a> 'na d�n��.:]
-	[ZH:��^ <a href="m4_HOME/">Debian �p���D��</a>:]
+  <gettext>Back to the <a href="m4_HOME/">Debian Project homepage</a>.</gettext>
 </define-tag>
 <define-tag home whitespace=delete>
-	[EN:Home:]
-	[AR:���:]
-	[CA:P�gina principal:]
-	[DA:Hjem:]
-	[DE:Home:]
-	[EL:�������� ������:]
-	[EO:Hejmen:]
-	[ES:P&aacute;gina principal:]
-	[FI:Koti:]
-	[FR:Accueil:]
-	[HR:Po�etak:]
-	[HU:Kezd�oldal:]
-	[ID:Halaman Utama:]
-	[IT:Pagina principale:]
-	[JA:�ۡ���:]
-	[KO:Ȩ:]
-	[LT:Prad�ia:]
-	[NL:Home:]
-	[NO:Hjem:]
-	[PL:Strona G��wna:]
-	[PT:P�gina Principal:]
-	[RO:Acas&#259;:]
-	[RU:�����:]
-	[SV:Hem:]
-	[TR:Ana Sayfa:]
-	[ZH:�D��:]
+  <gettext>Home</gettext>
 </define-tag>
 <define-tag about whitespace=delete>
-	[EN:About:]
-	[AR:���:]
-	[CA:Quant&nbsp;a&nbsp;Debian:]
-	[DA:Om&nbsp;Debian:]
-	[DE:&Uuml;ber&nbsp;Debian:]
-	[EL:�������:]
-	[EO:Pri Debiano:]
-	[ES:Sobre&nbsp;Debian:]
-	[FI:Tietoa:]
-	[FR:�&nbsp;propos&nbsp;de&nbsp;Debian:]
-	[HR:O&nbsp;Debianu:]
-	[HU:Ismertet�:]
-	[ID:Tentang:]
-	[IT:Informazioni:]
-	[JA:Debian �ˤĤ���:]
-	[KO:����ȿ� ���ؼ�:]
-	[LT:Apie:]
-	[NL:Info:]
-	[NO:Om Debian:]
-	[PL:O&nbsp;Debianie:]
-	[PT:Sobre:]
-	[RO:Despre:]
-	[RU:�&nbsp;Debian:]
-	[SV:Om&nbsp;Debian:]
-	[TR:Hakk�nda:]
-	[ZH:����&nbsp;Debian:]
+  <gettext>About</gettext>
 </define-tag>
 <define-tag aboutdebian whitespace=delete>
-	[EN:About Debian:]
-	[AR:��� �����:]
-	[CA:Quant a Debian:]
-	[DA:Om Debian:]
-	[DE:&Uuml;ber Debian:]
-	[EL:������� �� �� Debian:]
-	[EO:Pri Debiano:]
-	[ES:Sobre Debian:]
-	[FI:Tietoa Debianista:]
-	[FR:� propos de Debian:]
-	[HR:O Debianu:]
-	[HU:Ismertet� a Debianr�l:]
-	[ID:Tentang Debian:]
-	[IT:Informazioni su Debian:]
-	[JA:Debian �ˤĤ���:]
-	[KO:����ȿ� ���ؼ�:]
-	[LT:Apie Debian:]
-	[NL:Over Debian:]
-	[NO:Om Debian:]
-	[PL:O Debianie:]
-	[PT:Sobre o Debian:]
-	[RO:Despre Debian:]
-	[RU:� Debian:]
-	[SV:Om Debian:]
-	[TR:Debian Hakk�nda:]
-	[ZH:���� Debian:]
+  <gettext>About Debian</gettext>
 </define-tag>
 <define-tag contactus whitespace=delete>
-	[EN:Contact&nbsp;Us:]
-	[AR:����� ���:]
-	[CA:Contacteu amb nosaltres:]
-	[DA:Kontakt&nbsp;os:]
-	[DE:Kontakte:]
-	[EL:������������� ��z� ���:]
-	[EO:Kontaktu&nbsp;Nin:]
-	[ES:Contacte&nbsp;con&nbsp;nosotros:]
-	[FI:Ota&nbsp;yhteytt�:]
-	[FR:Nous&nbsp;contacter:]
-	[HR:Kontaktirajte&nbsp;nas:]
-	[HU:Kapcsolatfelv�tel:]
-	[ID:Kontak&nbsp;kami:]
-	[IT:Contattaci:]
-	[JA:�䤿���ȥ��󥿥��Ȥ���:]
-	[KO:�츮���� �����ϱ�:]
-	[LT:Kontaktai:]
-	[NL:Contacteer&nbsp;Ons:]
-	[NO:Ta kontakt med oss:]
-	[PL:Skontaktuj&nbsp;si�&nbsp;z&nbsp;nami:]
-	[PT:Contate-nos:]
-	[RO:Contacta�i-ne:]
-	[RU:���&nbsp;�&nbsp;����&nbsp;���������:]
-	[SV:Kontakta oss:]
-	[TR:Bize&nbsp;ula��n:]
-	[ZH:�pô��k:]
+  <gettext>Contact&nbsp;Us</gettext>
 </define-tag>
 <define-tag donations whitespace=delete>
-	[EN:Donations:]
-	[AR:���:]
-	[CA:Donacions:]
-	[DA:Donationer:]
-	[DE:Spenden:]
-	[EL:������:]
-	[EO:Donacoj:]
-	[ES:Donaciones:]
-	[FI:Lahjoitukset:]
-	[FR:Donations:]
-	[HR:Donacije:]
-	[HU:Adom�nyok:]
-	[ID:Donasi:]
-	[IT:Donazioni:]
-	[JA:����:]
-	[KO:�⿩:]
-	[LT:Parama:]
-	[NL:Giften:]
-	[NO:Donasjoner:]
-	[PL:Dary:]
-	[PT:Doa��es:]
-	[RO:Dona�ii:]
-	[RU:����&nbsp;�&nbsp;�������������:]
-	[SV:Donationer:]
-	[TR:Ba���lar:]
-	[ZH:����:]
+  <gettext>Donations</gettext>
 </define-tag>
 <define-tag events whitespace=delete>
-	[EN:Events:]
-	[AR:�����:]
-	[CA:Esdeveniments:]
-	[DA:Begivenheder:]
-	[DE:Veranstaltungen:]
-	[EL:��������:]
-	[EO:Eventoj:]
-	[ES:Eventos:]
-	[FI:Tapahtumia:]
-	[FR:�v�nements:]
-	[HR:Zbivanja:]
-	[HU:Esem�nyek:]
-	[ID:Acara:]
-	[IT:Avvenimenti:]
-	[JA:���٥��:]
-	[KO:�̺�Ʈ:]
-	[LT:�vykiai:]
-	[NL:Agenda:]
-	[NO:Begivenheter:]
-	[PT:Eventos:]
-	[PL:Wydarzenia:]
-	[RO:Evenimente:]
-	[RU:�������:]
-	[SV:Evenemang:]
-	[TR:Olaylar:]
-	[ZH:���n����:]
+  <gettext>Events</gettext>
 </define-tag>
 <define-tag news whitespace=delete>
-	[EN:News:]
-	[AR:�����:]
-	[CA:Not�cies:]
-	[DA:Nyheder:]
-	[DE:Nachrichten:]
-	[EL:���:]
-	[EO:Nova�oj:]
-	[ES:Noticias:]
-	[FI:Uutisia:]
-	[FR:Actualit�s:]
-	[HR:Novosti:]
-	[HU:H�rek:]
-	[ID:Berita:]
-	[IT:Notizie:]
-	[JA:�˥塼��:]
-	[KO:����:]
-	[LT:Naujienos:]
-	[NL:Nieuws:]
-	[NO:Nyheter:]
-	[PL:Wiadomo�ci:]
-	[PT:Not�cias:]
-	[RO:�tiri:]
-	[RU:�������:]
-	[SV:Nyheter:]
-	[TR:Haberler:]
-	[ZH:�s�D:]
+  <gettext>News</gettext>
 </define-tag>
 <define-tag distribution whitespace=delete>
-	[EN:Distribution:]
-	[AR:�����:]
-	[CA:Distribuci�:]
-	[DA:Distribution:]
-	[DE:Distribution:]
-	[EL:�������:]
-	[EO:Distribuo:]
-	[ES:Distribuci&oacute;n:]
-	[FI:Jakelu:]
-	[FR:Distribution:]
-	[HR:Distribucija:]
-	[HU:Disztrib�ci�:]
-	[ID:Distribusi:]
-	[IT:Distribuzione:]
-	[JA:�ǥ����ȥ�ӥ塼�����:]
-	[KO:����:]
-	[LT:Distribucija:]
-	[NL:Distributie:]
-	[NO:Distribusjon:]
-	[PL:Dystrybucja:]
-	[PT:Distribui��o:]
-	[RO:Distribu�ie:]
-	[RU:�����������:]
-	[SV:Distribution:]
-	[TR:Da��t�m:]
-	[ZH:�t�εo�G:]
+  <gettext>Distribution</gettext>
 </define-tag>
 <define-tag support whitespace=delete>
-	[EN:Support:]
-	[AR:�����:]
-	[CA:Suport:]
-	[DA:Support:]
-	[DE:Unterst&uuml;tzung:]
-	[EL:����������:]
-	[EO:�enerala helpo:]
-	[ES:Soporte:]
-	[FI:Tuki:]
-	[FR:Assistance:]
-	[HR:Podr�ka:]
-	[HU:Term�kt�mogat�s:]
-	[ID:Support:]
-	[IT:Supporto:]
-	[JA:���ݡ���:]
-	[KO:����:]
-	[LT:Technin� pagalba:]
-	[NL:Ondersteuning:]
-	[NO:St�tte:]
-	[PL:Pomoc:]
-	[PT:Suporte:]
-	[RO:Suport:]
-	[RU:���������:]
-	[SV:Support:]
-	[TR:Destek:]
-	[ZH:[CN:���:][HKTW:�䴩:]:]
+  <gettext>Support</gettext>
 </define-tag>
 <define-tag develcorner whitespace=delete>
-	[EN:Developers'&nbsp;Corner:]
-	[AR: ��� ���������:]
-	[DA:Udviklerhj�rnet:]
-	[CA:Rac� del Desenvolupador:]
-	[DE:Entwickler-Ecke:]
-	[EL:� ����� ��� ��������������:]
-	[EO:Disvolviganta&nbsp;Angulo:]
-	[ES:Rinc&oacute;n&nbsp;del&nbsp;Desarrollador:]
-	[FI:Kehitt�jien&nbsp;nurkkaus:]
-	[FR:Le&nbsp;coin&nbsp;du&nbsp;d�veloppeur:]
-	[HR:Kutak&nbsp;za&nbsp;razvijatelje:]
-	[HU:Fejleszt�k oldala:]
-	[ID:Pojok&nbsp;Developer:]
-	[IT:Angolo&nbsp;degli&nbsp;sviluppatori:]
-	[JA:��ȯ�ԤΥ����ʡ�:]
-	[KO:������ �ڳ�:]
-	[LT:Pl�totoj�&nbsp;kampelis:]
-	[NL:Ontwikkeling:]
-	[NO:Utviklerhj�rnet:]
-	[PL:K�cik&nbsp;developer�w:]
-	[PT:Para&nbsp;Desenvolvedores:]
-	[RO:Col�ul&nbsp;programatorilor:]
-	[RU:������&nbsp;������������:]
-	[SV:Utvecklarh�rnet:]
-	[TR:Geli�tiriciler&nbsp;K��esi:]
-	[ZH:�}�o�̤Ѧa:]
+  <gettext>Developers'&nbsp;Corner</gettext>
 </define-tag>
 <define-tag documentation whitespace=delete>
-	[EN:Documentation:]
-	[AR: �����:]
-	[DA:Dokumentation:]
-	[CA:Documentaci�:]
-	[DE:Dokumentation:]
-	[EL:����������:]
-	[EO:Dokumentaro:]
-	[ES:Documentaci&oacute;n:]
-	[FI:K�ytt�ohjeet:]
-	[FR:Documentation:]
-	[HR:Dokumentacija:]
-	[HU:Dokument�ci�:]
-	[ID:Dokumentasi:]
-	[IT:Documentazione:]
-	[JA:ʸ��:]
-	[KO:����:]
-	[LT:Dokumentacija:]
-	[NL:Documentatie:]
-	[NO:Dokumentasjon:]
-	[PL:Dokumentacja:]
-	[PT:Documenta��o:]
-	[RO:Documenta�ie:]
-	[RU:������������:]
-	[SV:Dokumentation:]
-	[TR:D�k�mantasyon:]
-	[ZH:����[CN:����:][HKTW:���:]:]
+  <gettext>Documentation</gettext>
 </define-tag>
 <define-tag security whitespace=delete>
-	[EN:Security&nbsp;Information:]
-	[AR: �����:]
-	[CA:Informaci� sobre seguretat:]
-	[DA:Sikkerhedsoplysninger:]
-	[DE:Sicherheitsinformationen:]
-	[EL:����������� ������� �� ��� ��������:]
-	[EO:Sekureca&nbsp;Informo:]
-	[ES:Informaci&oacute;n&nbsp;sobre&nbsp;Seguridad:]
-	[FI:Tietoturvallisuudesta:]
-	[FR:Informations&nbsp;sur&nbsp;la&nbsp;s�curit�:]
-	[HR:Sigurnosne&nbsp;informacije:]
-	[HU:Biztons�g:]
-	[ID:Keamanan:]
-	[IT:Informazioni&nbsp;sulla&nbsp;sicurezza:]
-	[JA:�������ƥ�����:]
-	[KO:���� ����:]
-	[LT:Saugumas:]
-	[NL:Informatie&nbsp;over&nbsp;veiligheid:]
-	[NO:Sikkerhetsinformasjon:]
-	[PL:Bezpiecze�stwo:]
-	[PT:Informa��es&nbsp;sobre&nbsp;Seguran�a:]
-	[RO:Informa�ii&nbsp;despre&nbsp;securitate:]
-	[RU:����������&nbsp;�&nbsp;������������:]
-	[SV:S�kerhetsinformation:]
-	[TR:G�venlik&nbsp;Bilgisi:]
-	[ZH:�w������:]
+  <gettext>Security&nbsp;Information</gettext>
 </define-tag>
 <define-tag search whitespace=delete>
-	[EN:Search:]
-	[AR:���:]
-	[CA:Cerca:]
-	[DA:S�g:]
-	[DE:Suche:]
-	[EL:���������:]
-	[EO:Ser�o:]
-	[ES:B&uacute;squeda:]
-	[FI:Haku:]
-	[FR:Recherche:]
-	[HR:Pretra�ivanje:]
-	[HU:Keres�s:]
-	[ID:Cari:]
-	[IT:Cerca:]
-	[JA:����:]
-	[KO:�˻�:]
-	[LT:Paie�ka:]
-	[NL:Zoeken:]
-	[NO:S�k:]
-	[PL:Wyszukiwanie:]
-	[PT:Procurar:]
-	[RO:Caut&#259;:]
-	[RU:�����:]
-	[SV:S�k:]
-	[TR:Arama:]
-	[ZH:�j��:]
+  <gettext>Search</gettext>
 </define-tag>
 <define-tag none whitespace=delete>
-	[EN:none:]
-	[AR:�� ���:]
-	[CA:cap:]
-	[DA:ingen:]
-	[DE:kein:]
-	[EL:������:]
-	[EO:neniu:]
-	[ES:ninguno:]
-	[FI:ei&nbsp;mit��n:]
-	[FR:aucun:]
-	[HR:nema:]
-	[HU:nincs:]
-	[ID:tidak&nbsp;ada:]
-	[IT:nessuno:]
-	[JA:�ʤ�:]
-	[KO:����:]
-	[LT:N�ra:]
-	[NL:geen:]
-	[NO:ingen:]
-	[PL:�adne:]
-	[PT:nenhum:]
-	[RO:nimic:]
-	[RU:���:]
-	[SV:ingen:]
-	[TR:hi�biri:]
-	[ZH:�L:]
+  <gettext>none</gettext>
 </define-tag>
 <define-tag go whitespace=delete>
-	[EN:Go:]
-	[AR:����:]
-	[CA:Anem-hi!:]
-	[DA:Udf�r:]
-	[DE:Los:]
-	[EL:��������:]
-	[EO:Iri:]
-	[ES:Ir:]
-	[FI:Etene:]
-	[FR:Lancer:]
-	[HR:Kreni:]
-	[HU:Rajta:]
-	[ID:Cari:]
-	[IT:Vai:]
-	[JA:Go:]
-	[KO:Go:]
-	[LT:Pirmyn:]
-	[NL:Start:]
-	[NO:G� dit:]
-	[PL:Id�:]
-	[PT:Ir:]
-	[RO:Execut&#259;:]
-	[RU:�������:]
-	[SV:G� dit:]
-	[TR:Git:]
-	[ZH:�h / Go:]
+  <gettext>Go</gettext>
 </define-tag>
 <define-tag WWc whitespace=delete>
-	[EN:worldwide:]
-	[AR:worldwide:]
-	[CA:global:]
-	[DA:global:]
-	[DE:weltweit:]
-	[EL:worldwide:]
-	[EO:worldwide:]
-	[ES:worldwide:]
-	[FI:maailmanlaajuinen:]
-	[FR:partout dans le monde:]
-	[HR:�irom svijeta:]
-	[HU:vil�gm�ret�:]
-	[ID:global:]
-	[IT:globale:]
-	[JA:worldwide:]
-	[KO:worldwide:]
-	[LT:Pasauliniu mastu:]
-	[NL:wereldwijd:]
-	[NO:verdensomspennende:]
-	[PL:og�lno�wiatowe:]
-	[PT:mundialmente:]
-	[RO:peste tot �n lume:]
-	[RU:worldwide:]
-	[SV:global:]
-	[TR:worldwide:]
-	[ZH:worldwide:]
+  <gettext>worldwide</gettext>
 </define-tag>
 <define-tag sitemap_short whitespace=delete>
-	[EN:Site map:]
-	[AR:Site map:]
-	[CA:Mapa del servidor:]
-	[DA:Sideoversigt:]
-	[DE:Sitemap:]
-	[EL:Site map:]
-	[EO:Reteja Mapo:]
-	[ES:Mapa del servidor:]
-	[FI:Sivustokartta:]
-	[FR:Plan du site:]
-	[HR:Pregled web stranica:]
-	[HU:Honlapt�rk�p:]
-	[ID:Peta situs:]
-	[IT:Mappa del sito:]
-	[JA:�����ȥޥå�:]
-	[KO:����Ʈ �ȳ�:]
-	[LT:Turinys:]
-	[NL:Index:]
-	[NO:Sideoversikt:]
-	[PL:Mapa serwisu:]
-	[PT:Mapa do site:]
-	[RO:Planul paginilor:]
-	[RU:����� �����:]
-	[SV:Sid�versikt:]
-	[TR:Site haritas�:]
-	[ZH:�����a��:]
+  <gettext>Site map</gettext>
 </define-tag>
 <define-tag misc whitespace=delete>
-	[EN:Miscellaneous:]
-	[AR:Miscellaneous:]
-	[CA:Miscel�l�nia:]
-	[DA:Forskelligt:]
-	[DE:Verschiedenes:]
-	[EL:Miscellaneous:]
-	[EO:Miscellaneous:]
-	[ES:Miscel�nea:]
-	[FI:Sekalaista:]
-	[FR:Divers:]
-	[HR:Razno:]
-	[HU:Egyebek:]
-	[ID:Lain-lain:]
-	[IT:Varie:]
-	[JA:����¾:]
-	[KO:Miscellaneous:]
-	[LT:Kita:]
-	[NL:Diversen:]
-	[NO:Diverse:]
-	[PL:R�ne:]
-	[PT:Miscel�nea:]
-	[RO:Diverse:]
-	[RU:������:]
-	[SV:Diverse:]
-	[TR:Muhtelif:]
-	[ZH:����:]
+  <gettext>Miscellaneous</gettext>
+</define-tag>
+<define-tag gettingdebian whitespace=delete>
+  <gettext>Getting Debian</gettext>
 </define-tag>
-<define-tag-sliced gettingdebian whitespace=delete>
-	[EN:Getting Debian:]
-	[CA:Obtenir Debian:]
-	[DA:F� fat i Debian:]
-	[DE:Debian besorgen:]
-	[EL:���������� �� Debian:]
-	[EO:Akiri Debianon:]
-	[ES:C�mo obtener Debian:]
-	[FI:Debianin hakeminen:]
-	[FR:Obtenir Debian:]
-	[HR:Nabavka Debiana:]
-	[HU:Debianhoz jut�s:]
-	[ID:Memperoleh Debian:]
-	[IT:Ottenere Debian:]
-	[JA:Debian �����ꤹ��:]
-	[KO:����� ���ϱ�:]
-	[LT:Kaip gauti Debian?:]
-	[NL:Verkrijgen:]
-	[NO:F� tak i Debian:]
-	[PL:Jak zdoby� Debiana:]
-	[PT:Obtendo o Debian:]
-	[RO:Ob�in�nd Debian:]
-	[RU:��� ����� �����������:]
-	[SV:F� tag p� Debian:]
-	[ZH:���o Debian:]
-</define-tag-sliced>
diff --git a/english/template/debian/consultant.wml b/english/template/debian/consultant.wml
index 44ef2ac6a71..75d4df0158c 100644
--- a/english/template/debian/consultant.wml
+++ b/english/template/debian/consultant.wml
@@ -1,61 +1,10 @@
 
-# Please keep slices sorted alphabetically with the exception of English.
 
 <define-tag consultanttitle whitespace=delete>
-	[EN:List of Consultants:]
-	[AR:����� ����������:]
-	[CA:Llista de Consultors:]
-	[DA:Konsulentliste:]
-	[DE:Liste der Berater:]
-	[EL:��������� ���������:]
-	[EO:Listo de Konsultantoj:]
-	[ES:Lista de Consultores:]
-	[FI:Konsulttilista:]
-	[FR:Liste des consultants:]
-	[HR:Popis konzultanata:]
-	[HU:Konzult�nsok n�vsora:]
-	[ID:Daftar Penasehat:]
-	[IT:Elenco dei consulenti:]
-	[JA:���󥵥륿��Ȱ���:]
-	[KO:������Ʈ ����Ʈ:]
-	[LT:Konsultant� s�ra�as:]
-	[NL:Lijst van consultants:]
-	[NO:Konsulentliste:]
-	[PL:Lista Konsultant�w:]
-	[PT:Lista de Consultores:]
-	[RO:Lista&nbsp;consultan�ilor:]
-	[RU:������ �������������:]
-	[SV:Konsult�versikt:]
-	[TR:Dan��man Listesi:]
-	[ZH:List of Consultants:]
+  <gettext>List of Consultants</gettext>
 </define-tag>
 <define-tag returnconsult whitespace=delete>
-	[EN:Back to the <a href="./">Debian consultants page</a>.:]
-	[AR:���� �������� �����:]
-	[CA:Tornar a la <a href="./">p�gina de consultors de Debian</a>.:]
-	[DA:Tilbage til <a href="./">Debians konsulentside</a>.:]
-	[DE:Zur�ck zur <a href="./">Debian Beraterseite</a>.:]
-	[EL:���� ���� ������ ��� <a href="./">��������� ��� Debian</a>.:]
-	[EO:Reen al la <a href="./">Pa�o de konsultantoj de Debian</a>.:]
-	[ES:Volver a la <a href="./">p�gina de consultores de Debian</a>.:]
-	[FI:Takaisin <a href="./">Debian-konsulttisivulle</a>.:]
-	[FR:Retour � la <a href="./">page des consultants Debian</a>.:]
-	[HR:Natrag na stranicu <a href="./">Debian konzultanti</a>.:]
-	[HU:Vissza a <a href="./">Debian-konzult�nsok oldal�ra</a>.:]
-	[ID:Kembali ke <a href="./">halaman Penasehat</a>.:]
-	[IT:Ritorna alla <a href="./">pagina dei consulenti Debian</a>.:]
-	[JA:<a href="./">Debian ���󥵥륿��ȤΥڡ���</a>����롣:]
-	[KO:<a href="./">Debian ������Ʈ ������</a>��:]
-	[LT:Gr��ti � <a href="./">Debian konsultant� puslap�</a>.:]
-	[NL:Terug naar de <a href="./">Debian consultants pagina</a>.:]
-	[NO:Tilbake til <a href="./">Debians konsulentliste</a>.:]
-	[PL:Powr�t do <a href="./">strony konsultant�w Debian'a</a>.:]
-	[PT:Voltar para a <a href="./">p�gina de consultores da Debian</a>.:]
-	[RO:�napoi&nbsp;la&nbsp;<a&nbsp;href="./">pagina&nbsp;consultan�ilor</a>.:]
-	[RU:����� �� �������� <a href="./">������������ Debian</a>.:]
-	[SV:�ter till <a href="./">Debians konsult�verikt</a>.:]
-	[TR:<a href="./">Debian dan��manlar sayfas�</a>'na d�n��.:]
-	[ZH:��^ <a href="./">Debian consultants page</a>.:]
+  <gettext>Back to the <a href="./">Debian consultants page</a>.</gettext>
 </define-tag>
 
 # DO NOT translate anything below this line. If you feel something needs to
diff --git a/english/template/debian/countries.wml b/english/template/debian/countries.wml
index 25d43117acf..c0e9972d857 100644
--- a/english/template/debian/countries.wml
+++ b/english/template/debian/countries.wml
@@ -1872,9 +1872,7 @@ if ('$(DUMMY_VAR_DO_NOT_REMOVE)' ne '') {
     print GEN "#   File generated automatically.  Do not edit!\n";
     foreach my $c (sort keys %countries) {
         print GEN "<"."define-tag ".$c."c endtag=delete whitespace=delete>\n";
-        foreach my $t (sort keys %{$countries{$c}}) {
-            print GEN "    [".$t.":".$countries{$c}{$t}.":]\n";
-        }
+        print GEN "    <"."gettext>".$countries{$c}{EN}."<"."/gettext>\n";
         print GEN "<"."/define-tag>\n";
     }
 }
diff --git a/english/template/debian/ddp.wml b/english/template/debian/ddp.wml
index 6d8989a8c28..a2b9ae0f142 100644
--- a/english/template/debian/ddp.wml
+++ b/english/template/debian/ddp.wml
@@ -3,34 +3,7 @@
 #use wml::debian::languages
 
 <define-tag ddpcommentsto whitespace=delete>
-[EN:Please send all comments, criticisms and suggestions about these web pages to our <a href="mailto:debian-doc@lists.debian.org">mailing list</a>.:]
-[AR:Please send all comments, criticisms and suggestions about these web pages to our <a href="mailto:debian-doc@lists.debian.org">mailing list</a>.:]
-[CA:Si us plau, envieu tots els comentaris, suggeriments i cr�tiques sobre aquesta p�gina a la nostra <a href="mailto:debian-doc@lists.debian.org">llista de correu</a>.:]
-[DA:Send kommentarer, kritik og forslag om disse websider til vores <a href="mailto:debian-doc@lists.debian.org">postliste</a>.:]
-[DE:Bitte schicken Sie alle Kommentare, Kritiken und Vorschl�ge zu diese Webseiten an unsere <a href="mailto:debian-doc@lists.debian.org">Mailing-Liste</a> (in Englisch).:]
-[EL:����������� ������� �� ������ ��� ������� � ��� ���������� ��� ������� �� ����� ��� ������� ���� <a href="mailto:debian-doc@lists.debian.org">mailing list</a>.:]
-[EO:Bonvolu sendi �iujn komentarojn, kritikojn kaj sugestojn pri �i tiuj pa�oj al nia <a href="mailto:debian-doc@lists.debian.org">retpo�ta listo</a>.:]
-[ES:Por favor, env�e todos sus comentarios, sugerencias o cr�ticas sobre estas paginas a nuestra <a href="mailto:debian-doc@lists.debian.org">lista de correo</a>.:]
-[FI:N�it� sivuja koskevia Kommentteja, kritiikki� ja ehdotuksia otetaan mielell��n vastaan <a href="mailto:debian-doc@lists.debian.org">postilistallamme</a>.:]
-[FR:Veuillez envoyer vos commentaires, critiques et suggestions concernant ces pages web � notre <a href="mailto:debian-doc@lists.debian.org">liste de diffusion</a>.:]
-[HR:Molimo po�aljite sve komentare, kritike i sugestije o ovim web stranicama na na�u <a href="mailto:debian-doc@lists.debian.org">mailing listu</a>.:]
-[HU:Please send all comments, criticisms and suggestions about these web pages to our <a href="mailto:debian-doc@lists.debian.org">mailing list</a>.:]
-[ID:Harap kirim semua komentar, kritik dan saran anda tentang situs web ini ke <a href="mailto:debian-doc@lists.debian.org">milis</a> kami.:]
-[IT:Per favore manda tutti i commenti, critiche e suggerimenti su queste pagine web alla nostra <a href="mailto:debian-doc@lists.debian.org">lista di messaggi</a>.:]
-[JA:�����Υ����֥ڡ����˴ؤ��륳���ȡ����ո�������Ƥ�<a href="mailto:debian-doc@lists.debian.org">�᡼��󥰥ꥹ��</a>�ޤǤ��󤻤���������:]
-[KO:�� �� �������� ���� �� ���� �ְų� ������ ���� ������ �츮�� <a href="mailto:debian-doc@lists.debian.org">���ϸ� ����Ʈ</a>�� �̿��ϱ� �ٶ���.:]
-[LT:Pra�ome si�sti visus komentarus, kritik�, pasi�lymus apie �iuos tinklapius m�s� <a href="mailto:debian-doc@lists.debian.org">pa�to konferencijai</a>.:]
-[NL:Stuur commentaar, kritiek en suggesties over deze pagina's naar onze
-<a href="mailto:debian-doc@lists.debian.org">mailinglijst</a>.:]
-[NO:Send gjerne kommentarer, kritikk og forslag for disse sidene til <a href="mailto:debian-doc@lists.debian.org">postlisten</a> v�r.:]
-[PL:Prosimy przesy�a� wszelkie komentarze, krytyczne uwagi i sugestie na temat tych stron WWW na nasz� <a href="mailto:debian-doc@lists.debian.org">list� dyskusyjn�</a>.:]
-[PT:Queira enviar seus coment�rios, cr�ticas e sugest�es sobre essas p�ginas para a nossa <a href="mailto:debian-doc@lists.debian.org">lista de discuss�o</a>.:]
-[RO:V� rug�m s� trimite�i toate comentariile, criticile �i sugestiile
-despre aceste pagini la <a href="mailto:debian-doc@lists.debian.org">lista noastr� de e-mail</a>.:]
-[RU:���������� ����������� ��� �����������, ������� � �����������, ��������� � ����� ���������� � ��� <a href="mailto:debian-doc@lists.debian.org">������ ��������</a>.:]
-[SV:S�nd kommentarer, kritik och f�rslag om dessa webbsidor till v�r <a href="mailto:debian-doc@lists.debian.org">s�ndlista</a>.:]
-[TR:Please send all comments, criticisms and suggestions about these web pages to our <a href="mailto:debian-doc@lists.debian.org">mailing list</a>.:]
-[ZH:Please send all comments, criticisms and suggestions about these web pages to our <a href="mailto:debian-doc@lists.debian.org">mailing list</a>.:]
+  <gettext>Please send all comments, criticisms and suggestions about these web pages to our <a href="mailto:debian-doc@lists.debian.org">mailing list</a>.</gettext>
 </define-tag>
 
 {#check_trans#}
diff --git a/english/template/debian/events_common.wml b/english/template/debian/events_common.wml
index 741277c7a89..daa62608c46 100644
--- a/english/template/debian/events_common.wml
+++ b/english/template/debian/events_common.wml
@@ -1,279 +1,36 @@
 #use wml::std::tags
 #use wml::debian::common_translation
 
-# Please keep slices sorted alphabetically with the exception of English.
 
 <define-tag eventtitle whitespace=delete>
-	[EN:Upcoming Attractions:]
-	[AR:������ �������:]
-	[CA:Properes atraccions:]
-	[DA:Kommende begivenheder:]
-	[DE:Kommende Veranstaltungen:]
-	[EL:���������� ��������:]
-	[EO:Venontaj Aferoj:]
-	[ES:Pr�ximas atracciones:]
-	[FI:Tulevia tapahtumia:]
-	[FR:Attractions � venir:]
-	[HR:Nadolaze�e atrakcije:]
-	[ID:Acara mendatang:]
-	[IT:Upcoming Attractions:]
-	[JA:�������Ť���륤�٥��:]
-	[KO:�� ���ֵ� �̺�Ʈ:]
-	[LT:Ateinan�ios atrakcijos:]
-	[NL:Komende evenementen:]
-	[NO:Kommende begivenheter:]
-	[PL:Nadchodz�ce Atrakcje:]
-	[PT:Pr�ximas Atra��es:]
-	[RO:Evenimente&nbsp;viitoare:]
-	[RU:�������� �������:]
-	[SV:Kommande tilldragelser:]
-	[TR:�ok Yak�nda:]
-	[ZH:Upcoming Attractions:]
+  <gettext>Upcoming Attractions</gettext>
 </define-tag>
 <define-tag notvalid whitespace=delete>
-	[EN:link may no longer be valid:]
-	[AR:���� ����� �� ��� �����:]
-	[CA:Potser l'enlla� ja no es v�lid:]
-	[DA:Link'et kan v�re gammelt:]
-	[DE:Link k�nnte veraltet sein:]
-	[EL:� ��������� ������ �� ��� ����� �������:]
-	[EO:eble la ligo ne plu estas valida:]
-	[ES:el enlace puede no ser ya v�lido:]
-	[FI:linkki voi olla vanhentunut:]
-	[FR:le lien n'est peut-�tre plus valide:]
-	[HR:veza mo�da vi�e ne radi:]
-	[ID:link ini mungkin sudah kadaluwarsa:]
-	[IT:link may no longer be valid:]
-	[JA:��󥯤��ڤ�Ƥ����ǽ��������ޤ�:]
-	[KO:������ ��ȿ���� ���� �� �ֽ��ϴ�:]
-	[LT:nuoroda grei�iausiai nebe egzistuoja:]
-	[NL:de link is misschien niet meer geldig:]
-	[NO:pekeren er muligvis gammel:]
-	[PL:odno�nik mo�e nie by� ju� aktualny:]
-	[PT:link pode n�o ser v�lido mais:]
-	[RO:trimiterea&nbsp;poate&nbsp;nu&nbsp;mai&nbsp;este&nbsp;valid�:]
-	[RU:������ ����� ������ �� �����������:]
-	[SV:l�nken kan vara gammal:]
-	[TR:Ba�lant� art�k ge�erli olmayabilir:]
-	[ZH:link may no longer be valid:]
+  <gettext>link may no longer be valid</gettext>
 </define-tag>
 <define-tag langwhen whitespace=delete>
-	[EN:When:]
-	[AR:���:]
-	[CA:Quan:]
-	[DA:Hvorn�r:]
-	[DE:Wann:]
-	[EL:����:]
-	[EO:Kiam:]
-	[ES:Cu�ndo:]
-	[FI:Milloin:]
-	[FR:Quand:]
-	[HR:Kada:]
-	[ID:Waktu:]
-	[IT:Quando:]
-	[JA:����:]
-	[KO:��:]
-	[LT:Kada:]
-	[NL:Wanneer:]
-	[NO:N�r:]
-	[PL:Kiedy:]
-	[PT:Quando:]
-	[RO:C�nd:]
-	[RU:�����:]
-	[TR:Ne Zaman:]
-	[SV:N�r:]
-	[ZH:When:]
+  <gettext>When</gettext>
 </define-tag>
 <define-tag langwhere whitespace=delete>
-	[EN:Where:]
-	[AR:���:]
-	[CA:On:]
-	[DA:Hvor:]
-	[DE:Wo:]
-	[EL:���:]
-	[EO:Kie:]
-	[ES:D�nde:]
-	[FI:Miss�:]
-	[FR:O�:]
-	[HR:Gdje:]
-	[ID:Tempat:]
-	[IT:Dove:]
-	[JA:���:]
-	[KO:���:]
-	[LT:Kur:]
-	[NL:Waar:]
-	[NO:Hvor:]
-	[PL:Gdzie:]
-	[PT:Onde:]
-	[RO:Unde:]
-	[RU:���:]
-	[SV:Var:]
-	[TR:Nerede:]
-	[ZH:Where�]��B*�^:]
+  <gettext>Where</gettext>
 </define-tag>
 <define-tag langinfo whitespace=delete>
-	[EN:More Info:]
-	[AR:������ �� ���������:]
-	[CA:M�s informaci�:]
-	[DA:Yderligere oplysninger:]
-	[DE:Weitere Informationen:]
-	[EL:������������ �����������:]
-	[EO:Pli da informo:]
-	[ES:Informaci�n adicional:]
-	[FI:Lis�tietoa:]
-	[FR:Pour plus d'information:]
-	[HR:Podrobnije informacije:]
-	[HU:B�vebb inform�ci�:]
-	[ID:Informasi lebih lanjut:]
-	[IT:Ulteriori informazioni:]
-	[JA:�ɲþ���:]
-	[KO:�߰� ����:]
-	[LT:Daugiau informacijos:]
-	[NL:Voor meer info:]
-	[NO:Mer informasjon:]
-	[PL:Wi�cej informacji:]
-	[PT:Informa��o adicional:]
-	[RO:Informa�ii&nbsp;suplimentare:]
-	[RU:����� ��������� ����������:]
-	[SV:Ytterligare information:]
-	[TR:Daha fazla bilgi iCin:]
-	[ZH:��Ժɪ����:]
+  <gettext>More Info</gettext>
 </define-tag>
 <define-tag debinvolve whitespace=delete>
-	[EN:Debian Involvement:]
-	[AR:����� �����:]
-	[CA:Participaci� de Debian:]
-	[DA:Debians involvering:]
-	[DE:Beteiligung von Debian:]
-	[EO:Partopreno de Debiano:]
-	[ES:Implicaci�n de Debian:]
-	[FI:Debianin osallisuus:]
-	[FR:Participation de Debian:]
-	[HR:Upletenost Debiana:]
-	[ID:Partisipasi Debian:]
-	[IT:Come Debian � coinvolta:]
-	[JA:Debian ��Ϣ����:]
-	[KO:����� ���� ����:]
-	[LT:Debian dalyvavimas:]
-	[NL:Betrokkenheid van Debian:]
-	[NO:Debians engasjement:]
-	[PL:Zaanga�owanie Debian'a:]
-	[PT:Envolvimento da Debian:]
-	[RO:Implicarea&nbsp;Debian:]
-	[RU:������� Debian:]
-	[SV:Debians involvering:]
-	[TR:Debian Kat�l�m:]
-	[ZH:Debian Involvement:]
+  <gettext>Debian Involvement</gettext>
 </define-tag>
 <define-tag maincoordinator whitespace=delete>
-	[EN:Main Coordinator:]
-	[AR:������� �����:]
-	[CA:Coordinador principal:]
-	[DA:Hovedkoordinator:]
-	[DE:Hauptkoordinator:]
-	[EL:������ �����������:]
-	[EO:�efa Kunordiganto:]
-	[ES:Coordinador principal:]
-	[FI:P��koordinoija:]
-	[FR:Principal coordinateur:]
-	[HR:Glavni koordinator:]
-	[ID:Koordinator Utama:]
-	[IT:Coordinatore principale:]
-	[JA:�ᥤ�󥳡��ǥ��͡���:]
-	[KO:���� �ڵ������:]
-	[LT:Pagrindinis koordinatorius:]
-	[NL:Hoofdco�rdinator:]
-	[NO:Hovedkoordinator:]
-	[PT:Coordenador Principal:]
-	[PL:G��wny koordynator:]
-	[RO:Coordonatorul&nbsp;principal:]
-	[RU:������� �����������:]
-	[SV:Huvudsamordnare:]
-	[TR:Ana Koordinat�r:]
-	[ZH:Main Coordinator:]
+  <gettext>Main Coordinator</gettext>
 </define-tag>
 <define-tag projcoordinator whitespace=delete>
-	[EN:<th>Project</th><th>Coordinator</th>:]
-	[AR:����� �������:]
-	[CA:<th>Coordinador del</th><th>Projecte</th>:]
-	[DA:<th>Projekt</th><th>Koordinator</th>:]
-	[DE:<th>Projekt</th><th>Koordinator</th>:]
-	[EL:<th>����������� ���</th><th>��������</th>:]
-	[EO:<th>Projekto</th><th>Kunordiganto</th>:]
-	[ES:<th>Coordinador de</th><th>Proyecto</th>:]
-	[FI:<th>Projekti</th><th>Koordinaattori</th>:]
-	[FR:<th>Projet</th><th>Coordinateur</th>:]
-	[HR:<th>Projekt</th><th>Koordinator</th>:]
-	[ID:<th>Koordinator</th><th>Proyek</th>:]
-	[IT:<th>Project</th><th>Coordinator</th>:]
-	[JA:<th>�ץ���������</th><th>�����ǥ��͡���</th>:]
-	[KO:<th>������Ʈ</th><th>�ڵ������</th>:]
-	[LT:<th>Projekto</th><th>koordinatorius</th>:]
-	[NL:<th>Project</th><th>Co�rdinator</th>:]
-	[NO:<th>Prosjekt</th><th>Koordinator</th>:]
-	[PL:<th>Koordynatora</th><th>Projektu</th>:]
-	[PT:<th>Coordenador de</th><th>Projeto</th>:]
-	[RO:<th>Coordonatorul&nbsp;de</th><th>proiect</th>:]
-	[RU:<th>�����������</th><th>�������</th>:]
-	[SV:<th>Projekt</th><th>Samordnare</th>:]
-	[TR:<th>Proje</th><th>Koordinat�r�</th>:]
-	[ZH:<th>�p��</th><th>Coordinator</th>:]
+  <gettext><th>Project</th><th>Coordinator</th></gettext>
 </define-tag> 
 <define-tag relatedlinks whitespace=delete>
-	[EN:Related Links:]
-	[AR:������ ���������:]
-	[CA:Enlla�os rel�lacionats:]
-	[DA:Relaterede links:]
-	[DE:Weitere Links:]
-	[EL:�������� ���������:]
-	[EO:Rilataj Ligoj:]
-	[ES:Enlaces relacionados:]
-	[FI:Aiheeseen liittyvi� linkkej�:]
-	[FR:Liens connexes:]
-	[HR:Srodne veze:]
-	[HU:Kapcsol�d� linkek:]
-	[ID:Info Lainnya:]
-	[IT:Collegamenti comuni:]
-	[JA:��Ϣ���:]
-	[KO:���� ��ũ:]
-	[LT:Susijusios nuorodos:]
-	[NL:Verwante sites:]
-	[NO:Beslektede pekere:]
-	[PL:Odno�niki do powi�zanych temat�w:]
-	[PT:Links Relacionados:]
-	[RO:Link-uri interesante:]
-	[RU:��������� ������:]
-	[SV:Relaterade l�nkar:]
-	[TR:�lgili ba�lant�lar:]
-	[ZH:�������}:]
+  <gettext>Related Links</gettext>
 </define-tag>
 <define-tag latestnews whitespace=delete>
-	[EN:Latest News:]
-	[AR:��� �������:]
-	[CA:Darreres Not�cies:]
-	[DA:Sidste nyt:]
-	[DE:Neuste Nachrichten:]
-	[EL:��������� ���:]
-	[EO:Lastaj Nova�oj:]
-	[ES:�ltimas Noticias:]
-	[FI:Tuoreimmat uutiset:]
-	[FR:Derni�res nouvelles:]
-	[HR:Najnovije vijesti:]
-	[HU:Legfrissebb h�rek:]
-	[ID:Berita Terbaru:]
-	[IT:Ultime notizie:]
-	[JA:�ǿ��˥塼��:]
-	[KO:�ֽ� �ҽ�:]
-	[LT:Paskutin�s naujienos:]
-	[NL:Laatste nieuws:]
-	[NO:Siste nytt:]
-	[PL:Najnowsze wiadomo�ci:]
-	[PT:�ltimas Not�cias:]
-	[RO:Ultimele �tiri:]
-	[RU:��������� �������:]
-	[SV:Senaste nytt:]
-	[TR:En Son Haberler:]
-	[ZH:�̷s����:]
+  <gettext>Latest News</gettext>
 </define-tag>
 
 # Do NOT translate anything below this point. If you feel something needs to
diff --git a/english/template/debian/fixes_link.wml b/english/template/debian/fixes_link.wml
index 24df2e3fabb..83776dd2722 100644
--- a/english/template/debian/fixes_link.wml
+++ b/english/template/debian/fixes_link.wml
@@ -1,6 +1,5 @@
 #use wml::std::tags
 
-# Please keep slices sorted alphabetically with the exception of English.
 
 # creates a link given the parameters or returns "arch: N/A" or "arch: not fixed"
 # if applicable
@@ -8,193 +7,25 @@
 # if $stable = "" then not applicable is sent
 
 <define-tag notneeded whitespace=delete>
-	[EN:not needed:]
-	[AR:��� �����:]
-	[CA:No cal:]
-	[DA:Ikke n�dvendig:]
-	[DE:nicht ben�tigt:]
-	[EL:��� ����� ����������:]
-	[EO:ne bezonata:]
-	[ES:no necesario:]
-	[FI:ei tarpeen:]
-	[FR:non n�cessaire:]
-	[HR:nije potrebno:]
-	[ID:tidak diperlukan:]
-	[IT:non richiesto:]
-	[JA:not needed:]
-	[KO:not needed:]
-	[LT:nereikalinga:]
-	[NL:niet nodig:]
-	[NO:ikke n�dvendig:]
-	[PL:niepotrzebny:]
-	[PT:n�o necess�rio:]
-	[RO:nu&nbsp;este&nbsp;necesar:]
-	[RU:�� ���������:]
-	[SV:ej n�dv�ndigt:]
-	[TR:gerekli deGil:]
-	[ZH:not needed:]
+  <gettext>not needed</gettext>
 </define-tag>
 <define-tag notavailable whitespace=delete>
-	[EN:not available:]
-	[AR:��� ������:]
-	[CA:No disponible:]
-	[DA:ikke tilg�ngelig:]
-	[DE:nicht vorhanden:]
-	[EL:��� ����� ���������:]
-	[EO:ne disponebla:]
-	[ES:No Disponible:]
-	[FI:ei saatavilla:]
-	[FR:non disponible:]
-	[HR:nije dostupno:]
-	[ID:tidak tersedia:]
-	[IT:non disponibile:]
-	[JA:not available:]
-	[KO:not available:]
-	[LT:n�ra:]
-	[NL:niet beschikbaar:]
-	[NO:Ikke tilgjengelig:]
-	[PL:niedost�pne:]
-	[PT:indispon�vel:]
-	[RO:nu&nbsp;este&nbsp;disponibil:]
-	[RU:����������:]
-	[SV:ej tillg�ngligt:]
-	[TR:artIk bulunmuyor:]
-	[ZH:not available:]
+  <gettext>not available</gettext>
 </define-tag>
 <define-tag notapplicable whitespace=delete>
-	[EN:N/A:]
-	[AR:����� ��� ����:]
-	[CA:N/D:]
-	[DA:ikke relevant:]
-	[DE:nicht anwendbar:]
-	[EL:��� ����� ����������:]
-	[EO:N/D:]
-	[ES:N/A:]
-	[FI:N/A:]
-	[FR:N/A:]
-	[HR:nije primjenjivo:]
-	[ID:tidak tersedia:]
-	[IT:non applicabile:]
-	[JA:N/A:]
-	[KO:N/A:]
-	[LT:nepritaikoma:]
-	[NL:n.v.t.:]
-	[NO:ikke relevant:]
-	[PL:nie dotyczy:]
-	[PT:N�o Aplic�vel:]
-	[RO:nu&nbsp;se&nbsp;aplic�:]
-	[RU:�� ���������:]
-	[SV:ej relevant:]
-	[TR:N/A:]
-	[ZH:N/A:]
+  <gettext>N/A</gettext>
 </define-tag>
 <define-tag in1_3 whitespace=delete>
-	[EN:in release 1.3:]
-	[AR:�� ������ 1.3:]
-	[CA:En la versi� 1.3:]
-	[DA:i version 1.3:]
-	[DE:in Version 1.3:]
-	[EL:���� ������ 1.3:]
-	[EO:en livero 1.3:]
-	[ES:en la versi�n 1.3:]
-	[FI:versiossa 1.3:]
-	[FR:dans la version 1.3:]
-	[HR:u verziji 1.3:]
-	[ID:di Debian 1.3:]
-	[IT:nella versione 1.3:]
-	[JA:in release 1.3:]
-	[KO:in release 1.3:]
-	[LT:1.3 versijoje:]
-	[NL:in release 1.3:]
-	[NO:i utgave 1.3:]
-	[PL:w wersji 1.3:]
-	[PT:na vers�o 1.3:]
-	[RO:�n&nbsp;versiunea&nbsp;1.3:]
-	[RU:� ������ 1.3:]
-	[SV:i utg�va 1.3:]
-	[TR:sUrUm 1.3:]
-	[ZH:in release 1.3:]
+  <gettext>in release 1.3</gettext>
 </define-tag>
 <define-tag in2_0 whitespace=delete>
-	[EN:in release 2.0:]
-	[AR:�� ������ 2.0:]
-	[CA:En la versi� 2.0:]
-	[DA:i version 2.0:]
-	[DE:in Version 2.0:]
-	[EL:���� ������ 2.0:]
-	[EO:en livero 2.0:]
-	[ES:en la versi�n 2.0:]
-	[FI:versiossa 2.0:]
-	[FR:dans la version 2.0:]
-	[HR:u verziji 2.0:]
-	[ID:di Debian 2.0:]
-	[IT:nella versione 2.0:]
-	[JA:in release 2.0:]
-	[KO:in release 2.0:]
-	[LT:2.0 versijoje:]
-	[NL:in release 2.0:]
-	[NO:i utgave 2.0:]
-	[PL:w wersji 2.0:]
-	[PT:na vers�o 2.0:]
-	[RO:�n&nbsp;versiunea&nbsp;2.0:]
-	[RU:� ������ 2.0:]
-	[SV:i utg�va 2.0:]
-	[TR:sUrUm 2.0:]
-	[ZH:in release 2.0:]
+  <gettext>in release 2.0</gettext>
 </define-tag>
 <define-tag in2_1 whitespace=delete>
-	[EN:in release 2.1:]
-	[AR:�� ������ 2.1:]
-	[CA:En la versi� 2.1:]
-	[DA:i version 2.1:]
-	[DE:in Version 2.1:]
-	[EL:���� ������ 2.1:]
-	[EO:en livero 2.1:]
-	[ES:en la versi�n 2.1:]
-	[FI:versiossa 2.1:]
-	[FR:dans la version 2.1:]
-	[HR:u verziji 2.1:]
-	[ID:di Debian 2.1:]
-	[IT:nella versione 2.1:]
-	[JA:in release 2.1:]
-	[KO:in release 2.1:]
-	[LT:2.1 versijoje:]
-	[NL:in release 2.1:]
-	[NO:i utgave 2.1:]
-	[PL:w wersji 2.1:]
-	[PT:na vers�o 2.1:]
-	[RO:�n&nbsp;versiunea&nbsp;2.1:]
-	[RU:� ������ 2.1:]
-	[SV:i utg�va 2.1:]
-	[TR:sUrUm 2.1:]
-	[ZH:in release 2.1:]
+  <gettext>in release 2.1</gettext>
 </define-tag>
 <define-tag in2_2 whitespace=delete>
-	[EN:in release 2.2:]
-	[AR:�� ������ 2.2:]
-	[CA:En la versi� 2.2:]
-	[DA:i version 2.2:]
-	[DE:in Version 2.2:]
-	[EL:���� ������ 2.2:]
-	[EO:en livero 2.2:]
-	[ES:en la versi�n 2.2:]
-	[FI:versiossa 2.2:]
-	[FR:dans la version 2.2:]
-	[HR:u verziji 2.2:]
-	[ID:di Debian 2.2:]
-	[IT:nella versione 2.2:]
-	[JA:in release 2.2:]
-	[KO:in release 2.2:]
-	[LT:2.2 versijoje:]
-	[NL:in release 2.2:]
-	[NO:i utgave 2.2:]
-	[PL:w wersji 2.2:]
-	[PT:na vers�o 2.2:]
-	[RO:�n&nbsp;versiunea&nbsp;2.2:]
-	[RU:� ������ 2.2:]
-	[SV:i utg�va 2.2:]
-	[TR:sUrUm 2.2:]
-	[ZH:in release 2.2:]
+  <gettext>in release 2.2</gettext>
 </define-tag>
 
 # DO NOT translate anything below here. If you feel something needs to be changed, write to
diff --git a/english/template/debian/footer.wml b/english/template/debian/footer.wml
index 28473dc3f6b..4edfae3fe21 100644
--- a/english/template/debian/footer.wml
+++ b/english/template/debian/footer.wml
@@ -1,39 +1,7 @@
 #use wml::debian::ctime
 
 <define-tag sendcomments whitespace=delete>
-<:
-my $slices = q{
-	[EN:See the Debian <a href="m4_HOME/contact">contact page</a> for information on contacting us.:]
-	[AR:��<a href="m4_HOME/contact">���� ��������</a> ����� ������ �� ��������� � �������� ���.:]
-	[CA:Vegeu la <a href="m4_HOME/contact">p�gina de contactes</a> de Debian per a obtenir m�s informaci� de com contactar-nos.:]
-	[DA:Se Debians <a href="m4_HOME/contact">kontaktside</a> for oplysninger om at kontakte os.:]
-	[DE:Lesen Sie Debians <a href="m4_HOME/contact">Kontakt-Seite</a> f&uuml;r Informationen, wie Sie sich mit uns in Verbindung setzen k&ouml;nnen.:]
-	[EL:����� ��� ������ <a href="m4_HOME/contact"> ������������ �� �� Debian</a> ��� ����������� ������������ ���� ���.:]
-	[EO:Legu la <a href="m4_HOME/contact">debianan kontaktpa�on</a> por scii kiel kontakti nin.:]
-	[ES:Vea la <a href="m4_HOME/contact">p�gina de contactos</a> de Debian para m�s informaci�n sobre c�mo contactar con nosotros.:]
-	[FI:Debianin yhteystiedot kerrotaan <a href="m4_HOME/contact">kontaktisivulla</a>.:]
-	[FR:Voir la <a href="m4_HOME/contact">page contact</a> de Debian pour plus d'information pour nous contacter.:]
-	[HR:Pogledajte Debianovu <a href="m4_HOME/contact">kontaktnu stranicu</a> za informacije o tome kako nas kontaktirati.:]
-	[HU:Ha fel akarod venni vel�nk a kapcsolatot, l�togass el <a href="m4_HOME/contact">ide</a>!:]
-	[ID:Untuk menghubungi kami, silahkan lihat <a href="m4_HOME/contact">Halaman kontak</a> Debian.:]
-	[IT:Vedi la <a href="m4_HOME/contact">pagina dei contatti</a> Debian per informazioni su come contattarci.:]
-	[JA:�䤿���ȥ��󥿥��Ȥ���ݤˤϡ�<a href="m4_HOME/contact">���󥿥��ȥڡ���</a>�ξ����������������:]
-	[KO:�츮�� �����ϰ��� �Ѵٸ� <a href="m4_HOME/contact">�츮���� �����ϱ�</a>�� �����ϼ���.:]
-	[LT:Nor�dami su mumis susisiekti aplankykite <a href="m4_HOME/contact">kontakt� puslap�</a>.:]
-	[NL:Op de Debian <a href="m4_HOME/contact">contact pagina</a> staat hoe u ons kunt bereiken.:]
-	[NO:Se Debians <a href="m4_HOME/contact">kontaktside</a> for informasjon om � komme i kontakt med oss.:]
-	[PL:Informacje o tym, jak si� z nami skontaktowa� s� umieszczone na <a href="m4_HOME/contact">stronie kontaktowej</a>.:]
-	[PT:Veja a <a href="m4_HOME/contact">p�gina de contato com a Debian</a> para saber como voc� pode nos contatar.:]
-	[RO:Vede�i <a href="m4_HOME/contact">pagina de contacte</a> Debian pentru mai multe informa�ii.:]
-	[RU:<a href="m4_HOME/contact">��� � ���� ���������</a>.:]
-	[SV:Se Debians <a href="m4_HOME/contact">kontaktsida</a> f�r information om att kontakta oss.:]
-	[TR:Bizimle ileti�im sa�lamak i�in Debian <a href="m4_HOME/contact">kontak sayfas�</a>'n� ziyaret edin:]
-	[ZH:�аѾ\<a href="m4_HOME/contact">�pô��k</a>�P�ڭ�[CN:���o�pô:][HKTW:�p��:]�C:]
-};
-$slices =~ s/([^:][^ \]])\n/$1 \n/g;
-$slices =~ s/\n\s*//g;
-print $slices;
-:>
+  <gettext>See the Debian <a href="m4_HOME/contact">contact page</a> for information on contacting us.</gettext>
 </define-tag>
 #<define-tag sendcomments whitespace=delete>
 #	[EN:Please send comments or corrections on these pages to:]
@@ -60,88 +28,13 @@ print $slices;
 #       [RU:Please send comments or corrections on these pages to:]
 #</define-tag>
 <define-tag lastmodified whitespace=delete>
-	[EN:Last Modified:]
-	[AR:��� �����:]
-	[CA:�ltima modificaci�:]
-	[DA:Sidst opdateret:]
-	[DE:Zuletzt ge�ndert:]
-	[EL:��������� �����������:]
-	[EO:Laste Modifita:]
-	[ES:�ltima modificaci&oacute;n:]
-	[FI:Viimeksi muutettu:]
-	[FR:Derni�re modification:]
-	[HR:Zadnji put promijenjeno:]
-	[HU:Legut�bbi m�dos�t�s:]
-	[ID:Modifikasi terakhir:]
-	[IT:Ultima modifica:]
-	[JA:�ǽ�����:]
-	[KO:������ ������:]
-	[LT:Paskutin� redagavimo data:]
-	[NL:Laatste aanpassing:]
-	[NO:Sist oppdatert:]
-	[PL:Ostatnia modyfikacja:]
-	[PT:�ltima modifica��o:]
-	[RO:Modificat ultima dat�:]
-	[RU:��������� ���������:]
-	[SV:Senast uppdaterad:]
-	[TR:Son G�ncelleme:]
-	[ZH:�̪�׭q���:]
+  <gettext>Last Modified</gettext>
 </define-tag>
 <define-tag copyright whitespace=delete>
-	[EN:Copyright:]
-	[AR:��� �����:]
-	[CA:Copyright:]
-	[DA:Copyright:]
-	[DE:Copyright:]
-	[EL:���������� ����������:]
-	[EO:Kopirajto:]
-	[ES:Copyright:]
-	[FI:Tekij�noikeudet:]
-	[FR:Copyright:]
-	[HR:Vlasnik autorskih prava:]
-	[HU:Copyright:]
-	[ID:Hak Cipta:]
-	[IT:Copyright:]
-	[JA:Copyright:]
-	[KO:Copyright:]
-	[LT:Autorin�s teis�s:]
-	[NL:Copyright:]
-	[NO:Opphavsrett:]
-	[PL:Copyright:]
-	[PT:Copyright:]
-	[RO:Drepturi de copiere:]
-	[RU:��������� �����:]
-	[SV:Upphovsr�ttsskyddat:]
-	[TR:Telif Hakk�:]
-	[ZH:���v�Ҧ�:]
+  <gettext>Copyright</gettext>
 </define-tag>
 <define-tag seelicense whitespace=delete>
-	[EN:See <a href="m4_HOME/license" rel="copyright">license terms</a>:]
-	[AR:�� <a href="m4_HOME/license" rel="copyright">���� �������</a>:]
-	[CA:Vegeu <a href="m4_HOME/license" rel="copyright">els termes de la llic�ncia</a>:]
-	[DA:Se <a href="m4_HOME/license" rel="copyright">licensbetingelserne</a>:]
-	[DE:Hier die <a href="m4_HOME/license" rel="copyright">Lizenzbestimmungen</a>:]
-	[EL:����� ���� <a href="m4_HOME/license" rel="copyright">����� ������</a>:]
-	[EO:Legu la <a href="m4_HOME/license" rel="copyright">kontraktajn kondi�ojn</a>:]
-	[ES:Vea <a href="m4_HOME/license" rel="copyright">los t&eacute;rminos de la licencia</a>:]
-	[FI:Katso <a href="m4_HOME/license" rel="copyright">lisenssiehtoja</a>:]
-	[FR:Voir <a href="m4_HOME/license" rel="copyright">les termes de la licence</a>:]
-	[HR:Pro�itajte <a href="m4_HOME/license" rel="copyright">uvjete licence</a>:]
-	[HU:L�sd a <a href="m4_HOME/license" rel="copyright">licencfelt�teleket</a>:]
-	[ID:Lihat <a href="m4_HOME/license" rel="copyright">Lisensi</a>:]
-	[IT:Si veda qui <a href="m4_HOME/license" rel="copyright">per i termini della licenza</a>:]
-	[JA:<a href="m4_HOME/license" rel="copyright">�饤���󥹾��</a>������������:]
-	[KO:<a href="m4_HOME/license" rel="copyright">����</a>�� �о� ������:]
-	[LT:�i�r�kite <a href="m4_HOME/license" rel="copyright">licenzijavimo tvark�</a>:]
-	[NL:Zie <a href="m4_HOME/license" rel="copyright">de licentievoorwaarden</a>:]
-	[NO:Se <a href="m4_HOME/license" rel="copyright">lisensvilk�rene</a>:]
-	[PL:Zobacz <a href="m4_HOME/license" rel="copyright">warunki umowy</a>:]
-	[PT:Veja os <a href="m4_HOME/license" rel="copyright">termos de licen�a</a>:]
-	[RO:vede�i <a href="m4_HOME/license" rel="copyright">termenii licen�ei</a>.:]
-	[RU:<a href="m4_HOME/license" rel="copyright">��������</a>:]
-	[SV:Se <a href="m4_HOME/license" rel="copyright">licensvillkor</a>:]
-	[TR:<a href="m4_HOME/license" rel="copyright">Lisans �artlar�</a>:]
-	[ZH:�d�\<a href="m4_HOME/license" rel="copyright">�\�i�ұ���</a>:]
+  <gettext>See <a href="m4_HOME/license" rel="copyright">license terms</a></gettext>
 </define-tag>
 
 # Do NOT translate anything below this line. If you feel something needs
diff --git a/english/template/debian/languages.wml b/english/template/debian/languages.wml
index 50d1db6b777..3423024ac52 100644
--- a/english/template/debian/languages.wml
+++ b/english/template/debian/languages.wml
@@ -4,62 +4,15 @@
 #use wml::debian::language_names
 
 <define-tag langtext whitespace=delete>
-	[EN:This page is also available in the following languages:]
-	[AR:��� ������� ����� ������� ������� ����:]
-	[CA:Disposeu tamb� d'aquesta p�gina en les lleng�es seg�ents:]
-	[DA:Denne side findes ogs� p� f�lgende sprog:]
-	[DE:Diese Seite gibt es auch in den folgenden Sprachen:]
-	[EL:� ������ ���� ����� ��������� ��� ���� ��������� �������:]
-	[EO:Tiu �i pa�o estas anka� legebla en la jenaj lingvoj:]
-	[ES:Esta p�gina tambi�n est� disponible en los siguientes idiomas:]
-	[FI:T�m� sivu on on olemassa my�s seuraavilla kielill�:]
-	[FR:Cette page est aussi disponible dans les langues suivantes&nbsp;:]
-	[HR:Ova stranica je tako�er dostupna na sljede�im jezicima:]
- 	[HU:Az oldal az al�bbi nyelveken is olvashat�:]
-	[ID:Halaman ini juga tersedia dalam bahasa:]
-	[IT:Questa pagina � disponibile anche nelle lingue seguenti:]
- 	[JA:���Υڡ����ϰʲ��θ���Ǥ⤴���ˤʤ�ޤ�:]
- 	[KO:�� �������� ���� ���ε� �� �� �ֽ��ϴ�:]
-	[LT:�is puslapis i�verstas � �ias kalbas:]
-	[NL:Deze pagina is ook beschikbaar in de volgende talen:]
-	[NO:Denne siden fins ogs� p� f�lgende spr�k:]
-	[PL:Ta strona jest r�wnie� dost�pna w nast�puj�cych j�zykach:]
-	[PT:Esta p�gina tamb�m est� dispon�vel nos seguintes idiomas:]
-	[RO:Aceast� pagin� este disponibil� �n urm�toarele limbi:]
-	[RU:��� �������� ����� �������� �� ��������� ������:]
-	[SV:Denna sida finns �ven p� f�ljande spr�k:]
-	[TR:Bu sayfa a�a��daki dillerde de mevcuttur:]
-	[ZH:������L�y�������p�U:]
+  <gettext>This page is also available in the following languages</gettext>
 </define-tag>
 <define-tag setlang whitespace=delete>
-	[EN:How to set <a href=m4_HOME/intro/cn>the default document language</a>:]
-	[AR:��� ����� <a href=m4_HOME/intro/cn>������ ��������� ������</a>:]
-	[CA:Com configurar <a href=m4_HOME/intro/cn>la llengua per defecte als documents</a>:]
-	[DA:S�dan ops�tter du <a href=m4_HOME/intro/cn>standardsprogvalg for dokumenter</a>:]
-	[DE:Wie stellt man <a href=m4_HOME/intro/cn>die Standardsprache</a> ein:]
-	[EL:��� �� <a href=m4_HOME/intro/cn>������� ��� �������������� ������</a>:]
-	[EO:Kiel elekti <a href=m4_HOME/intro/cn>la dokumentan lingvon</a>:]
-	[ES:C�mo modificar <a href=m4_HOME/intro/cn>el idioma por defecto de los documentos</a>:]
-	[FI:Oletuskielen <a href=m4_HOME/intro/cn>asettamisohjeet</a>:]
-	[FR:Comment configurer la <a href=m4_HOME/intro/cn>langue par d�faut du document</a>:]
-	[HR:Kako postaviti <a href=m4_HOME/intro/cn>predodre�eni jezik dokumenata</a>:]
- 	[HU:Hogyan �ll�tsd be <a href=m4_HOME/intro/cn>az alap�rtelmezett nyelvet?</a>:]
-	[ID:Cara menentukan <a href=m4_HOME/intro/cn>bahasa utama untuk digunakan browser anda</a>:]
-	[IT:Come configurare <a href=m4_HOME/intro/cn>la lingua predefinita per i documenti</a>:]
- 	[JA:<a href=m4_HOME/intro/cn>�ǥե���Ȥθ�������ꤹ��ˤ�</a>:]
- 	[KO:<a href=m4_HOME/intro/cn>���ϴ� ���� ������ ��� �ؾ� �ϴ°�?</a>:]
-	[LT:Kaip nustatyti <a href=m4_HOME/intro/cn>standartin� dokumento kalb�?</a>:]
-	[NL:Hoe stelt u <a href=m4_HOME/intro/cn>de standaard taal voor documenten in</a>:]
-	[NO:Slik velger du <a href=m4_HOME/intro/cn>standard spr�k</a>:]
-	[PL:Jak ustawi� <a href=m4_HOME/intro/cn>domy�lny j�zyk dokumentu</a>:]
-	[PT:Como configurar <a href=m4_HOME/intro/cn>o idioma padr�o dos documentos</a>:]
-	[RO:Cum s� configura�i <a href=m4_HOME/intro/cn>limba predefinit� a documentului.</a>:]
-	[RU:��� ���������� <a href=m4_HOME/intro/cn>���� �� ���������</a>:]
-	[SV:S� st�ller du in <a href=m4_HOME/intro/cn>standardspr�kval f�r dokument</a>:]
-	[TR:Varsay�lan belge <a href=m4_HOME/intro/cn>dili nas�l ayarlan�r</a>:]
-	[ZH:<a href=m4_HOME/intro/cn>�p��]�m[CN:�ʬ�:][HKTW:�w�]:]�y��</a>:]
+  <gettext>How to set <a href=m4_HOME/intro/cn>the default document language</a></gettext>
 </define-tag>
 
+#   Empty slice so that WML won't fail
+[<upcase $(CUR_ISO_LANG) />::]
+
 <perl>
 # Add your language directory along with its ISO abbreviation here.
 # Do _not_ translate the directory names.
diff --git a/english/template/debian/links.tags.wml b/english/template/debian/links.tags.wml
index 2736e1dc7b2..62a48bd5cc3 100644
--- a/english/template/debian/links.tags.wml
+++ b/english/template/debian/links.tags.wml
@@ -1,900 +1,103 @@
 
 # Add all translations to the define-tags
-# Please keep slices sorted alphabetically with the exception of English.
 
 <define-tag debinternational whitespace=delete>
-	[EN:Debian&nbsp;International:]
-	[AR:����� �������:]
-	[CA:Debian internacionalment:]
-	[DA:Debian&nbsp;internationalt:]
-	[DE:Debian&nbsp;International:]
-	[EL:�� Debian �������:]
-	[EO:Internacia&nbsp;Debiano:]
-	[ES:Debian&nbsp;es&nbsp;internacional:]
-	[FI:Kansainv�linen&nbsp;Debian:]
-	[FR:Debian&nbsp;et&nbsp;l'international:]
-	[HR:Debian&nbsp;me�unarodno:]
-	[HU:Debian&nbsp;International:]
-	[ID:Debian&nbsp;Internasional:]
-	[IT:Debian&nbsp;diventa&nbsp;Internazionale:]
-	[JA:Debian �ι�ݲ��˸�����:]
-	[KO:������� ����ȭ:]
-	[LT:Debian&nbsp;Pasaulyje:]
-	[NL:Debian&nbsp;Internationaal:]
-	[NO:Debian&nbsp;internasjonal:]
-	[PL:R�ne&nbsp;j�zyki&nbsp;w&nbsp;Debianie:]
-	[PT:Debian&nbsp;Internacional:]
-	[RO:Debian&nbsp;Interna�ional:]
-	[RU:�������������&nbsp;Debian:]
-	[SV:Debian&nbsp;internationellt:]
-	[TR:Debian&nbsp;Uluslararas�:]
-	[ZH:Debian&nbsp;��ڤ�:]
+  <gettext>Debian&nbsp;International</gettext>
 </define-tag>
 <define-tag partners whitespace=delete>
-	[EN:Partners:]
-	[AR:�����:]
-	[CA:Socis:]
-	[DA:Partnere:]
-	[DE:Partner:]
-	[EL:����������:]
-	[EO:Asociitoj:]
-	[ES:Colaboradores:]
-	[FI:Kumppanit:]
-	[FR:Partenaires:]
-	[HR:Partneri:]
-	[HU:Partnerek:]
-	[ID:Rekanan:]
-	[IT:Partner:]
-	[JA:�ѡ��ȥʡ�:]
-	[KO:��Ʈ��:]
-	[LT:Partneriai:]
-	[NL:Partners:]
-	[NO:Partnere:]
-	[PL:Partnerzy:]
-	[PT:Parceiros:]
-	[RO:Parteneri:]
-	[RU:��������:]
-	[SV:Partner:]
-	[TR:Ortaklar:]
-	[ZH:�X�@���:]
+  <gettext>Partners</gettext>
 </define-tag>
 <define-tag debianweeklynews whitespace=delete>
-	[EN:Debian Weekly News:]
-	[AR:Debian Weekly News:]
-	[CA:Debian Weekly News:]
-	[DA:Debian Weekly News:]
-	[DE:Debian Weekly News:]
-	[EL:����������� ��� ��� Debian:]
-	[EO:Debian Weekly News:]
-	[ES:Noticias semanales de Debian:]
-	[FI:Debianin viikkokatsaus:]
-	[FR:Nouvelles hebdomadaires Debian:]
-	[HR:Tjedne Debian vijesti:]
-	[HU:Debian Weekly News:]
-	[ID:Debian Weekly News:]
-	[IT:Notizie settimanali Debian:]
-	[JA:Debian ���������꡼�˥塼��:]
-	[KO:Debian Weekly News:]
-	[LT:Savaitin�s Debian Naujienos:]
-	[NL:Debian Weekly News:]
-	[NO:Debians Ukentlige Nyheter:]
-	[PL:Cotygodniowe&nbsp;wiadomo�ci&nbsp;Debiana:]
-	[PT:Debian Weekly News:]
-	[RO:Debian,&nbsp;�tiri&nbsp;s�pt�m�nale:]
-	[RU:������������ ������� Debian:]
-	[SV:Debian Weekly News:]
-	[TR:Debian Haftal�k Haberler:]
-	[ZH:Debian �C�g�ְT:]
+  <gettext>Debian Weekly News</gettext>
 </define-tag>
 <define-tag weeklynews whitespace=delete>
-	[EN:Weekly&nbsp;News:]
-	[AR:������� ���������:]
-	[CA:Not�cies setmanals:]
-	[DA:Ugentlige&nbsp;nyheder:]
-	[DE:W�chentliche&nbsp;Nachrichten:]
-	[EL:����������� ���:]
-	[EO:�iusemajnaj&nbsp;Nova�oj:]
-	[ES:Noticias&nbsp;semanales:]
-	[FI:Viikkokatsaus:]
-	[FR:Nouvelles&nbsp;hebdomadaires:]
-	[HR:Tjedne&nbsp;vijesti:]
-	[HU:Heti&nbsp;h�rek:]
-	[ID:Berita&nbsp;Mingguan:]
-	[IT:Notizie&nbsp;settimanali:]
-	[JA:���������꡼�˥塼��:]
-	[KO:�ְ� ����:]
-	[LT:Savaitin�s&nbsp;naujienos:]
-	[NL:Wekelijks&nbsp;Nieuws:]
-	[NO:Ukentlige&nbsp;nyheter:]
-	[PL:Wiadomo�ci&nbsp;cotygodniowe:]
-	[PT:Not�cias&nbsp;Semanais:]
-	[RO:�tiri&nbsp;s�pt�m�nale:]
-	[RU:������������&nbsp;�������:]
-	[SV:Weekly&nbsp;News:]
-	[TR:Haftal�k&nbsp;Haberler:]
-	[ZH:�C�g�ְT:]
+  <gettext>Weekly&nbsp;News</gettext>
 </define-tag>
 <define-tag releaseinfo whitespace=delete>
-	[EN:Release&nbsp;Info:]
-	[AR:������� ������:]
-	[CA:Info&nbsp;sobre&nbsp;versions:]
-	[DA:Udgivelsesoplysninger:]
-	[DE:Release-Informationen:]
-	[EL:����������� �������:]
-	[EO:Livera&nbsp;Informo:]
-	[ES:Info&nbsp;sobre&nbsp;versiones:]
-	[FI:Julkaisutiedot:]
-	[FR:Derni�re&nbsp;version:]
-	[HR:Informacije&nbsp;o&nbsp;izdanjima:]
-	[HU:Verzi�k:]
-	[ID:Informasi&nbsp;Tentang&nbsp;Debian&nbsp;Rilis:]
-	[IT:Informazioni&nbsp;sulle&nbsp;Versioni:]
-	[JA:��꡼������:]
-	[KO:������ ����:]
-	[LT:Leidimo&nbsp;informacija:]
-	[NL:Release&nbsp;Info:]
-	[NO:Informasjon&nbsp;om&nbsp;utgaver:]
-	[PL:Informacje&nbsp;o&nbsp;wersjach:]
-	[PT:Informa��es&nbsp;sobre&nbsp;Vers�es:]
-	[RO:Informa�ii&nbsp;ale&nbsp;versiunilor:]
-	[RU:����������&nbsp;�&nbsp;��������:]
-	[SV:Versionsfakta:]
-	[TR:S�r�m&nbsp;Bilgisi:]
-	[ZH:�o��[CN:�H��:][HKTW:����:]:]
+  <gettext>Release&nbsp;Info</gettext>
 </define-tag>
 <define-tag debianpackages whitespace=delete>
-	[EN:Debian&nbsp;Packages:]
-	[AR:������ �����:]
-	[CA:Paquets&nbsp;Debian:]
-	[DA:Debian-pakker:]
-	[DE:Debian-Softwarepakete:]
-	[EL:������ ��� Debian:]
-	[EO:Debianaj&nbsp;Pakoj:]
-	[ES:Paquetes&nbsp;Debian:]
-	[FI:Debian-paketit:]
-	[FR:Paquets&nbsp;Debian:]
-	[HR:Debian&nbsp;paketi:]
-	[HU:Debian-csomagok:]
-	[ID:Paket-paket&nbsp;Debian:]
-	[IT:Pacchetti&nbsp;Debian:]
-	[JA:Debian �ѥå�����:]
-	[KO:����� ��Ű��:]
-	[LT:Debian&nbsp;paketai:]
-	[NL:Debian&nbsp;Pakketten:]
-	[NO:Debianpakker:]
-	[PL:Pakiety&nbsp;Debiana:]
-	[PT:Pacotes&nbsp;na&nbsp;Debian:]
-	[RO:Pachete&nbsp;Debian:]
-	[RU:������&nbsp;Debian:]
-	[SV:Debianpaket:]
-	[TR:Debian&nbsp;Paketleri:]
-	[ZH:Debian&nbsp;[CN:�n��]:][HKTW:�M��:]:]
+  <gettext>Debian&nbsp;Packages</gettext>
 </define-tag>
 <define-tag download whitespace=delete>
-	[EN:Download:]
-	[AR:Download:]
-	[CA:Baixada:]
-	[DA:Hent:]
-	[DE:Download:]
-	[EL:����:]
-	[EO:Elpreno:]
-	[ES:Descargar:]
-	[FI:Hakeminen:]
-	[FR:T�l�chargement:]
-	[HR:Prijenos Internetom:]
-	[HU:Let�lt�s:]
-	[ID:Download:]
-	[IT:Download:]
-	[JA:�ǤΥ����������:]
-	[KO:�� �����ޱ�:]
-	[LT:Parsisi�sti:]
-	[NL:Download:]
-	[NO:Hent:]
-	[PL:Pobieranie:]
-	[PT:Download:]
-	[RO:Desc�rcare:]
-	[RU:���������:]
-	[SV:H�mta:]
-	[TR:Transfer:]
-	[ZH:�U�� Debian:]
+  <gettext>Download</gettext>
 </define-tag>
 <define-tag debiancd whitespace=delete>
-	[EN:Debian&nbsp;on&nbsp;CD:]
-	[AR:��� �����:]
-	[CA:Debian&nbsp;en&nbsp;CD:]
-	[DA:Debian&nbsp;p�&nbsp;cd:]
-	[DE:Debian&nbsp;auf&nbsp;CD:]
-	[EL:Debian �� CD:]
-	[EO:Debiano&nbsp;en&nbsp;KD:]
-	[ES:Debian&nbsp;en&nbsp;CD:]
-	[FI:Debian&nbsp;CD:ll�:]
-	[FR:Debian&nbsp;sur&nbsp;CD:]
-	[HR:Debian&nbsp;na&nbsp;CD-u:]
-	[HU:Debian CD-n:]
-	[ID:CD&nbsp;Debian:]
-	[IT:Debian&nbsp;su&nbsp;CD:]
-	[JA:Debian �� CD:]
-	[KO:����� CD:]
-	[LT:Debian&nbsp;kompaktiniame&nbsp;diske:]
-	[NL:Debian&nbsp;op&nbsp;CD:]
-	[NO:Debian&nbsp;p�&nbsp;CD-ROM:]
-	[PL:Debian&nbsp;na&nbsp;CD-ROM-ach:]
-	[PT:Debian&nbsp;em&nbsp;CDs:]
-	[RO:CD-uri&nbsp;cu&nbsp;Debian:]
-	[RU:Debian&nbsp;��&nbsp;CD:]
-	[SV:Debian&nbsp;p�&nbsp;cd:]
-	[TR:Debian&nbsp;CD'leri:]
-	[ZH:Debian&nbsp;[CN:���L:][HKTW:����:]:]
+  <gettext>Debian&nbsp;on&nbsp;CD</gettext>
 </define-tag>
 <define-tag debianbooks whitespace=delete>
-	[EN:Debian&nbsp;Books:]
-	[AR:��� �����:]
-	[CA:Llibres&nbsp;sobre&nbsp;Debian:]
-	[DA:Debian-b�ger:]
-	[DE:Debian-B�cher:]
-	[EL:������ Debian:]
-	[EO:Libroj&nbsp;pri&nbsp;Debiano:]
-	[ES:Libros&nbsp;sobre&nbsp;Debian:]
-	[FI:Debian-kirjallisuutta:]
-	[FR:Livres&nbsp;Debian:]
-	[HR:Knjige&nbsp;o&nbsp;Debianu:]
-	[HU:K�nyvek&nbsp;a&nbsp;Debianr�l:]
-	[ID:Buku-buku&nbsp;Tentang&nbsp;Debian:]
-	[IT:Libri&nbsp;su&nbsp;Debian:]
-	[JA:Debian �˴ؤ������:]
-	[KO:����� ���� ����:]
-	[LT:Knygos&nbsp;apie&nbsp;Debian:]
-	[NL:Debian&nbsp;Boeken:]
-	[NO:Debianb�ker:]
-	[PL:Ksi��ki&nbsp;o&nbsp;Debianie:]
-	[PT:Livros&nbsp;sobre&nbsp;Debian:]
-	[RO:C�r�i&nbsp;Debian:]
-	[RU:�����&nbsp;Debian:]
-	[SV:Debianb�cker:]
-	[TR:Debian&nbsp;Hakk�nda&nbsp;Kitaplar:]
-	[ZH:Debian&nbsp;���y:]
+  <gettext>Debian&nbsp;Books</gettext>
 </define-tag>
 <define-tag mailarchives whitespace=delete>
-	[EN:Mailing&nbsp;List&nbsp;Archives:]
-	[AR:������� ������ �����:]
-	[CA:Arxius&nbsp;de&nbsp;llistes&nbsp;de&nbsp;correu:]
-	[DA:Postlistearkiv:]
-	[DE:Archiv&nbsp;der&nbsp;Mailing-Listen:]
-	[EL:����������� ��� ���� ���������� ����������:]
-	[EO:Retpo�tlistaj&nbsp;Ar�ivoj:]
-	[ES:Archivos&nbsp;de&nbsp;listas de&nbsp;correo:]
-	[FI:Postilistojen&nbsp;arkistot:]
-	[FR:Archives&nbsp;des&nbsp;listes&nbsp;de&nbsp;diffusion:]
-	[HR:Arhive&nbsp;mailing&nbsp;lista:]
-	[HU:Levelez�lista-arch�vumok:]
-	[ID:Arsip&nbsp;Milis:]
-	[IT:Archivi&nbsp;delle&nbsp;liste&nbsp;di&nbsp;messaggi:]
-	[JA:�᡼��󥰥ꥹ�ȥ���������:]
-	[KO:���ϸ� ����Ʈ ����:]
-	[LT:Pa�to&nbsp;konferencij�&nbsp;archyvai:]
-	[NL:Mailinglijst&nbsp;Archieven:]
-	[NO:Postlistearkiver:]
-	[PL:Archiwa&nbsp;List&nbsp;Dyskusyjnych:]
-	[PT:Arquivos&nbsp;das&nbsp;Listas&nbsp;de&nbsp;Discuss�o:]
-	[RO:Arhivele&nbsp;listelor&nbsp;de&nbsp;discu�ii:]
-	[RU:������&nbsp;�������&nbsp;��������:]
-	[SV:S�ndlistearkiv:]
-	[TR:Liste&nbsp;Ar�ivleri:]
-	[ZH:[CN:�l��C���k��:][HKTW:�׾¤��:]:]
+  <gettext>Mailing&nbsp;List&nbsp;Archives</gettext>
 </define-tag>
 <define-tag mailinglists whitespace=delete>
-	[EN:Mailing&nbsp;Lists:]
-	[AR:Mailing&nbsp;Lists:]
-	[CA:Llistes&nbsp;de&nbsp;correu:]
-	[DA:Postlister:]
-	[DE:Mailing-Listen:]
-	[EL:��������� ���������:]
-	[EO:Retpo�taj&nbsp;Listoj:]
-	[ES:Listas&nbsp;de&nbsp;correo:]
-	[FI:Postilistat:]
-	[FR:Listes&nbsp;de&nbsp;diffusion:]
-	[HR:Mailing&nbsp;liste:]
-	[HU:Levelez�list�k:]
-	[ID:Daftar&nbsp;Milis:]
-	[IT:Liste&nbsp;di&nbsp;messaggi:]
-	[JA:�᡼��󥰥ꥹ��:]
-	[KO:���ϸ�����Ʈ:]
-	[LT:Pa�to&nbsp;konferencijos:]
-	[NL:Mailinglijsten:]
-	[NO:Postlister:]
-	[PL:Listy&nbsp;Dyskusyjne:]
-	[PT:Listas&nbsp;de&nbsp;Discuss�o:]
-	[RO:Liste&nbsp;de&nbsp;discu�ii:]
-	[RU:������&nbsp;��������:]
-	[SV:S�ndlistor:]
-	[TR:Mail&nbsp;Listeleri:]
-	[ZH:�l��C��:]
+  <gettext>Mailing&nbsp;Lists</gettext>
 </define-tag>
 <define-tag develcorner whitespace=delete>
-	[EN:Developers'&nbsp;Corner:]
-	[AR:��� �������:]
-	[CA:Desenvolupament:]
-	[DA:Udviklerhj�rnet:]
-	[DE:Entwickler-Ecke:]
-	[EL:H ����� ��� ��������������:]
-	[EO:Programista&nbsp;Angulo:]
-	[ES:Desarrollo:]
-	[FI:Kehitt�jien&nbsp;nurkkaus:]
-	[FR:Le&nbsp;coin&nbsp;du&nbsp;d�veloppeur:]
-	[HR:Kutak&nbsp;za&nbsp;razvijatelje:]
-	[HU:Fejleszt�k&nbsp;oldala:]
-	[ID:Pojok&nbsp;Developer:]
-	[IT:Angolo&nbsp;degli&nbsp;sviluppatori:]
-	[JA:��ȯ�ԤΥ����ʡ�:]
-	[KO:������ �ڳ�:]
-	[LT:K�r�j�&nbsp;kampelis:]
-	[NL:Voor&nbsp;de&nbsp;ontwikkelaar:]
-	[NO:Utviklerhj�rnet:]
-	[PL:K�cik&nbsp;rozwijaj�cych:]
-	[PT:Para&nbsp;Desenvolvedores:]
-	[RO:Col�ul&nbsp;programatorilor:]
-	[RU:������&nbsp;������������:]
-	[SV:Utvecklarh�rnet:]
-	[TR:Geli�tiriciler&nbsp;B�l�m�:]
-	[ZH:�}�o�̤Ѧa:]
+  <gettext>Developers'&nbsp;Corner</gettext>
 </define-tag>
 <define-tag socialcontract whitespace=delete>
-	[EN:Social&nbsp;Contract:]
-	[AR:����� ���������:]
-	[CA:Contracte&nbsp;Social:]
-	[DA:Social&nbsp;kontrakt:]
-	[DE:Gesellschaftsvertrag:]
-	[EL:��������� ���������:]
-	[EO:Socia&nbsp;Kontrakto:]
-	[ES:Contrato&nbsp;social:]
-	[FI:Yhteiskuntasopimus:]
-	[FR:Notre&nbsp;contrat&nbsp;social:]
-	[HR:Dru�tveni&nbsp;ugovor:]
-	[HU:T�rsadalmi&nbsp;szerz�d�s:]
-	[ID:Kontrak&nbsp;Sosial:]
-	[IT:Il&nbsp;nostro&nbsp;contratto&nbsp;sociale:]
-	[JA:�䤿���μҲ����:]
-	[KO:�츮�� ���:]
-	[LT:Visuomenin�&nbsp;sutartis:]
-	[NL:Sociaal&nbsp;Contract:]
-	[NO:Sosial&nbsp;kontrakt:]
-	[PL:Umowa&nbsp;Spo�eczna:]
-	[PT:Contrato&nbsp;Social:]
-	[RO:Contractul&nbsp;social:]
-	[RU:����������&nbsp;��������:]
-	[SV:Socialt&nbsp;kontrakt:]
-	[TR:Sosyal&nbsp;Kontrat:]
-	[ZH:���s����:]
+  <gettext>Social&nbsp;Contract</gettext>
 </define-tag>
 <define-tag visitsponsor whitespace=delete>
-	[EN:Visit the site sponsor:]
-	[AR:�� ���� ������:]
-	[CA:Visiteu el servidor del patrocinador:]
-	[DA:Bes�g vores sponsor:]
-	[DE:Besuchen Sie unseren Sponsor:]
-	[EL:������������ �� ������ ��� �������:]
-	[EO:Vizitu a�spicianton:]
-	[ES:Visite el servidor de nuestro patrocinador:]
-	[FI:Vierailethan sivuston sponsorilla:]
-	[FR:Le site de notre sponsor:]
-	[HR:Posjetite pokrovitelja stranica:]
-	[HU:L�togasd meg szponzorainkat!:]
-	[ID:Sponsor situs web:]
-	[IT:Visita il sito dello sponsor:]
-	[JA:���Υ����ȤΥ��ݥ󥵡�:]
-	[KO:�� ����Ʈ�� �Ŀ���:]
-	[LT:Aplankykite puslapio sponsori�:]
-	[NL:Bezoek de sponsor van deze site:]
-	[NO:Bes�k sponsoren for disse sidene:]
-	[PL:Odwied� sponsora Strony:]
-	[PT:Visite o patrocinador do site:]
-	[RO:Vizita�i&nbsp;sponsorii:]
-	[RU:��������&nbsp;������&nbsp;��������:]
-	[SV:Bes�k v�r sponsor:]
-	[TR:Bu sitenin sponsorunu ziyaret ediniz:]
-	[ZH:[CN:�X��:][HKTW:���X:]�����٧U��:]
+  <gettext>Visit the site sponsor</gettext>
 </define-tag>
 <define-tag sitemap whitespace=delete>
-	[EN:Site map for Debian web pages:]
-	[AR:Site map for Debian web pages:]
-	[CA:Mapa de les p�gines al servidor de Debian:]
-	[DA:Oversigt over Debians websider:]
-	[DE:Sitemap der Debian-Webseiten:]
-	[EL:������ ������� ��� Debian:]
-	[EO:Site map for Debian web pages:]
-	[ES:Mapa del servidor de p�ginas de Debian:]
-	[FI:Debian-sivujen sivustokartta:]
-	[FR:Plan du site web Debian:]
-	[HR:Pregled Debian web stranica:]
-	[HU:A Debian-oldalak t�rk�pe:]
-	[ID:Peta situs web Debian:]
-	[IT:Mappa del sito per le pagine Debian:]
-	[JA:Debian �����֥ڡ����Υ����ȥޥå�:]
-	[KO:Site map for Debian web pages:]
-	[LT:Debian interneto puslapi� turinys:]
-	[NL:Site map for Debian web pages:]
-	[NO:Oversikt av Debians nettsider:]
-	[PL:Mapa witryny Debiana:]
-	[PT:Mapa das p�ginas no site da Debian:]
-	[RO:Planul&nbsp;paginilor&nbsp;web&nbsp;Debian:]
-	[RU:����� ����� Debian:]
-	[SV:�versikt �ver Debians webbsidor:]
-	[TR:Site haritas�:]
-	[ZH:Debian �����a��:]
+  <gettext>Site map for Debian web pages</gettext>
 </define-tag>
 <define-tag developerdb whitespace=delete>
-	[EN:Developer Database:]
-	[AR:Developer Database:]
-	[CA:Base de dades dels desenvolupadors:]
-	[DA:Udviklerdatabase:]
-	[DE:Entwickler-Datenbank:]
-	[EL:���� ��������� ��� developers:]
-	[EO:Programista Datbazumo:]
-	[ES:Base de datos de desarrolladores:]
-	[FI:Kehitt�j�tietokanta:]
-	[FR:Base de donn�es des d�veloppeurs:]
-	[HR:Baza podataka o razvijateljima:]
-	[ID:Basis Data Developer:]
-	[IT:Base di dati degli sviluppatori:]
-	[JA:��ȯ�ԥǡ����١���:]
-	[KO:Developer Database:]
-	[LT:K�r�j� duomen� baz�:]
-	[NL:Ontwikkelaars Database:]
-	[NO:Database av utviklere:]
-	[PL:Baza danych rozwijaj�cych:]
-	[PT:Banco de Dados dos Desenvolvedores:]
-	[RO:Baza&nbsp;de&nbsp;date&nbsp;a&nbsp;programatorilor:]
-	[RU:���� ������ � �������������:]
-	[SV:Utvecklardatabas:]
-	[TR:Geli�tiriciler&nbsp;veritaban�:]
-	[ZH:�}�o�H��[CN:�ƾ�:][HKTW:���:]�w:]
+  <gettext>Developer Database</gettext>
 </define-tag>
 <define-tag policy_manual whitespace=delete>
-	[EN:Debian Policy Manual:]
-	[AR:���� ����� �����:]
-	[CA:Manual de Normes de Debian:]
-	[DA:Debians retningslinieh�ndbog:]
-	[DE:Debian Policy-Handbuch:]
-	[EL:�� ���������� ��� ��������� ��� Debian:]
-	[EO:Manlibro de Debiana Kondutmaniero:]
-	[ES:Manual de normas de Debian:]
-	[FI:Debianin linjan kuvaus:]
-	[FR:Manuel des normes Debian:]
-	[HR:Debian Policy Manual:]
-	[HU:A Debian policy le�r�sa:]
-	[ID:Debian Policy Manual:] 
-	[IT:Manuale delle norme Debian:]
-	[JA:Debian �ݥꥷ���ޥ˥奢��:]
-	[KO:Debian Policy Manual:]
-	[LT:Debian Norm� vadovas:]
-	[NL:Debian beleidshandboek:]
-	[NO:Retningslinjeh�ndbok:]
-	[PL:Podr�cznik polityki Debiana:]
-	[PT:Manual de Normas da Debian:]
-	[RO:Manualul&nbsp;de&nbsp;conduit�&nbsp;Debian:]
-	[RU:�������� Debian:]
-	[SV:Debians policyhandbok:]
-	[TR:Debian Kurallar K�lavuzu:]
-	[ZH:Debian �F��[CN:����:][HKTW:���:]:]
+  <gettext>Debian Policy Manual</gettext>
 </define-tag>
 <define-tag devel_reference whitespace=delete>
-	[EN:Developers' Reference:]
-	[AR:����� �������:]
-	[CA:Refer�ncia per a desenvolupadors de Debian:]
-	[DA:Udviklerh�ndbog:]
-	[DE:Entwickler-Handbuch:]
-	[EL:����������� ��� ���������������:]
-	[EO:Referencoj de&nbsp;Programistoj:]
-	[ES:Referencia de los desarrolladores:]
-	[FI:Kehitt�jien k�sikirja:]
-	[FR:Guide de r�f�rence du d�veloppeur Debian:]
-	[HR:Developers' Reference:]
-	[HU:Fejleszt�k k�zik�nyve:]
-	[ID:Referensi Untuk Developer:]
-	[IT:Guida dello sviluppatore Debian:]
-	[JA:�ǥ٥��åѡ�����ե����:]
-	[KO:Developers' Reference:]
-	[LT:Programuotoj� �inynas:]
-	[NL:Naslagwerk voor ontwikkelaars:]
-	[NO:Utviklerh�ndbok:]
-	[PL:Poradnik dla rozwijaj�cych:]
-	[PT:Refer�ncia para Desenvolvedores:]
-	[RO:Referin�e&nbsp;pentru&nbsp;programatori:]
-	[RU:���������� ������������:]
-	[SV:Utvecklarreferensen:]
-	[TR:Geli�tirici Rehberi:]
-	[ZH:�}�o�H������:]
+  <gettext>Developers' Reference</gettext>
 </define-tag>
 <define-tag new_maint_guide whitespace=delete>
-	[EN:New Maintainers' Guide:]
-	[AR:���� ������ ������:]
-	[CA:Guia per a nous Desenvolupadors:]
-	[DA:H�ndbog for nye udviklere:]
-	[DE:Handbuch f&uuml;r neue Paketbetreuer:]
-	[EL:������� ��� ��������� ����������:]
-	[EO:Nova Gvidilo de konservantoj:]
-	[ES:Nueva gu�a del desarrollador:]
-	[FI:Uuden yll�pit�j�n opas:]
-	[FR:Guide du nouveau d�veloppeur:]
-	[HR:New Maintainers' Guide:]
-	[HU:�j fenntart�k k�zik�nyve:]
-	[ID:Panduan Bagi Pengelola Baru:]
-	[IT:Guida del nuovo manutentore:]
-	[JA:Debian ���ƥ�����:]
-	[KO:���ο� ����� �����ڸ� ���� �ȳ���:]
-	[LT:Naujojo pri�i�r�tojo vadovas:]
-	[NL:Naslagwerk voor nieuwe ontwikkelaars:]
-	[NO:Innledning for nye utviklere:]
-	[PL:Przewodnik dla nowych opiekun�w pakiet�w:]
-	[PT:Guia para Novos Mantenedores:]
-	[RO:Ghidul&nbsp;noului&nbsp;responsabil&nbsp;cu&nbsp;�inerea&nbsp;la&nbsp;zi:]
-	[RU:����������� ������ ������������:]
-	[SV:Nyutvecklarguiden:]
-	[TR:Yeni Geli�tirici Rehberi:]
-	[ZH:�s��W��:]
+  <gettext>New Maintainers' Guide</gettext>
 </define-tag>
 <define-tag rc_bugs whitespace=delete>
-	[EN:Release Critical Bugs:]
-	[AR:���ǐ ������ ��������:]
-	[CA:Errors cr�tics per a la publicaci� de noves versions:]
-	[DA:Kritiske fejl:]
-	[DE:Release-kritische Fehler:]
-	[EL:������� ���� ��� �������:]
-	[ES:Fallos cr�ticos para la liberaci�n:]
-	[EO:Liveraj Gravegaj Cimoj:]
-	[FI:Julkaisun est�v�t viat:]
-	[FR:Bogues critiques:]
-	[HR:Bugovi kriti�ni za izdanje:]
-	[HU:Kritikus hib�k:]
-	[ID:Bug Kritikal:]
-	[IT:Problemi critici:]
-	[JA:��꡼�������̿Ū�Х�:]
-	[KO:�˷��� �ɰ��� ����:]
-	[LT:Kritin�s i�leidimo klaidos:]
-	[NL:Release-kritieke Bugs:]
-	[NO:Utgavekritiske feil:]
-	[PL:B��dy krytyczne dystrybucji:]
-	[PT:Bugs Cr�ticos para Lan�amento de Novas Vers�es:]
-	[RO:Probleme&nbsp;critice:]
-	[RU:��������, ��������� ��� ������:]
-	[SV:Fel som m�ste fixas:]
-	[TR:S�r�m�n �nemli Hatalar�:]
-	[ZH:��ê�o�檺�Y�����D:]
+  <gettext>Release Critical Bugs</gettext>
 </define-tag>
 <define-tag lintian whitespace=delete>
-	[EN:Lintian Reports:]
-	[AR:������ �������:]
-	[CA:Informes de Lintian:]
-	[DA:Lintian-rapporter:]
-	[DE:Lintian-�berpr�fung:]
-	[EL:�������� Lintian:]
-	[EO:Lintianaj Informiloj:]
-	[ES:Informes de lintian:]
-	[FI:Lintian-raportit:]
-	[FR:Rapports Lintian:]
-	[HR:Lintian izvje�taji:]
-	[HU:Lintian-jelent�sek:]
-	[ID:Laporan Lintian:]
-	[IT:Rapporti di lintian:]
-	[JA:Lintian �ˤ��ݥꥷ���������å�:]
-	[KO:Lintian Reports:]
-	[LT:Lintian prane�imai:]
-	[NL:Lintian Rapporten:]
-	[NO:Lintian-rapporter:]
-	[PL:Raporty lintiana:]
-	[PT:Informes do Lintian:]
-	[RO:Rapoarte&nbsp;Lintian:]
-	[RU:������ Lintian:]
-	[SV:Lintianrapporter:]
-	[TR:Lintian Raporlar�:]
-	[ZH:Lintian ���i:]
+  <gettext>Lintian Reports</gettext>
 </define-tag>
 
 <define-tag listarchives_users whitespace=delete>
-	[EN:Archives for users' mailing lists:]
-	[AR:Archives for users' mailing lists:]
-	[CA:Arxius de llistes de correu per a usuaris:]
-	[DA:Arkiver for brugerpostlister:]
-	[DE:Archive f�r Anwender-Mailing-Listen:]
-	[EL:���������� ��� ��� �������� �������� ��� �������:]
-	[EO:Archives for users' mailing lists:]
-	[ES:Archivos de las listas de correo de los usuarios:]
-	[FI:K�ytt�jien postilistojen arkistot:]
-	[FR:Archives des listes de diffusion pour utilisateurs:]
-	[HR:Arhive korisni�kih mailing lista:]
-	[HU:Felhaszn�l�i list�k arch�vumai:]
-	[ID:Arsip milis debian-user:]
-	[IT:Archivi delle liste di messaggi per utenti:]
-	[JA:�桼���ѥ᡼��󥰥ꥹ�ȤΥ���������:]
-	[KO:Archives for users' mailing lists:]
-	[LT:Vartotoj� pa�to konferencijos archyvas:]
-	[NL:Archieven van gebruiker-mailinglijsten:]
-	[NO:Arkiv av brukerpostlister:]
-	[PL:Archiwa list dla u�ytkownik�w:]
-	[PT:Arquivos para listas de discuss�o para usu�rios:]
-	[RO:Archivele&nbsp;pentru&nbsp;listele&nbsp;de&nbsp;discu�ii&nbsp;ale&nbsp;utilizatorilor:]
-	[RU:������ ���������������� ������� ��������:]
-	[SV:Arkiv f�r anv�ndars�ndlistor:]
-	[TR:Kullan�c� listelerinin ar�ivleri:]
-	[ZH:[CNHK:�Τ�:][TW:�ϥΪ�:][CN:�l��C���k��:][HKTW:�׾¤��:]:]
+  <gettext>Archives for users' mailing lists</gettext>
 </define-tag>
 <define-tag listarchives_devel whitespace=delete>
-	[EN:Archives for developers' mailing lists:]
-	[AR:Archives for developers' mailing lists:]
-	[CA:Arxius de llistes de correu per a desenvolupadors:]
-	[DA:Arkiver for udviklerpostlister:]
-	[DE:Archive f�r Entwickler-Mailing-Listen:]
-	[EL:���������� ��� ��� �������� �������� ��� ���������������:]
-	[EO:Archives for developers' mailing lists:]
-	[ES:Archivos de las listas de correo de desarrolladores:]
-	[FI:Kehitt�jien postilistojen arkistot:]
-	[FR:Archives des listes de diffusion pour d�veloppeurs:]
-	[HR:Arhive razvijateljskih mailing lista:]
-	[HU:Fejleszt�i list�k arch�vumai:]
-	[ID:Arsip milis debian-devel:]
-	[IT:Archivi delle liste di messaggi per sviluppatori:]
-	[JA:��ȯ���ѥ᡼��󥰥ꥹ�ȤΥ���������:]
-	[KO:Archives for developers' mailing lists:]
-	[LT:Pl�totoj� pa�to konferencijos archyvas:]
-	[NL:Arcieven van ontwikkelaars-mailinglijsten:]
-	[NO:Arkiv av utviklerpostlister:]
-	[PL:Archiwa list dla rozwijaj�cych:]
-	[PT:Arquivo para listas de discuss�o para desenvolvedores:]
-	[RO:Archivele&nbsp;pentru&nbsp;listele&nbsp;de&nbsp;discu�ii&nbsp;ale&nbsp;dezvoltatorilor&nbsp;de&nbsp;programe:]
-	[RU:������ ������� �������� ��� �������������:]
-	[SV:Arkiv f�r utvecklars�ndlistor:]
-	[TR:Geli�tirici listelerinin ar�ivleri:]
-	[ZH:�}�o�H��[CN:�l��C���k��:][HKTW:�׾¤��:]:]
+  <gettext>Archives for developers' mailing lists</gettext>
 </define-tag>
 <define-tag listarchives_i18n whitespace=delete>
-	[EN:Archives for i18n/l10n mailing lists:]
-	[AR:Archives for i18n/l10n mailing lists:]
-	[CA:Arxius de llistes de correu per a i18n/l10n:]
-	[DA:Arkiver for i18n-/l10n-postlister:]
-	[DE:Archive f�r i18n/l10n-Mailing-Listen:]
-	[EL:���������� ��� ��� �������� �������� i18n/l10n:]
-	[EO:Archives for i18n/l10n mailing lists:]
-	[ES:Archivos de las listas de correo de i18n/l10n:]
-	[FI:I18n/l10n-postilistojen arkistot:]
-	[FR:Archives des listes de diffusion pour l'internationalisation:]
-	[HR:Arhive i18n/l10n mailing lista:]
-	[HU:Honos�t�si levelez�list�k arch�vumai:]
-	[ID:Arsip milis debian-i18n:]
-	[IT:Archivi delle liste di messaggi i18n/l10n:]
-	[JA:��ݲ�/�ϰ貽�᡼��󥰥ꥹ�ȤΥ���������:]
-	[KO:Archives for i18n/l10n mailing lists:]
-	[LT:i18n/l10n pa�to konferencijos archyvas:]
-	[NL:Arcieven van i18n/l10n mailinglijsten:]
-	[NO:Arkiv av i18n-/l10n-postlister:]
-	[PL:Archiwa list zwi�zanych z obs�ug� r�nych j�zyk�w:]
-	[PT:Arquivos para listas de discuss�o de i18n/l10n:]
-	[RO:Arhivele&nbsp;pentru&nbsp;listele&nbsp;de&nbsp;discu�ii&nbsp;de&nbsp;localizare&nbsp;�i&nbsp;interna�ionalizare:]
-	[RU:������ ������� �������� �� ������������������� � �����������:]
-	[SV:Arkiv for internationaliserings-/landsanpassningss�ndlistor:]
-	[TR:i18n/l10n liste ar�ivleri:]
-	[ZH:��ڤ�/���g�� (i18n/l10n) [CN:�l��C���k��:][HKTW:�׾¤��:]:]
+  <gettext>Archives for i18n/l10n mailing lists</gettext>
 </define-tag>
 <define-tag listarchives_ports whitespace=delete>
-	[EN:Archives for ports' mailing lists:]
-	[AR:Archives for ports' mailing lists:]
-	[CA:Arxius de llistes de correu per als ports:]
-	[DA:Arkiver for tilpasningspostlister:]
-	[DE:Archive f�r Portierungs-Mailing-Listen:]
-	[EL:���������� ��� ��� �������� �������� ��� ��������������:]
-	[EO:Archives for ports' mailing lists:]
-	[ES:Archivos de las listas de correo de las migraciones:]
-	[FI:Siirrosten postilistojen arkistot:]
-	[FR:Archives des listes de diffusion pour les portages:]
-	[HR:Arhive mailing lista portova:]
-	[HU:Portol�si list�k arch�vumai:]
-	[ID:Arsip milis debian-ports:]
-	[IT:Archivi delle liste di messaggi per i port:]
-	[JA:�ܿ��ѥ᡼��󥰥ꥹ�ȤΥ���������:]
-	[KO:Archives for ports' mailing lists:]
-	[LT:Architekt�ros migracij� pa�to konferencijos archyvas:]
-	[NL:Arcieven can port-mailinglijsten:]
-	[NO:Arkiv av porterings-postlister:]
-	[PL:Archiwa list dyskusyjnych dotycz�cych adaptacji:]
-	[PT:Arquivos para listas de discuss�o de ports:]
-	[RO:Arhivele&nbsp;pentru&nbsp;listele&nbsp;de&nbsp;discu�ii&nbsp;referitoare&nbsp;la&nbsp;port�ri:]
-	[RU:������ ������� �������� �� ������ ������������:]
-	[SV:Arkiv f�r anpassningss�ndlistor:]
-	[TR:Port'a �zel liste ar�ivleri:]
-	[ZH:���ӥ��x[CN:�l��C���k��:][HKTW:�׾¤��:]:]
+  <gettext>Archives for ports' mailing lists</gettext>
 </define-tag>
 <define-tag listarchives_misc whitespace=delete>
-	[EN:Archives for miscellaneous mailing lists:]
-	[AR:Archives for miscellaneous mailing lists:]
-	[CA:Arxius de llistes de correu variades:]
-	[DA:Arkiver for forskellige postlister:]
-	[DE:Archive f�r sonstige Mailing-Listen:]
-	[EL:���������� ��� ��� ������ �������� ��������:]
-	[EO:Archives for miscellaneous mailing lists:]
-	[ES:Archivos de listas de correo variadas:]
-	[FI:Muiden postilistojen arkistot:]
-	[FR:Archives des listes de diffusion de la section �&nbsp;divers&nbsp;�:]
-	[HR:Arhive raznih mailing lista:]
-	[HU:Egy�b levelez�list�k arch�vumai:]
-	[ID:Arsip milis debian-misc:]
-	[IT:Archivi delle liste di messaggi varie:]
-	[JA:����¾�Υ᡼��󥰥ꥹ�ȷ��Υ���������:]
-	[KO:Archives for miscellaneous mailing lists:]
-	[LT:Kit� pa�to konferencij� archyvai:]
-	[NL:Archieven van overige mailinglijsten:]
-	[NO:Arkiv av diverse postlister:]
-	[PL:Archiwa r�nych list dyskusyjnych:]
-	[PT:Arquivos para listas de discuss�o variadas:]
-	[RO:Arhivele&nbsp;pentru&nbsp;listele&nbsp;de&nbsp;discu�ii&nbsp;"diverse":]
-	[RU:������ ������ ������� ��������:]
-	[SV:Arkiv f�r blandade s�ndlistor:]
-	[TR:Di�er liste ar�ivleri:]
-	[ZH:��L[CN:�l��C���k��:][HKTW:�׾¤��:]:]
+  <gettext>Archives for miscellaneous mailing lists</gettext>
 </define-tag>
 <define-tag freesoftware whitespace=delete>
-	[EN:Free&nbsp;Software:]
-	[AR:Free&nbsp;Software:]
-	[CA:Programari&nbsp;lliure:]
-	[DA:Fri&nbsp;software:]
-	[DE:Freie&nbsp;Software:]
-	[EL:��������&nbsp;���������:]
-	[EO:Free&nbsp;Software:]
-	[ES:Software&nbsp;libre:]
-	[FI:Vapaa&nbsp;ohjelmisto:]
-	[FR:Logiciel&nbsp;libre:]
-	[HR:Slobodni&nbsp;softver:]
-	[HU:Szabad szoftver:]
-	[ID:Perangkat&nbsp;Lunak&nbsp;Free:]
-	[IT:Software&nbsp;libero:]
-	[JA:�ե꡼���եȥ�����:]
-	[KO:Free&nbsp;Software:]
-	[LT:Laisva&nbsp;programin�&nbsp;�ranga:]
-	[NL:Vrije&nbsp;Software:]
-	[NO:Fri&nbsp;programvare:]
-	[PL:Wolne&nbsp;oprogramowanie:]
-	[PT:Software&nbsp;Livre:]
-	[RO:Programe&nbsp;libere:]
-	[RU:���������&nbsp;�����������&nbsp;�����������:]
-	[SV:Fri&nbsp;programvara:]
-	[TR:�zg�r&nbsp;Yaz�l�m:]
-	[ZH:�ۥѳn��:]
-</define-tag>
-<define-tag-sliced gettingdebian whitespace=delete>
-	[EN:Getting Debian:]
-	[CA:Obtenir Debian:]
-	[DA:F� fat i Debian:]
-	[DE:Debian besorgen:]
-	[EL:���������� �� Debian:]
-	[ES:C�mo obtener Debian:]
-	[FI:Debianin hakeminen:]
-	[FR:R�cup�rer Debian:]
-	[HR:Nabavka Debiana:]
-	[ID:Memperoleh Debian:]
-	[IT:Ottenere Debian:]
-	[JA:Debian �����ꤹ��:]
-	[NL:Verkrijgen van Debian:]
-	[NO:F� tak i Debian:]
-	[PL:Jak zdoby� Debiana:]
-	[PT:Conseguindo o Debian:]
-	[RO:Ob�in�nd&nbsp;Debian:]
-	[RU:��� ����� �����������:]
-	[SV:F� tag p� Debian:]
-	[HU:Debianhoz jut�s:]
-	[ZH:���o Debian:]
-</define-tag-sliced>
-<define-tag-sliced development whitespace=delete>
-	[EN:Development:]
-	[CA:Desenvolupament:]
-	[DA:Udvikling:]
-	[DE:Entwicklung:]
-	[EL:��������:]
-	[ES:Desarrollo:]
-	[FI:Kehitys:]
-	[FR:D�veloppement:]
-	[HR:Razvoj:]
-	[ID:Pengembangan:]
-	[IT:Sviluppo:]
-	[JA:��ȯ:]
-	[LT:Vystymas:]
-	[NO:Utvikling:]
-	[PL:Rozw�j:]
-	[PT:Desenvolvimento:]
-	[RO:Dezvoltare:]
-	[SV:Utveckling:]
-	[TR:Geli�tirme:]
-	[HU:Fejleszt�s:]
-	[ZH:�}�o:]
-</define-tag-sliced>
-<define-tag-sliced helpdebian whitespace=delete>
-	[EN:Help Debian:]
-	[CA:Ajudeu a Debian:]
-	[DA:Hj�lp Debian:]
-	[DE:Debian unterst�tzen:]
-	[EL:�������:]
-	[ES:Ayuda a Debian:]
-	[FI:Auta Debiania:]
-	[FR:Aider Debian:]
-	[HR:Pomozite Debianu:]
-	[ID:Sokong Debian:]
-	[IT:Aiutare Debian:]
-	[JA:Debian ��ٱ礹��:]
-	[LT:Pagalba Debian:]
-	[NO:Hjelp Debian:]
-	[PL:Jak pom�c Debianowi:]
-	[PT:Ajude o Debian:]
-	[RO:Ajuta�i&nbsp;Debian:]
-	[RU:��� ������ Debian:]
-	[SV:Hj�lp Debian:]
-	[TR:Debian'a Yard�m Etme:]
-	[HU:Seg�ts a Debiannak:]
-	[ZH:��U Debian:]
-</define-tag-sliced>
-<define-tag-sliced bugreports whitespace=delete>
-	[EN:Bug reports:]
-	[CA:Informes d'error:]
-	[DA:Fejlrapporter:]
-	[DE:Fehlerberichte:]
-	[ES:Informes de error:]
-	[FI:Vikailmoitukset:]
-	[FR:Rapports de bogues:]
-	[HR:Bug izvje�taji:]
-	[IT:Segnalazioni di bug:]
-	[JA:�Х����:]
-	[LT:Klaid� prane�imai:]
-	[PL:Zg�oszenia b��d�w:]
-        [RO:Rapoarte&nbsp;de&nbsp;erori:]
-	[RU:��������� �� �������:]
-	[SV:Felrapporter:]
-	[HU:Hibabejelent�sek:]
-        [NO:Feilmeldinger:]
-        [TR:Hata raporlar�:]
-	[ZH:���D���i:]
-</define-tag-sliced>
-<define-tag-sliced portsarchitectures whitespace=delete>
-	[EN:Ports/Architectures:]
-	[CA:Ports/Arquitectures:]
-	[DA:Tilpasninger/arkitekturer:]
-	[DE:Portierungen/Architekturen:]
-	[ES:Migraciones/Arquitecturas:]
-	[FI:Siirrokset/arkkitehtuurit:]
-	[FR:Portages/Architectures:]
-	[HR:Portovi/Arhitekture:]
-	[IT:Port/Architetture:]
-	[JA:�ܿ�/�������ƥ�����:]
-	[LT:Migracija/Architekt�ros:]
-	[PL:Adaptacje/Architektury:]
-        [RO:Port�ri/Arhitecturi:]
-	[RU:������� �� ������ �����������:]
-	[SV:Anpassningar/arkitekturer:]
-	[HU:Portol�s/Architekt�r�k:]
-        [NO:Arkitekturtilpasninger:]
-        [TR:Platformlar:]
-	[ZH:���ӥ��x/��t�[�c:]
-</define-tag-sliced>
+  <gettext>Free&nbsp;Software</gettext>
+</define-tag>
+<define-tag gettingdebian whitespace=delete>
+  <gettext>Getting Debian</gettext>
+</define-tag>
+<define-tag development whitespace=delete>
+  <gettext>Development</gettext>
+</define-tag>
+<define-tag helpdebian whitespace=delete>
+  <gettext>Help Debian</gettext>
+</define-tag>
+<define-tag bugreports whitespace=delete>
+  <gettext>Bug reports</gettext>
+</define-tag>
+<define-tag portsarchitectures whitespace=delete>
+  <gettext>Ports/Architectures</gettext>
+</define-tag>
 <define-tag installationmanual whitespace=delete>
-	[EN:Installation&nbsp;manual:]
-	[AR:�������&nbsp;�������:]
-	[CA:Manual&nbsp;d'Instal�laci�:]
-	[DA:Installationsvejledning:]
-	[DE:Installationsanleitung:]
-	[EL:�������&nbsp;������������:]
-	[EO:Kiel&nbsp;Instali:]
-	[ES:Manual&nbsp;de&nbsp;instalaci�n:]
-	[FI:Asennusopas:]
-	[FR:Manuel&nbsp;d'installation:]
-	[HR:Upute&nbsp;za&nbsp;instalaciju:]
-	[HU:Telep�t�si&nbsp;�tmutat�:]
-	[ID:Petunjuk&nbsp;Instalasi:]
-	[IT:Manuale&nbsp;d'installazione:]
-	[JA:���󥹥ȡ�����:]
-	[KO:��ġ&nbsp;������:]
-	[LT:�diegimo&nbsp;instrukcija:]
-	[NL:Installatiehandleiding:]
-	[NO:Installasjonsh�ndbok:]
-	[PL:Podr�cznik&nbsp;instalacji:]
-	[PT:Manual&nbsp;de&nbsp;Instala��o:]
-	[RO:Instruc�uni&nbsp;de&nbsp;instalare:]
-	[RU:����������&nbsp;��&nbsp;���������:]
-	[SV:Installationsmanual:]
-	[TR:Kurulum&nbsp;A��klamalar�:]
-	[ZH:�w�˻���:]
+  <gettext>Installation&nbsp;manual</gettext>
 </define-tag>
diff --git a/english/template/debian/mirrors.wml b/english/template/debian/mirrors.wml
index 565c1c60693..d6bbe60868c 100644
--- a/english/template/debian/mirrors.wml
+++ b/english/template/debian/mirrors.wml
@@ -1,33 +1,7 @@
 
-# Please keep slices sorted alphabetically with the exception of English.
 
 <define-tag selectserver whitespace=delete>
-	[EN:Select a server near you:]
-	[AR:���� ����� ����� ����:]
-	[CA:Tria un servidor a prop teu:]
-	[DA:V�lg en server i n�rheden af dig:]
-	[DE:W&auml;hlen Sie einen Server in Ihrer N&auml;he:]
-	[EL:�������� ���� ������� ��� �����������:]
-	[EO:Elektu servilon proksiman:]
-	[ES:Elija un servidor cerca de usted:]
-	[FI:Valitse l�heinen palvelin:]
-	[FR:Choisissez un serveur proche de vous:]
-	[HR:Izaberite vama blizak poslu�itelj:]
-	[HU:V�lassz hozz�d k�zeli szervert:]
-	[ID:Pilih server terdekat:]
-	[IT:Scegli il server pi� vicino:]
-	[JA:���᤯�Υ����Ф����Ӳ�����:]
-	[KO:����� ���� �����ϼ���:]
-	[LT:Pasirinkite tarnybin� stot�, esan�i� ar�iausiai j�s�:]
-	[NL:Kies een server dicht bij:]
-	[NO:Velg en tjener n�r deg:]
-	[PL:Wybierz najbli�szy serwer:]
-	[PT:Escolha um servidor pr�ximo de voc�:]
-	[RO:Alege�i un server apropiat:]
-	[RU:��������&nbsp;���������&nbsp;������:]
-	[SV:V�lj en server n�ra dig:]
-	[TR:Yak�n�n�zda bir sunucu se�iniz:]
-	[ZH:��[CN:�N���ܪA�Ⱦ�:][HKTW:��ܴN�񪺦��A��:]:]
+  <gettext>Select a server near you</gettext>
 </define-tag>
 
 # Don't change anything below this point.
@@ -77,18 +51,9 @@ my %mirrors = (
     "<USc/>" => "us", # the same as www.d.o
     "<ZAc/>" => "za",
               );
-# Transform this list
-my $mirrors_lang = {};
-foreach $m (keys %mirrors) {
-  while ($m =~ m/\[([A-Z_]+):(.*?):\]/g) {
-    $mirrors_lang->{$1}->{$2} = $mirrors{$m};
-  }
-}
-foreach $l (keys %$mirrors_lang) {
-  foreach $m (sort langcmp keys %{$mirrors_lang->{$l}}) {
-    my $s = " selected" if $mirrors_lang->{$l}->{$m} eq "us";
-    <perl:print>[$l:<option value=\"$mirrors_lang->{$l}->{$m}\"$s>$m</option>\n:]</perl:print>
-  }
+foreach my $m (sort langcmp keys %mirrors) {
+    my $s = " selected" if $mirrors{$m} eq "us";
+    <perl:print><option value=\"$mirrors{$m}\"$s>$m</option>\n</perl:print>
 }
 </perl>\
 </select>
diff --git a/english/template/debian/news.wml b/english/template/debian/news.wml
index d974c67c664..7f9f6fdb4cb 100644
--- a/english/template/debian/news.wml
+++ b/english/template/debian/news.wml
@@ -3,54 +3,14 @@
 #use wml::debian::languages
 #use wml::debian::ctime
 
-<define-tag-sliced othernews whitespace=delete>
-  [EN:Back to other <a href="./">Debian news</a>.:]
-  [CA:Tornar a altres <a href="./">not�cies de Debian</a>:]
-  [DA:Tilbage til andre <a href="./">Debian-nyheder</a>.:]
-  [DE:Zur�ck zu den anderen <a href="./">Debian-Neuigkeiten</a>.:]
-  [ES:Volver a otras <a href="./">noticias de Debian</a>.:]
-  [FI:Takaisin muihin <a href="./">Debian-uutisiin</a>.:]
-  [FR:Retour aux autres <a href="./">nouvelles Debian</a>.:]
-  [LT:Gr��ti � kitas <a href="./">Debian naujienas</a>.:]
-  [NL:Treug naar ander <a href="./">Debian nieuws</a>.:]
-  [NO:Tilbake til andre <a href="./">Debiannyheter</a>.:]
-  [PL:Powr�t do innych <a href="./">wiadomo�ci Debiana</a>.:]
-  [PT:Voltar para outras <a href="./">not�cias Debian</a>.:]
-  [RU:����� � ������ <a href="./">�������� Debian</a>.:]
-  [SV:Tillbaka till andra <a href="./">Debiannyheter</a>.:]
-</define-tag-sliced>
+<define-tag othernews whitespace=delete>
+  <gettext>Back to other <a href="./">Debian news</a>.</gettext>
+</define-tag>
 
 # Hint for translators: in the following, %0 is replaced by the URL
 # in english the final line would look like, "<http://broken.com (dead.link)>"
-<define-tag newsurldead whitespace=delete>\
-&lt;
-  [EN:%0 (dead link):]
-  [AR:%0 (dead link):]
-  [CA:%0 (enlla� mort):]
-  [DA:%0 (d�dt link):]
-  [DE:%0 (toter Link):]
-  [EL:%0 (������ ���������):]
-  [EO:%0 (mal�usta ligo):]
-  [ES:%0 (enlace roto):]
-  [FI:%0 (rikkin�inen linkki):]
-  [FR:%0 (lien inexistant):]
-  [HR:%0 (dead link):]
-  [HU:%0 (dead link):]
-  [ID:%0 (link buntu):]
-  [IT:%0 (dead link):]
-  [JA:%0 (dead link):]
-  [KO:%0 (dead link):]
-  [LT:%0 (nuoroda neegzistuoja):]
-  [NL:%0 (dode link):]
-  [NO:%0 (d�d peker):]
-  [PL:%0 (dead link):]
-  [PT:%0 (link inexistente):]
-  [RO:%0 (leg�tur� moart�):]
-  [RU:%0 (������ �� ��������):]
-  [SV:%0 (d�d l�nk):]
-  [TR:%0 (dead link):]
-  [ZH:%0 (dead link):]
-&gt;
+<define-tag newsurldead whitespace=delete>
+  <gettext>%0 (dead link)</gettext>
 </define-tag>
 
 # DO NOT translate anything below here. If you feel there is something that
diff --git a/english/template/debian/recent_list.wml b/english/template/debian/recent_list.wml
index f5edea6baba..b1e60811022 100644
--- a/english/template/debian/recent_list.wml
+++ b/english/template/debian/recent_list.wml
@@ -1,234 +1,34 @@
 #use wml::debian::ctime
 
-# Please keep slices sorted alphabetically with the exception of English.
 
 <define-tag noitemsforthisyear whitespace=delete>
-	[EN:No items for this year.:]
-	[AR:���� ���� ��� �����:]
-	[CA:Cap �tem per aquest any:]
-	[DA:Ingen i dette �r.:]
-	[DE:Keine Eintr�ge f�r dieses Jahr.:]
-	[EL:������ ��� ���� �� ����.:]
-	[EO:Estas nenio por �i tiu jaro.:]
-	[ES:No hay elementos para este a�o.:]
-	[FI:Ei otsikoita t�lt� vuodelta:]
-	[FR:Pas d'�l�ments cette ann�e.:]
-	[HR:Za ovu godinu nema �lanaka.:]
-	[ID:Untuk tahun ini tidak ada:]
-	[IT:Nessun articolo per quest'anno.:]
-	[JA:��ǯ�٤ι��ܤϤ���ޤ���:]
-	[KO:No items for this year.:]
-	[LT:�iais metais nieko n�ra.:]
-	[NL:Geen items voor dit jaar.:]
-	[NO:Ingen begivenheter dette �ret:]
-	[PL:Brak wydarze� w tym roku.:]
-	[PT:Sem �tens neste ano.:]
-	[RO:Nu s�nt articole pentru anul acesta.:]
-	[RU:��� ������ �� ���� ���.:]
-	[SV:Ingenting detta �r.:]
-	[TR:Bu yIl iCin bilgi yok:]
-	[ZH:���~�פ��٥�������s�����C:]
+  <gettext>No items for this year.</gettext>
 </define-tag>
 
 <define-tag proposed whitespace=delete>
-	[EN:proposed:]
-	[AR:proposed:]
-	[CA:proposat:]
-	[DA:foresl�et:]
-	[DE:vorgeschlagen:]
-	[EL:�������:]
-	[EO:proponita:]
-	[ES:propuesto:]
-	[FI:ehdotettu:]
-	[FR:propos�:]
-	[HR:predlo�eno:]
-	[HU:proposed:]
-	[ID:telah diajukan:]
-	[IT:proposto:]
-	[JA:proposed:]
-	[KO:proposed:]
-	[LT:si�loma:]
-	[NL:voorgesteld:]
-	[NO:foresl�tt:]
-	[PL:proponowane:]
-	[PT:proposto:]
-	[RO:propuse:]
-	[RU:proposed:]
-	[SV:f�reslagen:]
-	[TR:proposed:]
-	[ZH:proposed:]
+  <gettext>proposed</gettext>
 </define-tag>
 
 <define-tag discussed whitespace=delete>
-	[EN:discussed:]
-	[AR:discussed:]
-	[CA:Discutit:]
-	[DA:diskuteret:]
-	[DE:diskutiert:]
-	[EL:����� ���������:]
-	[EO:diskutita:]
-	[ES:discutido:]
-	[FI:keskusteltu:]
-	[FR:en discussion:]
-	[HR:diskutirano:]
-	[HU:discussed:]
-	[ID:telah didiskusikan:]
-	[IT:discusso:]
-	[JA:discussed:]
-	[KO:discussed:]
-	[LT:aptariama:]
-	[NL:besproken:]
-	[NO:diskutert:]
-	[PL:trwa dyskusja:]
-	[PT:discutido:]
-	[RO:discutate:]
-	[RU:discussed:]
-	[SV:diskuterad:]
-	[TR:discussed:]
-	[ZH:discussed:]
+  <gettext>discussed</gettext>
 </define-tag>
 
 <define-tag votedon whitespace=delete>
-	[EN:voted on:]
-	[AR:voted on:]
-	[CA:Votat el:]
-	[DA:afstemt:]
-	[DE:in Abstimmung:]
-	[EL:��������� ����:]
-	[EO:vocxdonita je la:]
-	[ES:votado el:]
-	[FI:��nestetty:]
-	[FR:en cours de vote:]
-	[HR:glasano:]
-	[HU:voted on:]
-	[ID:dipilih pada:]
-	[IT:votato il:]
-	[JA:voted on:]
-	[KO:voted on:]
-	[LT:balsuojama u�:]
-	[NL:op gestemd:]
-	[NO:avstemt:]
-	[PL:trwa g�osowanie:]
-	[PT:votado em:]
-	[RO:votate:]
-	[RU:voted on:]
-	[SV:omr�stad:]
-	[TR:voted on:]
-	[ZH:voted on:]
+  <gettext>voted on</gettext>
 </define-tag>
 
 <define-tag finished whitespace=delete>
-	[EN:finished:]
-	[AR:finished:]
-	[CA:acabat:]
-	[DA:afsluttet:]
-	[DE:beendet:]
-	[EL:��������:]
-	[EO:finita:]
-	[ES:terminado:]
-	[FI:p��tetty:]
-	[FR:termin�:]
-	[HR:zavr�eno:]
-	[HU:finished:]
-	[ID:selesai:]
-	[IT:terminato:]
-	[JA:finished:]
-	[KO:finished:]
-	[LT:pabaigta:]
-	[NL:afgelopen:]
-	[NO:avsluttet:]
-	[PL:zako�czone:]
-	[PT:acabado:]
-	[RO:terminate:]
-	[RU:finished:]
-	[SV:avslutad:]
-	[TR:finished:]
-	[ZH:finished:]
+  <gettext>finished</gettext>
 </define-tag>
 <define-tag withdrawn whitespace=delete>
-	[EN:withdrawn:]
-	[AR:withdrawn:]
-	[CA:withdrawn:]
-	[DA:tilbagetrukket:]
-	[DE:zur�ckgezogen:]
-	[EL:����������:]
-	[EO:withdrawn:]
-	[ES:withdrawn:]
-	[FI:withdrawn:]
-	[FR:withdrawn:]
-	[HR:withdrawn:]
-	[HU:withdrawn:]
-	[ID:withdrawn:]
-	[IT:withdrawn:]
-	[JA:withdrawn:]
-	[KO:withdrawn:]
-	[LT:at�aukta:]
-	[NL:teruggetrokken:]
-	[NO:tilbaketrukket:]
-	[PL:wycofane:]
-	[PT:withdrawn:]
-	[RO:retras:]
-	[RU:withdrawn:]
-	[SV:tillbakadraget:]
-	[TR:withdrawn:]
-	[ZH:withdrawn:]
+  <gettext>withdrawn</gettext>
 </define-tag>
 
 <define-tag future_events whitespace=delete>
-	[EN:Future events:]
-	[AR:Future events:]
-	[CA:Esdeveniments futurs:]
-	[DA:Kommende begivenheder:]
-	[DE:Kommende Veranstaltungen:]
-	[EL:���������� ��������:]
-	[EO:Future events:]
-	[ES:Eventos futuros:]
-	[FI:Tulevia tapahtumia:]
-	[FR:�v�nements � venir:]
-	[HR:Budu�i doga�aji:]
-	[HU:Elj�vend� esem�nyek:]
-	[ID:Acara mendatang:]
-	[IT:Eventi futuri:]
-	[JA:Future events:]
-	[KO:Future events:]
-	[LT:Ateityje:]
-	[NL:Komende evenementen:]
-	[NO:Kommende begivenheter:]
-	[PL:Przysz�e wydarzenia:]
-	[PT:Eventos seguintes:]
-	[RO:Evenimente viitoare:]
-	[RU:������� �������:]
-	[SV:Kommande evenemang:]
-	[TR:Future events:]
-	[ZH:Future events:]
+  <gettext>Future events</gettext>
 </define-tag>
 <define-tag past_events whitespace=delete>
-	[EN:Past events:]
-	[AR:Past events:]
-	[CA:Esdeveniments passats:]
-	[DA:Tidligere begivenheder:]
-	[DE:Vergangene Veranstaltungen:]
-	[EL:���������� ��������:]
-	[EO:Past events:]
-	[ES:Eventos pasados:]
-	[FI:Menneit� tapahtumia:]
-	[FR:�v�nements pass�s:]
-	[HR:Pro�li doga�aji:]
-	[HU:R�gebbi esem�nyek:]
-	[ID:Acara yang lalu:]
-	[IT:Eventi passati:]
-	[JA:Past events:]
-	[KO:Past events:]
-	[LT:Praeityje:]
-	[NL:Afgelopen evenementen:]
-	[NO:Tidligere begivenheter:]
-	[PL:Przesz�e wydarzenia:]
-	[PT:Eventos anteriores:]
-	[RO:Evenimente trecute:]
-	[RU:��������� �������:]
-	[SV:Tidigare evenemang:]
-	[TR:Past events:]
-	[ZH:Past events:]
+  <gettext>Past events</gettext>
 </define-tag>
 
 # DO NOT translate anything below here. If you feel something needs to be changed, write to
diff --git a/english/template/debian/security_tags.wml b/english/template/debian/security_tags.wml
index 19667859d95..fe70c136c97 100644
--- a/english/template/debian/security_tags.wml
+++ b/english/template/debian/security_tags.wml
@@ -2,379 +2,60 @@
 
 #use wml::debian::common_tags
 
-<define-tag-sliced debian_security whitespace=delete>
-	[EN:Debian Security:]
-	[DA:Sikkerhed i Debian:]
-	[DE:Debian Security:]
-	[EL:�������� ��� Debian:]
-	[ES:Seguridad en Debian:]
-	[FI:Debianin tietoturva:]
-	[FR:S�curit� Debian:]
-	[IT:Sicurezza Debian:]
-	[JA:Debian �������ƥ���:]
-	[LT:Debian Saugumas:]
-	[PL:Bezpiecze�stwo Debiana:]
-	[PT:Seguran�a no Debian:]
-        [RO:Securitate Debian:]
-	[RU:������������ Debian:]
-	[SV:S�kerhet i Debian:]
-        [NO:Sikkerhet i Debian:]
-</define-tag-sliced>
+<define-tag debian_security whitespace=delete>
+  <gettext>Debian Security</gettext>
+</define-tag>
 
-<define-tag-sliced debian_security_advisory whitespace=delete>
-	[EN:Debian Security Advisory:]
-	[DA:Debians sikkerhedsbulletin:]
-	[DE:Debian-Sicherheitsgutachten:]
-	[EL:�������� ���������:]
-	[ES:Aviso de seguridad de Debian:]
-	[FI:Debianin tietoturvatiedote:]
-	[FR:Bulletin d'alerte Debian:]
-	[IT:Bacheca Debian sulla sicurezza:]
-	[LT:Debian saugumo patarimas:]
-	[PL:Porada dotycz�ca bezpiecze�stwa Debiana:]
-	[PT:Alerta de Seguran�a do Debian:]
-        [RO:Buletin de alert� Debian:]
-	[RU:Debian Security Advisory:]
-	[SV:S�kerhetsbulletin fr�n Debian:]
-        [NO:Sikkerhetsmelding fra Debian:]
-</define-tag-sliced>
+<define-tag debian_security_advisory whitespace=delete>
+  <gettext>Debian Security Advisory</gettext>
+</define-tag>
 
-<define-tag-sliced debian_security_advisories whitespace=delete>
-	[EN:Debian Security Advisories:]
-	[DA:Debians sikkerhedsbulletiner:]
-	[DE:Debian-Sicherheitsgutachten:]
-	[EL:��������� ���������:]
-	[ES:Avisos de seguridad de Debian:]
-	[FI:Debianin tietoturvatiedotteet:]
-	[FR:Bulletins d'alerte Debian:]
-	[IT:Annunci della sicurezza Debian:]
-	[JA:Debian �������ƥ����ٹ�:]
-	[LT:Debian saugumo patarimai:]
-	[PL:Porady dotycz�ce bezpiecze�stwa Debiana:]
-	[PT:Alertas de Seguran�a Debian:]
-        [RO:Buletin de alert� Debian:]
-	[RU:Debian Security Advisories:]
-	[SV:S�kerhetsbulletiner fr�n Debian:]
-        [NO:Sikkerhetsmeldinger fra Debian:]
-</define-tag-sliced>
+<define-tag debian_security_advisories whitespace=delete>
+  <gettext>Debian Security Advisories</gettext>
+</define-tag>
 
 <define-tag datereported whitespace=delete>
-	[EN:Date Reported:]
-	[AR:����� �������:]
-	[CA:Data de l'informe:]
-	[DA:Rapporteret den:]
-	[DE:Datum des Berichts:]
-	[EL:���������� ��������:]
-	[EO:Dato de la Raporto:]
-	[ES:Fecha del informe:]
-	[FI:Ilmoitettu:]
-	[FR:Date du rapport:]
-	[HR:Datum prijave:]
-	[HU:Bejelent�s d�tuma:]
-	[ID:Dilaporkan Pada:]
-	[IT:Data della segnalazione:]
-	[JA:�������:]
-	[KO:���� �Ͻ�:]
-	[LT:Prane�imo data:]
-	[NL:Datum van het verslag:]
-	[NO:Rapportert den:]
-	[PL:Data Zg�oszenia:]
-	[PT:Data do Alerta:]
-	[RO:Data raportului:]
-	[RU:���� ���������:]
-	[SV:Rapporterat den:]
-	[TR:Rapor Edildi�i Tarih:]
-	[ZH:���i���:]
+  <gettext>Date Reported</gettext>
 </define-tag>
 <define-tag affectedpackages whitespace=delete>
-	[EN:Affected Packages:]
-	[AR:�������� �������:]
-	[CA:Paquets afectats:]
-	[DA:Ber�rte pakker:]
-	[DE:Betroffene Pakete:]
-	[EL:������ ��� ������������:]
-	[EO:Pakoj Koncernataj:]
-	[ES:Paquetes afectados:]
-	[FI:Vaikutuksen alaiset paketit:]
-	[FR:Paquets concern�s:]
-	[HR:Zahva�eni paketi:]
-	[HU:�rintett csomagok:]
-	[ID:Paket-paket Terkena Efek:]
-	[IT:Pacchetti coinvolti:]
-	[JA:�ƶ�����ѥå�����:]
-	[KO:���� �޴� ��Ű��:]
-	[LT:Paliesti paketai:]
-	[NL:Betrokken pakketten:]
-	[NO:Ber�rte pakker:]
-	[PL:Nara�one Pakiety:]
-	[PT:Pacotes Afetados:]
-	[RO:Pachete afectate:]
-	[RU:������������� ������:]
-	[SV:Ber�rda paket:]
-	[TR:Etkilenen Paketler:]
-	[ZH:���v�T���n��:]
+  <gettext>Affected Packages</gettext>
 </define-tag>
 <define-tag vulnerable whitespace=delete>
-	[EN:Vulnerable:]
-	[AR:���������:]
-	[CA:Vulnerable:]
-	[DA:S�rbar:]
-	[DE:Verwundbar:]
-	[EL:�����:]
-	[EO:Koncernebla:]
-	[ES:Vulnerable:]
-	[FI:Altis:]
-	[FR:Vuln�rabilit�:]
-	[HR:Ranjiv:]
-	[HU:Sebezhet�:]
-	[ID:Rawan:]
-	[IT:Vulnerabile:]
-	[JA:������:]
-	[KO:���輺:]
-	[LT:Pa�eid�iama:]
-	[NL:Kwetsbaar:]
-	[NO:S�rbar:]
-	[PL:Podatny:]
-	[PT:Vulner�vel:]
-	[RO:Vulnerabile:]
-	[RU:������:]
-	[SV:S�rbara:]
-	[TR:Vulnerable:]
-	[ZH:�i�Qŧ��:]
+  <gettext>Vulnerable</gettext>
 </define-tag>
 <define-tag formoreinfo whitespace=delete>
-	[EN:More information:]
-	[AR:������ �� ���������:]
-	[CA:M�s informaci�:]
-	[DA:Yderligere oplysninger:]
-	[DE:Weitere Informationen:]
-	[EL:������������ �����������:]
-	[EO:Pli da informo:]
-	[ES:Informaci�n adicional:]
-	[FI:Lis�tietoa:]
-	[FR:Pour plus d'information:]
-	[HR:Podrobnije informacije:]
-	[HU:B�vebb inform�ci�:]
-	[JA:�ɲþ���:]
-	[ID:Informasi lebih lanjut:]
-	[IT:Maggiori informazioni:]
-	[KO:�߰� ����:]
-	[LT:Daugiau informacijos:]
-	[NL:Voor meer info:]
-	[NO:Mer informasjon:]
-	[PL:Wi�cej informacji:]
-	[PT:Informa��es adicionais:]
-	[SV:Ytterligare information:]
-	[TR:Daha fazla bilgi i�in:]
-	[RO:Pentru mai multe informa�ii:]
-	[RU:����� ��������� ����������:]
-	[ZH:��Ժɪ����:]
+  <gettext>More information</gettext>
 </define-tag>
 <define-tag fixedin whitespace=delete>
-	[EN:Fixed in:]
-	[AR:���� ��:]
-	[CA:Arreglat en:]
-	[DA:Rettet i:]
-	[DE:Behoben in:]
-	[EL:������������� ���:]
-	[EO:Solvita je:]
-	[ES:Arreglado en:]
-	[FI:Korjattu:]
-	[FR:Corrig� dans:]
-	[HR:Rije�eno u:]
-	[HU:Kijav�t�sa:]
-	[ID:Telah diperbaiki di:]
-	[IT:Risolto in:]
-	[JA:����:]
-	[KO:����:]
-	[LT:Pataisyta:]
-	[NL:Verbeterd in:]
-	[NO:Rettet i:]
-	[PL:Naprawiony w:]
-	[PT:Corrigido em:]
-	[RO:Corectat �n:]
-	[RU:���������� �:]
-	[SV:R�ttat i:]
-	[TR:D�zeltilmi� hali:]
-	[ZH:�ק��:]
+  <gettext>Fixed in</gettext>
 </define-tag>
 <define-tag source whitespace=delete>
-	[EN:Source::]
-	[AR:Source::]
-	[CA:Font:]
-	[DA:Kildekode::]
-	[DE:Quellcode::]
-	[EL:�������::]
-	[EO:Source::]
-	[ES:Fuentes::]
-	[FI:L�hde::]
-	[FR:Source::]
-	[HR:Izvorni kod::]
-	[HU:Forr�s::]
-	[ID:Sumber:]
-	[IT:Sorgente::]
-	[JA:������::]
-	[KO:Source::]
-	[LT:I�eities tekstai:]
-	[NL:Source::]
-	[NO:Kildekode::]
-	[PL:�r�d�o::]
-	[PT:Fonte::]
-	[RO:Surs�::]
-	[RU:�������� ������::]
-	[SV:K�llkod::]
-	[TR:Kaynak::]
-	[ZH:Source::]
+  <gettext>Source:</gettext>
 </define-tag>
 <define-tag arch-indep whitespace=delete>
-	[EN:Architecture-independent component::]
-	[AR:Architecture-independent component::]
-	[CA:Component independent d'arquitectura:]
-	[DA:Arkitekturuafh�ngig komponent::]
-	[DE:Architektur-unabh�ngige Dateien::]
-	[EL:�������� ���������� ��������������::]
-	[EO:Architecture-independent component::]
-	[ES:Componentes independientes de la arquitectura::]
-	[FI:Arkkitehtuuririippumaton komponentti::]
-	[FR:Composant ind�pendant de l'architecture&nbsp;::]
-	[HR:Komponenta neovisna o arhitekturi::]
-	[HU:Architekt�raf�ggetlen komponens::]
-	[ID:Komponen yang Arsitektur-independen::] 
-	[IT:Componente indipendente dall'architettura::]
-	[JA:�������ƥ��������¸����ݡ��ͥ��::]
-	[KO:Architecture-independent component::]
-	[LT:Komponenetas nepriklausantis nuo architekt�ros:]
-	[NL:Architecture-independent component::]
-	[NO:Arkitekturuavhengig bestanddel::]
-	[PL:Element niezale�ny od architektury::]
-	[PT:Componente independente de arquitetura::]
-	[RO:Component independent de arhitectur�::]
-	[RU:����������� �� ����������� ����������::]
-	[SV:Arkitekturoberoende komponent::]
-	[TR:Architecture-independent component::]
-	[ZH:Architecture-independent component::]
+  <gettext>Architecture-independent component:</gettext>
 </define-tag>
 # don't translate `%attributes'.
 <define-tag md5sums whitespace=delete>
-  [EN:MD5 checksums of the listed files are available in the <a href="%attributes">original advisory</a>.:]
-  [AR:MD5 checksums of the listed files are available in the <a href="%attributes">original advisory</a>.:]
-  [CA:Sumes de comprobaci� MD5 dels fitxers llistats disponibles en el <a href="%attributes">informe original</a>.:] 
-  [DA:MD5-kontrolsummer for de listede filer findes i den <a href="%attributes">originale sikkerhedsbulletin</a>.:]
-  [DE:MD5-Pr�fsummen der aufgez�hlten Dateien stehen im <a href="%attributes">originalen Sicherheitsgutachten</a> zur Verf�gung.:]
-  [EL:�� �������� ������� MD5 ��� ������������� ������� ����� ��������� ��� <a href="%attributes">������ ��������</a>.:]
-  [EO:MD5 checksums of the listed files are available in the <a href="%attributes">original advisory</a>.:]
-  [ES:Las sumas MD5 de los ficheros que se listan est�n disponibles en el <a href="%attributes">aviso original</a>.:]
-  [FI:Listattujen tiedostojen MD5-tarkistussummat on luettavissa <a href="%attributes">alkuper�isesss� tiedotteessa</a>.:]
-  [FR:Les hach�s MD5 des fichiers indiqu�s sont disponibles sur la <a href="%attributes">page originale de l'alerte de s�curit�</a>.:]
-  [HR:MD5 checksumi navedenih datoteka su dostupni u <a href="%attributes">originalnom upozorenju</a>.:]
-  [HU:MD5 checksums of the listed files are available in the <a href="%attributes">original advisory</a>.:]
-  [ID:Checksum MD5 untuk file-file terdaftar tersedia di <a href="%attributes">original advisory</a>.:]
-  [IT:Somma di controllo MD5 per i file in elenco disponibile nella <a href="%attributes">notizia originale</a>.:]
-  [JA:�����ˤ���ե������ MD5 �����å������ <a href="%attributes">����θ�ʸ</a>�ˤ���ޤ���:]
-  [KO:MD5 checksums of the listed files are available in the <a href="%attributes">original advisory</a>.:]
-  [LT:Pateikt� byl� kontrolin�s sumos yra <a href="%attributes">originaliame prane�ime</a>.:]
-  [NL:MD5 checksums of the listed files are available in the <a href="%attributes">original advisory</a>.:]
-  [NO:MD5-kontrolsummer av disse filene er tilgjengelig i den <a  href="%attributes">originale sikkerhetsmeldingen</a>.:]
-  [PL:Skr�ty MD5 wymienionych plik�w dost�pne s� w <a href="%attributes">oryginalnej poradzie</a>.:]
-  [PT:Checksums MD5 dos arquivos listados est�o dispon�veis no <a href="%attributes">alerta original</a>.:]
-  [RO:Verificarea MD5 a fi�ierelor disponibile listate �n <a href="%attributes">buletinul original</a>.:]
-  [RU:MD5 ����������� ����� ���� ������ �������� � <a href="%attributes">�������� ���������</a>.:]
-  [SV:MD5-kontrollsummor f�r dessa filer finns i <a href="%attributes">originalbulletinen</a>.:]
-  [TR:Yukar�daki dosyalar�n MD5 checksum de�erlerini <a href="%attributes">orjinal duyuru</a>'dan edinebilirsiniz.:]
-  [ZH:MD5 checksums of the listed files are available in the <a href="%attributes">original advisory</a>.:]
+  <gettext>MD5 checksums of the listed files are available in the <a href="%attributes">original advisory</a>.</gettext>
 </define-tag>
 
-<define-tag-sliced nosecref whitespace=delete>
-  [EN:No other external database security references currently available.:]
-  [DA:Der er pt. ingen tilg�ngelige eksterne sikkerhedsreferencer i andre databaser.:]
-  [DE:Im Augenblick ist keine weitere externe Sicherheitsdatenbank-Referenz verf�gbar.:]
-  [JA:�������Ǥϡ�����¾�γ������ͥ������ƥ����ǡ����١����Ϥ���ޤ���:]
-  [EL:��� �������� ���������� ����� ���������� �������� ���� ���� ���� �� ������.:]
-  [ES:No se dispone, de momento, de referencias a otras bases de datos de seguridad externas.:]
-  [FI:Muita tietoturvaviitteit� ulkoisiin tietokantoihin ei t�ll� hetkell� ole saatavilla.:]
-  [FR:Aucune r�f�rence � une base de donn�es externe en rapport avec la s�curit� n'est actuellement disponible.:]
-  [IT:Non sono disponibili altri riferimenti legati alla sicurezza in database esterni.:]
-  [LT:Joki� i�orini� saugumo duomen� bazi� �altini� �iuo met� n�ra:]
-  [PL:Brak dost�pnych odno�nik�w do zewn�trznych baz danych na temat bezpiecze�stwa.:]
-  [PT:Nenhuma refer�ncia a base de dados sobre seguran�a dispon�vel atualmente.:]
-  [RO:Nici o alt� referint� la o banc� de date extern� �n raport cu securitatea nu este acum disponibil�:]
-  [RU:�� ������ ������ ������ �� ������� ���� ������ �� ������������ �����������.:]
-  [SV:F�r n�rvarande �r inga ytterligare referenser till externa s�kerhetsdatabaser tillg�ngliga.:]
-  [NO:Ingen sikkerhetsreferanser er for tiden tilgjengelig i andre databaser.:]
-</define-tag-sliced>
+<define-tag nosecref whitespace=delete>
+  <gettext>No other external database security references currently available.</gettext>
+</define-tag>
 
-<define-tag-sliced cert whitespace=delete>
-  [EN:CERT's vulnerabilities, advisories and incident notes::]
-  [DA:CERTs noter om s�rbarheder, bulletiner og h�ndelser::]
-  [JA:CERT ���ȼ����ꥹ�ȡ����𤪤���ղþ���::]
-  [DE:CERT's Verwundbarkeiten, Gutachten und Ereignis-Notizen::]
-  [EL:���������� ��� CERT ��� ����������� ��� ����� ������::]
-  [ES:Notas y avisos de incidentes y vulnerabilidades en CERT::]
-  [FI:CERT:n alttiudet, tiedotteet ja ongelmahuomiot::]
-  [FR:Les annonces de vuln�rabilit� et les bulletins d'alerte du CERT&nbsp;::]
-  [IT:Annunci di vulnerabilit� e note d'incidenti del CERT::]
-  [LT:CERT pa�eidimai, patarimai ir atsitikim� pasakojimai::]
-  [PL:Baza danych b��d�w, porad i incydent�w CERT::]
-  [PT:Alertas, notas de incidentes e vulnerabilidades do CERT::]
-  [RO:Anun�urile de vulnerabilitate �i buletinele de alerte de la CERT::]
-  [RU:���� ������ CERT �� ����������� � ����������::]
-  [SV:CERTs information om s�rbarheter, bulletiner och incidenter::]
-  [NO:CERT's notater om s�rbarheter, sikkerhet, og observasjoner::]
-</define-tag-sliced>
+<define-tag cert whitespace=delete>
+  <gettext>CERT's vulnerabilities, advisories and incident notes:</gettext>
+</define-tag>
 
-<define-tag-sliced bugtraq whitespace=delete>
-  [EN:In the Bugtraq database (at SecurityFocus)::]
-  [JA:(SecurityFocus ��) Bugtraq �ǡ����١���::]
-  [DA:I Bugtraq-databasen (hos SecurityFocus)::]
-  [DE:In der Bugtraq-Datenbank (bei SecurityFocus)::]
-  [EL:��� ���� ��������� (��� SecurityFocus)::]
-  [ES:En la base de datos de Bugtraq (en SecurityFocus)::]
-  [FI:Bugtraq-tietokannassa (SecurityFocuksella)::]
-  [FR:Dans la base de donn�es de suivi des bogues (chez SecurityFocus)&nbsp;::]
-  [IT:Nel database Bugtraq (presso SecurityFocus)::]
-  [LT:Bugtraq duomen� baz�je (pas SecurityFocus)::]
-  [PL:Baza danych Bugtraq (SecurityFocus)::]
-  [PT:Na base de dados do BugTraq::]
-  [RO:�n banca de date a urm�ririi gre�elilor (la SecurityFocus)::]
-  [RU:� ���� ������ Bugtraq (�� SecurityFocus)::]
-  [SV:I Bugtraq-databasen (hos SecurityFocus)::]
-  [NO:I Bugtraq-databasen (hos SecurityFocus)::]
-</define-tag-sliced>
+<define-tag bugtraq whitespace=delete>
+  <gettext>In the Bugtraq database (at SecurityFocus):</gettext>
+</define-tag>
 
-<define-tag-sliced cve whitespace=delete>
-  [JA:Mitre �� CVE ����::]
-  [EN:In Mitre's CVE dictionary::]
-  [DA:I Mitres CVE-ordbog::]
-  [DE:In Mitre's CVE-Verzeichnis::]
-  [EL:��� ������ Mitre's CVE::]
-  [ES:En el diccionario CVE de Mitre::]
-  [FI:Mitren CVE-sanakirjassa::]
-  [FR:Dans le dictionnaire CVE du Mitre&nbsp;::]
-  [IT:Nel dizionario CVE di Mitre::]
-  [LT:Mitre CVE �odyne::]
-  [EN:S�ownik CVE Mitre::]
-  [PT:No dicion�rio CVE do Mitre::]
-  [RO:�n dic�ionarul CVE de la Mitre::]
-  [RU:� �������� Mitre CVE::]
-  [SV:I Mitres CVE-ordbok::]
-  [NO:I Mitre's CVE-ordbok::]
-</define-tag-sliced>
+<define-tag cve whitespace=delete>
+  <gettext>In Mitre's CVE dictionary:</gettext>
+</define-tag>
 
-<define-tag-sliced secdbinfo whitespace=delete>
-  [EN:Security database references:]
-  [DA:Referencer i sikkerhedsdatabaser:]
-  [DE:Sicherheitsdatenbanken-Referenzen:]
-  [EL:�������� ����� ��������� ���������:]
-  [ES:Referencias a bases de datos de seguridad:]
-  [FI:Viittaukset tietoturvatietokantoihin:]
-  [FR:R�f�rences dans la base de donn�es de s�curit�:]
-  [IT:Referenze all'interno del database della sicurezza:]
-  [JA:���ͥ������ƥ����ǡ����١���:]
-  [LT:Saugumo duomen� baz�s s�sajos:]
-  [PL:Odno�niki do baz danych na temat bezpiecze�stwa:]
-  [PT:Refer�ncia a base de dados de seguran�a::]
-  [RO:Referin�e �n banca de date de securitate::]
-  [RU:������ �� ���� ������ �� ������������:]
-  [SV:Referenser i s�kerhetsdatabaser:]
-  [NO:Referanser i sikkerhetsdatabaser:]
-</define-tag-sliced>
+<define-tag secdbinfo whitespace=delete>
+  <gettext>Security database references</gettext>
+</define-tag>
diff --git a/english/template/debian/todoitem.wml b/english/template/debian/todoitem.wml
index b180409bf5e..95bf180be08 100644
--- a/english/template/debian/todoitem.wml
+++ b/english/template/debian/todoitem.wml
@@ -2,40 +2,21 @@
 
 #use wml::debian::common_tags
 
-<define-tag-sliced moreinfo whitespace=delete>
-	[EN:More information::]
-	[DA:Flere oplysninger::]
-	[DE:Weitere Informationen::]
-	[FR:Plus d'informations�::]
-        [RO:Mai multe informa�ii::]
-	[SV:Ytterligare information::]
-</define-tag-sliced>
+<define-tag moreinfo whitespace=delete>
+  <gettext>More information:</gettext>
+</define-tag>
 
-<define-tag-sliced takenby whitespace=delete>
-	[EN:Taken by::]
-	[DA:Overtaget af::]
-	[DE:�bernommen von::]
-	[FR:Pris en charge par�::]
-        [RO:Luat� �n grij� de::]
-	[SV:Taget av::]
-</define-tag-sliced>
+<define-tag takenby whitespace=delete>
+  <gettext>Taken by:</gettext>
+</define-tag>
 
-<define-tag-sliced nobody whitespace=delete>
-	[EN:Nobody:]
-	[DA:Ingen:]
-	[DE:Niemandem:]
-	[FR:Personne:]
-	[SV:Ingen:]
-</define-tag-sliced>
+<define-tag nobody whitespace=delete>
+  <gettext>Nobody</gettext>
+</define-tag>
 
-<define-tag-sliced rating whitespace=delete>
-	[EN:Rating::]
-	[DA:Grad::]
-	[DE:Bewertung::]
-	[FR:Classement&nbsp;:]
-        [RO:Cotare::]
-	[SV:Grad::]
-</define-tag-sliced>
+<define-tag rating whitespace=delete>
+  <gettext>Rating:</gettext>
+</define-tag>
 
 # DO NOT translate anything below here. --------------------------------------
 
diff --git a/english/template/debian/translation-check.wml b/english/template/debian/translation-check.wml
index b6a11db48fb..b2cb74161e0 100644
--- a/english/template/debian/translation-check.wml
+++ b/english/template/debian/translation-check.wml
@@ -33,118 +33,19 @@
 # This is the message that is displayed if the translation is aged.
 # (min_delta <= difference < max_delta)
 <define-tag translationaged>
-  [EN:<em>Note:</em> The <a href="$link">original document</a> is newer than this translation.:]
-  [AR:<em>Note:</em> The <a href="$link">original document</a> is newer than this translation.:]
-  [CA:<em>Nota:</em> El <a href="$link">document original</a> �s m�s nou que aquesta traducci�.:]
-  [DA:<em>Bem�rk:</em> <a href="$link">Originalen</a> er nyere end denne overs�ttelse.:]
-  [DE:<em>Bemerkung:</em> Das <a href="$link">Original</a> ist neuer als diese �bersetzung.:]
-  [EL:<em>��������:</em> To <a href="$link">���������</a> ����� ������� ��� ���� �� ���������.:]
-  [EO:<em>Noto:</em> La <a href="$link">originala pa�o</a> estas pli nova ol tiu �i.:]
-  [ES:<em>Nota:</em> La <a href="$link">p�gina original</a> es m�s nueva que esta traducci�n.:]
-  [FI:<em>Huomaa:</em> <a href="$link">Alkuper�inen</a> sivu on t�t� suomennosta uudempi.:]
-  [FR:<em>Note&nbsp;:</em> le <a href="$link">document original</a> est plus r�cent que cette traduction.:]
-  [HR:<em>Pa�nja:</em> <a href="$link">Originalni dokument</a> je noviji od ovog prijevoda.:]
-  [HU:<em>Megjegyz�s:</em> Az <a href="$link">eredeti oldalt</a> a legut�bbi ford�t�s �ta m�dos�tott�k.:]
-  [ID:<em>Catatan:</em> Dokumen ini sudah kadaluwarsa, yang <a href="$link">asli</a> telah dimodifikasi.:]
-  [IT:<em>Nota:</em> <a href="$link">L'originale</a> � pi� recente di questa traduzione.:]
-  [JA:<em>����:</em> ��ʸ�Ϥ����������⿷�����ʤäƤ��ޤ���:]
-  [KO:<em>Note:</em> The <a href="$link">original document</a> is newer than this translation.:]
-  [LT:<em>Pastaba:</em> <a href="$link">Originalus dokumentas</a> yra naujesnis nei �is versijas.:]
-  [NL:<em>Opmerking:</em> Het <a href="$link">origineel</a> is recenter dan de vertaling.:]
-  [NO:<em>NB:</em> <a href="$link">Originalen</a> er nyere enn denne oversettelsen.:]
-  [PL:<em>Uwaga: <a href="$link">Orygina�</a> jest nowszy ni� to t�umaczenie</em>.:]
-  [PT:<em>Nota:</em> O <a href="$link">original</a> � mais novo que essa tradu��o.:]
-  [RO:<em>Not�:</em> <a href="$link">originalul</a> este mai nou dec�t traducerea.:]
-  [RU:<em>���������:</em> <a href="$link">�������� ����� ���������</a> �����, ��� �������.:]
-  [SV:<em>Observera:</em> <a href="$link">Originalet</a> �r nyare �n denna �vers�ttning.:]
-  [TR:<em>Not:</em> Bu belgenin <a href="$link">son hali</a> hen�z �evrilmemi�.:]
-  [ZH:<em>���G</em>������������Ķ�����έ�^�奻�s�C:]
+  <gettext><em>Note:</em> The <a href="$link">original document</a> is newer than this translation.</gettext>
 </define-tag>
 
 # This is the message that is displayed if the translation is too old.
 # (difference >= max_delta)
 <define-tag translationoutofdate>
-  [EN:Warning! This translation is too out of date,
-      please see the <a href="$link">original</a>.:]
-  [AR:Warning! This translation is too out of date,
-      please see the <a href="$link">original</a>.:]
-  [CA:Advertiment!:Aquesta traducci� �s massa antiga, si us
-      plau vegeu <a href="$link">l'original</a>.:]
-  [DA:Advarsel! Denne overs�ttelse er for gammel,
-      benyt venligst <a href="$link">originalen</a>.:]
-  [DE:Achtung! Diese �bersetzung ist zu alt,
-      benutzen Sie bitte das <a href="$link">Original</a>.:]
-  [EL:�������! ���� � ��������� ����� ���� �����,
-      �������� ����� �� <a href="$link">��������� �������</a>.:]
-  [EO:Atentu! Tiu �i traduko estas tro malnova,
-      bonvolu viziti la <a href="$link">originalan</a>.:]
-  [ES:�Ojo! Esta traducci�n est� muy desactualizada,
-      por favor, consulte el <a href="$link">documento original</a>.:]
-  [FI:Varoitus! T�m� suomennos on liian vanha, katso mielummin
-      <a href="$link">alkuper�ist� sivua</a>.:]
-  [FR:Attention&nbsp;: cette traduction n'est plus � jour,
-      veuillez consulter le <a href="$link">document original</a>.:]
-  [HR:Pa�nja! Ovaj prijevod je jako zastario,
-      molimo pogledajte <a href="$link">original</a>.:]
-  [HU:Figyelem! A ford�t�s elavult,
-      olvasd az <a href="$link">eredetit</a>.:]
-  [ID:Peringatan! Translasi untuk dokumen ini sudah terlalu kadaluwarsa, harap lihat dokumen <a href="$link">asli</a>.:]
-  [IT:Attenzione! Questa traduzione � ormai datata,
-      perci� dai un'occhiata anche alla nuova pagina <a href="$link">originale</a>.:]
-  [JA:�ٹ�! ���������ϸŲ᤮�뤿�ᡢ
-      <a href="$link">��ʸ</a>���������������:]
-  [KO:Warning! This translation is too out of date,
-      please see the <a href="$link">original</a>.:]
-  [LT:D�mesio! �is vertimas yra per daug senas,
-      pra�ome �i�r�ti <a href="$link">original�</a>.:]
-  [NL:Waarschuwing! Deze vertaling is te oud.
-      Lees bij voorkeur het <a href="$link">origineel</a>.:]
-  [NO:Merk! Denne oversettelsen er utdatert, 
-      se <a href="$link">originalen</a>.:]
-  [PL:Uwaga! To t�umaczenie jest przestarza�e,
-      prosz� zwr�ci� uwag� na <a href="$link">orygina�</a>.:]
-  [PT:Aviso! Essa tradu�ao est� muito desatualizada,
-      por favor veja o <a href="$link">original</a>.:]
-  [RO:Avertisment! Aceast� traducere este prea neactualizat�,
-      v� rug�m s� vede�i <a href="$link">originalul</a>.:]
-  [RU:��������������! ���� ������� ������ �������,
-      ���������� ����������� <a href="$link">����������</a>.:]
-  [SV:Varning! Den h�r �vers�ttningen �r f�r gammal,
-      v�nligen se <a href="$link">originalet</a>.:]
-  [TR:Uyar�! Bu �eviri olduk�a eski,
-      l�tfen belgenin <a href="$link">son hali</a>'ne bak�n�z.:]
-  [ZH:�`�N�I����������Ķ���Ӥ[�S����s�F�A\
-      �аѾ\\<a href="$link">�̷s��^�奻</a>�C:]
+  <gettext>Warning! This translation is too out of date, please see the <a href="$link">original</a>.</gettext>
 </define-tag>
 
 # This is the message that is displayed if the referenced original file
 # no longer exists.
 <define-tag originalgone>
-  [EN:<em>Note:</em> The original document of this translation no longer exists.:]
-  [AR:<em>Note:</em> The original document of this translation no longer exists.:]
-  [CA:<em>Nota:</em> El document original d'aquesta traducci� ja no existeix.:]
-  [DA:<em>Bem�rk:</em> Originalen findes ikke l�ngere.:]
-  [DE:<em>Bemerkung:</em> Das Original dieser �bersetzung existiert nicht mehr.:]
-  [EL:<em>Note:</em> The original document of this translation no longer exists.:]
-  [EO:<em>Noto:</em> La originala pa�o ne plu ekzistas.:]
-  [ES:<em>Nota:</em> La p�gina original de esta traducci�n ya no existe.:]
-  [FI:<em>Huomaa:</em> Alkuper�ist� sivua, josta t�m� on k��nnetty, ei en�� ole.:]
-  [FR:<em>Note&nbsp;:</em> le document original n'existe plus.:]
-  [HR:<em>Pa�nja:</em> Originalni dokument za ovaj prijevod vi�e ne postoji.:]
-  [HU:<em>Megjegyz�s:</em> Az eredeti oldal m�r nem l�tezik.:]
-  [ID:<em>Catatan:</em> Dokumen asli untuk terjemahan ini sudah tidak ada lagi.:]
-  [IT:<em>Nota:</em> La pagina originale non esiste pi�.:]
-  [JA:<em>Note:</em> ��ʸ�Ϥ⤦¸�ߤ��ޤ���:]
-  [KO:<em>Note:</em> The original document of this translation no longer exists.:]
-  [NL:<em>Note:</em> Het origineel van deze vertaling bestaat niet meer.:]
-  [NO:<em>Merk:</em> Originalen til denne oversettelsen fins ikke lenger.:]
-  [PL:<em>Uwaga:</em> Oryginalny dokument tego t�umaczenia ju� nie istnieje.:]
-  [PT:<em>Nota:</em> O original n�o existe mais.:]
-  [RO:<em>Not�:</em> originalul nu mai exist�.:]
-  [RU:<em>���������:</em> �������� ������ �� ����������.:]
-  [TR:<em>Not:</em> Bu �evirinin �ngilizce'si art�k mevcut de�il.:]
-  [SV:<em>Observera:</em> Originalet existerar inte l�ngre.:]
-  [ZH:<strong>���G</strong>����������^�奻�w�g���s�b�F�C:]
+  <gettext><em>Note:</em> The original document of this translation no longer exists.</gettext>
 </define-tag>
 
 # DO NOT translate anything below here. --------------------------------------
diff --git a/english/template/debian/url.wml b/english/template/debian/url.wml
index 32903ac1276..f99f4dad6a3 100644
--- a/english/template/debian/url.wml
+++ b/english/template/debian/url.wml
@@ -1,28 +1,5 @@
 <define-tag our_URL whitespace=delete>
-	[EN:URL:]
-	[AR:URL:]
-	[DA:URL:]
-	[DE:URL:]
-	[EL:URL:]
-	[EO:URL:]
-	[ES:URL:]
-	[FI:URL:]
-	[FR:URL:]
-	[HR:URL:]
-	[HU:URL:]
-	[IT:URL:]
-	[JA:URL:]
-	[KO:URL:]
-	[LT:URL:]
-	[NL:URL:]
-	[NO:URL:]
-	[PL:URL:]
-	[PT:URL:]
-	[RO:URL:]
-	[RU:URL:]
-	[SV:Webbadress:]
-	[TR:URL:]
-	[ZH:���}:]
+  <gettext>URL</gettext>
 </define-tag>
 
 # don't translate anything below this point
diff --git a/english/template/debian/votebar.wml b/english/template/debian/votebar.wml
index 6dcce92480e..af3e0fdfd4f 100644
--- a/english/template/debian/votebar.wml
+++ b/english/template/debian/votebar.wml
@@ -1,370 +1,44 @@
 
-# Please keep slices sorted alphabetically with the exception of English.
 
 <define-tag needsponsors whitespace=delete>
-	[EN:Waiting&nbsp;for&nbsp;Sponsors:]
-	[AR:�� �������� ��� ���:]
-	[CA:Esperant&nbsp;patrocinadors:]
-	[DA:Venter&nbsp;p�&nbsp;en&nbsp;sponsor:]
-	[DE:Wir warten auf einen Sponsor:]
-	[EL:�� ������� �������:]
-	[EO:Esperanta&nbsp;je&nbsp;A�spiciantoj:]
-	[ES:Esperando&nbsp;Patrocinadores:]
-	[FI:Kannatusta odottavat:]
-	[FR:En&nbsp;attente&nbsp;de&nbsp;sponsors:]
-	[HR:�eka&nbsp;na&nbsp;pokrovitelje:]
-	[HU:Szponzorokat keres�nk:]
-	[ID:Menunggu&nbsp;Sponsor:]
-	[IT:Waiting&nbsp;for&nbsp;Sponsors:]
-	[JA:���ݥ󥵡��罸��:]
-	[KO:Waiting&nbsp;for&nbsp;Sponsors:]
-	[LT:Laukia&nbsp;sponsori�:]
-	[NL:In&nbsp;afwachting&nbsp;van&nbsp;sponsors:]
-	[NO:Venter&nbsp;p�&nbsp;sponsorer:]
-	[PL:Czeka&nbsp;na&nbsp;Sponsora:]
-	[PT:Aguardando&nbsp;Patrocinadores:]
-	[RO:A�tept�nd sponsorii:]
-	[RU:�&nbsp;��������&nbsp;���������:]
-	[SV:V�ntar&nbsp;p�&nbsp;sponsor:]
-	[TR:Sponsor Aran�yor:]
-	[ZH:�����٧U:]
+  <gettext>Waiting&nbsp;for&nbsp;Sponsors</gettext>
 </define-tag>
 <define-tag indiscussion whitespace=delete>
-	[EN:In&nbsp;Discussion:]
-	[AR:�� ���� ����:]
-	[CA:En discussi�:]
-	[DA:Under&nbsp;diskussion:]
-	[DE:In Diskussion:]
-	[EL:�� �������:]
-	[EO:Diskutata:]
-	[ES:En&nbsp;Discusi�n:]
-	[FI:Keskusteltavana:]
-	[FR:En&nbsp;discussion:]
-	[HR:U&nbsp;raspravi:]
-	[HU:Vita t�rgya:]
-	[ID:Sedang&nbsp;Didiskusikan:]
-	[IT:In&nbsp;Discussion:]
-	[JA:������:]
-	[KO:In&nbsp;Discussion:]
-	[LT:Vyksta&nbsp;diskusijos:]
-	[NL:Ter&nbsp;discussie:]
-	[NO:Under&nbsp;diskusjon:]
-	[PL:Dyskusja&nbsp;trwa:]
-	[PT:Em&nbsp;Discuss�o:]
-	[RO:�n discu�ie:]
-	[RU:�����������:]
-	[SV:Under&nbsp;diskussion:]
-	[TR:Fikir Al��veri�i S�ras�nda:]
-	[ZH:�Q�פ�:]
+  <gettext>In&nbsp;Discussion</gettext>
 </define-tag>
 <define-tag votingopen whitespace=delete>
-	[EN:Voting&nbsp;Open:]
-	[AR:����� �����:]
-	[CA:Votaci�&nbsp;en&nbsp;curs:]
-	[DA:Afstemning&nbsp;�ben:]
-	[DE:In der Abstimmung:]
-	[EL:���� ������� ���������:]
-	[EO:Vo�dono&nbsp;Malfermita:]
-	[ES:Votaci�n&nbsp;en&nbsp;Curso:]
-	[FI:��nestys&nbsp;k�ynniss�:]
-	[FR:Vote&nbsp;ouvert:]
-	[HR:Glasovanje&nbsp;otvoreno:]
-	[HU:Szavaz�s alatt:]
-	[ID:Pemungutan&nbsp;Suara&nbsp;Berjalan:]
-	[IT:Voting&nbsp;Open:]
-	[JA:��ɼ������:]
-	[KO:Voting&nbsp;Open:]
-	[LT:Atviras&nbsp;balsavimas:]
-	[NL:In&nbsp;stemming:]
-	[NO:Avstemming&nbsp;p�g�r:]
-	[PL:G�osowanie&nbsp;Otwarte:]
-	[PT:Vota��o&nbsp;Aberta:]
-	[RO:Vot deschis:]
-	[RU:����������� �������:]
-	[SV:R�stning&nbsp;p�g�r:]
-	[TR:Voting&nbsp;Open:]
-	[ZH:�����벼��:]
+  <gettext>Voting&nbsp;Open</gettext>
 </define-tag>
 <define-tag decided whitespace=delete>
-	[EN:Decided:]
-	[AR:�����:]
-	[CA:Decidit:]
-	[DA:Besluttet:]
-	[DE:Entschieden:]
-	[EL:���� �����������:]
-	[EO:Decidita:]
-	[ES:Decidido:]
-	[FI:P��tetty:]
-	[FR:D�cid�:]
-	[HR:Odlu�eno:]
-	[HU:Eld�lt:]
-	[ID:Telah&nbsp;Diputuskan:]
-	[IT:Decided:]
-	[JA:�������:]
-	[KO:Decided:]
-	[LT:Nuspr�sta:]
-	[NL:Besloten:]
-	[NO:Besluttet:]
-	[PL:Zadecydowano:]
-	[PT:Decidido:]
-	[RO:Decis:]
-	[RU:������:]
-	[SV:Beslutade:]
-	[TR:Kararla�t�r�lan:]
-	[ZH:�w�M�w:]
+  <gettext>Decided</gettext>
 </define-tag>
 <define-tag withdrawn whitespace=delete>
-	[EN:Withdrawn:]
-	[AR:Withdrawn:]
-	[CA:Withdrawn:]
-	[DA:Tilbagetrukket:]
-	[DE:Zur�ckgezogen:]
-	[EL:Withdrawn:]
-	[EO:Withdrawn:]
-	[ES:Withdrawn:]
-	[FI:Withdrawn:]
-	[FR:Annul�:]
-	[HR:Withdrawn:]
-	[HU:Withdrawn:]
-	[ID:Withdrawn:]
-	[IT:Withdrawn:]
-	[JA:ű�󤵤줿�Ʒ�:]
-	[KO:Withdrawn:]
-	[LT:At�aukta:]
-	[NL:Teruggetrokken:]
-	[NO:Tilbaketrukket:]
-	[PL:Wycofane:]
-	[PT:Withdrawn:]
-	[RO:Retras:]
-	[RU:Withdrawn:]
-	[SV:Tillbakadragna:]
-	[TR:Withdrawn:]
-	[ZH:Withdrawn:]
+  <gettext>Withdrawn</gettext>
 </define-tag>
 <define-tag other whitespace=delete>
-	[EN:Other:]
-	[AR:���:]
-	[CA:Altre:]
-	[DA:Andet:]
-	[DE:Sonstiges:]
-	[EL:����:]
-	[EO:Alia:]
-	[ES:Otro:]
-	[FI:Muu:]
-	[FR:Autre:]
-	[HR:Ostalo:]
-	[HU:Egy�b:]
-	[ID:Lain-lain:]
-	[IT:Other:]
-	[JA:����¾:]
-	[KO:Other:]
-	[LT:Kita:]
-	[NL:Andere:]
-	[NO:Annet:]
-	[PL:Inne:]
-	[PT:Outro:]
-	[RO:Altele:]
-	[RU:������:]
-	[SV:Annat:]
-	[TR:Di�er:]
-	[ZH:��L:]
+  <gettext>Other</gettext>
 </define-tag>
 
 <define-tag homevote whitespace=delete>
-	[EN:Home&nbsp;Vote&nbsp;Page:]
-	[AR:��� ���� �������:]
-	[CA:P�gina&nbsp;Principal&nbsp;de&nbsp;Votacions:]
-	[DA:Hjem&nbsp;til&nbsp;afstemningssiden:]
-	[DE:Home&nbsp;Abstimmungsseite:]
-	[EL:�������� ������ ����������:]
-	[EO:Hejma&nbsp;Vo�dona&nbsp;Pa�o:]
-	[ES:P�gina&nbsp;Principal&nbsp;de&nbsp;Votaciones:]
-	[FI:Koti&nbsp;��nestyssivu:]
-	[FR:Page&nbsp;d'accueil&nbsp;des&nbsp;votes:]
-	[HR:Po�etna&nbsp;stranica&nbsp;glasovanja:]
-	[HU:Kezd�oldal - Szavaz�s:]
-	[ID:Halaman&nbsp;Utama&nbsp;Pemungutan&nbsp;Suara:]
-	[IT:Home&nbsp;Vote&nbsp;Page:]
-	[JA:��ɼ����ۡ���ڡ���:]
-	[KO:Home&nbsp;Vote&nbsp;Page:]
-	[LT:Pradinis&nbsp;balsavimo&nbsp;puslapis:]
-	[NL:Home&nbsp;stempagina:]
-	[NO:Hjem&nbsp;Avstemmingssiden:]
-	[PL:G��wna&nbsp;Strona&nbsp;G�osowa�:]
-	[PT:P�gina&nbsp;principal&nbsp;de&nbsp;Vota��o:]
-	[RO:Pagina de vot:]
-	[RU:��&nbsp;��������&nbsp;�����������:]
-	[SV:Hem&nbsp;-&nbsp;R�stningssida:]
-	[TR:Home&nbsp;Vote&nbsp;Page:]
-	[ZH:�벼�D��:]
+  <gettext>Home&nbsp;Vote&nbsp;Page</gettext>
 </define-tag>
 <define-tag howto whitespace=delete>
-	[EN:How&nbsp;To:]
-	[AR:���:]
-	[CA:Com:]
-	[DA:Hvordan&nbsp;man&nbsp;...:]
-	[DE:Wie:]
-	[EL:��� �� ��������:]
-	[EO:Kiel&nbsp;Fari:]
-	[ES:C�mo:]
-	[FI:Kuinka:]
-	[FR:Aide:]
-	[HR:Kako:]
-	[HU:Hogyan:]
-	[ID:Bagaimana:]
-	[IT:How&nbsp;To:]
-	[JA:������ˡ:]
-	[KO:How&nbsp;To:]
-	[LT:Kaip:]
-	[NL:How&nbsp;To:]
-	[NO:Hvordan...:]
-	[PL:Jak:]
-	[PT:How&nbsp;To:]
-	[RO:Cum s�:]
-	[RU:���:]
-	[SV:Hur&nbsp;man...:]
-	[TR:Nas�l:]
-	[ZH:How&nbsp;To:]
+  <gettext>How&nbsp;To</gettext>
 </define-tag>
 <define-tag submit whitespace=delete>
-	[EN:Submit&nbsp;a&nbsp;Proposal:]
-	[AR:��� ������:]
-	[CA:Enviar&nbsp;Proposta:]
-	[DA:Afgiver&nbsp;et&nbsp;forslag:]
-	[DE:Vorschlag&nbsp;einsenden:]
-	[EL:����� ��� ��������� ���:]
-	[EO:Sendi&nbsp;Proponon:]
-	[ES:Enviar&nbsp;Propuesta:]
-	[FI:Ehdottaa:]
-	[FR:Soumettre&nbsp;une&nbsp;proposition:]
-	[HR:Predati&nbsp;prijedlog:]
-	[HU:adj be ind�tv�nyt:]
-	[ID:Mengajukan&nbsp;Proposal:]
-	[IT:Submit&nbsp;a&nbsp;Proposal:]
-	[JA:��Ƥ����:]
-	[KO:Submit&nbsp;a&nbsp;Proposal:]
-	[LT:Pateikti&nbsp;si�lym�:]
-	[NL:Een&nbsp;voorstel&nbsp;voorleggen:]
-	[NO:Send&nbsp;inn&nbsp;et&nbsp;forslag:]
-	[PL:Zg�osi�&nbsp;Propozycj�:]
-	[PT:Enviar&nbsp;Proposi��o:]
-	[RO:Propune�i:]
-	[RU:�����������&nbsp;�����������:]
-	[SV:Avger&nbsp;f�rslag:]
-	[TR:Submit&nbsp;a&nbsp;Proposal:]
-	[ZH:���Xĳ��:]
+  <gettext>Submit&nbsp;a&nbsp;Proposal</gettext>
 </define-tag>
 <define-tag amend whitespace=delete>
-	[EN:Amend&nbsp;a&nbsp;Proposal:]
-	[AR:����� ������:]
-	[CA:Esmenar&nbsp;una&nbsp;Proposta:]
-	[DA:�ndrer&nbsp;et&nbsp;forslag:]
-	[DE:Vorschlag&nbsp;erg�nzen:]
-	[EL:������� �����������:]
-	[EO:Modifi&nbsp;Proponon:]
-	[ES:Enmendar&nbsp;una&nbsp;Propuesta:]
-	[FI:T�ydent��&nbsp;ehdotusta:]
-	[FR:Amender&nbsp;une&nbsp;proposition:]
-	[HR:Ispraviti&nbsp;prijedlog:]
-	[HU:m�dos�ts ind�tv�nyt:]
-	[ID:Mengubah&nbsp;Proposal:]
-	[IT:Amend&nbsp;a&nbsp;Proposal:]
-	[JA:��Ƥν���:]
-	[KO:Amend&nbsp;a&nbsp;Proposal:]
-	[LT:Keisti&nbsp;si�lym�:]
-	[NL:Een&nbsp;voorstel&nbsp;amenderen:]
-	[NO:Legg&nbsp;til&nbsp;et&nbsp;forslag:]
-	[PL:Poprawi�&nbsp;Propozycj�:]
-	[PT:Corrigir&nbsp;uma&nbsp;Proposi��o:]
-	[RO:Amenda�i propunerea:]
-	[RU:��������&nbsp;a&nbsp;�����������:]
-	[SV:�ndrar&nbsp;f�rslag:]
-	[TR:Amend&nbsp;a&nbsp;Proposal:]
-	[ZH:�ץ�ĳ��:]
+  <gettext>Amend&nbsp;a&nbsp;Proposal</gettext>
 </define-tag>
 <define-tag follow whitespace=delete>
-	[EN:Follow&nbsp;a&nbsp;Proposal:]
-	[AR:���� ������:]
-	[CA:Donar&nbsp;suport&nbsp;a&nbsp;una&nbsp;Proposta:]
-	[DA:F�lger&nbsp;et&nbsp;forslag:]
-	[DE:Einen&nbsp;Vorschlag&nbsp;verfolgen:]
-	[EL:��������� ��������:]
-	[EO:Sekvi&nbsp;Proponon:]
-	[ES:Apoyar&nbsp;una&nbsp;Propuesta:]
-	[FI:Seurata&nbsp;ehdotuksen&nbsp;kehityst�:]
-	[FR:Appuyer&nbsp;une&nbsp;proposition:]
-	[HR:Slijediti&nbsp;prijedlog:]
-	[HU:k�vess ind�tv�nyt:]
-	[ID:Menindaklanjuti&nbsp;Proposal:]
-	[IT:Follow&nbsp;a&nbsp;Proposal:]
-	[JA:��Ƥؤΰո�:]
-	[KO:Follow&nbsp;a&nbsp;Proposal:]
-	[LT:Sekti&nbsp;si�lym�:]
-	[NL:Een&nbsp;voorstel&nbsp;steunen:]
-	[NO:F�lg&nbsp;et&nbsp;forslag:]
-	[PL:Poprze�&nbsp;Propozycj�:]
-	[PT:Apoiar&nbsp;uma&nbsp;Proposi��o:]
-	[SV:F�ljer&nbsp;f�rslag:]
-	[RO:Urm�ri�i propunerea:]
-	[RU:����������&nbsp;�����������:]
-	[TR:Follow&nbsp;a&nbsp;Proposal:]
-	[ZH:���Hĳ�ת��i�i:]
+  <gettext>Follow&nbsp;a&nbsp;Proposal</gettext>
 </define-tag>
 <define-tag read whitespace=delete>
-	[EN:Read&nbsp;a&nbsp;Result:]
-	[AR:����� ��� �������:]
-	[CA:Llegir un resultat:]
-	[DA:L�ser&nbsp;et&nbsp;resultat:]
-	[DE:Resultat&nbsp;lesen:]
-	[EL:�������� �������������:]
-	[EO:Legi&nbsp;Rezulton:]
-	[ES:Leer&nbsp;un&nbsp;Resultado:]
-	[FI:Lukea&nbsp;tulos:]
-	[FR:Lire&nbsp;un&nbsp;r�sultat:]
-	[HR:Pro�itati&nbsp;rezultat:]
-	[HU:olvasd el a v�geredm�nyt:]
-	[ID:Lihat&nbsp;Hasil:]
-	[IT:Read&nbsp;a&nbsp;Result:]
-	[JA:��̤α���:]
-	[KO:Read&nbsp;a&nbsp;Result:]
-	[LT:Skaityti&nbsp;rezultat�:]
-	[NL:Lees&nbsp;een&nbsp;resultaat:]
-	[NO:Les&nbsp;et&nbsp;resultat:]
-	[PL:Przeczyta�&nbsp;Rezultat:]
-	[PT:Ler&nbsp;um&nbsp;Resultado:]
-	[RO:Citi�i rezultatul:]
-	[RU:������ ����������:]
-	[SV:L�ser&nbsp;resultat:]
-	[TR:SonuClara&nbsp;GOz&nbsp;At:]
-	[ZH:�d�ݵ��G:]
+  <gettext>Read&nbsp;a&nbsp;Result</gettext>
 </define-tag>
 <define-tag vote whitespace=delete>
-	[EN:Vote:]
-	[AR:�����:]
-	[CA:Votar:]
-	[DA:Stemmer:]
-	[DE:Abstimmen:]
-	[EL:���������:]
-	[EO:Vo�dono:]
-	[ES:Votar:]
-	[FI:��nest��:]
-	[FR:Vote:]
-	[HR:Glasovati:]
-	[HU:szavazz:]
-	[ID:Pilih:]
-	[IT:Vote:]
-	[JA:��ɼ:]
-	[KO:Vote:]
-	[LT:Balsuoti:]
-	[NL:Stem:]
-	[NO:Stem:]
-	[PL:G�osowa�:]
-	[PT:Votar:]
-	[RO:Vota�i:]
-	[RU:�������������:]
-	[SV:R�star:]
-	[TR:Vote:]
-	[ZH:�벼:]
+  <gettext>Vote</gettext>
 </define-tag>
 
 # DO NOT translate anything below here. If you feel something needs to be changed, write to
diff --git a/english/template/debian/weeklynews/footer.wml b/english/template/debian/weeklynews/footer.wml
index 7d3fc66d694..68567758410 100644
--- a/english/template/debian/weeklynews/footer.wml
+++ b/english/template/debian/weeklynews/footer.wml
@@ -2,251 +2,15 @@
 # languages in them (except english ones).
 
 <define-tag subscribe>
-[EN:To receive this newsletter weekly in your mailbox,
-<a href="m4_HOME/MailingLists/subscribe#debian-news">subscribe</a>
-to the debian-news mailing list.:]
-[AR:To receive this newsletter weekly in your mailbox,
-<a href="m4_HOME/MailingLists/subscribe#debian-news">subscribe</a>
-to the debian-news mailing list.:]
-[CA:Per a rebre aquest butllet� setmanal en la vostra b�stia,
-<a href="m4_HOME/MailingLists/subscribe#debian-news">subscriviu-vos</a>
-a la llista de correu debian-news.:]
-[DA:For at f� dette nyhedsbrev som e-mail hver uge,
-<a href="m4_HOME/MailingLists/subscribe#debian-news">abonn�r</a>
-p� postlisten debian-news.:]
-[DE:Wenn Sie diese Nachrichtenseite w�chentlich in Ihrer Mailbox haben
-wollen, tragen Sie sich in die
-<a href="m4_HOME/MailingLists/subscribe#debian-news-german">Mailingliste</a>
-debian-news-german ein.:]
-[EL:To receive this newsletter weekly in your mailbox,
-<a href="m4_HOME/MailingLists/subscribe#debian-news">subscribe</a>
-to the debian-news mailing list.:]
-[EO: <a href="m4_HOME/MailingLists/subscribe#debian-news">Ali�u</a>
-al la <i>debian-news</i> retpo�ta dissendolisto
-kaj vi ricevos tiun �i nova�leteron �iusemajne en via po�tkesto.:]
-[ES:Para recibir este bolet�n semanalmente en su buz�n,
-<a href="m4_HOME/MailingLists/subscribe#debian-news">suscr�base</a>
-a la lista de correo debian-news.:]
-[FI:Saadaksesi t�m�n uutiskirjeen viikottain postilaatikkoosi, 
-<a href="m4_HOME/MailingLists/subscribe#debian-news">liity</a> 
-debian-news -postilistalla.:]
-[FR:Pour recevoir cette gazette chaque semaine dans votre bo�te � lettres,
-<a href="m4_HOME/MailingLists/subscribe#debian-news">abonnez-vous</a>
-� la liste de diffusion debian-news.:]
-[HR:Kako bi dobili ove vijesti tjedno u svoj elektronski po�tanski pretinac,
-<a href="m4_HOME/MailingLists/subscribe#debian-news">pretplatite se</a>
-na debian-news mailing listu.:]
-[HU:Ha meg akarod kapni e-mailben a heti h�rlevel�nket,
-<a href="m4_HOME/MailingLists/subscribe#debian-news">iratkozz fel</a>
-a debian-news list�ra.:]
-[ID:Untuk menerima newsletter mingguan ini di email anda,
-silahkan <a href="m4_HOME/MailingLists/subscribe#debian-news">subscribe</a>
-ke milis debian-news.:]
-[IT:Per ricevere le notizie settimanali al tuo indirizzo di posta elettronica,
-<a href="m4_HOME/MailingLists/subscribe#debian-news">iscriviti</a>
-alla lista di messaggi debian-news.:]
-[JA:���Υ˥塼���쥿�����轵�Żҥ᡼��Ǽ�����ꤿ�����ϡ�debian-news 
-�᡼��󥰥ꥹ�Ȥ� <a href="m4_HOME/MailingLists/subscribe#debian-news">
-����</a> ���Ƥ���������:]
-[KO:�� ������ ���� �޾� ������, ����� ���� ���ϸ� ����Ʈ��
-<a href="m4_HOME/MailingLists/subscribe#debian-news">����</a>�ϼ���.:]
-[LT:Nor�dami kas savait� gauti naujienas,  
-<a href="m4_HOME/MailingLists/subscribe#debian-news">u�siregistruokite</a>
-debian-news pa�to konferencijoje.
-:]
-[NL:To receive this newsletter weekly in your mailbox,
-<a href="m4_HOME/MailingLists/subscribe#debian-news">subscribe</a>
-to the debian-news mailing list.:]
-[NO:For � f� dette nyhetsbrevet per e-post hver uke,
-<a href="m4_HOME/MailingLists/subscribe#debian-news">abonner</a>
-p� postlisten debian-news.:]
-[PL:Aby co tydzie� otrzymywa� poczt� elektroniczn� ten biuletyn
-<a href="m4_HOME/MailingLists/subscribe#debian-news">zapisz si�</a>
-na list� debian-news.:]
-[PT:Para receber esse boletim em seu correio eletr�nico semanalmente,
-<a href="m4_HOME/MailingLists/subscribe#debian-news-portuguese">inscreva-se</a> na lista de
-discuss�o debian-news (ingl�s) ou debian-news-portuguese (portugu�s).:]
-[RO:Pentru a primi �tiri s�pt�minale
-<a href="m4_HOME/MailingLists/subscribe#debian-news">subscrie�i</a>
-la lista de mail debian-news.:]
-[RU:��� ������������� ��������� �������� � ��� �������� ����,
-<a href="m4_HOME/MailingLists/subscribe#debian-news">�����������</a>
-�� ������ �������� debian-news.:]
-[SV:F�r att f� det h�r nyhetsbrevet tills�nt dig per e-post varje vecka,
-<a href="m4_HOME/MailingLists/subscribe#debian-news">prenumerera</a>
-p� s�ndlistan debian-news.:]
-[TR:To receive this newsletter weekly in your mailbox,
-<a href="m4_HOME/MailingLists/subscribe#debian-news">subscribe</a>
-to the debian-news mailing list.:]
-[ZH:�Q�C�ӬP�����H�q�l�l��覡�����u�C�g�ְT�v�ܡH��<a href="m4_HOME/MailingLists/subscribe#debian-news">�q�\</a> debian-news �l��C���C:]
+  <gettext>To receive this newsletter weekly in your mailbox, <a href="m4_HOME/MailingLists/subscribe#debian-news">subscribe</a> to the debian-news mailing list.</gettext>
 </define-tag>
 
 <define-tag backissues whitespace=delete>
-[EN:<a href="../../">Back issues</a> of this newsletter are available.:]
-[AR:<a href="../../">Back issues</a> of this newsletter are available.:]
-[CA:Els <a href="../../">n�meros anteriors</a> d'aquest butllet� estan disponibles.:]
-[DA:<a href="../../">Tidligere udgaver</a> af nyhedsbrevet er tilg�ngelige.:]
-[DE:Hier gibt es <a href="../../">�ltere Ausgaben</a> dieser Nachrichtenseite.:]
-[EL:<a href="../../">Back issues</a> of this newsletter are available.:]
-[EO:<a href="../../">Anta�aj ekzempleroj</a> de tiu �i nova�letero estas haveblaj.:]
-[ES:Puede conseguir <a href="../../">ejemplares anteriores</a> de este bolet�n.:]
-[FI:Uutiskirjeen <a href="../../">vanhoja numeroita</a> on my�s saatavilla.:]
-[FR:<a href="../../">Les derni�res parutions</a> de cette gazette sont disponibles.:]
-[HR:<a href="../../">Prija�nja izdanja</a> ovih vijesti su dostupna.:]
-[HU:<a href="../..">Kor�bbi h�reink</a>:]
-[ID:Edisi lama newsletter ini tersedia di <a href="../../">sini</a>.:]
-[IT:Sono disponibili <a href="../../">edizioni precedenti</a> di queste raccolte settimanali.:]
-[JA:<a href="../../">�Хå��ʥ�С�</a>�⤴���Ѥ��������ޤ���:]
-[KO:<a href="../../">�ڷ�</a>:]
-[LT:<a href="../../">Ankstesn�s naujienos</a>.:]
-[NL:<a href="../../">Back issues</a> of this newsletter are available.:]
-[NO:<a href="../../">Tidligere utgaver</a> av nyhetsbrevet er tilgjengelige.:]
-[PL:Dost�pne s� <a href="../../">archiwalne</a> wiadomo�ci.:]
-[PT:<a href="../../">Edi��es anteriores</a> deste boletim est�o dispon�veis.:]
-[RO:<a href="../../">Edi�ii mai vechi</a> ale acestor �tiri s�nt disponibile:]
-[RU:<a href="../../">������� �������</a> ���� �������� ����� ��������.:]
-[SV:<a href="../../">Tidigare utg�vor</a> av nyhetsbrevet finns att tillg�.:]
-[TR:<a href="../../">Back issues</a> of this newsletter are available.:]
-[ZH:�z��i½�\<a href="../../">�L�������D</a>�C:]
+  <gettext><a href="../../">Back issues</a> of this newsletter are available.</gettext>
 </define-tag>
 
 <define-tag editor whitespace=delete>
-<:{
-     my $path = q|<get-var WML_SRC_DIRNAME>|;
-     my ($issue, $year, $null) = split /\//, scalar reverse $path;
-     $year = reverse $year;
-     $issue = reverse $issue;
-     if ($year =~ /^\d+$/) {
-
-	  # This is a normal issue
-     } elsif ($issue =~/^\d+$/) {
-	  # year/index.wml or equvalient.
-	  $year = $issue;
-	  $issue = 999;
-     } else {
-	  $year = 9999;
-	  $issue = 0;
-     }
-     
-     if (($year > 2002) or (($year == 2002) and ($issue >= 2))) {
-	  print q{
-[EN:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Yooseong Yang and Martin 'Joey' Schulze</a>.:]
-[AR:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Yooseong Yang and Martin 'Joey' Schulze</a>.:]
-[DA:Redakt�r af Debian Weekly News er <a href="mailto:dwn@debian.org">Yooseong Yang og Martin 'Joey' Schulze</a>.:]
-[DE:Die w�chentlichen Debian-Nachrichten werden von <a href="mailto:dwn@debian.org">Yooseong Yang und Martin 'Joey' Schulze</a> erstellt.:]
-[EL:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Yooseong Yang and Martin 'Joey' Schulze</a>.:]
-[EO:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Yooseong Yang and Martin 'Joey' Schulze</a>.:]
-[ES:Los editores de las Noticias Semanales de Debian son <a href="mailto:dwn@debian.org">Yooseong Yang y Martin 'Joey' Schulze</a>.:]
-[FI:Debianin viikkokatsausta toimittavat <a href="mailto:dwn@debian.org">Yooseong Yang ja Martin 'Joey' Schulze</a>.:]
-[FR:Debian Weekly News est �dit�e par <a href="mailto:dwn@debian.org">Yooseong Yang et Martin 'Joey' Schulze</a>.:]
-[HR:Debian Weekly News ure�uju <a href="mailto:dwn@debian.org">Yooseong Yang i Martin 'Joey' Schulze</a>.:]
-[HU:A Debian Weekly Newst <a href="mailto:dwn@debian.org">Yooseong Yang �s Martin 'Joey' Schulze</a> szerkeszti.:]
-[ID:Debian Weekly News diedit oleh <a href="mailto:dwn@debian.org">Yooseong Yang and Martin 'Joey' Schulze</a>.:]
-[IT:Debian Weekly News � scritta da <a href="mailto:dwn@debian.org">Yooseong Yang e Martin 'Joey' Schulze</a>.:]
-[JA:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Yooseong Yang and Martin 'Joey' Schulze</a>.:]
-[KO:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Yooseong Yang and Martin 'Joey' Schulze</a>.:]
-[LT:Debian Savaitines Naujienas redaguoja <a href="mailto:dwn@debian.org">Yooseong Yang ir Martin 'Joey' Schulze</a>. :]
-[NL:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Yooseong Yang and Martin 'Joey' Schulze</a>.:]
-[NO:Redakt�r av Debian Weekly News er <a href="mailto:dwn@debian.org">Yooseong Yang og Martin 'Joey' Schulze</a>.:]
-[PL:Debian Weekly News tem como editores <a href="mailto:dwn@debian.org">Yooseong Yang e Martin 'Joey' Schulze</a>.:]
-[PT:Debian Weekly News � escrito por <a href="mailto:dwn@debian.org">Yooseong Yang e Martin 'Joey' Schulze</a>.<br>Tradu��o para o portugu�s: <a href="mailto:henrique@ital.org.br">Henrique Pedroni Neto</a>.:]
-[RO:�tirile s�pt�m�nale Debian s�nt editate de <a href="mailto:dwn@debian.org">Yooseong Yang and Martin 'Joey' Schulze</a>.:]
-[RU:������������ ������� Debian ��������� <a href="mailto:dwn@debian.org">Yooseong Yang � Martin 'Joey' Schulze</a>.:]
-[SV:Redakt�rer f�r Debian Weekly News �r <a href="mailto:dwn@debian.org">Joe "Zonker" Brockmeier, Yooseong Yang och Martin "Joey" Schulze</a>.:]
-[TR:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Yooseong Yang and Martin 'Joey' Schulze</a>.:]
-[ZH:Debian �C�g�ְT (Debian Weekly News) �� <a href="mailto:dwn@debian.org">Yooseong Yang �M Martin 'Joey' Schulze</a> �t�d�s��C:]
-};
-     } elsif (($year > 2001) or (($year >= 2001) and ($issue >= 20))) {
-	  print q{
-[EN:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier and Martin 'Joey' Schulze</a>.:]
-[AR:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier and Martin 'Joey' Schulze</a>.:]
-[CA:Els editors de les Not�cies Setmanals de Debian s�n <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier i Martin 'Joey' Schulze</a>.:]
-[DA:Redakt�r af Debian Weekly News er <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier og Martin 'Joey' Schulze</a>.:]
-[DE:Die w�chentlichen Debian-Nachrichten werden von <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier und Martin 'Joey' Schulze</a> erstellt.:]
-[EL:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier and Martin 'Joey' Schulze</a>.:]
-[EO:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier and Martin 'Joey' Schulze</a>.:]
-[ES:Los editores de las Noticias Semanales de Debian son <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier y Martin 'Joey' Schulze</a>.:]
-[FI:Debianin viikkokatsausta toimittavat <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier ja Martin 'Joey' Schulze</a>.:]
-[FR:Debian Weekly News est �dit�e par <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier and Martin 'Joey' Schulze</a>.:]
-[HR:Debian Weekly News ure�uju <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier i Martin 'Joey' Schulze</a>.:]
-[HU:A Debian Weekly Newst <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier �s Martin 'Joey' Schulze</a> szerkeszti.:]
-[ID:Debian Weekly News diedit oleh <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier and Martin 'Joey' Schulze</a>.:]
-[IT:Debian Weekly News � scritta da <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier e Martin 'Joey' Schulze</a>.:]
-[JA:Debian ���������꡼�˥塼���� <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier �� Martin 'Joey' Schulze</a> ���Խ����Ƥ��ޤ���:]
-[KO:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier and Martin 'Joey' Schulze</a>.:]
-[LT:Debian Savaitines Naujienas redaguoja <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier ir Martin 'Joey' Schulze</a>.:]
-[NL:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier and Martin 'Joey' Schulze</a>.:]
-[NO:Redakt�r av Debian Weekly News er <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier og Martin 'Joey' Schulze</a>.:]
-[PL:Debian Weekly News tem como editores <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier e Martin 'Joey' Schulze</a>.:]
-[PT:A Debian Weekly News � escrita por <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier e Martin 'Joey' Schulze</a>.:]
-[RO:�tirile s�pt�m�nale Debian s�nt editate de <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier and Martin 'Joey' Schulze</a>.:]
-[RU:������������ ������� Debian ��������� <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier � Martin 'Joey' Schulze</a>.:]
-[SV:Redakt�rer f�r Debian Weekly News �r <a href="mailto:dwn@debian.org">Joe "Zonker" Brockmeier och Martin "Joey" Schulze</a>.:]
-[TR:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier and Martin 'Joey' Schulze</a>.:]
-[ZH:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier and Martin 'Joey' Schulze</a>.:]
-};
-     } elsif (($year > 2001) or (($year >= 2001) and ($issue >= 10))) {
-	  print q{
-[EN:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>.:]
-[AR:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>.:]
-[CA:Els editors de les Not�cies Setmanals de Debian s�n <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary i Tollef Fog Heen</a>.:]
-[DA:Redakt�r af Debian Weekly News er <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary og Tollef Fog Heen</a>.:]
-[DE:Die w�chentlichen Debian-Nachrichten werden von <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary und Tollef Fog Heen</a> erstellt.:]
-[EL:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>.:]
-[EO:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>.:]
-[ES:Los editores de las Noticias Semanales de Debian son <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary y Tollef Fog Heen</a>.:]
-[FI:Debianin viikkokatsausta toimittavat <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary ja Tollef Fog Heen</a>.:]
-[FR:Debian Weekly News est �dit�e par <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>.:]
-[HR:Debian Weekly News ure�uju <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary i Tollef Fog Heen</a>.:]
-[HU:A Debian Weekly Newst <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary �s Tollef Fog Heen</a> szerkeszti.:]
-[ID:Debian Weekly News diedit oleh <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>.:]
-[IT:Debian Weekly News � scritta da <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary e Tollef Fog Heen</a>.:]
-[JA:Debian ���������꡼�˥塼���� <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary ����� Tollef Fog Heen</a> ���Խ����Ƥ��ޤ���:]
-[KO:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>.:]
-[LT:Debian Savaitines Naujienas redaguoja <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary ir Tollef Fog Heen</a>.:]
-[NL:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>.:]
-[NO:Redakt�r av Debian Weekly News er <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary og Tollef Fog Heen</a>.:]
-[PL:Debian Weekly News tem como editores <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary e Tollef Fog Heen</a>.:]
-[PT:A Debian Weekly News � escrita por <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary e Tollef Fog Heen</a>.<br>Tradu��o para o portugu�s: <a href="mailto:henrique@ital.org.br">Henrique Pedroni Neto</a>.:]
-[RO:�tirile s�pt�m�nale Debian s�nt editate de <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>.:]
-[RU:������������ ������� Debian ��������� <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary � Tollef Fog Heen</a>.:]
-[SV:Redakt�rer f�r Debian Weekly News �r <a href="mailto:dwn@debian.org">Joe "Zonker" Brockmeier, Jean-Christophe Helary och Tollef Fog Heen</a>.:]
-[TR:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>.:]
-[ZH:Debian �C�g�ְT (Debian Weekly News) �� <a href="mailto:dwn@debian.org">Joe 'Zonker' Brockmeier, Jean-Christophe Helary �M Tollef Fog Heen</a> �t�d�s��C:]
-};
-     } else {
-     print q{
-[EN:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[AR:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[CA:El editor de les Not�cies Setmanals de Debian �s <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[DA:Redakt�r af Debian Weekly News er <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[DE:Die w�chentlichen Debian-Nachrichten werden von <a href="mailto:dwn@debian.org">Joey Hess</a> erstellt.:]
-[EL:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[EO:<i>Debian Weekly News</i> estas verkita de <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[ES:Las Noticias Semanales de Debian son editadas por <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[FI:Debianin viikkokatsausta toimittaa <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[FR:Debian Weekly News est �dit�e par <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[HR:Debian Weekly News ure�uje <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[HU:A heti Debian-h�reket <a href="mailto:dwn@debian.org">Joey Hess</a> szerkeszti.:]
-[ID:Debian Weekly News diedit oleh <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[IT:Redattore di Debian Weekly News � <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[JA:Debian ���������꡼�˥塼���� <a href="mailto:dwn@debian.org">Joey Hess</a> ���Խ����Ƥ��ޤ���:]
-[KO:����� �ְ� ������ <a href="mailto:dwn@debian.org">Joey Hess</a>�� �����ϰ� �ֽ��ϴ�.:]
-[LT:Debian Savaitin�s Naujienos redaguojamos <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[NL:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[NO:Redakt�r av Debian Weekly News er <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[PL:Cotygodniowe wiadomo�ci Debiana tworzy <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[PT:A Debian Weekly News tem como editor <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[RO:Debian Weekly News este editat� de c�tre <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[RU:������������ ������� Debian ��������� <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[SV:Redakt�r f�r Debian Weekly News �r <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[TR:Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Joey Hess</a>.:]
-[ZH:Debian �C�P�ְT (Debian Weekly News) �� <a href="mailto:dwn@debian.org">Joey Hess</a> �t�d�s��C:]
-};
-     }
-     
-	 
-}:>
+  <gettext>Debian Weekly News is edited by <a href="mailto:dwn@debian.org">Yooseong Yang and Martin 'Joey' Schulze</a>.</gettext>
 </define-tag>
 
 <hrline/>
author	Denis Barbier <barbier>	2002-11-01 14:00:07 +0000
committer	Denis Barbier <barbier>	2002-11-01 14:00:07 +0000
commit	0cf62aed65db193332806ceae07baa8c65fb202c (patch)
tree	9f869341461e2e6f2e66818bb1c0975c0f9e39e2
parent	7823f083cfff7a85707cb59e35c8fb5207ffb419 (diff)