Make everything translatable and Case changes

CVS version numbers

english/template/debian/cdimage.wml: 1.69 -> 1.70

1 files changed, 44 insertions, 25 deletions

diff --git a/english/template/debian/cdimage.wml b/english/template/debian/cdimage.wml
index 30fde6df5e9..d3386824486 100644
--- a/english/template/debian/cdimage.wml
+++ b/english/template/debian/cdimage.wml
@@ -8,22 +8,43 @@
   <gettext>&middot;</gettext>
 </define-tag>
 <define-tag dc_faq whitespace=delete>
-  <gettext><void id="dc_faq" />faq</gettext>
+  <gettext><void id="dc_faq" />FAQ</gettext>
 </define-tag>
 <define-tag dc_jigdo whitespace=delete>
-  <gettext>download with jigdo</gettext>
+  <gettext>Download with Jigdo</gettext>
 </define-tag>
 <define-tag dc_httpftp whitespace=delete>
-  <gettext>download via http/ftp</gettext>
+  <gettext>Download via HTTP/FTP</gettext>
 </define-tag>
 <define-tag dc_buy whitespace=delete>
-  <gettext>buy pre-made images</gettext>
+  <gettext>Buy CDs or DVDs</gettext>
 </define-tag>
 <define-tag dc_net whitespace=delete>
-  <gettext>network install</gettext>
+  <gettext>Network Install</gettext>
+</define-tag>
+<define-tag dc_download whitespace=delete>
+  <gettext><void id="dc_download" />Download</gettext>
 </define-tag>
 <define-tag dc_misc whitespace=delete>
-  <gettext><void id="dc_misc" />misc</gettext>
+  <gettext><void id="dc_misc" />Misc</gettext>
+</define-tag>
+<define-tag dc_artwork whitespace=delete>
+  <gettext><void id="dc_artwork" />Artwork</gettext>
+</define-tag>
+<define-tag dc_mirroring whitespace=delete>
+  <gettext><void id="dc_mirroring" />Mirroring</gettext>
+</define-tag>
+<define-tag dc_rsyncmirrors whitespace=delete>
+  <gettext><void id="dc_rsyncmirrors" />Rsync Mirrors</gettext>
+</define-tag>
+<define-tag dc_torrent whitespace=delete>
+  <gettext><void id="dc_torrent" />Download with Torrent</gettext>
+</define-tag>
+<define-tag dc_pik whitespace=delete>
+  <gettext><void id="dc_pik" />Pseudo Image Kit</gettext>
+</define-tag>
+<define-tag dc_relinfo whitespace=delete>
+  <gettext><void id="dc_relinfo" />Image Release Info</gettext>
 </define-tag>
 <define-tag debian-cd-team whitespace=delete>
   <gettext>Debian CD team</gettext>
@@ -67,7 +88,7 @@
     <set-var cdimage:release-notes-version=<get-var version/> />
     <set-var cdimage:release-notes=%body />
   "/>
-  <dt><strong><a name="<get-var version/>"><get-var title/></a></strong></dt>
+  <dt><strong><a name="<get-var version/>"></a><get-var title/></strong></dt>
   <dd>%body</dd>
   <restore title version />
 </define-tag>
@@ -87,27 +108,25 @@
 <!--UdmComment-->
       <p><a href="$(HOME)/CD/"><debiancd/></a></p>
     <ul>
-      <li><a href="$(HOME)/CD/faq/"><faq-bottom/></a></li>
-      <li><a href="$(HOME)/CD/netinst/"><net-install-bottom/></a></li>
-      <li><a href="$(HOME)/CD/vendors/"><buy-bottom/></a></li>
-      <li>Download<br>
-         <ul>
-      <li><a href="$(HOME)/CD/jigdo-cd/"><jigdo-bottom/></a></li>
-      <li><a href="$(HOME)/CD/http-ftp/"><http-ftp-bottom/></a></li>
-      <li><a href="$(HOME)/CD/jigdo-cd/"><dc_jigdo/></a></li>
-      <li><a href="$(HOME)/CD/http-ftp/"><dc_httpftp/></a></li>
-      <li><a href="$(HOME)/CD/mirroring/rsync-mirrors">Rsync-Mirrors</a></li>
-      <li><a href="$(HOME)/CD/torrent-cd/">Torrent</a></li>
-
-	 </ul>
-      </li>
-      <li><a href="$(HOME)/CD/misc"><misc-bottom/></a></li>
-<!--
       <li><a href="$(HOME)/CD/faq/"><dc_faq/></a></li>
       <li><a href="$(HOME)/CD/netinst/"><dc_net/></a></li>
       <li><a href="$(HOME)/CD/vendors/"><dc_buy/></a></li>
-      <li><a href="$(HOME)/CD/misc"><dc_misc/></a></li>
--->
+      <li><dc_download/>
+         <ul>
+         <li><a href="$(HOME)/CD/jigdo-cd/"><dc_jigdo/></a></li>
+         <li><a href="$(HOME)/CD/http-ftp/"><dc_httpftp/></a></li>
+         <li><a href="$(HOME)/CD/torrent-cd/"><dc_torrent/></a></li>
+         <li><a href="$(HOME)/CD/mirroring/rsync-mirrors"><dc_rsyncmirrors/></a></li>
+	 </ul>
+      </li>
+      <li><dc_misc/>
+         <ul>
+	  <li><a href="$(HOME)/CD/artwork/"><dc_artwork/></a></li>
+	  <li><a href="$(HOME)/CD/mirroring/"><dc_mirroring/></a></li>
+	  <li><a href="$(HOME)/CD/pik/"><dc_pik/></a></li>
+	  <li><a href="$(HOME)/CD/releases/"><dc_relinfo/></a></li>
+	 </ul>
+      </li>
     </ul>
 <!--/UdmComment-->
 </div> <!-- end leftcol -->