Changed all menu files to a different structure as proposed by Matt

Kraai.  All menu files now have slices for all languages,
alphabetically sorted.

CVS version numbers

english/misc/laptops/Makefile: 1.4 -> 1.5 
english/misc/laptops/index.wml: 1.4 -> 1.5 
english/misc/laptops/menu.inc: 1.1 -> 1.2 
english/ports/arm/Makefile: 1.9 -> 1.10 
english/ports/arm/index.wml: 1.28 -> 1.29 
english/ports/arm/menu.inc: 1.1 -> 1.2 
english/ports/beowulf/Makefile: 1.4 -> 1.5 
english/ports/beowulf/index.wml: 1.3 -> 1.4 
english/ports/beowulf/menu.inc: 1.1 -> 1.2 
english/ports/hppa/Makefile: 1.4 -> 1.5 
english/ports/hppa/index.wml: 1.7 -> 1.8 
english/ports/hppa/menu.inc: 1.2 -> 1.3 
english/ports/hurd/Makefile: 1.8 -> 1.9 
english/ports/hurd/hurd-cd.wml: 1.9 -> 1.10 
english/ports/hurd/hurd-contact.wml: 1.14 -> 1.15 
english/ports/hurd/hurd-devel-debian.wml: 1.18 -> 1.19 
english/ports/hurd/hurd-devel-ports.wml: 1.9 -> 1.10 
english/ports/hurd/hurd-devel-tasks.wml: 1.12 -> 1.13 
english/ports/hurd/hurd-devel.wml: 1.6 -> 1.7 
english/ports/hurd/hurd-doc-server.wml: 1.11 -> 1.12 
english/ports/hurd/hurd-doc-translator.wml: 1.7 -> 1.8 
english/ports/hurd/hurd-doc-utils.wml: 1.6 -> 1.7 
english/ports/hurd/hurd-doc.wml: 1.13 -> 1.14 
english/ports/hurd/hurd-faq.wml: 1.25 -> 1.26 
english/ports/hurd/hurd-install.wml: 1.16 -> 1.17 
english/ports/hurd/hurd-links.wml: 1.20 -> 1.21 
english/ports/hurd/hurd-news.wml: 1.9 -> 1.10 
english/ports/hurd/index.wml: 1.9 -> 1.10 
english/ports/hurd/menu.inc: 1.1 -> 1.2 
english/ports/ia64/Makefile: 1.3 -> 1.4 
english/ports/ia64/index.wml: 1.6 -> 1.7 
english/ports/ia64/menu.inc: 1.2 -> 1.3 
english/ports/mips/Makefile: 1.4 -> 1.5 
english/ports/mips/cpu.wml: 1.11 -> 1.12 
english/ports/mips/index.wml: 1.28 -> 1.29 
english/ports/mips/menu.inc: 1.3 -> 1.4 
english/ports/mips/system.wml: 1.9 -> 1.10 
english/ports/powerpc/Makefile: 1.12 -> 1.13 
english/ports/powerpc/devel.wml: 1.11 -> 1.12 
english/ports/powerpc/docu.wml: 1.8 -> 1.9 
english/ports/powerpc/history.wml: 1.9 -> 1.10 
english/ports/powerpc/index.wml: 1.22 -> 1.23 
english/ports/powerpc/menu.inc: 1.1 -> 1.2 
english/ports/powerpc/news.wml: 1.11 -> 1.12 
english/ports/powerpc/supply.wml: 1.11 -> 1.12 
english/ports/powerpc/inst/Makefile: 1.4 -> 1.5 
english/ports/powerpc/inst/apus.wml: 1.6 -> 1.7 
english/ports/powerpc/inst/booting.wml: 1.3 -> 1.4 
english/ports/powerpc/inst/chrp.wml: 1.6 -> 1.7 
english/ports/powerpc/inst/install.wml: 1.11 -> 1.12 
english/ports/powerpc/inst/mbx.wml: 1.4 -> 1.5 
english/ports/powerpc/inst/menu.inc: 1.1 -> 1.2 
english/ports/powerpc/inst/pmac.wml: 1.7 -> 1.8 
english/ports/powerpc/inst/prep.wml: 1.5 -> 1.6 
english/ports/powerpc/inst/rs6k.wml: 1.2 -> 1.3 
english/ports/s390/Makefile: 1.4 -> 1.5 
english/ports/s390/index.wml: 1.2 -> 1.3 
english/ports/s390/menu.inc: 1.1 -> 1.2 
english/ports/sparc/Makefile: 1.11 -> 1.12 
english/ports/sparc/credits.wml: 1.2 -> 1.3 
english/ports/sparc/index.wml: 1.15 -> 1.16 
english/ports/sparc/menu.inc: 1.1 -> 1.2 
english/ports/sparc/porting.wml: 1.5 -> 1.6 
english/ports/sparc/problems.wml: 1.8 -> 1.9 
english/ports/sparc64/Makefile: 1.4 -> 1.5 
english/ports/sparc64/index.wml: 1.7 -> 1.8 
english/ports/sparc64/menu.inc: 1.1 -> 1.2 
english/template/debian/submenu.wml: INITIAL -> 1.1

3 files changed, 53 insertions, 7 deletions

diff --git a/english/ports/hppa/Makefile b/english/ports/hppa/Makefile
index d875b9a4eda..0af3a1cda88 100644
--- a/english/ports/hppa/Makefile
+++ b/english/ports/hppa/Makefile
@@ -8,4 +8,4 @@ SUBS=
 
 include $(WMLBASE)/Make.lang
 
-index.$(LANGUAGE).html: index.wml menu.inc $(TEMPLDIR)/template.wml
+$(HTMLFILES): menu.inc $(TEMPLDIR)/submenu.wml $(TEMPLDIR)/template.wml
diff --git a/english/ports/hppa/index.wml b/english/ports/hppa/index.wml
index 159c60870fa..efd077c780f 100644
--- a/english/ports/hppa/index.wml
+++ b/english/ports/hppa/index.wml
@@ -1,5 +1,5 @@
 #use wml::debian::template title="PA-RISC Port" NOHEADER="yes"
-#include "menu.inc"
+#include "$(ENGLISHDIR)/ports/hppa/menu.inc"
 
 <h1>Debian for PA-RISC</h1>
 
diff --git a/english/ports/hppa/menu.inc b/english/ports/hppa/menu.inc
index f48c965a677..464d026771f 100644
--- a/english/ports/hppa/menu.inc
+++ b/english/ports/hppa/menu.inc
@@ -1,5 +1,51 @@
-[ <a href="../">Ports</a> ]
-[ <ifneq <get-var WML_SRC_BASENAME> "index"
-  "<a href="index">Debian for PA-RISC</a>"
-  "<b>Debian for PA-RISC</b>"
-> ]
+#use wml::debian::submenu
+
+<menu-item basename="../index">
+[AR:Ports:]
+[DA:Ports:]
+[DE:Ports:]
+[EL:Ports:]
+[EN:Ports:]
+[EO:Ports:]
+[ES:Ports:]
+[FI:Ports:]
+[FR:Ports:]
+[HR:Ports:]
+[HU:Ports:]
+[JA:Ports:]
+[KO:Ports:]
+[NL:Ports:]
+[NO:Ports:]
+[PL:Ports:]
+[PT:Ports:]
+[RO:Ports:]
+[RU:Ports:]
+[SV:Ports:]
+[TR:Ports:]
+[ZH:Ports:]
+</menu-item>
+
+<menu-item basename="index">
+[AR:Debian for PA-RISC:]
+[DA:Debian for PA-RISC:]
+[DE:Debian für PA-RISC:]
+[EL:Debian for PA-RISC:]
+[EN:Debian for PA-RISC:]
+[EO:Debian for PA-RISC:]
+[ES:Debian for PA-RISC:]
+[FI:Debian for PA-RISC:]
+[FR:Debian for PA-RISC:]
+[HR:Debian for PA-RISC:]
+[HU:Debian for 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 for PA-RISC:]
+[RO:Debian for PA-RISC:]
+[RU:Debian for PA-RISC:]
+[SV:Debian for PA-RISC:]
+[TR:Debian for PA-RISC:]
+[ZH:Debian for PA-RISC:]
+</menu-item>